Executor post request fix

GoodforGod · GoodforGod · commit f1aff4e2754a · 2018-11-04T02:36:58.000+03:00
diff --git a/src/main/java/io/api/etherscan/core/impl/ProxyApiProvider.java b/src/main/java/io/api/etherscan/core/impl/ProxyApiProvider.java
@@ -136,7 +136,7 @@ public Optional<String> txSendRaw(final String hexEncodedTx) throws ApiException
             throw new InvalidDataHexException("Data is not encoded in hex format - " + hexEncodedTx);
 
         final String urlParams = ACT_SEND_RAW_TX_PARAM + HEX_PARAM + hexEncodedTx;
-        final StringProxyTO response = getRequest(urlParams, StringProxyTO.class);
+        final StringProxyTO response = postRequest(urlParams, "", StringProxyTO.class);
         if(response.getError() != null)
             throw new EtherScanException("Error occurred with code " + response.getError().getCode()
                     + " with message " + response.getError().getMessage());
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,9 +17,8 @@
 import static java.net.HttpURLConnection.HTTP_MOVED_TEMP;
 
 /**
- * @see IHttpExecutor
- *
  * @author GoodforGod
+ * @see IHttpExecutor
  * @since 28.10.2018
  */
 public class HttpExecutor implements IHttpExecutor {
@@ -30,7 +29,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("cache-control", "max-age=0");
+        DEFAULT_HEADERS.put("content-Type", "application/x-www-form-urlencoded");
     }
 
     private final Map<String, String> headers;
@@ -82,13 +81,14 @@ public String post(final String urlAsString, final String dataToPost) {
             connection.setConnectTimeout(timeout);
             headers.forEach(connection::setRequestProperty);
 
-            if(!BasicUtils.isEmpty(dataToPost)) {
-                connection.setDoOutput(true);
-                DataOutputStream wr = new DataOutputStream(connection.getOutputStream());
-                wr.writeBytes(dataToPost);
-                wr.flush();
-                wr.close();
-            }
+            final String contentLength = (BasicUtils.isEmpty(dataToPost)) ? "0" : String.valueOf(dataToPost.length());
+            connection.setRequestProperty("Content-Length", contentLength);
+
+            connection.setDoOutput(true);
+            DataOutputStream wr = new DataOutputStream(connection.getOutputStream());
+            wr.writeBytes(dataToPost);
+            wr.flush();
+            wr.close();
 
             final int status = connection.getResponseCode();
             if (status == HTTP_MOVED_TEMP || status == HTTP_MOVED_PERM) {
diff --git a/src/test/java/io/api/etherscan/account/AccountTxInternalByHashTest.java b/src/test/java/io/api/etherscan/account/AccountTxInternalByHashTest.java
@@ -24,7 +24,6 @@ public void correct() {
         assertNotNull(txs);
         assertEquals(1, txs.size());
         assertTxs(txs);
-        assertNotNull(txs.get(0).getHash());
         assertNotNull(txs.get(0).getFrom());
         assertNotNull(txs.get(0).getTimeStamp());
         assertNotNull(txs.get(0).getGas());
diff --git a/src/test/java/io/api/etherscan/block/BlockApiTest.java b/src/test/java/io/api/etherscan/block/BlockApiTest.java
@@ -19,7 +19,7 @@ public class BlockApiTest extends Assert {
 
     @Test
     public void correct() {
-        Optional<UncleBlock> uncles = api.block().uncles(242512);
+        Optional<UncleBlock> uncles = api.block().uncles(2165403);
         assertTrue(uncles.isPresent());
         assertFalse(uncles.get().isEmpty());
         assertNotNull(uncles.get().getBlockMiner());
diff --git a/src/test/java/io/api/etherscan/proxy/ProxyCodeApiTest.java b/src/test/java/io/api/etherscan/proxy/ProxyCodeApiTest.java
@@ -14,7 +14,7 @@
  * @author GoodforGod
  * @since 03.11.2018
  */
-public class ProxyCodeApiTest extends Assert{
+public class ProxyCodeApiTest extends Assert {
 
     private final EtherScanApi api = new EtherScanApi();
 
diff --git a/src/test/java/io/api/etherscan/proxy/ProxyGasApiTest.java b/src/test/java/io/api/etherscan/proxy/ProxyGasApiTest.java
@@ -13,7 +13,7 @@
  * @author GoodforGod
  * @since 03.11.2018
  */
-public class ProxyGasApiTest extends Assert{
+public class ProxyGasApiTest extends Assert {
 
     private final EtherScanApi api = new EtherScanApi();
 
diff --git a/src/test/java/io/api/etherscan/proxy/ProxyStorageApiTest.java b/src/test/java/io/api/etherscan/proxy/ProxyStorageApiTest.java
@@ -14,7 +14,7 @@
  * @author GoodforGod
  * @since 03.11.2018
  */
-public class ProxyStorageApiTest extends Assert{
+public class ProxyStorageApiTest extends Assert {
 
     private final EtherScanApi api = new EtherScanApi();
 
diff --git a/src/test/java/io/api/etherscan/proxy/ProxyTxApiTest.java b/src/test/java/io/api/etherscan/proxy/ProxyTxApiTest.java
@@ -14,7 +14,7 @@
  * @author GoodforGod
  * @since 03.11.2018
  */
-public class ProxyTxApiTest extends Assert{
+public class ProxyTxApiTest extends Assert {
 
     private final EtherScanApi api = new EtherScanApi();
 
diff --git a/src/test/java/io/api/etherscan/proxy/ProxyTxCountApiTest.java b/src/test/java/io/api/etherscan/proxy/ProxyTxCountApiTest.java
@@ -11,7 +11,7 @@
  * @author GoodforGod
  * @since 03.11.2018
  */
-public class ProxyTxCountApiTest extends Assert{
+public class ProxyTxCountApiTest extends Assert {
 
     private final EtherScanApi api = new EtherScanApi();
 
diff --git a/src/test/java/io/api/etherscan/proxy/ProxyTxReceiptApiTest.java b/src/test/java/io/api/etherscan/proxy/ProxyTxReceiptApiTest.java
@@ -14,7 +14,7 @@
  * @author GoodforGod
  * @since 03.11.2018
  */
-public class ProxyTxReceiptApiTest extends Assert{
+public class ProxyTxReceiptApiTest extends Assert {
 
     private final EtherScanApi api = new EtherScanApi();
 
diff --git a/src/test/java/io/api/etherscan/proxy/ProxyTxSendRawApiTest.java b/src/test/java/io/api/etherscan/proxy/ProxyTxSendRawApiTest.java
@@ -15,7 +15,7 @@
  * @since 03.11.2018
  */
 //TODO contact etherscan and ask about methods
-public class ProxyTxSendRawApiTest extends Assert{
+public class ProxyTxSendRawApiTest extends Assert {
 
     private final EtherScanApi api = new EtherScanApi();
 
@@ -31,7 +31,7 @@ public void invalidParamWithError() {
 
     @Test(expected = EtherScanException.class)
     public void invalidParamEtherScanDataException() {
-        Optional<String> sendRaw = api.proxy().txSendRaw("0x0");
+        Optional<String> sendRaw = api.proxy().txSendRaw("0x1");
     }
 
     public void correctParamWithEmptyExpectedResult() {
