Minor refactoring and renaming

GoodforGod · GoodforGod · commit 2af17f05989f · 2018-11-05T00:48:03.000+03:00
diff --git a/pom.xml b/pom.xml
@@ -7,13 +7,12 @@
   <artifactId>etherscan</artifactId>
   <version>1.0.0</version>
 
-  <name>etherscan-api</name>
+  <name>java-etherscan-api</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <apache.http>4.5.6</apache.http>
   </properties>
 
   <dependencies>
@@ -24,12 +23,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>${apache.http}</version>
-    </dependency>
-
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
@@ -41,12 +34,6 @@
       <artifactId>annotations</artifactId>
       <version>13.0</version>
     </dependency>
-
-    <dependency>
-      <groupId>com.jsoniter</groupId>
-      <artifactId>jsoniter</artifactId>
-      <version>0.9.23</version>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/src/main/java/io/api/etherscan/executor/impl/HttpExecutor.java b/src/main/java/io/api/etherscan/executor/impl/HttpExecutor.java
@@ -17,8 +17,10 @@
 import static java.net.HttpURLConnection.HTTP_MOVED_TEMP;
 
 /**
- * @author GoodforGod
+ * Http client implementation
  * @see IHttpExecutor
+ *
+ * @author GoodforGod
  * @since 28.10.2018
  */
 public class HttpExecutor implements IHttpExecutor {
@@ -29,7 +31,7 @@ public class HttpExecutor implements IHttpExecutor {
         DEFAULT_HEADERS.put("accept-language", "en,ru;q=0.9");
         DEFAULT_HEADERS.put("accept-encoding", "gzip, deflate, br");
         DEFAULT_HEADERS.put("user-agent", "Mozilla/5.0 (Windows NT 10.0; WOW64) Chrome/68.0.3440.106");
-        DEFAULT_HEADERS.put("content-Type", "application/x-www-form-urlencoded");
+        DEFAULT_HEADERS.put("content-type", "application/x-www-form-urlencoded");
     }
 
     private final Map<String, String> headers;
@@ -43,6 +45,11 @@ public HttpExecutor(final int timeout) {
         this(timeout, DEFAULT_HEADERS);
     }
 
+    /**
+     *
+     * @param timeout custom timeout in millis
+     * @param headers custom HTTP headers
+     */
     public HttpExecutor(final int timeout,
                         final Map<String, String> headers) {
         this.timeout = timeout;
@@ -82,7 +89,7 @@ public String post(final String urlAsString, final String dataToPost) {
             headers.forEach(connection::setRequestProperty);
 
             final String contentLength = (BasicUtils.isEmpty(dataToPost)) ? "0" : String.valueOf(dataToPost.length());
-            connection.setRequestProperty("Content-Length", contentLength);
+            connection.setRequestProperty("content-length", contentLength);
 
             connection.setDoOutput(true);
             DataOutputStream wr = new DataOutputStream(connection.getOutputStream());
diff --git a/src/main/java/io/api/etherscan/model/utility/BalanceTO.java b/src/main/java/io/api/etherscan/model/utility/BalanceTO.java
@@ -11,11 +11,6 @@ public class BalanceTO {
     private String account;
     private String balance;
 
-    public BalanceTO(String account, String balance) {
-        this.account = account;
-        this.balance = balance;
-    }
-
     public String getAccount() {
         return account;
     }
diff --git a/src/test/java/io/api/etherscan/account/AccountTxInternalByHashTest.java b/src/test/java/io/api/etherscan/account/AccountTxInternalByHashTest.java
@@ -3,6 +3,7 @@
 import io.api.etherscan.core.impl.EtherScanApi;
 import io.api.etherscan.error.InvalidTxHashException;
 import io.api.etherscan.model.TxInternal;
+import io.api.etherscan.util.BasicUtils;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -27,7 +28,8 @@ public void correct() {
         assertNotNull(txs.get(0).getFrom());
         assertNotNull(txs.get(0).getTimeStamp());
         assertNotNull(txs.get(0).getGas());
-        assertNotNull(txs.get(0).getHash());
+        assertNotNull(txs.get(0).getValue());
+        assertTrue(BasicUtils.isEmpty(txs.get(0).getErrCode()));
     }
 
     @Test(expected = InvalidTxHashException.class)
diff --git a/src/test/java/io/api/util/BasicUtilTest.java b/src/test/java/io/api/util/BasicUtilTest.java
