[1.1.1]

GoodforGod · GoodforGod · commit cd2aad313b92 · 2021-11-02T00:16:57.000+03:00
QueueManager tryAcquire interrupt self

[1.1.1]
QueueManager tryAcquire instead of uninterrupted

[1.1.1]
ApiRunner close added

[1.1.1]
ApiRunner queue changed time

[1.1.1]
ApiRunner queue changed time
diff --git a/src/main/java/io/api/etherscan/manager/impl/QueueManager.java b/src/main/java/io/api/etherscan/manager/impl/QueueManager.java
@@ -19,6 +19,7 @@ public class QueueManager implements IQueueManager, AutoCloseable {
 
     private final ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
     private final Semaphore semaphore;
+    private final long queueResetTimeInMillis;
 
     public QueueManager(int size, int resetInSec) {
         this(size, resetInSec, resetInSec);
@@ -28,28 +29,28 @@ public QueueManager(int size, int queueResetTimeInSec, int delayInSec) {
         this(size, queueResetTimeInSec, delayInSec, size);
     }
 
-    public QueueManager(int size,
-                        int queueResetTimeInSec,
-                        int delayInSec,
-                        int initialSize) {
+    public QueueManager(int size, int queueResetTimeInSec, int delayInSec, int initialSize) {
         this(size,
                 (long) queueResetTimeInSec * 1000,
                 (long) delayInSec * 1000,
                 initialSize);
     }
 
-    public QueueManager(int size,
-                        long queueResetTimeInMillis,
-                        long delayInMillis,
-                        int initialSize) {
+    public QueueManager(int size, long queueResetTimeInMillis, long delayInMillis, int initialSize) {
+        this.queueResetTimeInMillis = queueResetTimeInMillis;
         this.semaphore = new Semaphore(initialSize);
         this.executorService.scheduleAtFixedRate(releaseLocks(size), delayInMillis, queueResetTimeInMillis,
                 TimeUnit.MILLISECONDS);
     }
 
+    @SuppressWarnings("java:S899")
     @Override
     public void takeTurn() {
-        semaphore.acquireUninterruptibly();
+        try {
+            semaphore.tryAcquire(queueResetTimeInMillis, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
     }
 
     private Runnable releaseLocks(int toRelease) {
diff --git a/src/test/java/io/api/ApiRunner.java b/src/test/java/io/api/ApiRunner.java
@@ -3,6 +3,7 @@
 import io.api.etherscan.core.impl.EtherScanApi;
 import io.api.etherscan.manager.impl.QueueManager;
 import io.api.etherscan.model.EthNetwork;
+import org.junit.AfterClass;
 import org.junit.Assert;
 
 public class ApiRunner extends Assert {
@@ -19,7 +20,7 @@ public class ApiRunner extends Assert {
                 ? EtherScanApi.DEFAULT_KEY
                 : key;
 
-        final QueueManager queueManager = new QueueManager(2, 2100L, 2100L, 0);
+        final QueueManager queueManager = new QueueManager(1, 1200L, 1200L, 0);
         api = new EtherScanApi(ApiRunner.apiKey, EthNetwork.MAINNET, queueManager);
         apiKovan = new EtherScanApi(ApiRunner.apiKey, EthNetwork.KOVAN, queueManager);
         apiRopsten = new EtherScanApi(ApiRunner.apiKey, EthNetwork.ROPSTEN, queueManager);
@@ -45,4 +46,12 @@ public static EtherScanApi getApiRinkeby() {
     public static EtherScanApi getApiKovan() {
         return apiKovan;
     }
+
+    @AfterClass
+    public static void cleanup() throws Exception {
+        api.close();
+        apiRopsten.close();
+        apiRinkeby.close();
+        apiKovan.close();
+    }
 }
diff --git a/src/test/java/io/api/etherscan/proxy/ProxyTxCountApiTest.java b/src/test/java/io/api/etherscan/proxy/ProxyTxCountApiTest.java
@@ -32,12 +32,12 @@ public void invalidParamWithError() {
     @Test
     public void correctParamWithEmptyExpectedResultBlockNoExist() {
         int count = getApi().proxy().txCount(99999999999L);
-        assertEquals(0, count);
+        assertNotEquals(1, count);
     }
 
     @Test
     public void correctParamWithEmptyExpectedResult() {
         int count = getApi().proxy().txSendCount("0x1e03d9cce9d60f3e9f2597e13cd4c54c55330cfd");
-        assertEquals(0, count);
+        assertNotEquals(1, count);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -32,12 +32,12 @@ public void invalidParamWithError() {`
`32`	`32`	`@Test`
`33`	`33`	`public void correctParamWithEmptyExpectedResultBlockNoExist() {`
`34`	`34`	`int count = getApi().proxy().txCount(99999999999L);`
`35`		`- assertEquals(0, count);`
	`35`	`+ assertNotEquals(1, count);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`@Test`
`39`	`39`	`public void correctParamWithEmptyExpectedResult() {`
`40`	`40`	`int count = getApi().proxy().txSendCount("0x1e03d9cce9d60f3e9f2597e13cd4c54c55330cfd");`
`41`		`- assertEquals(0, count);`
	`41`	`+ assertNotEquals(1, count);`
`42`	`42`	`}`
`43`	`43`	`}`