Merge pull request tronprotocol#3111 from M-blockcoder/develop

optimize code structure

Author: DorianRust

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

@@ -22,18 +22,15 @@ public class ExchangeTransactionServlet extends RateLimiterServlet {
 
   protected void doPost(HttpServletRequest request, HttpServletResponse response) {
     try {
-      String contract = request.getReader().lines()
-          .collect(Collectors.joining(System.lineSeparator()));
-      Util.checkBodySize(contract);
-      boolean visible = Util.getVisiblePost(contract);
+      PostParams params = PostParams.getPostParams(request);
       ExchangeTransactionContract.Builder build = ExchangeTransactionContract.newBuilder();
-      JsonFormat.merge(contract, build, visible);
+      JsonFormat.merge(params.getParams(), build, params.isVisible());
       Transaction tx = wallet
           .createTransactionCapsule(build.build(), ContractType.ExchangeTransactionContract)
           .getInstance();
-      JSONObject jsonObject = JSONObject.parseObject(contract);
+      JSONObject jsonObject = JSONObject.parseObject(params.getParams());
       tx = Util.setTransactionPermissionId(jsonObject, tx);
-      response.getWriter().println(Util.printCreateTransaction(tx, visible));
+      response.getWriter().println(Util.printCreateTransaction(tx, params.isVisible()));
     } catch (Exception e) {
       Util.processError(e, response);
     }

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

@@ -85,18 +85,14 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
 
   protected void doPost(HttpServletRequest request, HttpServletResponse response) {
     try {
-      String input = request.getReader().lines()
-          .collect(Collectors.joining(System.lineSeparator()));
-      Util.checkBodySize(input);
-      boolean visible = Util.getVisiblePost(input);
-
+      PostParams params = PostParams.getPostParams(request);
       NumberMessage.Builder build = NumberMessage.newBuilder();
-      JsonFormat.merge(input, build, visible);
+      JsonFormat.merge(params.getParams(), build, params.isVisible());
 
       long num = build.getNum();
       if (num > 0L) {
         TransactionInfoList reply = wallet.getTransactionInfoByBlockNum(num);
-        response.getWriter().println(printTransactionInfoList(reply, visible));
+        response.getWriter().println(printTransactionInfoList(reply, params.isVisible()));
       } else {
         response.getWriter().println("{}");
       }

framework/src/main/java/org/tron/core/services/http/solidity/GetTransactionInfoByIdSolidityServlet.java

@@ -12,6 +12,7 @@
 import org.tron.common.utils.ByteArray;
 import org.tron.core.Wallet;
 import org.tron.core.services.http.JsonFormat;
+import org.tron.core.services.http.PostParams;
 import org.tron.core.services.http.RateLimiterServlet;
 import org.tron.core.services.http.Util;
 import org.tron.protos.Protocol.TransactionInfo;
@@ -49,17 +50,15 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
   @Override
   protected void doPost(HttpServletRequest request, HttpServletResponse response) {
     try {
-      String input = request.getReader().lines()
-          .collect(Collectors.joining(System.lineSeparator()));
-      Util.checkBodySize(input);
-      boolean visible = Util.getVisiblePost(input);
+      PostParams params = PostParams.getPostParams(request);
+
       BytesMessage.Builder build = BytesMessage.newBuilder();
-      JsonFormat.merge(input, build, visible);
+      JsonFormat.merge(params.getParams(), build, params.isVisible());
       TransactionInfo transInfo = wallet.getTransactionInfoById(build.build().getValue());
       if (transInfo == null) {
         response.getWriter().println("{}");
       } else {
-        response.getWriter().println(JsonFormat.printToString(transInfo, visible));
+        response.getWriter().println(JsonFormat.printToString(transInfo, params.isVisible()));
       }
     } catch (Exception e) {
       logger.debug("Exception: {}", e.getMessage());