JetBrains annotation integrated

Exception improvements
QueueManager integrated
Model improvements
Account Provider improvements

Author: GoodforGod

pom.xml

@@ -36,6 +36,12 @@
       <version>2.8.5</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.jetbrains</groupId>
+      <artifactId>annotations</artifactId>
+      <version>13.0</version>
+    </dependency>
+
     <dependency>
       <groupId>com.jsoniter</groupId>
       <artifactId>jsoniter</artifactId>

src/main/java/io/api/App.java

@@ -2,6 +2,8 @@
 
 import io.api.core.EtherScanApi;
 import io.api.model.Tx;
+import io.api.model.TxInternal;
+import io.api.model.TxToken;
 
 import java.util.List;
 
@@ -12,6 +14,8 @@ public class App {
     public static void main(String[] args) {
         EtherScanApi api = new EtherScanApi(args[0]);
         List<Tx> txs = api.account().txs("0x8d4426f94e42f721C7116E81d6688cd935cB3b4F");
+        List<TxInternal> txInternals = api.account().txsInternal("0x2c1ba59d6f58433fb1eaee7d20b26ed83bda51a3");
+        List<TxToken> txTokens = api.account().txsToken("0xf261B3A60Ef40eE0B369B0705c1a2c58B02799DF");
         System.out.println("Test");
     }
 }

src/main/java/io/api/core/EtherScanApi.java

@@ -2,6 +2,8 @@
 
 import io.api.core.impl.AccountProvider;
 import io.api.core.impl.ContractProvider;
+import io.api.manager.IQueueManager;
+import io.api.manager.impl.QueueManager;
 import io.api.model.EthereumNetwork;
 
 import java.util.HashMap;
@@ -24,8 +26,8 @@ public class EtherScanApi {
         HEADERS.put("cache-control", "max-age=0");
     }
 
