Merge branch 'develop' into feature/debug_net_limit

# Conflicts:
#	src/main/java/org/tron/core/witness/WitnessController.java

Author: sean-liu55

.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'
@@ -236,9 +236,9 @@ jacocoTestReport {
     }
 }
 
-task stest(type:Test){
-    useTestNG{
-        suites( file('src/test/resources/testng.xml') )
+task stest(type: Test) {
+    useTestNG {
+        suites(file('src/test/resources/testng.xml'))
     }
 
     testLogging {
@@ -247,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
@@ -267,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/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/NodeStatistics.java

@@ -21,7 +21,7 @@
 import static java.lang.Math.min;
 
 import java.util.concurrent.atomic.AtomicLong;
-import org.tron.common.overlay.message.ReasonCode;
+import org.tron.protos.Protocol.ReasonCode;
 
 public class NodeStatistics {
 

src/main/java/org/tron/common/overlay/message/DisconnectMessage.java

@@ -1,8 +1,8 @@
 package org.tron.common.overlay.message;
 
-import com.google.protobuf.InvalidProtocolBufferException;
 import org.tron.core.net.message.MessageTypes;
 import org.tron.protos.Protocol;
+import org.tron.protos.Protocol.ReasonCode;
 
 public class DisconnectMessage extends P2pMessage {
 
@@ -16,7 +16,7 @@ public DisconnectMessage(byte type, byte[] rawData) throws Exception{
   public DisconnectMessage(ReasonCode reasonCode) {
     this.disconnectMessage = Protocol.DisconnectMessage
         .newBuilder()
-        .setReason(Protocol.ReasonCode.forNumber(reasonCode.getReason()))
+        .setReason(reasonCode)
         .build();
     this.type = MessageTypes.P2P_DISCONNECT.asByte();
     this.data = this.disconnectMessage.toByteArray();
@@ -26,6 +26,10 @@ public int getReason() {
     return this.disconnectMessage.getReason().getNumber();
   }
 
+  public ReasonCode getReasonCode() {
+    return disconnectMessage.getReason();
+  }
+
   @Override
   public String toString() {
     return new StringBuilder().append(super.toString()).append("reason: ").append(this.disconnectMessage.getReason()).toString();

src/main/java/org/tron/common/overlay/message/ReasonCode.java

@@ -36,12 +36,12 @@
 import org.tron.common.overlay.message.DisconnectMessage;
 import org.tron.common.overlay.message.HelloMessage;
 import org.tron.common.overlay.message.MessageCodec;
-import org.tron.common.overlay.message.ReasonCode;
 import org.tron.common.overlay.message.StaticMessages;
 import org.tron.core.db.ByteArrayWrapper;
 import org.tron.core.exception.P2pException;
 import org.tron.core.net.peer.PeerConnectionDelegate;
 import org.tron.core.net.peer.TronHandler;
+import org.tron.protos.Protocol.ReasonCode;
 
 @Component
 @Scope("prototype")

src/main/java/org/tron/common/overlay/server/Channel.java

@@ -17,8 +17,8 @@
  */
 package org.tron.common.overlay.server;
 
-import static org.tron.common.overlay.message.ReasonCode.DUPLICATE_PEER;
-import static org.tron.common.overlay.message.ReasonCode.TOO_MANY_PEERS;
+import static org.tron.protos.Protocol.ReasonCode.DUPLICATE_PEER;
+import static org.tron.protos.Protocol.ReasonCode.TOO_MANY_PEERS;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -36,9 +36,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.tron.common.overlay.client.PeerClient;
-import org.tron.common.overlay.message.ReasonCode;
 import org.tron.core.config.args.Args;
 import org.tron.core.db.ByteArrayWrapper;
+import org.tron.protos.Protocol.ReasonCode;
 
 
 @Component

src/main/java/org/tron/common/overlay/server/ChannelManager.java

@@ -34,10 +34,10 @@
 import org.tron.common.overlay.message.HelloMessage;
 import org.tron.common.overlay.message.P2pMessage;
 import org.tron.common.overlay.message.P2pMessageFactory;
-import org.tron.common.overlay.message.ReasonCode;
 import org.tron.core.config.args.Args;
 import org.tron.core.db.Manager;
 import org.tron.core.net.peer.PeerConnection;
+import org.tron.protos.Protocol.ReasonCode;
 
 @Component
 @Scope("prototype")
@@ -92,7 +92,8 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> ou
         break;
       case P2P_DISCONNECT:
         if (channel.getNodeStatistics() != null){
-          channel.getNodeStatistics().nodeDisconnectedRemote(ReasonCode.fromInt(((DisconnectMessage) msg).getReason()));
+          channel.getNodeStatistics()
+              .nodeDisconnectedRemote(((DisconnectMessage) msg).getReasonCode());
         }
         channel.close();
         break;