Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
32e9076e
Shardingsphere
项目概览
apache
/
Shardingsphere
通知
56
Star
3
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Shardingsphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
32e9076e
编写于
3月 26, 2018
作者:
W
WangKai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix some code style
上级
385263d9
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
35 addition
and
62 deletion
+35
-62
pom.xml
pom.xml
+12
-0
sharding-opentracing/.travis.yml
sharding-opentracing/.travis.yml
+0
-7
sharding-opentracing/pom.xml
sharding-opentracing/pom.xml
+0
-29
sharding-opentracing/src/main/java/io/shardingjdbc/opentracing/ShardingJDBCTracer.java
.../java/io/shardingjdbc/opentracing/ShardingJDBCTracer.java
+2
-2
sharding-opentracing/src/main/java/io/shardingjdbc/opentracing/config/ConfigurationLoader.java
.../shardingjdbc/opentracing/config/ConfigurationLoader.java
+4
-4
sharding-opentracing/src/main/java/io/shardingjdbc/opentracing/config/ConfigurationParser.java
.../shardingjdbc/opentracing/config/ConfigurationParser.java
+1
-1
sharding-opentracing/src/main/java/io/shardingjdbc/opentracing/config/OpentracingConfigurationParser.java
...bc/opentracing/config/OpentracingConfigurationParser.java
+1
-1
sharding-opentracing/src/test/java/io/shardingjdbc/opentracing/AllTests.java
...g/src/test/java/io/shardingjdbc/opentracing/AllTests.java
+3
-3
sharding-opentracing/src/test/java/io/shardingjdbc/opentracing/ExecuteEventListenerTest.java
...io/shardingjdbc/opentracing/ExecuteEventListenerTest.java
+2
-2
sharding-opentracing/src/test/java/io/shardingjdbc/opentracing/ShardingJDBCTracerTest.java
...a/io/shardingjdbc/opentracing/ShardingJDBCTracerTest.java
+3
-4
sharding-opentracing/src/test/java/io/shardingjdbc/opentracing/config/ConfigurationLoaderTest.java
...rdingjdbc/opentracing/config/ConfigurationLoaderTest.java
+5
-5
sharding-opentracing/src/test/java/io/shardingjdbc/opentracing/fixture/FooTracer.java
...t/java/io/shardingjdbc/opentracing/fixture/FooTracer.java
+2
-4
未找到文件。
pom.xml
浏览文件 @
32e9076e
...
...
@@ -299,6 +299,18 @@
<version>
${spring-boot.version}
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.powermock
</groupId>
<artifactId>
powermock-module-junit4
</artifactId>
<version>
${powermock.version}
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.powermock
</groupId>
<artifactId>
powermock-api-mockito2
</artifactId>
<version>
${powermock.version}
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencyManagement>
...
...
sharding-opentracing/.travis.yml
已删除
100644 → 0
浏览文件 @
385263d9
language
:
java
jdk
:
-
oraclejdk8
before_script
:
-
echo "MAVEN_OPTS='-Xmx1024m -XX:MaxPermSize=256m'" > ~/.mavenrc
after_success
:
-
mvn clean cobertura:cobertura coveralls:report
\ No newline at end of file
sharding-opentracing/pom.xml
浏览文件 @
32e9076e
...
...
@@ -39,13 +39,11 @@
<dependency>
<groupId>
org.powermock
</groupId>
<artifactId>
powermock-module-junit4
</artifactId>
<version>
${powermock.version}
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.powermock
</groupId>
<artifactId>
powermock-api-mockito2
</artifactId>
<version>
${powermock.version}
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
...
...
@@ -53,17 +51,6 @@
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-compiler-plugin
</artifactId>
<configuration>
<source>
${java.version}
</source>
<target>
${java.version}
</target>
<testSource>
${java.version}
</testSource>
<testTarget>
${java.version}
</testTarget>
</configuration>
<version>
${maven-compiler-plugin.version}
</version>
</plugin>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-resources-plugin
</artifactId>
...
...
@@ -240,22 +227,6 @@
<artifactId>
coveralls-maven-plugin
</artifactId>
<version>
${coveralls-maven-plugin.version}
</version>
</plugin>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${maven-gpg-plugin.version}</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
-->
</plugins>
</build>
...
...
sharding-opentracing/src/main/java/io/shardingjdbc/opentracing/ShardingJDBCTracer.java
浏览文件 @
32e9076e
...
...
@@ -21,7 +21,7 @@ import io.opentracing.Tracer;
import
io.opentracing.util.GlobalTracer
;
import
io.shardingjdbc.core.exception.ShardingJdbcException
;
import
io.shardingjdbc.core.util.EventBusInstance
;
import
io.shardingjdbc.opentracing.config.ConfigLoader
;
import
io.shardingjdbc.opentracing.config.Config
uration
Loader
;
import
lombok.AccessLevel
;
import
lombok.NoArgsConstructor
;
...
...
@@ -41,7 +41,7 @@ public final class ShardingJDBCTracer {
if
(
GlobalTracer
.
isRegistered
())
{
return
;
}
String
tracerClassName
=
new
ConfigLoader
().
getTracerClassName
();
String
tracerClassName
=
new
Config
uration
Loader
().
getTracerClassName
();
try
{
init
((
Tracer
)
Class
.
forName
(
tracerClassName
).
newInstance
());
}
catch
(
final
InstantiationException
|
IllegalAccessException
|
ClassNotFoundException
ex
)
{
...
...
sharding-opentracing/src/main/java/io/shardingjdbc/opentracing/config/ConfigLoader.java
→
sharding-opentracing/src/main/java/io/shardingjdbc/opentracing/config/Config
uration
Loader.java
浏览文件 @
32e9076e
...
...
@@ -27,16 +27,16 @@ import lombok.Getter;
* @author gaohongtao
* @author wangkai
*/
public
class
ConfigLoader
{
public
class
Config
uration
Loader
{
private
static
final
Config
Parser
[]
PARSERS
=
new
ConfigParser
[]{
new
OptsConfig
Parser
()};
private
static
final
Config
urationParser
[]
PARSERS
=
new
ConfigurationParser
[]{
new
OpentracingConfiguration
Parser
()};
@Getter
private
final
String
tracerClassName
;
public
ConfigLoader
()
{
public
Config
uration
Loader
()
{
String
tracerClassName
=
null
;
for
(
ConfigParser
each
:
PARSERS
)
{
for
(
Config
uration
Parser
each
:
PARSERS
)
{
Optional
<
String
>
tracerClassOptional
=
each
.
parse
(
"tracer.class"
);
if
(
tracerClassOptional
.
isPresent
())
{
tracerClassName
=
tracerClassOptional
.
get
();
...
...
sharding-opentracing/src/main/java/io/shardingjdbc/opentracing/config/ConfigParser.java
→
sharding-opentracing/src/main/java/io/shardingjdbc/opentracing/config/Config
uration
Parser.java
浏览文件 @
32e9076e
...
...
@@ -25,7 +25,7 @@ import com.google.common.base.Optional;
* @author gaohongtao
* @author wangkai
*/
interface
ConfigParser
{
interface
Config
uration
Parser
{
/**
* Parse config item to config value.
...
...
sharding-opentracing/src/main/java/io/shardingjdbc/opentracing/config/Op
tsConfig
Parser.java
→
sharding-opentracing/src/main/java/io/shardingjdbc/opentracing/config/Op
entracingConfiguration
Parser.java
浏览文件 @
32e9076e
...
...
@@ -25,7 +25,7 @@ import com.google.common.base.Optional;
* @author gaohongtao
* @author wangkai
*/
public
class
Op
tsConfigParser
implements
Config
Parser
{
public
class
Op
entracingConfigurationParser
implements
Configuration
Parser
{
private
static
final
String
PREFIX
=
"shardingjdbc.opentracing"
;
...
...
sharding-opentracing/src/test/java/io/shardingjdbc/opentracing/AllTests.java
浏览文件 @
32e9076e
...
...
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
...
...
@@ -17,12 +17,12 @@
package
io.shardingjdbc.opentracing
;
import
io.shardingjdbc.opentracing.config.ConfigLoaderTest
;
import
io.shardingjdbc.opentracing.config.Config
uration
LoaderTest
;
import
org.junit.runner.RunWith
;
import
org.junit.runners.Suite
;
@RunWith
(
Suite
.
class
)
@Suite
.
SuiteClasses
({
ConfigLoaderTest
.
class
,
@Suite
.
SuiteClasses
({
Config
uration
LoaderTest
.
class
,
ExecuteEventListenerTest
.
class
,
ShardingJDBCTracerTest
.
class
})
...
...
sharding-opentracing/src/test/java/io/shardingjdbc/opentracing/ExecuteEventListenerTest.java
浏览文件 @
32e9076e
...
...
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
...
...
@@ -54,7 +54,7 @@ public class ExecuteEventListenerTest {
}
@Before
public
void
before
()
throws
NoSuchFieldException
,
IllegalAccessException
{
public
void
before
()
{
TRACER
.
reset
();
}
...
...
sharding-opentracing/src/test/java/io/shardingjdbc/opentracing/ShardingJDBCTracerTest.java
浏览文件 @
32e9076e
...
...
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
...
...
@@ -21,8 +21,7 @@ import io.opentracing.NoopTracerFactory;
import
io.opentracing.Tracer
;
import
io.opentracing.util.GlobalTracer
;
import
io.shardingjdbc.core.exception.ShardingJdbcException
;
import
io.shardingjdbc.opentracing.config.OptsConfigParser
;
import
org.apache.commons.lang3.builder.ToStringExclude
;
import
io.shardingjdbc.opentracing.config.OpentracingConfigurationParser
;
import
org.hamcrest.core.Is
;
import
org.junit.Before
;
import
org.junit.Test
;
...
...
@@ -40,7 +39,7 @@ import static org.powermock.api.mockito.PowerMockito.mockStatic;
import
static
org
.
powermock
.
api
.
mockito
.
PowerMockito
.
when
;
@RunWith
(
PowerMockRunner
.
class
)
@PrepareForTest
(
Op
tsConfig
Parser
.
class
)
@PrepareForTest
(
Op
entracingConfiguration
Parser
.
class
)
public
class
ShardingJDBCTracerTest
{
@Before
...
...
sharding-opentracing/src/test/java/io/shardingjdbc/opentracing/config/ConfigLoaderTest.java
→
sharding-opentracing/src/test/java/io/shardingjdbc/opentracing/config/Config
uration
LoaderTest.java
浏览文件 @
32e9076e
...
...
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
...
...
@@ -29,18 +29,18 @@ import static org.powermock.api.mockito.PowerMockito.mockStatic;
import
static
org
.
powermock
.
api
.
mockito
.
PowerMockito
.
when
;
@RunWith
(
PowerMockRunner
.
class
)
@PrepareForTest
(
Op
tsConfig
Parser
.
class
)
public
class
ConfigLoaderTest
{
@PrepareForTest
(
Op
entracingConfiguration
Parser
.
class
)
public
class
Config
uration
LoaderTest
{
@Before
public
void
setUp
()
throws
Exception
{
public
void
setUp
()
{
mockStatic
(
System
.
class
);
}
@Test
public
void
assertLoadConfigFromProperty
()
{
when
(
System
.
getProperty
(
"shardingjdbc.opentracing.tracer.class"
)).
thenReturn
(
"com.foo.fooClass"
);
assertThat
(
new
ConfigLoader
().
getTracerClassName
(),
is
(
"com.foo.fooClass"
));
assertThat
(
new
Config
uration
Loader
().
getTracerClassName
(),
is
(
"com.foo.fooClass"
));
}
}
sharding-opentracing/src/test/java/io/shardingjdbc/opentracing/fixture/FooTracer.java
浏览文件 @
32e9076e
...
...
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
...
...
@@ -31,9 +31,7 @@ public class FooTracer implements Tracer {
}
@Override
public
<
C
>
void
inject
(
final
SpanContext
spanContext
,
final
Format
<
C
>
format
,
final
C
c
)
{
}
public
<
C
>
void
inject
(
final
SpanContext
spanContext
,
final
Format
<
C
>
format
,
final
C
c
)
{}
@Override
public
<
C
>
SpanContext
extract
(
final
Format
<
C
>
format
,
final
C
c
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录