README improvements

Author: GoodforGod

Diff for: README.md

@@ -2,6 +2,7 @@
 
 [Etherscan](https://etherscan.io/apis) Java API implementation.
 
+Library supports all available EtherScan *API* calls for all available *Ethereum Networks*.
 
 ![](https://media.giphy.com/media/1msHfmVdtuwkXww4ZC/giphy.gif)
 
@@ -34,55 +35,107 @@ dependencies {
     - [Transactions](#transaction-api)
 - [Version History](#version-history)
 
-## Overall
-
-How all is linked together:
-
 ## Api Examples
 
 You can read about all API methods on [Etherscan](https://etherscan.io/apis)
 
-You can you API with you key or without key as well.
+*Library support all available EtherScan API.*
+
+You can use API with you key or without key as well (Check API request\sec restrictions).
 ```java
 EtherScanApi api = new EtherScanApi();
 EtherScanApi api = new EtherScanApi("YourApiKey");
 ```
 
+Below there are examples for each API category.
+
 ### Mainnet and Testnets
-API support: *MAINNET, ROPSTEN, KOVAN, RINKEBY* networks.
+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.MAINNET);
 EtherScanApi api = new EtherScanApi("YourApiKey", EthNetwork.KOVAN);
 ```
 
 ### Account Api
-**Get Ether Balance for a single Address Example**
+**Get Ether Balance for a single Address**
 ```java
 EtherScanApi api = new EtherScanApi();
 Balance balance = api.account().balance("0x8d4426f94e42f721C7116E81d6688cd935cB3b4F");
 ```
 
 ### Block Api
+**Get uncles block for block height**
+```java
+EtherScanApi api = new EtherScanApi();
+Optional<UncleBlock> uncles = api.block().uncles(200000);
+```
 
 ### Contract Api
+**Request contract ABI from [verified codes](https://etherscan.io/contractsVerified)**
+```java
+EtherScanApi api = new EtherScanApi();
+Abi abi = api.contract().contractAbi("0xBB9bc244D798123fDe783fCc1C72d3Bb8C189413");
+```
 
 ### Logs Api
+**Get event logs for single topic**
+```java
+EtherScanApi api = new EtherScanApi();
+LogQuery query = LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c")
+           .topic("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545")
+           .build();
+List<Log> logs = api.logs().logs(query);
+```
+
+**Get event logs for 3 topics with respectful operations**
+```java
+EtherScanApi api = new EtherScanApi();
+LogQuery query = LogQueryBuilder.with("0x33990122638b9132ca29c723bdf037f1a891a70c", 379224, 400000)
+        .topic("0xf63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a8545",
+                "0x72657075746174696f6e00000000000000000000000000000000000000000000",
+                "0x72657075746174696f6e00000000000000000000000000000000000000000000")
+        .setOpTopic0_1(LogOp.AND)
+        .setOpTopic0_2(LogOp.OR)
+        .setOpTopic1_2(LogOp.AND)
+        .build();
+List<Log> logs = api.logs().logs(query);
+```
 
 ### Proxy Api
+**Get tx detailds with proxy endpoint**
+```java
+EtherScanApi api = new EtherScanApi(EthNetwork.MAINNET);
+Optional<TxProxy> tx = api.proxy().tx("0x1e2910a262b1008d0616a0beb24c1a491d78771baa54a33e66065e03b1f46bc1");
+```
+
+**Get block info with proxy endpoint**
+```java
+EtherScanApi api = new EtherScanApi(EthNetwork.MAINNET);
+Optional<BlockProxy> block = api.proxy().block(15215);
+```
 
 ### Stats Api
+**Statistic about last price**
+```java
+EtherScanApi api = new EtherScanApi();
+Price price = api.stats().lastPrice();
+```
 
 ### Transaction Api
-
+**Request receipt status for tx**
+```java
+EtherScanApi api = new EtherScanApi();
+Optional<Boolean> status = api.txs().receiptStatus("0x513c1ba0bebf66436b5fed86ab668452b7805593c05073eb2d51d3a52f480a76");
+```
 
 ### Token Api
 You can read account API [here](https://etherscan.io/apis#accounts)
 
-Token API migrated to account & stats respectfully.
+Token API methods migrated to [Account](#account-api) & [Stats](#stats-api) respectfully.
 
 ## Version History
 
-**1.0.0** - Initial project with all API functionality.
+**1.0.0** - Initial project with all API functionality, for all available networks, with tests coverage for all cases.
 
 ## License
 

Diff for: src/main/java/io/api/etherscan/App.java

@@ -1,16 +1,7 @@
 package io.api.etherscan;
 
-import io.api.etherscan.core.impl.EtherScanApi;
-import io.api.etherscan.model.Balance;
-import io.api.etherscan.model.EthNetwork;
-
-/**
- *
- */
 public class App {
     public static void main(String[] args) {
-        EtherScanApi api = new EtherScanApi(EthNetwork.MAINNET);
-        Balance balance = api.account().balance("0x8d4426f94e42f721C7116E81d6688cd935cB3b4F");
-        System.out.println("Test");
+
     }
 }

Diff for: src/main/java/io/api/etherscan/core/impl/EtherScanApi.java

@@ -1,6 +1,7 @@
 package io.api.etherscan.core.impl;
 
 import io.api.etherscan.core.*;
+import io.api.etherscan.error.ApiException;
 import io.api.etherscan.error.ApiKeyException;
 import io.api.etherscan.executor.IHttpExecutor;
 import io.api.etherscan.executor.impl.HttpExecutor;
@@ -54,14 +55,16 @@ public EtherScanApi(final String apiKey,
         if (BasicUtils.isBlank(apiKey))
             throw new ApiKeyException("API key can not be null or empty");
 
+        if(network == null)
+            throw new ApiException("Ethereum Network is set to NULL value");
+
         // EtherScan 5request\sec limit support by queue manager
         final IQueueManager masterQueue = (apiKey.equals("YourApiKeyToken"))
                 ? new FakeQueueManager()
                 : new QueueManager(5, 1);
 
         final IHttpExecutor executor = executorSupplier.get();
-        final EthNetwork usedNetwork = (network == null) ? EthNetwork.MAINNET : network;
-        final String baseUrl = "https://" + usedNetwork.getDomain() + ".etherscan.io/api" + "?apikey=" + apiKey;
+        final String baseUrl = "https://" + network.getDomain() + ".etherscan.io/api" + "?apikey=" + apiKey;
 
         this.account = new AccountApiProvider(masterQueue, baseUrl, executor);
         this.block = new BlockApiProvider(masterQueue, baseUrl, executor);

Diff for: src/main/java/io/api/etherscan/executor/impl/HttpExecutor.java

@@ -127,7 +127,7 @@ private String readData(final HttpURLConnection connection) throws IOException {
     }
 
     private InputStreamReader getStreamReader(final HttpURLConnection connection) throws IOException {
-        return ("gzip".equals(connection.getContentEncoding()))
+        return (connection.getContentEncoding() != null && "gzip".equals(connection.getContentEncoding()))
                 ? new InputStreamReader(new GZIPInputStream(connection.getInputStream()), "utf-8")
                 : new InputStreamReader(connection.getInputStream(), "utf-8");
     }

Diff for: src/test/java/io/api/etherscan/EtherScanApiTest.java

@@ -1,6 +1,7 @@
 package io.api.etherscan;
 
 import io.api.etherscan.core.impl.EtherScanApi;
+import io.api.etherscan.error.ApiException;
 import io.api.etherscan.error.ApiKeyException;
 import io.api.etherscan.model.EthNetwork;
 import org.junit.Assert;
@@ -35,7 +36,7 @@ public void blankKey() {
         EtherScanApi api = new EtherScanApi(blankKey, network);
     }
 
-    @Test
+    @Test(expected = ApiException.class)
     public void nullNetwork() {
         EtherScanApi api = new EtherScanApi(validKey, null);
         assertNotNull(api);