fix

Author: conglinduye

.codeclimate.yml

@@ -0,0 +1,6 @@
+version: "2"
+plugins:
+  sonar-java:
+    enabled: true
+    config:
+      sonar.java.source: 8

.travis.yml

@@ -3,4 +3,5 @@ language: java
 jdk: oraclejdk8
 
 script:
+  - ./gradlew lint
   - ./gradlew test

build.gradle

@@ -4,6 +4,7 @@ version '1.0.0'
 apply plugin: 'java'
 apply plugin: 'com.google.protobuf'
 apply plugin: 'application'
+apply plugin: 'checkstyle'
 
 sourceCompatibility = 1.8
 mainClassName = 'org.tron.example.Tron'
@@ -21,6 +22,19 @@ buildscript {
     }
 }
 
+def versions = [
+        checkstyle: '8.7',
+]
+
+configurations {
+    checkstyleConfig
+
+}
+
+configurations.getByName('checkstyleConfig') {
+    transitive = false
+}
+
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
     testCompile group: 'org.mockito', name: 'mockito-all', version: '1.9.5'
@@ -86,8 +100,30 @@ dependencies {
     compile group: 'org.apache.commons', name: 'commons-math', version: '2.2'
 
     compile group: 'io.dropwizard.metrics', name: 'metrics-core', version: '3.1.2'
+
+    checkstyleConfig "com.puppycrawl.tools:checkstyle:${versions.checkstyle}"
+
+}
+
+task lint(type: Checkstyle) {
+    // Cleaning the old log because of the creation of the new ones (not sure if totaly needed)
+    delete fileTree(dir: "${project.rootDir}/app/build/reports")
+    source 'src'
+    include '**/*.java'
+    exclude '**/gen/**'
+    // empty classpath
+    classpath = files()
+    //Failing the build
+    ignoreFailures = false
 }
 
