update exception handling in RetryHandler

Author: PraneethChandraThota

examples/src/main/java/examples/basic/BasicSendWithRetry.java

@@ -27,7 +27,9 @@ public SendResponse RunExample () throws Exception {
         Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 4433));
 
         // create the client
-        SocketLabsClient client = new SocketLabsClient(ExampleConfig.ServerId, ExampleConfig.ApiKey, proxy);
+//        SocketLabsClient client = new SocketLabsClient(37371, "q2QFw9b3KAr6e4S7DsWo");
+        SocketLabsClient client = new SocketLabsClient(ExampleConfig.ServerId, ExampleConfig.ApiKey);
+        client.setEndPointUrl("http://127.0.0.1:5000/");
         client.setRequestTimeout(5);
         client.setNumberOfRetries(2);
 

injectionApi/src/main/java/com/socketLabs/injectionApi/core/RetryHandler.java

@@ -11,7 +11,6 @@
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.net.SocketTimeoutException;
-//import javax.ws.rs.ServerErrorException;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -52,16 +51,15 @@ public SendResponse send() throws IOException, InterruptedException {
             return parser.Parse(response);
         }
 
-//        int attempts = 0;
-
         do {
+
             Duration waitInterval = retrySettings.getNextWaitInterval(attempts);
 
             try{
                 Response response = httpRequest.SendRequest();
                 System.out.println("RESPONSE : " + response.networkResponse().code());
                 if (ErrorStatusCodes.contains(response.networkResponse().code()))
-                    throw new IOException();
+                    throw new IOException("Received Http Status Code : " + response.networkResponse().code());
                 return parser.Parse(response);
             }
 
@@ -87,7 +85,7 @@ public SendResponse send() throws IOException, InterruptedException {
             {
                 attempts++;
                 System.out.println("Exception Occured in IOException : " + exception + " Attempt : " + attempts);
-                if (attempts > retrySettings.getMaximumNumberOfRetries()) throw new IOException();
+                if (attempts > retrySettings.getMaximumNumberOfRetries()) throw new IOException(exception.getMessage());
                 TimeUnit.MILLISECONDS.sleep(waitInterval.toMillis());
             }
 
@@ -96,56 +94,74 @@ public SendResponse send() throws IOException, InterruptedException {
     }
 
     public void sendAsync (final SendAsyncCallback callback) throws IOException, InterruptedException{
+
         InjectionResponseParser parser = new InjectionResponseParser();
-        do {
-            if(attempts <= retrySettings.getMaximumNumberOfRetries()){
-                final SendResponse[] sendResp = {new SendResponse()};
-                httpRequest.SendAsyncRequest(new Callback() {
-                    @Override
-                    public void onFailure(Call call, IOException e) {
-                        if(Exceptions.contains(e.getClass())){
-                            attempts++;
-                            System.out.println("onFailure Exception : " + e.getClass());
-                            try {
-                                sendAsync(callback);
-                            } catch (IOException exception) {
-                                exception.printStackTrace();
-                            } catch (InterruptedException interruptedException) {
-                                interruptedException.printStackTrace();
-                            }
-                        }
-                        else{
-                            attempts = retrySettings.getMaximumNumberOfRetries() + 1;
-                            System.out.println("Different Exception with attempt : " + attempts);
-                            callback.onError(e);
-                        }
+        Duration waitInterval = retrySettings.getNextWaitInterval(attempts);
+        final SendResponse[] sendResp = {new SendResponse()};
+
+        httpRequest.SendAsyncRequest(new Callback() {
+            @Override
+            public void onFailure(Call call, IOException e) {
+                if(Exceptions.contains(e.getClass()) && attempts <= retrySettings.getMaximumNumberOfRetries()) {
+
+                    System.out.println("Attempt : " + attempts);
+                    attempts++;
+                    System.out.println("onFailure Exception : " + e.getClass());
+
+                    try {
+
+                        TimeUnit.MILLISECONDS.sleep(waitInterval.toMillis());
+                        sendAsync(callback);
+
+                    }
+
+                    catch (IOException exception) {
+                        exception.printStackTrace();
+                    }
 
+                    catch (InterruptedException interruptedException) {
+                        interruptedException.printStackTrace();
                     }
 
-                    @Override
-                    public void onResponse(Call call, Response response) throws IOException {
-                        System.out.println("Response code : " + response.networkResponse().code());
-                        if (ErrorStatusCodes.contains(response.networkResponse().code())){
-                            attempts++;
-                            try {
-                                sendAsync(callback);
-                            } catch (InterruptedException e) {
-                                e.printStackTrace();
-                            }
-                        }
-                        else {
-                            sendResp[0] = parser.Parse(response);
-                            System.out.println("Response : " + sendResp[0]);
-                            callback.onResponse(sendResp[0]);
-                        }
+                }
+
+                else {
+
+                    attempts = retrySettings.getMaximumNumberOfRetries() + 1;
+                    System.out.println("Different Exception with attempt : " + attempts);
+                    callback.onError(e);
+
+                }
+
+            }
 
+            @Override
+            public void onResponse(Call call, Response response) throws IOException {
 
+                if (ErrorStatusCodes.contains(response.networkResponse().code()) && attempts <= retrySettings.getMaximumNumberOfRetries()){
+
+                    System.out.println("Attempt : " + attempts);
+                    attempts++;
+                    System.out.println("Response code : " + response.networkResponse().code());
+                    try {
+                        TimeUnit.MILLISECONDS.sleep(waitInterval.toMillis());
+                        sendAsync(callback);
+                    }
+                    catch (InterruptedException e) {
+                        e.printStackTrace();
                     }
-                });
-                System.out.println("Attempt : " + attempts);
+
+                }
+
+                else {
+                    sendResp[0] = parser.Parse(response);
+                    System.out.println("Response : " + sendResp[0]);
+                    callback.onResponse(sendResp[0]);
+                }
+
             }
+        });
 
-        } while (false);
     }
 
 }