LogQuery implementation finalized

TransactionProvider & others implemented
HttpExecutor supplier in api constructor
Refactoring & improvements

Author: GoodforGod

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

@@ -1,11 +1,13 @@
 package io.api;
 
-import io.api.core.EtherScanApi;
+import io.api.core.impl.EtherScanApi;
 import io.api.model.Tx;
 import io.api.model.TxInternal;
 import io.api.model.TxToken;
+import io.api.model.UncleBlock;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  *
@@ -14,8 +16,10 @@ 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");
+        List<TxInternal> txInternals = api.account().txsInternal("0x2c1ba59d6f58433fb1eaee7d20b26ed83bda51a3");
+        Optional<UncleBlock> uncles = api.block().uncles(2165403);
+        Optional<UncleBlock> uncleBlock = api.block().uncles(999965403);
         System.out.println("Test");
     }
 }

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

@@ -18,6 +18,9 @@ public interface IAccountProvider {
     /** Address ETH balance */
     @NotNull Balance balance(String address) throws ApiException;
 
+    /** ERC20 token balance for address */
+    @NotNull Balance balance(String address, String contract) throws ApiException;
+
     /**
      * Maximum 20 address for single batch request
      * If address > 20, then there will be more than 1 request performed

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

@@ -1,6 +1,10 @@
 package io.api.core;
 
+import io.api.error.ApiException;
 import io.api.model.UncleBlock;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Optional;
 
 /**
  * EtherScan - API Descriptions
@@ -12,5 +16,5 @@
 public interface IBlockProvider {
 
     /** Return uncle blocks */
-    UncleBlock uncles(long blockNumber);
+    @NotNull Optional<UncleBlock> uncles(long blockNumber) throws ApiException;
 }

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

@@ -1,5 +1,8 @@
 package io.api.core;
 
+import io.api.error.ApiException;
+import org.jetbrains.annotations.NotNull;
+
 /**
  * EtherScan - API Descriptions
  * https://etherscan.io/apis#contracts
@@ -10,5 +13,5 @@
 public interface IContractProvider {
 
     /** Get Verified Contract Sources */
-    String contractAbi(String address);
+    @NotNull String contractAbi(String address) throws ApiException;
 }

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

@@ -1,6 +1,8 @@
 package io.api.core;
 
 import io.api.model.Log;
+import io.api.model.builder.LogQuery;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
@@ -13,7 +15,5 @@
  */
 public interface ILogsProvider {
 
-    List<Log> logs(String address);
-    List<Log> logs(String address, long startBlock);
-    List<Log> logs(String address, long startBlock, long endBlock);
+    @NotNull List<Log> logs(LogQuery query);
 }

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

@@ -8,6 +8,5 @@
  * @since 30.10.2018
  */
 public interface IParityProvider {
-
     //TODO implement
 }

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

@@ -2,6 +2,10 @@
 
 import io.api.model.Price;
 import io.api.model.Supply;
+import org.jetbrains.annotations.NotNull;
+
+import java.math.BigInteger;
+import java.util.Optional;
 
 /**
  * EtherScan - API Descriptions
@@ -12,9 +16,12 @@
  */
 public interface IStatisticProvider {
 
+    /** ERC20 Total Supply */
+    @NotNull Optional<BigInteger> supply(String contract);
+
     /** Eth Total Supply */
-    Supply supply();
+    @NotNull Supply supply();
 
     /** Eth last USD and BTC price */
-    Price lastPrice();
+    @NotNull Price lastPrice();
 }

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

@@ -1,6 +1,7 @@
 package io.api.core;
 
 import io.api.model.Status;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * EtherScan - API Descriptions
@@ -11,7 +12,7 @@
  */
 public interface ITransactionProvider {
 
-    Status execStatus(String txhash);
+    @NotNull Status execStatus(String txhash);
 
     boolean receiptStatus(String txhash);
 }

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

@@ -1,18 +1,19 @@
 package io.api.core.impl;
 
 import io.api.core.IAccountProvider;
+import io.api.error.ApiException;
 import io.api.error.EtherScanException;
+import io.api.executor.IHttpExecutor;
 import io.api.manager.IQueueManager;
 import io.api.model.*;
