updated RetryHandler

Author: PraneethChandraThota

injectionApi/src/main/java/com/socketLabs/injectionApi/SocketLabsClient.java

@@ -126,7 +126,6 @@ public void sendAsync(BasicMessage message, final SendAsyncCallback callback) th
 
         RetryHandler retryHandler = new RetryHandler(request, this.endPointUrl, new RetrySettings(this.numberOfRetries));
         retryHandler.sendAsync(callback);
-//        request.SendAsyncRequest(callback);
 
     }
 
@@ -150,7 +149,6 @@ public void sendAsync(BulkMessage message, final SendAsyncCallback callback) thr
 
         RetryHandler retryHandler = new RetryHandler(request, this.endPointUrl, new RetrySettings(this.numberOfRetries));
         retryHandler.sendAsync(callback);
-//        request.SendAsyncRequest(callback);
 
     }
 

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

@@ -102,12 +102,9 @@ public void SendAsyncRequest(final Callback callback) {
 
         Call call = BuildClientCall();
 
-        final SendResponse[] sendResp = {new SendResponse()};
-
         call.enqueue(new Callback() {
             public void onResponse(Call call, Response response) throws IOException {
 
-//                sendResp[0] = ParseResponse(response);
                 callback.onResponse(call, response);
                 // ...
             }

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

@@ -46,7 +46,8 @@ public SendResponse send() throws IOException, InterruptedException {
 
         InjectionResponseParser parser = new InjectionResponseParser();
 
-        if (retrySettings.getMaximumNumberOfRetries() == 0){
+        if (retrySettings.getMaximumNumberOfRetries() == 0) {
+
             Response response =  httpRequest.SendRequest();
             return parser.Parse(response);
         }
@@ -56,37 +57,47 @@ public SendResponse send() throws IOException, InterruptedException {
             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("Received Http Status Code : " + response.networkResponse().code());
+
                 return parser.Parse(response);
+
             }
 
             catch (SocketTimeoutException exception)
             {
+
                 attempts++;
-                System.out.println("Exception Occured in SocketTimeOutException : " + exception + " Attempt : " + attempts);
+
                 if (attempts > retrySettings.getMaximumNumberOfRetries()) throw new SocketTimeoutException();
+
                 TimeUnit.MILLISECONDS.sleep(waitInterval.toMillis());
 
             }
 
             catch (InterruptedIOException exception)
             {
+
                 attempts++;
-                System.out.println("Exception Occured in InterruptedIOException : " + exception + " Attempt : " + attempts);
+
                 if (attempts > retrySettings.getMaximumNumberOfRetries()) throw new InterruptedIOException();
+
                 TimeUnit.MILLISECONDS.sleep(waitInterval.toMillis());
 
             }
 
             catch (IOException exception)
             {
+
                 attempts++;
-                System.out.println("Exception Occured in IOException : " + exception + " Attempt : " + attempts);
+
                 if (attempts > retrySettings.getMaximumNumberOfRetries()) throw new IOException(exception.getMessage());
+
                 TimeUnit.MILLISECONDS.sleep(waitInterval.toMillis());
+
             }
 
         } while (true);
@@ -97,69 +108,75 @@ public void sendAsync (final SendAsyncCallback callback) throws IOException, Int
 
         InjectionResponseParser parser = new InjectionResponseParser();
         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()) {
+            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("onFailure Exception : " + e.getClass());
 
                     try {
 
                         TimeUnit.MILLISECONDS.sleep(waitInterval.toMillis());
                         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);
+                    callback.onResponse(parser.Parse(response));
 
                 }
 
             }
 
             @Override
-            public void onResponse(Call call, Response response) throws IOException {
+            public void onFailure(Call call, IOException exception) {
 
-                if (ErrorStatusCodes.contains(response.networkResponse().code()) && attempts <= retrySettings.getMaximumNumberOfRetries()){
+                if(Exceptions.contains(exception.getClass()) && 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();
+
+                    catch (IOException ioException) {
+
+                        ioException.printStackTrace();
+
+                    }
+
+                    catch (InterruptedException interruptedException) {
+
+                        interruptedException.printStackTrace();
+
                     }
 
                 }
 
                 else {
-                    sendResp[0] = parser.Parse(response);
-                    System.out.println("Response : " + sendResp[0]);
-                    callback.onResponse(sendResp[0]);
+
+                    attempts = retrySettings.getMaximumNumberOfRetries() + 1;
+                    callback.onError(exception);
+
                 }
 
             }
+
         });
 
     }