Merge pull request #854 from tronprotocol/develop

merge develop

Author: zhaohong

.travis.yml

@@ -1,13 +1,20 @@
 sudo: required
 language: java
 jdk: oraclejdk8
-script:
-- sh tron.sh
-- ./gradlew lint
-- ./gradlew test
 addons:
   ssh_known_hosts:
   - 47.93.9.236:22008
+  sonarcloud:
+    organization: tron-zhaohong
+    token:
+      secure: "KXWEeQ1elAoQ0XfR54TQWfhrIdDP0+2CYPv2X9aWpU/YDl7hqZBAjcCOAUGvlbyM54jtG6YMaWwG48jlrOwwl5l/VjWSnUXF+7ixQy5ki0Ci9s7Y1pTQwV9SpL8TLIK2TYqabN8Mw+FJULASXLjYr9GerbbcUbCPTmcL6mQKw6ivxxpNPmz4eNoKAEuOzruO9fTXGAV3yr8Nn85c+mVxV8EUhkR17zpE9O8fvzOtSnYArWNOSCgDBn0EG45UNNPF2vn44s1c3h3gX1m3WK6PeCXPgy3hPqRn3wTG+xglnbqthGpo2wt1rJ83af+BwdYwvPEcUq84yLgXcE/aMkTKcVAfPWBP/6vblaoI90jxCeFji+MdMimKZAqIXt7oLqDZVmIq65de5YC5s7QTSbzJNY/tsAu3dqzSfbUJY6CRNFDcoenVpvgQkqb37TkDah4mJM8EUjbu2A9Q2HSFbyCVsQJtdasuu9cBOf6azK3U0XgFNBc0y2aziZrTnX30q7bi+5L/mbTnRdXrDqBOqyPeGtT77UZfcajHHmEWU/e6gYWiA/c+K25n13DD53Au6gpnnQ6ALeUl/1gDwz3fPBebJ5bVWrkIcLj7bbysjzfOvQmDS6G13RNz58Hm0/B7bVtZTr1E1q6Z1zEJwbuJYEJASNcezAfK5x/hIfZTGNqT3M8="
+cache:
+  directories:
+    - '$HOME/.sonar/cache'
+script:
+- sh tron.sh
+- "./gradlew build"
+- sonar-scanner
 skip_build:
 - README.md：
 - LICENSE
@@ -17,6 +24,5 @@ deploy:
   on:
     branch: develop
 after_deploy:
-  - ./gradlew stest
-
+- "./gradlew stest"
 

build.gradle

@@ -1,3 +1,18 @@
+buildscript {
+    repositories {
+        maven { url 'http://mvnrepository.com' }
+        mavenCentral()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
+    }
+}
+plugins {
+    id "org.sonarqube" version "2.6"
+}
+
 group 'org.tron'
 version '1.0.0'
 
@@ -8,7 +23,6 @@ apply plugin: 'checkstyle'
 apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: "jacoco"
 
-
 sourceCompatibility = 1.8
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 mainClassName = 'org.tron.program.FullNode'
@@ -18,19 +32,6 @@ repositories {
     mavenLocal()
     mavenCentral()
 }
-
-buildscript {
-    repositories {
-        maven { url 'http://mvnrepository.com' }
-        mavenCentral()
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3'
-        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
-    }
-}
-
 def versions = [
         checkstyle: '8.7',
 ]
