Skip to content

Commit e931343

Browse files
authored
Merge pull request #1146 from tronprotocol/new_http
format code in http services
2 parents cc4848b + 7286ab8 commit e931343

37 files changed

+1037
-1245
lines changed

src/main/java/org/tron/core/db/api/index/AbstractIndex.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
import org.tron.core.db.common.WrappedByteArray;
1818
import org.tron.core.db.common.WrappedResultSet;
1919

20-
import java.io.File;
21-
import java.util.Iterator;
22-
import java.util.Objects;
23-
2420
public abstract class AbstractIndex<E extends ProtoCapsule<T>, T> implements Iface<T> {
2521

2622
protected TronDatabase<E> database;
@@ -40,8 +36,8 @@ public AbstractIndex(TronDatabase<E> database) {
4036
this.database = database;
4137
String dbName = database.getDbSource().getDBName();
4238
File parentDir = Paths.get(
43-
Args.getInstance().getOutputDirectoryByDbName(dbName),
44-
Args.getInstance().getStorage().getIndexDirectory()
39+
Args.getInstance().getOutputDirectoryByDbName(dbName),
40+
Args.getInstance().getStorage().getIndexDirectory()
4541
).toFile();
4642
if (!parentDir.exists()) {
4743
parentDir.mkdirs();

src/main/java/org/tron/core/services/http/BroadcastServlet.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import org.springframework.stereotype.Component;
1111
import org.tron.api.GrpcAPI;
1212
import org.tron.core.Wallet;
13-
import org.tron.core.services.http.JsonFormat.ParseException;
1413
import org.tron.protos.Protocol.Transaction;
1514

1615
@Component

src/main/java/org/tron/core/services/http/CreateAccountServlet.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import org.springframework.beans.factory.annotation.Autowired;
1010
import org.springframework.stereotype.Component;
1111
import org.tron.core.Wallet;
12-
import org.tron.core.exception.ContractValidateException;
13-
import org.tron.core.services.http.JsonFormat.ParseException;
1412
import org.tron.protos.Contract.AccountCreateContract;
1513
import org.tron.protos.Protocol.Transaction;
1614
import org.tron.protos.Protocol.Transaction.Contract.ContractType;

src/main/java/org/tron/core/services/http/CreateAddressServlet.java

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

33
import com.alibaba.fastjson.JSONObject;
4-
import com.google.protobuf.ByteString;
54
import java.io.IOException;
65
import java.util.stream.Collectors;
76
import javax.servlet.http.HttpServlet;
@@ -13,7 +12,6 @@
1312
import org.tron.api.GrpcAPI.BytesMessage;
1413
import org.tron.common.utils.ByteArray;
1514
import org.tron.core.Wallet;
16-
import org.tron.core.services.http.JsonFormat.ParseException;
1715

1816

1917
@Component

src/main/java/org/tron/core/services/http/CreateAssetIssueServlet.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import org.springframework.beans.factory.annotation.Autowired;
1010
import org.springframework.stereotype.Component;
1111
import org.tron.core.Wallet;
12-
import org.tron.core.exception.ContractValidateException;
13-
import org.tron.core.services.http.JsonFormat.ParseException;
1412
import org.tron.protos.Contract.AssetIssueContract;
1513
import org.tron.protos.Protocol.Transaction;
1614
import org.tron.protos.Protocol.Transaction.Contract.ContractType;

src/main/java/org/tron/core/services/http/CreateWitnessServlet.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import org.springframework.beans.factory.annotation.Autowired;
1010
import org.springframework.stereotype.Component;
1111
import org.tron.core.Wallet;
12-
import org.tron.core.exception.ContractValidateException;
13-
import org.tron.core.services.http.JsonFormat.ParseException;
1412
import org.tron.protos.Contract.WitnessCreateContract;
1513
import org.tron.protos.Protocol.Transaction;
1614
import org.tron.protos.Protocol.Transaction.Contract.ContractType;

src/main/java/org/tron/core/services/http/EasyTransferByPrivateServlet.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
import org.tron.common.crypto.ECKey;
1717
import org.tron.core.Wallet;
1818
import org.tron.core.capsule.TransactionCapsule;
19-
import org.tron.core.exception.ContractValidateException;
20-
import org.tron.core.services.http.JsonFormat.ParseException;
2119
import org.tron.protos.Contract.TransferContract;
2220
import org.tron.protos.Protocol.Transaction.Contract.ContractType;
2321

src/main/java/org/tron/core/services/http/FreezeBalanceServlet.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import org.springframework.beans.factory.annotation.Autowired;
1010
import org.springframework.stereotype.Component;
1111
import org.tron.core.Wallet;
12-
import org.tron.core.exception.ContractValidateException;
13-
import org.tron.core.services.http.JsonFormat.ParseException;
1412
import org.tron.protos.Contract.FreezeBalanceContract;
1513
import org.tron.protos.Protocol.Transaction;
1614
import org.tron.protos.Protocol.Transaction.Contract.ContractType;

src/main/java/org/tron/core/services/http/GenerateAddressServlet.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@
88
import lombok.extern.slf4j.Slf4j;
99
import org.apache.commons.codec.binary.Hex;
1010
import org.springframework.stereotype.Component;
11-
import org.tron.api.GrpcAPI.AddressPrKeyPairMessage;
1211
import org.tron.common.crypto.ECKey;
1312
import org.tron.common.utils.ByteArray;
1413
import org.tron.common.utils.Utils;
1514
import org.tron.core.Wallet;
16-
import org.tron.core.services.http.JsonFormat.ParseException;
1715

1816

1917
@Component

src/main/java/org/tron/core/services/http/GetAccountNetServlet.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.tron.api.GrpcAPI.AccountNetMessage;
1313
import org.tron.common.utils.ByteArray;
1414
import org.tron.core.Wallet;
15-
import org.tron.core.services.http.JsonFormat.ParseException;
1615
import org.tron.protos.Protocol.Account;
1716

1817

0 commit comments

Comments
 (0)