-    private final ContractProvider contract;
-    private final AccountProvider account;
+    private final IContractProvider contract;
+    private final IAccountProvider account;
 
     public EtherScanApi(final String apiKey) {
         this(apiKey, EthereumNetwork.MAINNET);
@@ -37,16 +39,19 @@ public EtherScanApi(final String apiKey,
                 ? EthereumNetwork.MAINNET
                 : network;
 
+        // EtherScan 5req\sec limit support
+        final IQueueManager masterQueue = new QueueManager(5, 1);
+
         final String url = "https://" + usedNetwork.getDomain() + ".etherscan.io/api" + "?apikey=" + apiKey;
-        this.contract = new ContractProvider(url, HEADERS);
-        this.account = new AccountProvider(url, HEADERS);
+        this.contract = new ContractProvider(masterQueue, url, HEADERS);
+        this.account = new AccountProvider(masterQueue, url, HEADERS);
     }
 
-    public ContractProvider contract() {
+    public IContractProvider contract() {
         return contract;
     }
 
-    public AccountProvider account() {
+    public IAccountProvider account() {
         return account;
     }
 }

src/main/java/io/api/core/IAccountProvider.java

@@ -1,8 +1,8 @@
 package io.api.core;
 
-import io.api.model.Balance;
-import io.api.model.Block;
-import io.api.model.Tx;
+import io.api.error.ApiException;
+import io.api.model.*;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
@@ -16,34 +16,34 @@
 public interface IAccountProvider {
 
     /** Address ETH balance */
-    Balance balance(String address);
+    @NotNull Balance balance(String address) throws ApiException;
 
     /**
      * Maximum 20 address for batch request
      * If address > 20, then there will be more than 1 request performed
      */
-    List<Balance> balances(List<String> addresses);
+    @NotNull List<Balance> balances(List<String> addresses) throws ApiException;
 
     /** All txs */
-    List<Tx> txs(String address);
+    @NotNull List<Tx> txs(String address) throws ApiException;
     /** Only last 10000 txs */
-    List<Tx> txs(String address, long startBlock);
-    List<Tx> txs(String address, long startBlock, long endBlock);
+    @NotNull List<Tx> txs(String address, long startBlock);
+    @NotNull List<Tx> txs(String address, long startBlock, long endBlock);
 
     /** All internal txs */
-    List<Tx> txsInternal(String address);
+    @NotNull List<TxInternal> txsInternal(String address);
     /** Only last 10000 internal txs */
-    List<Tx> txsInternal(String address, long startBlock);
-    List<Tx> txsInternal(String address, long startBlock, long endBlock);
+    @NotNull List<TxInternal> txsInternal(String address, long startBlock);
+    @NotNull List<TxInternal> txsInternal(String address, long startBlock, long endBlock);
     /** Only last 10000 internal txs by txhash */
-    List<Tx> txsInternalByHash(String txhash);
+    @NotNull List<TxInternal> txsInternalByHash(String txhash);
 
     /** All token txs */
-    List<Tx> txsToken(String address);
+    @NotNull List<TxToken> txsToken(String address);
     /** Only last 10000 token txs */
-    List<Tx> txsToken(String address, long startBlock);
-    List<Tx> txsToken(String address, long startBlock, long endBlock);
+    @NotNull List<TxToken> txsToken(String address, long startBlock);
+    @NotNull List<TxToken> txsToken(String address, long startBlock, long endBlock);
 
     /** All blocks mined by address */
-    List<Block> minedBlocks(String address);
+    @NotNull List<Block> minedBlocks(String address);
 }

src/main/java/io/api/core/impl/AccountProvider.java

@@ -1,16 +1,14 @@
 package io.api.core.impl;
 
-import com.sun.istack.internal.NotNull;
 import io.api.core.IAccountProvider;
 import io.api.error.EtherScanException;
-import io.api.model.Balance;
-import io.api.model.Block;
-import io.api.model.Tx;
-import io.api.model.temporary.BalanceResponseTO;
-import io.api.model.temporary.StringResponseTO;
-import io.api.model.temporary.TxResponseTO;
+import io.api.manager.IQueueManager;
+import io.api.model.*;
+import io.api.model.temporary.*;
 import io.api.util.BasicUtils;
+import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -45,9 +43,10 @@ public class AccountProvider extends BasicProvider implements IAccountProvider {
     private static final String OFFSET_PARAM = "&offset=";
     private static final String PAGE_PARAM = "&page=";
 
-    public AccountProvider(final String baseUrl,
+    public AccountProvider(final IQueueManager queueManager,
+                           final String baseUrl,
                            final Map<String, String> header) {
-        super("account", baseUrl, header);
+        super(queueManager, "account", baseUrl, header);
     }
 
     @NotNull
@@ -56,28 +55,38 @@ public Balance balance(final String address) {
         BasicUtils.validateAddress(address);
 
         final String urlParams = BALANCE_ACTION + TAG_LATEST_PARAM + ADDRESS_PARAM + address;
-        final String response = getRequest(urlParams);
-        final StringResponseTO converted = convert(response, StringResponseTO.class);
+        final StringResponseTO converted = getRequest(urlParams, StringResponseTO.class);
         if (converted.getStatus() != 1)
-            throw new EtherScanException(converted.getMessage() + " with status " + converted.getStatus());
+            throw new EtherScanException(converted.getMessage() + ", with status " + converted.getStatus());
 
         return new Balance(address, Long.valueOf(converted.getResult()));
     }
 
     @NotNull
     @Override
     public List<Balance> balances(final List<String> addresses) {
-        BasicUtils.validateAddresses(addresses);
-        if (addresses.isEmpty())
+        if (BasicUtils.isEmpty(addresses))
             return Collections.emptyList();
 
-        final String urlParams = BALANCE_MULTI_ACTION + TAG_LATEST_PARAM + ADDRESS_PARAM + toAddressParam(addresses);
-        final String response = getRequest(urlParams);
-        final BalanceResponseTO converted = convert(response, BalanceResponseTO.class);
-        if (converted.getStatus() != 1)
-            throw new EtherScanException(converted.getMessage() + " with status " + converted.getStatus());
+        BasicUtils.validateAddresses(addresses);
+
+        // Maximum addresses in batch request - 20
+        final List<Balance> balances = new ArrayList<>();
+        final List<List<String>> addressesAsBatches = BasicUtils.partition(addresses, 20);
 
-        return converted.getBalances().stream().map(Balance::of).collect(Collectors.toList());
+        for (final List<String> batch : addressesAsBatches) {
+            final String urlParams = BALANCE_MULTI_ACTION + TAG_LATEST_PARAM + ADDRESS_PARAM + toAddressParam(batch);
+            final BalanceResponseTO converted = getRequest(urlParams, BalanceResponseTO.class);
+            if (converted.getStatus() != 1)
+                throw new EtherScanException(converted.getMessage() + ", with status " + converted.getStatus());
+
+            if (!BasicUtils.isEmpty(converted.getBalances()))
+                balances.addAll(converted.getBalances().stream()
+                        .map(Balance::of)
+                        .collect(Collectors.toList()));
+        }
+
+        return balances;
     }
 
     private String toAddressParam(final List<String> addresses) {
@@ -88,8 +97,7 @@ private String toAddressParam(final List<String> addresses) {
     @Override
     public List<Tx> txs(final String address) {
         //TODO all txs implementations with pagination
-
-        return txs(address, MIN_START_BLOCK, MAX_END_BLOCK);
+        return txs(address, MIN_START_BLOCK);
     }
 
     @NotNull
@@ -105,8 +113,7 @@ public List<Tx> txs(final String address, final long startBlock, final long endB
 
         final String blockParam = START_BLOCK_PARAM + startBlock + END_BLOCK_PARAM + endBlock;
         final String urlParams = TX_ACTION + ADDRESS_PARAM + address + blockParam + SORT_ASC_PARAM;
-        final String response = getRequest(urlParams);
-        final TxResponseTO converted = convert(response, TxResponseTO.class);
+        final TxResponseTO converted = getRequest(urlParams, TxResponseTO.class);
         if (converted.getStatus() != 1)
             throw new EtherScanException(converted.getMessage() + " with status " + converted.getStatus());
 
@@ -117,49 +124,89 @@ public List<Tx> txs(final String address, final long startBlock, final long endB
 
     @NotNull
     @Override
-    public List<Tx> txsInternal(final String address) {
-        return null;
+    public List<TxInternal> txsInternal(final String address) {
+        //TODO all txs implementations with pagination
+        return txsInternal(address, MIN_START_BLOCK);
     }
 
     @NotNull
     @Override
-    public List<Tx> txsInternal(final String address, final long startBlock) {
+    public List<TxInternal> txsInternal(final String address, final long startBlock) {
         return txsInternal(address, startBlock, MAX_END_BLOCK);
     }
 
     @NotNull
     @Override
-    public List<Tx> txsInternal(final String address, final long startBlock, final long endBlock) {
-        return null;
+    public List<TxInternal> txsInternal(final String address, final long startBlock, final long endBlock) {
+        BasicUtils.validateAddress(address);
+
+        final String blockParam = START_BLOCK_PARAM + startBlock + END_BLOCK_PARAM + endBlock;
+        final String urlParams = TX_INTERNAL_ACTION + ADDRESS_PARAM + address + blockParam + SORT_ASC_PARAM;
+        final TxInternalResponseTO converted = getRequest(urlParams, TxInternalResponseTO.class);
+        if (converted.getStatus() != 1)
+            throw new EtherScanException(converted.getMessage() + " with status " + converted.getStatus());
+
+        return (converted.getResult() == null)
+                ? Collections.emptyList()
+                : converted.getResult();
     }
 
     @NotNull
     @Override
-    public List<Tx> txsInternalByHash(String txhash) {
-        return null;
+    public List<TxInternal> txsInternalByHash(final String txhash) {
+        BasicUtils.validateTxHash(txhash);
+
+        final String urlParams = TX_INTERNAL_ACTION + TXHASH_PARAM + txhash;
+        final TxInternalResponseTO converted = getRequest(urlParams, TxInternalResponseTO.class);
+        if (converted.getStatus() != 1)
+            throw new EtherScanException(converted.getMessage() + " with status " + converted.getStatus());
+
+        return (converted.getResult() == null)
+                ? Collections.emptyList()
+                : converted.getResult();
     }
 
     @NotNull
     @Override
-    public List<Tx> txsToken(final String address) {
-        return null;
+    public List<TxToken> txsToken(final String address) {
+        //TODO all txs implementations with pagination
+        return txsToken(address, MIN_START_BLOCK);
     }
 
     @NotNull
     @Override
-    public List<Tx> txsToken(final String address, final long startBlock) {
+    public List<TxToken> txsToken(final String address, final long startBlock) {
         return txsToken(address, startBlock, MAX_END_BLOCK);
     }
 
     @NotNull
     @Override
-    public List<Tx> txsToken(final String address, final long startBlock, final long endBlock) {
-        return null;
+    public List<TxToken> txsToken(final String address, final long startBlock, final long endBlock) {
+        BasicUtils.validateAddress(address);
+
+        final String blockParam = START_BLOCK_PARAM + startBlock + END_BLOCK_PARAM + endBlock;
+        final String urlParams = TX_TOKEN_ACTION + ADDRESS_PARAM + address + blockParam + SORT_ASC_PARAM;
+        final TxTokenResponseTO converted = getRequest(urlParams, TxTokenResponseTO.class);
+        if (converted.getStatus() != 1)
+            throw new EtherScanException(converted.getMessage() + " with status " + converted.getStatus());
+
+        return (converted.getResult() == null)
+                ? Collections.emptyList()
+                : converted.getResult();
     }
 
     @NotNull
     @Override
     public List<Block> minedBlocks(final String address) {
-        return null;
+        BasicUtils.validateAddress(address);
+
+        final String urlParams = MINED_ACTION + BLOCK_TYPE_PARAM + ADDRESS_PARAM + address;
+        final BlockResponseTO converted = getRequest(urlParams, BlockResponseTO.class);
+        if (converted.getStatus() != 1)
+            throw new EtherScanException(converted.getMessage() + " with status " + converted.getStatus());
+
+        return (converted.getResult() == null)
+                ? Collections.emptyList()
+                : converted.getResult();
     }
 }