ToString()

HttpExecutor improvements + default read timeout 0
Coverage improvements + README fixs

Author: GoodforGod

README.md

@@ -43,9 +43,10 @@ dependencies {
 API support Ethereum: *[MAINNET](https://etherscan.io), [ROPSTEN](https://ropsten.etherscan.io), 
 [KOVAN](https://kovan.etherscan.io), [RINKEBY](https://rinkeby.etherscan.io)* networks.
 ```java
-EtherScanApi api = new EtherScanApi(EthNetwork.MAINTNET);
-EtherScanApi api = new EtherScanApi(EthNetwork.RINKEBY);
-EtherScanApi api = new EtherScanApi("YourApiKey", EthNetwork.KOVAN);
+EtherScanApi api = new EtherScanApi(EthNetwork.MAINNET); // Default
+EtherScanApi apiRinkeby = new EtherScanApi(EthNetwork.RINKEBY);
+EtherScanApi apiRopsten = new EtherScanApi(EthNetwork.ROPSTEN);
+EtherScanApi apiKovan = new EtherScanApi("YourApiKey", EthNetwork.KOVAN);
 ```
 
 ## Custom HttpClient
@@ -56,10 +57,10 @@ just implement **IHttpExecutor** by your self or initialize it with your values.
 ```java
 int connectionTimeout = 10000;
 int readTimeout = 7000;
+ 
 Supplier<IHttpExecutor> supplier = () -> new HttpExecutor(connectionTimeout);
 Supplier<IHttpExecutor> supplierFull = () -> new HttpExecutor(connectionTimeout, readTimeout);
-
-
+ 
 EtherScanApi api = new EtherScanApi(EthNetwork.RINKEBY, supplier);
 EtherScanApi apiWithKey = new EtherScanApi("YourApiKey", EthNetwork.MAINNET, supplierFull);
 ```
@@ -70,14 +71,15 @@ You can read about all API methods on [Etherscan](https://etherscan.io/apis)
 
 *Library support all available EtherScan API.*
 
-You can use API with you key or without key as well (Check API request\sec restrictions).
-Library support limit when used without key and will limit requests up to *5 req/sec by itself*.
+You can use library *with or without* API key *([Check API request\sec restrictions when used without API key](https://ethereum.stackexchange.com/questions/34190/does-etherscan-require-the-use-of-an-api-key))*.
+
+Library will automatically limit requests up to **5 req/sec** when used *without* key.
 ```java
 EtherScanApi api = new EtherScanApi();
 EtherScanApi api = new EtherScanApi("YourApiKey");
 ```
 
-Below there are examples for each API category.
+Below are examples for each API category.
 
 ### Account Api
 **Get Ether Balance for a single Address**
@@ -121,6 +123,7 @@ LogQuery query = LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70
         .setOpTopic0_2(LogOp.OR)
         .setOpTopic1_2(LogOp.AND)
         .build();
+ 
 List<Log> logs = api.logs().logs(query);
 ```
 
@@ -152,7 +155,7 @@ Optional<Boolean> status = api.txs().receiptStatus("0x513c1ba0bebf66436b5fed86ab
 ```
 
 ### Token Api
-You can read token API [here](https://etherscan.io/apis#tokens)
+You can read about token API [here](https://etherscan.io/apis#tokens)
 
 Token API methods migrated to [Account](#account-api) & [Stats](#stats-api) respectfully.
 

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

@@ -10,6 +10,7 @@
 import io.api.etherscan.manager.impl.QueueManager;
 import io.api.etherscan.model.EthNetwork;
 import io.api.etherscan.util.BasicUtils;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.function.Supplier;
 
@@ -83,48 +84,55 @@ public EtherScanApi(final String apiKey,
     /**
      * API for interactions with account and address
      */
+    @NotNull
     public IAccountApi account() {
         return account;
     }
 
     /**
      * API for verifying contract ABI
      */
+    @NotNull
     public IContractApi contract() {
         return contract;
     }
 
     /**
      * [BETA] API for interaction with tx statuses
      */
+    @NotNull
     public ITransactionApi txs() {
         return txs;
     }
 
     /**
      * [BETA] API for getting block rewards and uncles
      */
+    @NotNull
     public IBlockApi block() {
         return block;
     }
 
     /**
      * [BETA] API for interaction with eth_getLogs
      */
+    @NotNull
     public ILogsApi logs() {
         return logs;
     }
 
     /**
      * API for interacting with geth/proxy etherscan
      */
+    @NotNull
     public IProxyApi proxy() {
         return proxy;
     }
 
     /**
      * API for eth price and supply statistic
      */
+    @NotNull
     public IStatisticApi stats() {
         return stats;
     }

src/main/java/io/api/etherscan/executor/impl/HttpExecutor.java

@@ -15,6 +15,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.zip.GZIPInputStream;
+import java.util.zip.InflaterInputStream;
 
 import static java.net.HttpURLConnection.HTTP_MOVED_PERM;
 import static java.net.HttpURLConnection.HTTP_MOVED_TEMP;
@@ -31,13 +32,12 @@ public class HttpExecutor implements IHttpExecutor {
     private static final Map<String, String> DEFAULT_HEADERS = new HashMap<>();
 
     private static final int CONNECT_TIMEOUT = 8000;
-    private static final int READ_TIMEOUT = 30000;
+    private static final int READ_TIMEOUT = 0;
 
     static {
-        DEFAULT_HEADERS.put("Accept-Language", "en;q=0.9");
+        DEFAULT_HEADERS.put("Accept-Language", "en");
         DEFAULT_HEADERS.put("Accept-Encoding", "deflate, gzip");
         DEFAULT_HEADERS.put("User-Agent", "Chrome/68.0.3440.106");
-        DEFAULT_HEADERS.put("Content-Type", "application/x-www-form-urlencoded");
         DEFAULT_HEADERS.put("Accept-Charset", "UTF-8");
     }
 
@@ -46,15 +46,14 @@ public class HttpExecutor implements IHttpExecutor {
     private final int readTimeout;
 
     public HttpExecutor() {
-        this(CONNECT_TIMEOUT, READ_TIMEOUT);
+        this(CONNECT_TIMEOUT);
     }
 
     public HttpExecutor(final int connectTimeout) {
         this(connectTimeout, READ_TIMEOUT);
     }
 
-    public HttpExecutor(final int connectTimeout,
-                        final int readTimeout) {
+    public HttpExecutor(final int connectTimeout, final int readTimeout) {
         this(connectTimeout, readTimeout, DEFAULT_HEADERS);
     }
 
@@ -142,8 +141,13 @@ private String readData(final HttpURLConnection connection) throws IOException {
     }
 
     private InputStreamReader getStreamReader(final HttpURLConnection connection) throws IOException {
-        return (connection.getContentEncoding() != null && "gzip".equals(connection.getContentEncoding()))
-                ? new InputStreamReader(new GZIPInputStream(connection.getInputStream()), "utf-8")
-                : new InputStreamReader(connection.getInputStream(), "utf-8");
+        final boolean haveEncoding = connection.getContentEncoding() != null;
+
+        if (haveEncoding && "gzip".equals(connection.getContentEncoding()))
+            return new InputStreamReader(new GZIPInputStream(connection.getInputStream()), "utf-8");
+        else if (haveEncoding && "deflate".equals(connection.getContentEncoding()))
+            return new InputStreamReader(new InflaterInputStream(connection.getInputStream()), "utf-8");
+        else
+            return new InputStreamReader(connection.getInputStream(), "utf-8");
     }
 }

src/main/java/io/api/etherscan/model/Abi.java

@@ -36,4 +36,30 @@ public String getContractAbi() {
     public boolean isVerified() {
         return isVerified;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Abi abi = (Abi) o;
+
+        if (isVerified != abi.isVerified) return false;
+        return contractAbi != null ? contractAbi.equals(abi.contractAbi) : abi.contractAbi == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = contractAbi != null ? contractAbi.hashCode() : 0;
+        result = 31 * result + (isVerified ? 1 : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "Abi{" +
+                "contractAbi='" + contractAbi + '\'' +
+                ", isVerified=" + isVerified +
+                '}';
+    }
 }

src/main/java/io/api/etherscan/model/BaseTx.java

@@ -84,4 +84,21 @@ public boolean equals(Object o) {
     public int hashCode() {
         return hash != null ? hash.hashCode() : 0;
     }
+
+    @Override
+    public String toString() {
+        return "BaseTx{" +
+                "blockNumber=" + blockNumber +
+                ", timeStamp='" + timeStamp + '\'' +
+                ", _timeStamp=" + _timeStamp +
+                ", hash='" + hash + '\'' +
+                ", from='" + from + '\'' +
+                ", to='" + to + '\'' +
+                ", value=" + value +
+                ", contractAddress='" + contractAddress + '\'' +
+                ", input='" + input + '\'' +
+                ", gas=" + gas +
+                ", gasUsed=" + gasUsed +
+                '}';
+    }
 }

src/main/java/io/api/etherscan/model/Block.java

@@ -49,4 +49,14 @@ public boolean equals(Object o) {
     public int hashCode() {
         return (int) (blockNumber ^ (blockNumber >>> 32));
     }
+
+    @Override
+    public String toString() {
+        return "Block{" +
+                "blockNumber=" + blockNumber +
+                ", blockReward=" + blockReward +
+                ", timeStamp='" + timeStamp + '\'' +
+                ", _timeStamp=" + _timeStamp +
+                '}';
+    }
 }

src/main/java/io/api/etherscan/model/Log.java

@@ -97,4 +97,26 @@ public Long getLogIndex() {
         return _logIndex;
     }
     //</editor-fold>
+
+    @Override
+    public String toString() {
+        return "Log{" +
+                "blockNumber='" + blockNumber + '\'' +
+                ", _blockNumber=" + _blockNumber +
+                ", address='" + address + '\'' +
+                ", transactionHash='" + transactionHash + '\'' +
+                ", transactionIndex='" + transactionIndex + '\'' +
+                ", _transactionIndex=" + _transactionIndex +
+                ", timeStamp='" + timeStamp + '\'' +
+                ", _timeStamp=" + _timeStamp +
+                ", data='" + data + '\'' +
+                ", gasPrice='" + gasPrice + '\'' +
+                ", _gasPrice=" + _gasPrice +
+                ", gasUsed='" + gasUsed + '\'' +
+                ", _gasUsed=" + _gasUsed +
+                ", topics=" + topics +
+                ", logIndex='" + logIndex + '\'' +
+                ", _logIndex=" + _logIndex +
+                '}';
+    }
 }

src/main/java/io/api/etherscan/model/Price.java

@@ -37,4 +37,16 @@ public LocalDateTime btcTimestamp() {
             _ethbtc_timestamp = LocalDateTime.ofEpochSecond(Long.valueOf(ethbtc_timestamp), 0, ZoneOffset.UTC);
         return _ethbtc_timestamp;
     }
+
+    @Override
+    public String toString() {
+        return "Price{" +
+                "ethusd=" + ethusd +
+                ", ethbtc=" + ethbtc +
+                ", ethusd_timestamp='" + ethusd_timestamp + '\'' +
+                ", ethbtc_timestamp='" + ethbtc_timestamp + '\'' +
+                ", _ethusd_timestamp=" + _ethusd_timestamp +
+                ", _ethbtc_timestamp=" + _ethbtc_timestamp +
+                '}';
+    }
 }

src/main/java/io/api/etherscan/model/Status.java

@@ -21,4 +21,12 @@ public boolean haveError() {
     public String getErrDescription() {
         return errDescription;
     }
+
+    @Override
+    public String toString() {
+        return "Status{" +
+                "isError=" + isError +
+                ", errDescription='" + errDescription + '\'' +
+                '}';
+    }
 }

src/main/java/io/api/etherscan/model/TokenBalance.java

@@ -38,4 +38,11 @@ public int hashCode() {
         result = 31 * result + (tokenContract != null ? tokenContract.hashCode() : 0);
         return result;
     }
+
+    @Override
+    public String toString() {
+        return "TokenBalance{" +
+                "tokenContract='" + tokenContract + '\'' +
+                '}';
+    }
 }

src/main/java/io/api/etherscan/model/Tx.java

@@ -54,4 +54,18 @@ public long getConfirmations() {
         return confirmations;
     }
     //</editor-fold>
+
+    @Override
+    public String toString() {
+        return "Tx{" +
+                "nonce=" + nonce +
+                ", blockHash='" + blockHash + '\'' +
+                ", transactionIndex=" + transactionIndex +
+                ", gasPrice=" + gasPrice +
+                ", cumulativeGasUsed=" + cumulativeGasUsed +
+                ", confirmations=" + confirmations +
+                ", isError='" + isError + '\'' +
+                ", txreceipt_status='" + txreceipt_status + '\'' +
+                '}';
+    }
 }

src/main/java/io/api/etherscan/model/TxInternal.java

@@ -30,4 +30,14 @@ public String getErrCode() {
         return errCode;
     }
     //</editor-fold>
+
+    @Override
+    public String toString() {
+        return "TxInternal{" +
+                "type='" + type + '\'' +
+                ", traceId=" + traceId +
+                ", isError=" + isError +
+                ", errCode='" + errCode + '\'' +
+                '}';
+    }
 }

src/main/java/io/api/etherscan/model/TxToken.java

@@ -55,4 +55,19 @@ public long getConfirmations() {
         return confirmations;
     }
     //</editor-fold>
+
+    @Override
+    public String toString() {
+        return "TxToken{" +
+                "nonce=" + nonce +
+                ", blockHash='" + blockHash + '\'' +
+                ", tokenName='" + tokenName + '\'' +
+                ", tokenSymbol='" + tokenSymbol + '\'' +
+                ", tokenDecimal='" + tokenDecimal + '\'' +
+                ", transactionIndex=" + transactionIndex +
+                ", gasPrice=" + gasPrice +
+                ", cumulativeGasUsed=" + cumulativeGasUsed +
+                ", confirmations=" + confirmations +
+                '}';
+    }
 }

src/main/java/io/api/etherscan/model/Uncle.java

@@ -27,4 +27,13 @@ public int getUnclePosition() {
         return unclePosition;
     }
     //</editor-fold>
+
+    @Override
+    public String toString() {
+        return "Uncle{" +
+                "miner='" + miner + '\'' +
+                ", blockreward=" + blockreward +
+                ", unclePosition=" + unclePosition +
+                '}';
+    }
 }