Skip to content

Commit d575241

Browse files
0xbigapple0xbigapple
committed
feat(api): add JsonRpcException.java
1 parent 1c27a8b commit d575241

29 files changed

+100
-71
lines changed

‎common/src/main/java/org/tron/common/utils/ByteArray.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.apache.commons.lang3.ArrayUtils;
1515
import org.apache.commons.lang3.StringUtils;
1616
import org.bouncycastle.util.encoders.Hex;
17-
import org.tron.core.exception.JsonRpcInvalidParamsException;
17+
import org.tron.core.exception.jsonrpc.JsonRpcInvalidParamsException;
1818

1919
/*
2020
* Copyright (c) [2016] [ <ether.camp> ]

‎common/src/main/java/org/tron/core/exception/TronException.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,12 @@
11
package org.tron.core.exception;
22

3-
import lombok.Getter;
4-
5-
@Getter
63
public class TronException extends Exception {
7-
private Object data = null;
84

95
public TronException() {
106
super();
117
report();
128
}
139

14-
public TronException(String message, Object data) {
15-
super(message);
16-
this.data = data;
17-
report();
18-
}
19-
2010
public TronException(String message) {
2111
super(message);
2212
report();

‎common/src/main/java/org/tron/core/exception/jsonrpc/JsonRpcException.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package org.tron.core.exception.jsonrpc;
2+
3+
import lombok.Getter;
4+
import org.tron.core.exception.TronException;
5+
6+
@Getter
7+
public class JsonRpcException extends TronException {
8+
private Object data = null;
9+
10+
public JsonRpcException() {
11+
super();
12+
report();
13+
}
14+
15+
public JsonRpcException(String message, Object data) {
16+
super(message);
17+
this.data = data;
18+
report();
19+
}
20+
21+
public JsonRpcException(String message) {
22+
super(message);
23+
report();
24+
}
25+
26+
public JsonRpcException(String message, Throwable cause) {
27+
super(message, cause);
28+
report();
29+
}
30+
31+
32+
}

common/src/main/java/org/tron/core/exception/JsonRpcInternalException.java renamed to common/src/main/java/org/tron/core/exception/jsonrpc/JsonRpcInternalException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package org.tron.core.exception;
1+
package org.tron.core.exception.jsonrpc;
22

3-
public class JsonRpcInternalException extends TronException {
3+
public class JsonRpcInternalException extends JsonRpcException {
44

55
public JsonRpcInternalException() {
66
super();

common/src/main/java/org/tron/core/exception/JsonRpcInvalidParamsException.java renamed to common/src/main/java/org/tron/core/exception/jsonrpc/JsonRpcInvalidParamsException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package org.tron.core.exception;
1+
package org.tron.core.exception.jsonrpc;
22

3-
public class JsonRpcInvalidParamsException extends TronException {
3+
public class JsonRpcInvalidParamsException extends JsonRpcException {
44

55
public JsonRpcInvalidParamsException() {
66
super();

common/src/main/java/org/tron/core/exception/JsonRpcInvalidRequestException.java renamed to common/src/main/java/org/tron/core/exception/jsonrpc/JsonRpcInvalidRequestException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package org.tron.core.exception;
1+
package org.tron.core.exception.jsonrpc;
22

3-
public class JsonRpcInvalidRequestException extends TronException {
3+
public class JsonRpcInvalidRequestException extends JsonRpcException {
44

55
public JsonRpcInvalidRequestException() {
66
super();

common/src/main/java/org/tron/core/exception/JsonRpcMethodNotFoundException.java renamed to common/src/main/java/org/tron/core/exception/jsonrpc/JsonRpcMethodNotFoundException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package org.tron.core.exception;
1+
package org.tron.core.exception.jsonrpc;
22

3-
public class JsonRpcMethodNotFoundException extends TronException {
3+
public class JsonRpcMethodNotFoundException extends JsonRpcException {
44

55
public JsonRpcMethodNotFoundException() {
66
super();

common/src/main/java/org/tron/core/exception/JsonRpcTooManyResultException.java renamed to common/src/main/java/org/tron/core/exception/jsonrpc/JsonRpcTooManyResultException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package org.tron.core.exception;
1+
package org.tron.core.exception.jsonrpc;
22

3-
public class JsonRpcTooManyResultException extends TronException {
3+
public class JsonRpcTooManyResultException extends JsonRpcException {
44

55
public JsonRpcTooManyResultException() {
66
super();

‎framework/src/main/java/org/tron/core/Wallet.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@
177177
import org.tron.core.exception.DupTransactionException;
178178
import org.tron.core.exception.HeaderNotFound;
179179
import org.tron.core.exception.ItemNotFoundException;
180-
import org.tron.core.exception.JsonRpcInvalidParamsException;
181180
import org.tron.core.exception.NonUniqueObjectException;
182181
import org.tron.core.exception.PermissionException;
183182
import org.tron.core.exception.SignatureFormatException;
@@ -188,6 +187,7 @@
188187
import org.tron.core.exception.VMIllegalException;
189188
import org.tron.core.exception.ValidateSignatureException;
190189
import org.tron.core.exception.ZksnarkException;
190+
import org.tron.core.exception.jsonrpc.JsonRpcInvalidParamsException;
191191
import org.tron.core.net.TronNetDelegate;
192192
import org.tron.core.net.TronNetService;
193193
import org.tron.core.net.message.adv.TransactionMessage;

‎framework/src/main/java/org/tron/core/services/jsonrpc/JsonRpcApiUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.tron.common.utils.Sha256Hash;
2727
import org.tron.common.utils.StringUtil;
2828
import org.tron.core.Wallet;
29-
import org.tron.core.exception.JsonRpcInvalidParamsException;
29+
import org.tron.core.exception.jsonrpc.JsonRpcInvalidParamsException;
3030
import org.tron.protos.Protocol.Block;
3131
import org.tron.protos.Protocol.Transaction;
3232
import org.tron.protos.Protocol.Transaction.Contract.ContractType;

0 commit comments

Comments
 (0)