Skip to content

Commit 2ab2677

Browse files
lxcmyflxcmyf
authored
fix(api):rollback due to insufficient compatibility (#5537)
1 parent e987efb commit 2ab2677

File tree

4 files changed

+29
-94
lines changed

4 files changed

+29
-94
lines changed

‎framework/src/main/java/org/tron/core/services/http/GetAssetIssueListServlet.java‎

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package org.tron.core.services.http;
22

3-
import static org.tron.core.services.http.Util.existVisible;
4-
5-
import java.io.IOException;
63
import javax.servlet.http.HttpServletRequest;
74
import javax.servlet.http.HttpServletResponse;
85
import lombok.extern.slf4j.Slf4j;
@@ -22,32 +19,19 @@ public class GetAssetIssueListServlet extends RateLimiterServlet {
2219
protected void doGet(HttpServletRequest request, HttpServletResponse response) {
2320
try {
2421
boolean visible = Util.getVisible(request);
25-
response(response, visible);
22+
AssetIssueList reply = wallet.getAssetIssueList();
23+
if (reply != null) {
24+
response.getWriter().println(JsonFormat.printToString(reply, visible));
25+
} else {
26+
response.getWriter().println("{}");
27+
}
2628
} catch (Exception e) {
2729
Util.processError(e, response);
2830
}
2931
}
3032

3133
@Override
3234
protected void doPost(HttpServletRequest request, HttpServletResponse response) {
33-
try {
34-
PostParams params = PostParams.getPostParams(request);
35-
boolean visible = Util.getVisible(request);
36-
if (!existVisible(request)) {
37-
visible = params.isVisible();
38-
}
39-
response(response, visible);
40-
} catch (Exception e) {
41-
Util.processError(e, response);
42-
}
43-
}
44-
45-
private void response(HttpServletResponse response, boolean visible) throws IOException {
46-
AssetIssueList reply = wallet.getAssetIssueList();
47-
if (reply != null) {
48-
response.getWriter().println(JsonFormat.printToString(reply, visible));
49-
} else {
50-
response.getWriter().println("{}");
51-
}
35+
doGet(request, response);
5236
}
5337
}

‎framework/src/main/java/org/tron/core/services/http/GetNowBlockServlet.java‎

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
package org.tron.core.services.http;
22

3-
import static org.tron.core.services.http.Util.existVisible;
4-
import static org.tron.core.services.http.Util.getVisible;
5-
6-
import java.io.IOException;
73
import javax.servlet.http.HttpServletRequest;
84
import javax.servlet.http.HttpServletResponse;
95
import lombok.extern.slf4j.Slf4j;
@@ -22,33 +18,20 @@ public class GetNowBlockServlet extends RateLimiterServlet {
2218
@Override
2319
protected void doGet(HttpServletRequest request, HttpServletResponse response) {
2420
try {
25-
boolean visible = getVisible(request);
26-
response(response, visible);
21+
boolean visible = Util.getVisible(request);
22+
Block reply = wallet.getNowBlock();
23+
if (reply != null) {
24+
response.getWriter().println(Util.printBlock(reply, visible));
25+
} else {
26+
response.getWriter().println("{}");
27+
}
2728
} catch (Exception e) {
2829
Util.processError(e, response);
2930
}
3031
}
3132

3233
@Override
3334
protected void doPost(HttpServletRequest request, HttpServletResponse response) {
34-
try {
35-
PostParams params = PostParams.getPostParams(request);
36-
boolean visible = getVisible(request);
37-
if (!existVisible(request)) {
38-
visible = params.isVisible();
39-
}
40-
response(response, visible);
41-
} catch (Exception e) {
42-
Util.processError(e, response);
43-
}
44-
}
45-
46-
private void response(HttpServletResponse response, boolean visible) throws IOException {
47-
Block reply = wallet.getNowBlock();
48-
if (reply != null) {
49-
response.getWriter().println(Util.printBlock(reply, visible));
50-
} else {
51-
response.getWriter().println("{}");
52-
}
35+
doGet(request, response);
5336
}
5437
}

‎framework/src/main/java/org/tron/core/services/http/ListNodesServlet.java‎

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package org.tron.core.services.http;
22

3-
import static org.tron.core.services.http.Util.existVisible;
4-
5-
import java.io.IOException;
63
import javax.servlet.http.HttpServletRequest;
74
import javax.servlet.http.HttpServletResponse;
85
import lombok.extern.slf4j.Slf4j;
@@ -22,32 +19,19 @@ public class ListNodesServlet extends RateLimiterServlet {
2219
protected void doGet(HttpServletRequest request, HttpServletResponse response) {
2320
try {
2421
boolean visible = Util.getVisible(request);
25-
response(response, visible);
22+
NodeList reply = wallet.listNodes();
23+
if (reply != null) {
24+
response.getWriter().println(JsonFormat.printToString(reply, visible));
25+
} else {
26+
response.getWriter().println("{}");
27+
}
2628
} catch (Exception e) {
2729
Util.processError(e, response);
2830
}
2931
}
3032

3133
@Override
3234
protected void doPost(HttpServletRequest request, HttpServletResponse response) {
33-
try {
34-
PostParams params = PostParams.getPostParams(request);
35-
boolean visible = Util.getVisible(request);
36-
if (!existVisible(request)) {
37-
visible = params.isVisible();
38-
}
39-
response(response, visible);
40-
} catch (Exception e) {
41-
Util.processError(e, response);
42-
}
43-
}
44-
45-
private void response(HttpServletResponse response, boolean visible) throws IOException {
46-
NodeList reply = wallet.listNodes();
47-
if (reply != null) {
48-
response.getWriter().println(JsonFormat.printToString(reply, visible));
49-
} else {
50-
response.getWriter().println("{}");
51-
}
35+
doGet(request, response);
5236
}
5337
}

‎framework/src/main/java/org/tron/core/services/http/ListProposalsServlet.java‎

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package org.tron.core.services.http;
22

3-
import static org.tron.core.services.http.Util.existVisible;
4-
5-
import java.io.IOException;
63
import javax.servlet.http.HttpServletRequest;
74
import javax.servlet.http.HttpServletResponse;
85
import lombok.extern.slf4j.Slf4j;
@@ -22,32 +19,19 @@ public class ListProposalsServlet extends RateLimiterServlet {
2219
protected void doGet(HttpServletRequest request, HttpServletResponse response) {
2320
try {
2421
boolean visible = Util.getVisible(request);
25-
response(response, visible);
22+
ProposalList reply = wallet.getProposalList();
23+
if (reply != null) {
24+
response.getWriter().println(JsonFormat.printToString(reply, visible));
25+
} else {
26+
response.getWriter().println("{}");
27+
}
2628
} catch (Exception e) {
2729
Util.processError(e, response);
2830
}
2931
}
3032

3133
@Override
3234
protected void doPost(HttpServletRequest request, HttpServletResponse response) {
33-
try {
34-
PostParams params = PostParams.getPostParams(request);
35-
boolean visible = Util.getVisible(request);
36-
if (!existVisible(request)) {
37-
visible = params.isVisible();
38-
}
39-
response(response, visible);
40-
} catch (Exception e) {
41-
Util.processError(e, response);
42-
}
43-
}
44-
45-
private void response(HttpServletResponse response, boolean visible) throws IOException {
46-
ProposalList reply = wallet.getProposalList();
47-
if (reply != null) {
48-
response.getWriter().println(JsonFormat.printToString(reply, visible));
49-
} else {
50-
response.getWriter().println("{}");
51-
}
35+
doGet(request, response);
5236
}
5337
}

0 commit comments

Comments
 (0)