merge develop

Author: geb789

framework/src/main/java/org/tron/core/config/args/Args.java

@@ -1000,7 +1000,8 @@ public static void initDBConfig(CommonParameter parameter) {
     DBConfig.setAllowProtoFilterNum(parameter.getAllowProtoFilterNum());
     DBConfig.setProposalExpireTime(parameter.getProposalExpireTime());
     DBConfig.setBlockNumForEneryLimit(parameter.getBlockNumForEneryLimit());
-    DBConfig.setFullNodeAllowShieldedTransaction(parameter.isFullNodeAllowShieldedTransactionArgs());
+    DBConfig.setFullNodeAllowShieldedTransaction(parameter
+        .isFullNodeAllowShieldedTransactionArgs());
     DBConfig.setZenTokenId(parameter.getZenTokenId());
     DBConfig.setValidContractProtoThreadNum(parameter.getValidContractProtoThreadNum());
     DBConfig.setVmTrace(parameter.isVmTrace());

framework/src/main/java/org/tron/core/db/backup/BackupDbUtil.java

@@ -42,7 +42,8 @@ private int getBackupState() {
   }
 
   private void setBackupState(int status) {
-    PropUtil.writeProperty(parameter.getDbBackupConfig().getPropPath(), BackupDbUtil.DB_BACKUP_STATE,
+    PropUtil.writeProperty(parameter.getDbBackupConfig()
+            .getPropPath(), BackupDbUtil.DB_BACKUP_STATE,
         String.valueOf(status));
   }
 

framework/src/main/java/org/tron/program/SolidityNode.java

@@ -59,7 +59,8 @@ public static void main(String[] args) {
     CommonParameter parameter = Args.getInstance();
 
     logger.info("index switch is {}",
-        BooleanUtils.toStringOnOff(BooleanUtils.toBoolean(parameter.getStorage().getIndexSwitch())));
+        BooleanUtils.toStringOnOff(BooleanUtils
+            .toBoolean(parameter.getStorage().getIndexSwitch())));
 
     if (StringUtils.isEmpty(parameter.getTrustNodeAddr())) {
       logger.error("Trust node not set.");

framework/src/test/java/org/tron/core/config/args/ArgsTest.java

@@ -74,7 +74,8 @@ public void get() {
     Assert.assertEquals(50051, parameter.getRpcPort());
     Assert.assertEquals(Integer.MAX_VALUE, parameter.getMaxConcurrentCallsPerConnection());
     Assert
-        .assertEquals(NettyServerBuilder.DEFAULT_FLOW_CONTROL_WINDOW, parameter.getFlowControlWindow());
+        .assertEquals(NettyServerBuilder
+            .DEFAULT_FLOW_CONTROL_WINDOW, parameter.getFlowControlWindow());
     Assert.assertEquals(60000L, parameter.getMaxConnectionIdleInMillis());
     Assert.assertEquals(Long.MAX_VALUE, parameter.getMaxConnectionAgeInMillis());
     Assert.assertEquals(GrpcUtil.DEFAULT_MAX_MESSAGE_SIZE, parameter.getMaxMessageSize());