duplicate code improvement

Author: Parachuteuk

framework/src/main/java/org/tron/core/services/http/GetBrokerageServlet.java

@@ -24,7 +24,7 @@ public class GetBrokerageServlet extends RateLimiterServlet {
   protected void doGet(HttpServletRequest request, HttpServletResponse response) {
     try {
       int value = 0;
-      byte[] address = getAddress(request);
+      byte[] address = Util.getAddress(request);
       long cycle = manager.getDynamicPropertiesStore().getCurrentCycleNumber();
       if (address != null) {
         value = manager.getDelegationStore().getBrokerage(cycle, address);
@@ -39,24 +39,4 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
     doGet(request, response);
   }
 
-  private byte[] getAddress(HttpServletRequest request) throws Exception {
-    byte[] address = null;
-    String addressParam = "address";
-    String addressStr = request.getParameter(addressParam);
-    if (StringUtils.isBlank(addressStr)) {
-      String input = request.getReader().lines()
-          .collect(Collectors.joining(System.lineSeparator()));
-      Util.checkBodySize(input);
-      JSONObject jsonObject = JSONObject.parseObject(input);
-      addressStr = jsonObject.getString(addressParam);
-    }
-    if (StringUtils.isNotBlank(addressStr)) {
-      if (StringUtils.startsWith(addressStr, Constant.ADD_PRE_FIX_STRING_MAINNET)) {
-        address = Hex.decode(addressStr);
-      } else {
-        address = Wallet.decodeFromBase58Check(addressStr);
-      }
-    }
-    return address;
-  }
 }

framework/src/main/java/org/tron/core/services/http/GetRewardServlet.java

@@ -25,7 +25,7 @@ public class GetRewardServlet extends RateLimiterServlet {
   protected void doGet(HttpServletRequest request, HttpServletResponse response) {
     try {
       long value = 0;
-      byte[] address = getAddress(request);
+      byte[] address = Util.getAddress(request);
       if (address != null) {
         value = manager.getDelegationService().queryReward(address);
       }
@@ -44,24 +44,4 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
     doGet(request, response);
   }
 
-  private byte[] getAddress(HttpServletRequest request) throws Exception {
-    byte[] address = null;
-    String addressParam = "address";
-    String addressStr = request.getParameter(addressParam);
-    if (StringUtils.isBlank(addressStr)) {
-      String input = request.getReader().lines()
-          .collect(Collectors.joining(System.lineSeparator()));
-      Util.checkBodySize(input);
-      JSONObject jsonObject = JSONObject.parseObject(input);
-      addressStr = jsonObject.getString(addressParam);
-    }
-    if (StringUtils.isNotBlank(addressStr)) {
-      if (StringUtils.startsWith(addressStr, Constant.ADD_PRE_FIX_STRING_MAINNET)) {
-        address = Hex.decode(addressStr);
-      } else {
-        address = Wallet.decodeFromBase58Check(addressStr);
-      }
-    }
-    return address;
-  }
 }

framework/src/main/java/org/tron/core/services/http/Util.java

@@ -14,6 +14,7 @@
 import java.nio.charset.Charset;
 import java.security.InvalidParameterException;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -31,6 +32,7 @@
 import org.tron.common.utils.DecodeUtil;
 import org.tron.common.utils.Hash;
 import org.tron.common.utils.Sha256Hash;
+import org.tron.core.Constant;
 import org.tron.core.Wallet;
 import org.tron.core.actuator.TransactionFactory;
 import org.tron.core.capsule.BlockCapsule;
@@ -433,4 +435,25 @@ public static void printAccount(Account reply, HttpServletResponse response, Boo
     }
   }
 
+  public static byte[] getAddress(HttpServletRequest request) throws Exception {
+    byte[] address = null;
+    String addressParam = "address";
+    String addressStr = request.getParameter(addressParam);
+    if (org.apache.commons.lang3.StringUtils.isBlank(addressStr)) {
+      String input = request.getReader().lines()
+              .collect(Collectors.joining(System.lineSeparator()));
+      Util.checkBodySize(input);
+      JSONObject jsonObject = JSONObject.parseObject(input);
+      addressStr = jsonObject.getString(addressParam);
+    }
+    if (org.apache.commons.lang3.StringUtils.isNotBlank(addressStr)) {
+      if (org.apache.commons.lang3.StringUtils.startsWith(addressStr, Constant.ADD_PRE_FIX_STRING_MAINNET)) {
+        address = Hex.decode(addressStr);
+      } else {
+        address = Wallet.decodeFromBase58Check(addressStr);
+      }
+    }
+    return address;
+  }
+
 }