moving InjectionResponseParser to client, Retry handler will only return/callback with result from request.

Author: david-schrenker

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

@@ -80,9 +80,10 @@ public SendResponse send(BasicMessage message) throws Exception {
         HttpRequest request = buildHttpRequest(this.proxy);
         request.setBody(new InjectionRequestFactory(this.serverId, this.apiKey).GenerateRequest(message));
         RetryHandler retryHandler = new RetryHandler(request, this.endPointUrl, new RetrySettings(this.numberOfRetries));
+        Response response = retryHandler.send();
 
-        return retryHandler.send();
-
+        InjectionResponseParser parser = new InjectionResponseParser();
+        return parser.Parse(response);
     }
 
     /**
@@ -100,9 +101,12 @@ public SendResponse send(BulkMessage message) throws Exception {
 
         HttpRequest request = buildHttpRequest(this.proxy);
         request.setBody(new InjectionRequestFactory(this.serverId, this.apiKey).GenerateRequest(message));
+
         RetryHandler retryHandler = new RetryHandler(request, this.endPointUrl, new RetrySettings(this.numberOfRetries));
+        Response response = retryHandler.send();
 
-        return retryHandler.send();
+        InjectionResponseParser parser = new InjectionResponseParser();
+        return parser.Parse(response);
 
     }
 
@@ -125,7 +129,17 @@ public void sendAsync(BasicMessage message, final SendAsyncCallback callback) th
         request.setBody(new InjectionRequestFactory(this.serverId, this.apiKey).GenerateRequest(message));
 
         RetryHandler retryHandler = new RetryHandler(request, this.endPointUrl, new RetrySettings(this.numberOfRetries));
-        retryHandler.sendAsync(callback);
+        InjectionResponseParser parser = new InjectionResponseParser();
+
+        retryHandler.sendAsync(new Callback() {
+            public void onResponse(Call call, Response response) throws IOException {
+                callback.onResponse(call, parser.Parse(response));
+            }
+
+            public void onFailure(Call call, IOException ex) {
+                callback.onFailure(call, ex);
+            }
+        });
 
     }
 
@@ -148,7 +162,18 @@ public void sendAsync(BulkMessage message, final SendAsyncCallback callback) thr
         request.setBody(new InjectionRequestFactory(this.serverId, this.apiKey).GenerateRequest(message));
 
         RetryHandler retryHandler = new RetryHandler(request, this.endPointUrl, new RetrySettings(this.numberOfRetries));
-        retryHandler.sendAsync(callback);
+        InjectionResponseParser parser = new InjectionResponseParser();
+
+        retryHandler.sendAsync(new Callback() {
+            public void onResponse(Call call, Response response) throws IOException {
+                callback.onResponse(call, parser.Parse(response));
+            }
+
+            public void onFailure(Call call, IOException ex) {
+                callback.onFailure(call, ex);
+            }
+        });
+
 
     }
 

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

@@ -44,12 +44,9 @@ public RetryHandler(HttpRequest request, String endpointUrl, RetrySettings setti
 
     public SendResponse send() throws IOException, InterruptedException {
 
-        InjectionResponseParser parser = new InjectionResponseParser();
-
         if (retrySettings.getMaximumNumberOfRetries() == 0) {
-
             Response response =  httpRequest.SendRequest();
-            return parser.Parse(response);
+            return response;
         }
 
         do {
@@ -59,45 +56,28 @@ public SendResponse send() throws IOException, InterruptedException {
             try{
 
                 Response response = httpRequest.SendRequest();
-
                 if (ErrorStatusCodes.contains(response.networkResponse().code()))
                     throw new IOException("Received Http Status Code : " + response.networkResponse().code());
-
-                return parser.Parse(response);
+                return response;
 
             }
-
             catch (SocketTimeoutException exception)
             {
-
                 attempts++;
-
                 if (attempts > retrySettings.getMaximumNumberOfRetries()) throw new SocketTimeoutException();
-
                 TimeUnit.MILLISECONDS.sleep(waitInterval.toMillis());
-
             }
-
             catch (InterruptedIOException exception)
             {
-
                 attempts++;
-
                 if (attempts > retrySettings.getMaximumNumberOfRetries()) throw new InterruptedIOException();
-
                 TimeUnit.MILLISECONDS.sleep(waitInterval.toMillis());
-
             }
-
             catch (IOException exception)
             {
-
                 attempts++;
-
                 if (attempts > retrySettings.getMaximumNumberOfRetries()) throw new IOException(exception.getMessage());
-
                 TimeUnit.MILLISECONDS.sleep(waitInterval.toMillis());
-
             }
 
         } while (true);
@@ -119,23 +99,17 @@ public void onResponse(Call call, Response response) throws IOException {
                     attempts++;
 
                     try {
-
                         TimeUnit.MILLISECONDS.sleep(waitInterval.toMillis());
                         sendAsync(callback);
-
                     }
                     catch (InterruptedException interruptedException) {
-
                         interruptedException.printStackTrace();
-
                     }
 
                 }
 
                 else {
-
-                    callback.onResponse(parser.Parse(response));
-
+                    callback.onResponse(response);
                 }
 
             }
@@ -148,31 +122,22 @@ public void onFailure(Call call, IOException exception) {
                     attempts++;
 
                     try {
-
                         TimeUnit.MILLISECONDS.sleep(waitInterval.toMillis());
                         sendAsync(callback);
-
                     }
 
                     catch (IOException ioException) {
-
                         ioException.printStackTrace();
-
                     }
 
                     catch (InterruptedException interruptedException) {
-
                         interruptedException.printStackTrace();
-
                     }
 
                 }
-
                 else {
-
                     attempts = retrySettings.getMaximumNumberOfRetries() + 1;
                     callback.onError(exception);
-
                 }
 
             }