Merge pull request tronprotocol#3404 from kaiserlinda/simplify_code

Simplify code with common functions
hujunbiao · Sep 17, 2020 · eee5bbd · eee5bbd
2 parents e641cc4 + cec45ae
commit eee5bbd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 23 deletions.
diff --git a/framework/src/main/java/org/tron/core/services/http/GetTransactionApprovedListServlet.java b/framework/src/main/java/org/tron/core/services/http/GetTransactionApprovedListServlet.java
@@ -24,14 +24,11 @@ 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);
-      Transaction transaction = Util.packTransaction(input, visible);
+      PostParams params = PostParams.getPostParams(request);
+      Transaction transaction = Util.packTransaction(params.getParams(), params.isVisible());
       TransactionApprovedList reply = wallet.getTransactionApprovedList(transaction);
       if (reply != null) {
-        response.getWriter().println(Util.printTransactionApprovedList(reply, visible));
+        response.getWriter().println(Util.printTransactionApprovedList(reply, params.isVisible()));
       } else {
         response.getWriter().println("{}");
       }

diff --git a/framework/src/main/java/org/tron/core/services/http/GetTransactionByIdServlet.java b/framework/src/main/java/org/tron/core/services/http/GetTransactionByIdServlet.java
@@ -33,13 +33,10 @@ 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);
       BytesMessage.Builder build = BytesMessage.newBuilder();
-      JsonFormat.merge(input, build, visible);
-      fillResponse(build.getValue(), visible, response);
+      JsonFormat.merge(params.getParams(), build, params.isVisible());
+      fillResponse(build.getValue(), params.isVisible(), response);
     } catch (Exception e) {
       Util.processError(e, response);
     }

diff --git a/...ework/src/main/java/org/tron/core/services/http/GetTransactionCountByBlockNumServlet.java b/...ework/src/main/java/org/tron/core/services/http/GetTransactionCountByBlockNumServlet.java
@@ -29,12 +29,9 @@ 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());
       fillResponse(build.getNum(), response);
     } catch (Exception e) {
       Util.processError(e, response);

diff --git a/framework/src/main/java/org/tron/core/services/http/GetTransactionInfoByIdServlet.java b/framework/src/main/java/org/tron/core/services/http/GetTransactionInfoByIdServlet.java
@@ -49,15 +49,12 @@ 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);
       BytesMessage.Builder build = BytesMessage.newBuilder();
-      JsonFormat.merge(input, build, visible);
+      JsonFormat.merge(params.getParams(), build, params.isVisible());
       TransactionInfo reply = wallet.getTransactionInfoById(build.getValue());
       if (reply != null) {
-        response.getWriter().println(convertLogAddressToTronAddress(reply, visible));
+        response.getWriter().println(convertLogAddressToTronAddress(reply, params.isVisible()));
       } else {
         response.getWriter().println("{}");
       }