Commit 32e9076e authored by WangKai's avatar WangKai
Browse files

fix some code style

parent 385263d9

pom.xml

+12 −0
Original line number Diff line number Diff line
@@ -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

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
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

+0 −29
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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.ConfigurationLoader;

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 ConfigurationLoader().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/ConfigurationLoader.java

+4 −4
Original line number Diff line number Diff line
@@ -27,16 +27,16 @@ import lombok.Getter; 
 * @author gaohongtao

 * @author wangkai

 */

public class ConfigLoader {

public class ConfigurationLoader {

    

    private static final ConfigParser[] PARSERS = new ConfigParser[]{new OptsConfigParser()};

    private static final ConfigurationParser[] PARSERS = new ConfigurationParser[]{new OpentracingConfigurationParser()};

    

    @Getter

    private final String tracerClassName;

    

    public ConfigLoader() {

    public ConfigurationLoader() {

        String tracerClassName = null;

        for (ConfigParser each : PARSERS) {

        for (ConfigurationParser each : PARSERS) {

            Optional<String> tracerClassOptional = each.parse("tracer.class");

            if (tracerClassOptional.isPresent()) {

                tracerClassName = tracerClassOptional.get();