@@ -143,17 +144,15 @@ checkstyle {
 }
 
 checkstyleMain {
-    source 'src'
-    include '**/*.java'
-    exclude '**/gen/**'
+    source = 'src/main/java'
 }
 
 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/**'
+    exclude 'main/gen/**'
     // empty classpath
     classpath = files()
     //Failing the build
@@ -186,6 +185,7 @@ protobuf {
     protoc {
         artifact = "com.google.protobuf:protoc:3.5.1-1"
     }
+
     plugins {
         grpc {
             artifact = 'io.grpc:protoc-gen-grpc-java:1.9.0'
@@ -223,14 +223,22 @@ test {
         exceptionFormat = 'full'
     }
     jacoco {
-        append = false
+        append = true
         destinationFile = file("$buildDir/jacoco/jacocoTest.exec")
     }
 }
 
-task stest(type:Test){
-    useTestNG{
-        suites( file('src/test/resources/testng.xml') )
+jacocoTestReport {
+    reports {
+        xml.enabled false
+        csv.enabled false
+        html.destination file("${buildDir}/jacocoHtml")
+    }
+}
+
+task stest(type: Test) {
+    useTestNG {
+        suites(file('src/test/resources/testng.xml'))
     }
 
     testLogging {
@@ -239,7 +247,7 @@ task stest(type:Test){
     }
 }
 
-def binaryRelease(taskName,jarName,mainClass) {
+def binaryRelease(taskName, jarName, mainClass) {
     return tasks.create("${taskName}", Jar) {
         baseName = jarName
         version = null
@@ -259,7 +267,8 @@ def binaryRelease(taskName,jarName,mainClass) {
     }
 }
 
+
 artifacts {
-    archives(binaryRelease('buildSolidityNodeJar','SolidityNode','org.tron.program.SolidityNode'),
-            binaryRelease('buildFullNodeJar','FullNode','org.tron.program.FullNode'))
+    archives(binaryRelease('buildSolidityNodeJar', 'SolidityNode', 'org.tron.program.SolidityNode'),
+            binaryRelease('buildFullNodeJar', 'FullNode', 'org.tron.program.FullNode'))
 }

sonar-project.properties

@@ -0,0 +1,19 @@
+sonar.projectKey=java-tron
+sonar.projectName=java-tron
+sonar.projectVersion=2.1
+# =====================================================
+#   Meta-data for the project
+# =====================================================
+sonar.links.homepage=https://github.com/tronprotocol/java-tron
+sonar.links.ci=https://travis-ci.org/tronprotocol/java-tron
+sonar.links.scm=https://github.com/tronprotocol/java-tron
+sonar.links.issue=https://github.com/tronprotocol/java-tron/issues
+# =====================================================
+#   Properties that will be shared amongst all modules
+# =====================================================
+# SQ standard properties
+sonar.sources=src/main
+sonar.tests=src/test
+sonar.java.binaries=build/classes
+# =====================================================
+#   Properties that will be shared amongst all modules

src/main/java/org/tron/common/overlay/client/DatabaseGrpcClient.java

@@ -37,6 +37,10 @@ public Block getBlock(long blockNum) {
     return databaseBlockingStub.getBlockByNum(builder.build());
   }
 
+  public void shutdown() {
+    channel.shutdown();
+  }
+
   public DynamicProperties getDynamicProperties() {
     return databaseBlockingStub.getDynamicProperties(EmptyMessage.newBuilder().build());
   }

src/main/java/org/tron/common/overlay/client/PeerClient.java

@@ -18,10 +18,10 @@
 import org.springframework.stereotype.Component;
 import org.tron.common.overlay.discover.Node;
 import org.tron.common.overlay.discover.NodeHandler;
-import org.tron.common.overlay.message.ReasonCode;
 import org.tron.common.overlay.server.TronChannelInitializer;
 import org.tron.core.config.args.Args;
 import org.tron.core.net.node.NodeImpl;
+import org.tron.protos.Protocol.ReasonCode;
 
 @Component
 public class PeerClient {

src/main/java/org/tron/common/overlay/discover/DiscoverListener.java

@@ -24,19 +24,23 @@
  */
 public interface DiscoverListener {
 
-    /**
-     * Invoked whenever a new node appeared which meets criteria specified
-     * in the {@link NodeManager#addDiscoverListener} method
-     */
-    void nodeAppeared(NodeHandler handler);
+  /**
+   * Invoked whenever a new node appeared which meets criteria specified in the {@link
+   * NodeManager#addDiscoverListener} method
+   */
+  void nodeAppeared(NodeHandler handler);
 
-    /**
-     * Invoked whenever a node stops meeting criteria.
-     */
-    void nodeDisappeared(NodeHandler handler);
+  /**
+   * Invoked whenever a node stops meeting criteria.
+   */
+  void nodeDisappeared(NodeHandler handler);
 
-    class Adapter implements DiscoverListener {
-        public void nodeAppeared(NodeHandler handler) {}
-        public void nodeDisappeared(NodeHandler handler) {}
+  class Adapter implements DiscoverListener {
+
+    public void nodeAppeared(NodeHandler handler) {
+    }
+
+    public void nodeDisappeared(NodeHandler handler) {
     }
+  }
 }

src/main/java/org/tron/common/overlay/discover/DiscoverTask.java

@@ -17,78 +17,84 @@
  */
 package org.tron.common.overlay.discover;
 
+import java.util.ArrayList;
+import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tron.common.overlay.discover.table.KademliaOptions;
 import org.tron.common.overlay.discover.table.NodeEntry;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class DiscoverTask implements Runnable {
-    private static final Logger logger = LoggerFactory.getLogger("DiscoverTask");
 
-    NodeManager nodeManager;
+  private static final Logger logger = LoggerFactory.getLogger("DiscoverTask");
 
-    byte[] nodeId;
+  NodeManager nodeManager;
 
-    public DiscoverTask(NodeManager nodeManager) {
-        this.nodeManager = nodeManager;
-        nodeId = nodeManager.homeNode.getId();
-    }
+  byte[] nodeId;
 
-    @Override
-    public void run() {
-        discover(nodeId, 0, new ArrayList<Node>());
-    }
+  public DiscoverTask(NodeManager nodeManager) {
+    this.nodeManager = nodeManager;
+    nodeId = nodeManager.homeNode.getId();
+  }
+
+  @Override
+  public void run() {
+    discover(nodeId, 0, new ArrayList<Node>());
+  }
 
-    public synchronized void discover(byte[] nodeId, int round, List<Node> prevTried) {
+  public synchronized void discover(byte[] nodeId, int round, List<Node> prevTried) {
 
-        try {
-            if (round == KademliaOptions.MAX_STEPS) {
-                logger.debug("Node table contains [{}] peers", nodeManager.getTable().getNodesCount());
-                logger.debug("{}", String.format("(KademliaOptions.MAX_STEPS) Terminating discover after %d rounds.", round));
-                logger.trace("{}\n{}", String.format("Nodes discovered %d ", nodeManager.getTable().getNodesCount()), dumpNodes());
-                return;
-            }
+    try {
+      if (round == KademliaOptions.MAX_STEPS) {
+        logger.debug("Node table contains [{}] peers", nodeManager.getTable().getNodesCount());
+        logger.debug("{}", String
+            .format("(KademliaOptions.MAX_STEPS) Terminating discover after %d rounds.", round));
+        logger.trace("{}\n{}",
+            String.format("Nodes discovered %d ", nodeManager.getTable().getNodesCount()),
+            dumpNodes());
+        return;
+      }
 
-            List<Node> closest = nodeManager.getTable().getClosestNodes(nodeId);
-            List<Node> tried = new ArrayList<>();
-            for (Node n : closest) {
-                if (!tried.contains(n) && !prevTried.contains(n)) {
-                    try {
-                        nodeManager.getNodeHandler(n).sendFindNode(nodeId);
-                        tried.add(n);
-                        Thread.sleep(50);
-                    }catch (InterruptedException e) {
-                    } catch (Exception ex) {
-                        logger.error("Unexpected Exception " + ex, ex);
-                    }
-                }
-                if (tried.size() == KademliaOptions.ALPHA) {
-                    break;
-                }
-            }
+      List<Node> closest = nodeManager.getTable().getClosestNodes(nodeId);
+      List<Node> tried = new ArrayList<>();
+      for (Node n : closest) {
+        if (!tried.contains(n) && !prevTried.contains(n)) {
+          try {
+            nodeManager.getNodeHandler(n).sendFindNode(nodeId);
+            tried.add(n);
+            Thread.sleep(50);
+          } catch (InterruptedException e) {
+          } catch (Exception ex) {
+            logger.error("Unexpected Exception " + ex, ex);
+          }
+        }
+        if (tried.size() == KademliaOptions.ALPHA) {
+          break;
+        }
+      }
 
-            if (tried.isEmpty()) {
-                logger.debug("{}", String.format("(tried.isEmpty()) Terminating discover after %d rounds.", round));
-                logger.trace("{}\n{}", String.format("Nodes discovered %d ", nodeManager.getTable().getNodesCount()), dumpNodes());
-                return;
-            }
+      if (tried.isEmpty()) {
+        logger.debug("{}",
+            String.format("(tried.isEmpty()) Terminating discover after %d rounds.", round));
+        logger.trace("{}\n{}",
+            String.format("Nodes discovered %d ", nodeManager.getTable().getNodesCount()),
+            dumpNodes());
+        return;
+      }
 
-            tried.addAll(prevTried);
+      tried.addAll(prevTried);
 
-            discover(nodeId, round + 1, tried);
-        } catch (Exception ex) {
-            logger.error("{}", ex);
-        }
+      discover(nodeId, round + 1, tried);
+    } catch (Exception ex) {
+      logger.error("{}", ex);
     }
+  }
 
-    private String dumpNodes() {
-        String ret = "";
-        for (NodeEntry entry : nodeManager.getTable().getAllNodes()) {
-            ret += "    " + entry.getNode() + "\n";
-        }
-        return ret;
+  private String dumpNodes() {
+    String ret = "";
+    for (NodeEntry entry : nodeManager.getTable().getAllNodes()) {
+      ret += "    " + entry.getNode() + "\n";
     }
+    return ret;
+  }
 }