Skip to content

Commit b47ed8f

Browse files
committed
suggestion improvement
1 parent 3108615 commit b47ed8f

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
2323
try {
2424
boolean visible = Util.getVisible(request);
2525
long getNum = Long.parseLong(request.getParameter("num"));
26-
writeRes(getNum, visible, response);
26+
writeResponse(getNum, visible, response);
2727
} catch (Exception e) {
2828
Util.processError(e, response);
2929
}
@@ -38,13 +38,14 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
3838
NumberMessage.Builder build = NumberMessage.newBuilder();
3939
JsonFormat.merge(input, build, visible);
4040
long getNum = build.getNum();
41-
writeRes(getNum, visible, response);
41+
writeResponse(getNum, visible, response);
4242
} catch (Exception e) {
4343
Util.processError(e, response);
4444
}
4545
}
4646

47-
private void writeRes(long getNum, boolean visible, HttpServletResponse response)
47+
private void writeResponse(long getNum, boolean visible,
48+
HttpServletResponse response)
4849
throws Exception {
4950
if (getNum > 0 && getNum < BLOCK_LIMIT_NUM) {
5051
BlockList reply = wallet.getBlockByLatestNum(getNum);

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) {
2424
boolean visible = Util.getVisible(request);
2525
long startNum = Long.parseLong(request.getParameter("startNum"));
2626
long endNum = Long.parseLong(request.getParameter("endNum"));
27-
writeRes(endNum, startNum, visible, response);
27+
writeResponse(endNum, startNum, visible, response);
2828
} catch (Exception e) {
2929
Util.processError(e, response);
3030
}
@@ -40,13 +40,14 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
4040
JsonFormat.merge(input, build, visible);
4141
long startNum = build.getStartNum();
4242
long endNum = build.getEndNum();
43-
writeRes(endNum, startNum, visible, response);
43+
writeResponse(endNum, startNum, visible, response);
4444
} catch (Exception e) {
4545
Util.processError(e, response);
4646
}
4747
}
4848

49-
private void writeRes(long endNum, long startNum, boolean visible, HttpServletResponse response)
49+
private void writeResponse(long endNum, long startNum, boolean visible,
50+
HttpServletResponse response)
5051
throws Exception {
5152
if (endNum > 0 && endNum > startNum && endNum - startNum <= BLOCK_LIMIT_NUM) {
5253
BlockList reply = wallet.getBlocksByLimitNext(startNum, endNum - startNum);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import org.tron.protos.Protocol.Transaction.Contract.ContractType;
4646
import org.tron.protos.contract.SmartContractOuterClass.CreateSmartContract;
4747

48+
4849
@Slf4j(topic = "API")
4950
public class Util {
5051

@@ -439,16 +440,15 @@ public static byte[] getAddress(HttpServletRequest request) throws Exception {
439440
byte[] address = null;
440441
String addressParam = "address";
441442
String addressStr = request.getParameter(addressParam);
442-
if (org.apache.commons.lang3.StringUtils.isBlank(addressStr)) {
443+
if (addressStr == null) {
443444
String input = request.getReader().lines()
444445
.collect(Collectors.joining(System.lineSeparator()));
445446
Util.checkBodySize(input);
446447
JSONObject jsonObject = JSONObject.parseObject(input);
447448
addressStr = jsonObject.getString(addressParam);
448449
}
449-
if (org.apache.commons.lang3.StringUtils.isNotBlank(addressStr)) {
450-
if (org.apache.commons.lang3.StringUtils.startsWith(addressStr,
451-
Constant.ADD_PRE_FIX_STRING_MAINNET)) {
450+
if (addressStr != null) {
451+
if (addressStr.startsWith(Constant.ADD_PRE_FIX_STRING_MAINNET)) {
452452
address = Hex.decode(addressStr);
453453
} else {
454454
address = Wallet.decodeFromBase58Check(addressStr);

0 commit comments

Comments
 (0)