Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
superrain51
apollo
提交
33ca9ec7
apollo
项目概览
superrain51
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
apollo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
33ca9ec7
编写于
6月 16, 2017
作者:
张
张乐
提交者:
GitHub
6月 16, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #640 from nobodyiam/revert-tomcat-custom-validator
Revert tomcat custom validator
上级
81fd3f07
d3cb418d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
2 addition
and
84 deletion
+2
-84
apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/DataSourceValidator.java
...ip/framework/apollo/common/utils/DataSourceValidator.java
+0
-27
apollo-common/src/main/resources/application.properties
apollo-common/src/main/resources/application.properties
+1
-1
apollo-common/src/test/java/com/ctrip/framework/apollo/common/AllTests.java
...test/java/com/ctrip/framework/apollo/common/AllTests.java
+1
-2
apollo-common/src/test/java/com/ctrip/framework/apollo/common/utils/DataSourceValidatorTest.java
...ramework/apollo/common/utils/DataSourceValidatorTest.java
+0
-54
未找到文件。
apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/DataSourceValidator.java
已删除
100644 → 0
浏览文件 @
81fd3f07
package
com.ctrip.framework.apollo.common.utils
;
import
org.apache.tomcat.jdbc.pool.Validator
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
java.sql.Connection
;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public
class
DataSourceValidator
implements
Validator
{
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
DataSourceValidator
.
class
);
private
static
final
int
DEFAULT_VALIDATE_TIMEOUT_IN_SECONDS
=
5
;
@Override
public
boolean
validate
(
Connection
connection
,
int
validateAction
)
{
boolean
isValid
=
false
;
try
{
isValid
=
connection
.
isValid
(
DEFAULT_VALIDATE_TIMEOUT_IN_SECONDS
);
}
catch
(
Throwable
ex
)
{
LOGGER
.
warn
(
"Data source validation error"
,
ex
);
}
return
isValid
;
}
}
apollo-common/src/main/resources/application.properties
浏览文件 @
33ca9ec7
...
...
@@ -3,7 +3,7 @@ spring.http.converters.preferred-json-mapper=gson
# DataSource
spring.datasource.testWhileIdle
=
true
spring.datasource.testOnBorrow
=
true
spring.datasource.validat
orClassName
=
com.ctrip.framework.apollo.common.utils.DataSourceValidator
spring.datasource.validat
ionQuery
=
SELECT 1
spring.datasource.validationInterval
=
5000
spring.datasource.initSQL
=
set names utf8mb4
...
...
apollo-common/src/test/java/com/ctrip/framework/apollo/common/AllTests.java
浏览文件 @
33ca9ec7
package
com.ctrip.framework.apollo.common
;
import
com.ctrip.framework.apollo.common.utils.DataSourceValidatorTest
;
import
com.ctrip.framework.apollo.common.utils.InputValidatorTest
;
import
org.junit.runner.RunWith
;
...
...
@@ -9,7 +8,7 @@ import org.junit.runners.Suite.SuiteClasses;
@RunWith
(
Suite
.
class
)
@SuiteClasses
({
InputValidatorTest
.
class
,
DataSourceValidatorTest
.
class
InputValidatorTest
.
class
})
public
class
AllTests
{
...
...
apollo-common/src/test/java/com/ctrip/framework/apollo/common/utils/DataSourceValidatorTest.java
已删除
100644 → 0
浏览文件 @
81fd3f07
package
com.ctrip.framework.apollo.common.utils
;
import
org.junit.Before
;
import
org.junit.Test
;
import
java.sql.Connection
;
import
static
org
.
junit
.
Assert
.*;
import
static
org
.
mockito
.
Matchers
.
anyInt
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
when
;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public
class
DataSourceValidatorTest
{
private
DataSourceValidator
datasourceValidator
;
@Before
public
void
setUp
()
throws
Exception
{
datasourceValidator
=
new
DataSourceValidator
();
}
@Test
public
void
testValidateSuccessfully
()
throws
Exception
{
Connection
someConnection
=
mock
(
Connection
.
class
);
int
someValidationAction
=
1
;
when
(
someConnection
.
isValid
(
anyInt
())).
thenReturn
(
true
);
assertTrue
(
datasourceValidator
.
validate
(
someConnection
,
someValidationAction
));
}
@Test
public
void
testValidateFailed
()
throws
Exception
{
Connection
someConnection
=
mock
(
Connection
.
class
);
int
someValidationAction
=
1
;
when
(
someConnection
.
isValid
(
anyInt
())).
thenReturn
(
false
);
assertFalse
(
datasourceValidator
.
validate
(
someConnection
,
someValidationAction
));
}
@Test
public
void
testValidateWithException
()
throws
Exception
{
Connection
someConnection
=
mock
(
Connection
.
class
);
int
someValidationAction
=
1
;
when
(
someConnection
.
isValid
(
anyInt
())).
thenThrow
(
new
RuntimeException
(
"error"
));
assertFalse
(
datasourceValidator
.
validate
(
someConnection
,
someValidationAction
));
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录