-import io.api.model.temporary.*;
+import io.api.model.utility.*;
 import io.api.util.BasicUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -23,17 +24,15 @@
  */
 public class AccountProvider extends BasicProvider implements IAccountProvider {
 
-    private static final int MAX_END_BLOCK = 999999999;
-    private static final int MIN_START_BLOCK = 0;
-
     private static final int OFFSET_MAX = 10000;
 
-    private static final String BALANCE_ACTION = ACTION_PARAM + "balance";
-    private static final String BALANCE_MULTI_ACTION = ACTION_PARAM + "balancemulti";
-    private static final String TX_ACTION = ACTION_PARAM + "txlist";
-    private static final String TX_INTERNAL_ACTION = ACTION_PARAM + "txlistinternal";
-    private static final String TX_TOKEN_ACTION = ACTION_PARAM + "tokentx";
-    private static final String MINED_ACTION = ACTION_PARAM + "getminedblocks";
+    private static final String ACT_BALANCE_ACTION = ACT_PARAM + "balance";
+    private static final String ACT_TOKEN_BALANCE_PARAM = ACT_PARAM + "tokenbalance";
+    private static final String ACT_BALANCE_MULTI_ACTION = ACT_PARAM + "balancemulti";
+    private static final String ACT_TX_ACTION = ACT_PARAM + "txlist";
+    private static final String ACT_TX_INTERNAL_ACTION = ACT_PARAM + "txlistinternal";
+    private static final String ACT_TX_TOKEN_ACTION = ACT_PARAM + "tokentx";
+    private static final String ACT_MINED_ACTION = ACT_PARAM + "getminedblocks";
 
     private static final String BLOCK_TYPE_PARAM = "&blocktype=blocks";
     private static final String TAG_LATEST_PARAM = "&tag=latest";
@@ -46,25 +45,31 @@ public class AccountProvider extends BasicProvider implements IAccountProvider {
     private static final String OFFSET_PARAM = "&offset=";
     private static final String PAGE_PARAM = "&page=";
 
-    public AccountProvider(final IQueueManager queueManager,
-                           final String baseUrl,
-                           final Map<String, String> header) {
-        super(queueManager, "account", baseUrl, header);
+    AccountProvider(final IQueueManager queueManager,
+                    final String baseUrl,
+                    final IHttpExecutor executor) {
+        super(queueManager, "account", baseUrl, executor);
     }
 
     @NotNull
     @Override
     public Balance balance(final String address) {
         BasicUtils.validateAddress(address);
 
-        final String urlParams = BALANCE_ACTION + TAG_LATEST_PARAM + ADDRESS_PARAM + address;
+        final String urlParams = ACT_BALANCE_ACTION + TAG_LATEST_PARAM + ADDRESS_PARAM + address;
         final StringResponseTO response = getRequest(urlParams, StringResponseTO.class);
         if (response.getStatus() != 1)
             throw new EtherScanException(response.getMessage() + ", with status " + response.getStatus());
 
         return new Balance(address, new BigInteger(response.getResult()));
     }
 
+    @NotNull
+    @Override
+    public Balance balance(final String address, final String contract) throws ApiException {
+        return null;
+    }
+
     @NotNull
     @Override
     public List<Balance> balances(final List<String> addresses) {
@@ -78,7 +83,7 @@ public List<Balance> balances(final List<String> addresses) {
         final List<List<String>> addressesAsBatches = BasicUtils.partition(addresses, 20);
 
         for (final List<String> batch : addressesAsBatches) {
-            final String urlParams = BALANCE_MULTI_ACTION + TAG_LATEST_PARAM + ADDRESS_PARAM + toAddressParam(batch);
+            final String urlParams = ACT_BALANCE_MULTI_ACTION + TAG_LATEST_PARAM + ADDRESS_PARAM + toAddressParam(batch);
             final BalanceResponseTO response = getRequest(urlParams, BalanceResponseTO.class);
             if (response.getStatus() != 1)
                 throw new EtherScanException(response.getMessage() + ", with status " + response.getStatus());
@@ -115,7 +120,7 @@ public List<Tx> txs(final String address, final long startBlock, final long endB
 
         final String offsetParam = PAGE_PARAM + "%s" + OFFSET_PARAM + OFFSET_MAX;
         final String blockParam = START_BLOCK_PARAM + startBlock + END_BLOCK_PARAM + endBlock;
-        final String urlParams = TX_ACTION + offsetParam + ADDRESS_PARAM + address + blockParam + SORT_ASC_PARAM;
+        final String urlParams = ACT_TX_ACTION + offsetParam + ADDRESS_PARAM + address + blockParam + SORT_ASC_PARAM;
 
         return getRequestUsingOffset(urlParams, TxResponseTO.class);
     }
@@ -125,9 +130,9 @@ public List<Tx> txs(final String address, final long startBlock, final long endB
      * To avoid 10k limit per response
      *
      * @param urlParams Url params for #getRequest()
-     * @param tClass responseListTO class
-     * @param <T> responseTO list T type
-     * @param <R> responseListTO type
+     * @param tClass    responseListTO class
+     * @param <T>       responseTO list T type
+     * @param <R>       responseListTO type
      * @return List of T values
      */
     private <T, R extends BaseListResponseTO> List<T> getRequestUsingOffset(final String urlParams, Class<R> tClass) {
@@ -137,11 +142,11 @@ private <T, R extends BaseListResponseTO> List<T> getRequestUsingOffset(final St
             final String formattedUrl = String.format(urlParams, page++);
             final R response = getRequest(formattedUrl, tClass);
             BasicUtils.validateTxResponse(response);
-            if(BasicUtils.isEmpty(response.getResult()))
+            if (BasicUtils.isEmpty(response.getResult()))
                 break;
 
             result.addAll(response.getResult());
-            if(response.getResult().size() < OFFSET_MAX)
+            if (response.getResult().size() < OFFSET_MAX)
                 break;
         }
 
@@ -167,7 +172,7 @@ public List<TxInternal> txsInternal(final String address, final long startBlock,
 
         final String offsetParam = PAGE_PARAM + "%s" + OFFSET_PARAM + OFFSET_MAX;
         final String blockParam = START_BLOCK_PARAM + startBlock + END_BLOCK_PARAM + endBlock;
-        final String urlParams = TX_INTERNAL_ACTION + offsetParam + ADDRESS_PARAM + address + blockParam + SORT_ASC_PARAM;
+        final String urlParams = ACT_TX_INTERNAL_ACTION + offsetParam + ADDRESS_PARAM + address + blockParam + SORT_ASC_PARAM;
 
         return getRequestUsingOffset(urlParams, TxInternalResponseTO.class);
     }
@@ -178,7 +183,7 @@ public List<TxInternal> txsInternal(final String address, final long startBlock,
     public List<TxInternal> txsInternalByHash(final String txhash) {
         BasicUtils.validateTxHash(txhash);
 
-        final String urlParams = TX_INTERNAL_ACTION + TXHASH_PARAM + txhash;
+        final String urlParams = ACT_TX_INTERNAL_ACTION + TXHASH_PARAM + txhash;
         final TxInternalResponseTO response = getRequest(urlParams, TxInternalResponseTO.class);
         BasicUtils.validateTxResponse(response);
 
@@ -206,7 +211,7 @@ public List<TxToken> txsToken(final String address, final long startBlock, final
 
         final String offsetParam = PAGE_PARAM + "%s" + OFFSET_PARAM + OFFSET_MAX;
         final String blockParam = START_BLOCK_PARAM + startBlock + END_BLOCK_PARAM + endBlock;
-        final String urlParams = TX_TOKEN_ACTION + offsetParam + ADDRESS_PARAM + address + blockParam + SORT_ASC_PARAM;
+        final String urlParams = ACT_TX_TOKEN_ACTION + offsetParam + ADDRESS_PARAM + address + blockParam + SORT_ASC_PARAM;
 
         return getRequestUsingOffset(urlParams, TxTokenResponseTO.class);
     }
@@ -217,7 +222,7 @@ public List<Block> minedBlocks(final String address) {
         BasicUtils.validateAddress(address);
 
         final String offsetParam = PAGE_PARAM + "%s" + OFFSET_PARAM + OFFSET_MAX;
-        final String urlParams = MINED_ACTION + offsetParam + BLOCK_TYPE_PARAM + ADDRESS_PARAM + address;
+        final String urlParams = ACT_MINED_ACTION + offsetParam + BLOCK_TYPE_PARAM + ADDRESS_PARAM + address;
 
         return getRequestUsingOffset(urlParams, BlockResponseTO.class);
     }