+checkstyle {
+    toolVersion = "${versions.checkstyle}"
+    config = resources.text.fromArchiveEntry(configurations.checkstyleConfig, 'google_checks.xml')
+}
+
+
+
 tasks.matching { it instanceof Test }.all {
     testLogging.events = ["failed", "passed", "skipped"]
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Sat Jan 06 16:37:04 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-rc-2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -6,31 +6,30 @@
 
 public class Application {
 
-    private Injector injector;
-    private ServiceContainer services;
-
-    private static final Logger logger = LoggerFactory.getLogger("Application");
-
-    public Application(Injector injector) {
-        this.injector = injector;
-        this.services = new ServiceContainer();
-    }
-
-    public Injector getInjector() {
-        return injector;
-    }
-
-    public void addService(Service service) {
-        this.services.add(service);
-    }
-
-    public void run() {
-        this.services.start();
-    }
-
-    public void shutdown() {
-        logger.info("shutting down");
-        this.services.stop();
-        System.exit(0);
-    }
+  private static final Logger logger = LoggerFactory.getLogger("Application");
+  private Injector injector;
+  private ServiceContainer services;
+
+  public Application(Injector injector) {
+    this.injector = injector;
+    this.services = new ServiceContainer();
+  }
+
+  public Injector getInjector() {
+    return injector;
+  }
+
+  public void addService(Service service) {
+    this.services.add(service);
+  }
+
+  public void run() {
+    this.services.start();
+  }
+
+  public void shutdown() {
+    logger.info("shutting down");
+    this.services.stop();
+    System.exit(0);
+  }
 }

gradlew

@@ -5,31 +5,31 @@
 
 public class ApplicationFactory {
 
-    /**
-     * Build a Guice instance
-     *
-     * @return Guice
-     */
-    public Injector buildGuice() {
-        return Guice.createInjector(
-            new Module());
-    }
+  /**
+   * Build a Guice instance
+   *
+   * @return Guice
+   */
+  public Injector buildGuice() {
+    return Guice.createInjector(
+        new Module());
+  }
 
-    /**
-     * Build a new application
-     *
-     * @return
-     */
-    public Application build() {
-        return new Application(buildGuice());
-    }
+  /**
+   * Build a new application
+   *
+   * @return
+   */
+  public Application build() {
+    return new Application(buildGuice());
+  }
 
-    /**
-     * Build a new cli application
-     *
-     * @return
-     */
-    public CliApplication buildCli() {
-        return new CliApplication(buildGuice());
-    }
+  /**
+   * Build a new cli application
+   *
+   * @return
+   */
+  public CliApplication buildCli() {
+    return new CliApplication(buildGuice());
+  }
 }

src/main/java/org/tron/application/Application.java

@@ -5,17 +5,17 @@
 
 public class CliApplication extends Application {
 
-    private Peer peer;
+  private Peer peer;
 
-    public CliApplication(Injector injector) {
-        super(injector);
-    }
+  public CliApplication(Injector injector) {
+    super(injector);
+  }
 
-    public Peer getPeer() {
-        return peer;
-    }
+  public Peer getPeer() {
+    return peer;
+  }
 
-    public void setPeer(Peer peer) {
-        this.peer = peer;
-    }
+  public void setPeer(Peer peer) {
+    this.peer = peer;
+  }
 }

src/main/java/org/tron/application/ApplicationFactory.java

@@ -1,52 +1,58 @@
 package org.tron.application;
 
+import static org.tron.core.Constant.BLOCK_DB_NAME;
+import static org.tron.core.Constant.TRANSACTION_DB_NAME;
+
 import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
+import javax.inject.Named;
 import org.tron.consensus.client.Client;
 import org.tron.consensus.server.Server;
+import org.tron.core.Blockchain;
 import org.tron.core.Constant;
 import org.tron.storage.leveldb.LevelDbDataSourceImpl;
 
-import javax.inject.Named;
-
-import static org.tron.core.Constant.BLOCK_DB_NAME;
-import static org.tron.core.Constant.TRANSACTION_DB_NAME;
-
 public class Module extends AbstractModule {
 
-    @Override
-    protected void configure() {
-
-    }
-
-    @Provides
-    @Singleton
-    public Client buildClient() {
-        return new Client();
-    }
-
-    @Provides
-    @Singleton
-    public Server buildServer() {
-        return new Server();
-    }
-
-    @Provides
-    @Singleton
-    @Named("transaction")
-    public LevelDbDataSourceImpl buildTransactionDb() {
-        LevelDbDataSourceImpl db = new LevelDbDataSourceImpl(Constant.NORMAL,TRANSACTION_DB_NAME);
-        db.initDB();
-        return db;
-    }
-
-    @Provides
-    @Singleton
-    @Named("block")
-    public LevelDbDataSourceImpl buildBlockDb() {
-        LevelDbDataSourceImpl db = new LevelDbDataSourceImpl(Constant.NORMAL,BLOCK_DB_NAME);
-        db.initDB();
-        return db;
-    }
+  @Override
+  protected void configure() {
+
+  }
+
+  @Provides
+  @Singleton
+  public Client buildClient() {
+    return new Client();
+  }
+
+  @Provides
+  @Singleton
+  public Server buildServer() {
+    return new Server();
+  }
+
+  @Provides
+  @Singleton
+  @Named("transaction")
+  public LevelDbDataSourceImpl buildTransactionDb() {
+    LevelDbDataSourceImpl db = new LevelDbDataSourceImpl(Constant.NORMAL, TRANSACTION_DB_NAME);
+    db.initDB();
+    return db;
+  }
+
+  @Provides
+  @Singleton
+  @Named("block")
+  public LevelDbDataSourceImpl buildBlockDb() {
+    LevelDbDataSourceImpl db = new LevelDbDataSourceImpl(Constant.NORMAL, BLOCK_DB_NAME);
+    db.initDB();
+    return db;
+  }
+
+  @Provides
+  @Singleton
+  public Blockchain buildBlockchain(@Named("block") LevelDbDataSourceImpl blockDB) {
+    return new Blockchain(blockDB);
+  }
 }