handleded async callbacks and imports

Author: PraneethChandraThota

examples/src/main/java/examples/basic/BasicAsync.java

@@ -8,6 +8,7 @@
 import com.socketLabs.injectionApi.message.BasicMessage;
 import com.socketLabs.injectionApi.message.EmailAddress;
 import examples.*;
+import okhttp3.Call;
 
 import java.io.IOException;
 

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

@@ -1,12 +1,16 @@
 package examples.basic;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.socketLabs.injectionApi.SendResponse;
 import com.socketLabs.injectionApi.SocketLabsClient;
+import com.socketLabs.injectionApi.core.SendAsyncCallback;
 import com.socketLabs.injectionApi.message.BasicMessage;
 import com.socketLabs.injectionApi.message.EmailAddress;
 import examples.Example;
 import examples.ExampleConfig;
 
+import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.Proxy;
 

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

@@ -2,9 +2,14 @@
 
 import com.socketLabs.injectionApi.core.*;
 import com.socketLabs.injectionApi.core.serialization.InjectionRequestFactory;
+import com.socketLabs.injectionApi.core.serialization.InjectionResponseParser;
 import com.socketLabs.injectionApi.message.*;
 
+import java.io.IOException;
 import java.net.Proxy;
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.Response;
 
 /**
  * SocketLabsClient is a wrapper for the SocketLabs Injection API that makes it easy to send messages and parse responses.
@@ -133,11 +138,11 @@ public void sendAsync(BasicMessage message, final SendAsyncCallback callback) th
 
         retryHandler.sendAsync(new Callback() {
             public void onResponse(Call call, Response response) throws IOException {
-                callback.onResponse(call, parser.Parse(response));
+                callback.onResponse(parser.Parse(response));
             }
 
             public void onFailure(Call call, IOException ex) {
-                callback.onFailure(call, ex);
+                callback.onError(ex);
             }
         });
 
@@ -166,11 +171,11 @@ public void sendAsync(BulkMessage message, final SendAsyncCallback callback) thr
 
         retryHandler.sendAsync(new Callback() {
             public void onResponse(Call call, Response response) throws IOException {
-                callback.onResponse(call, parser.Parse(response));
+                callback.onResponse(parser.Parse(response));
             }
 
             public void onFailure(Call call, IOException ex) {
-                callback.onFailure(call, ex);
+                callback.onError(ex);
             }
         });
 

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

@@ -1,7 +1,6 @@
 package com.socketLabs.injectionApi.core;
 
 import com.socketLabs.injectionApi.RetrySettings;
-import com.socketLabs.injectionApi.SendResponse;
 
 import com.socketLabs.injectionApi.core.serialization.InjectionResponseParser;
 import okhttp3.Call;
@@ -42,7 +41,7 @@ public RetryHandler(HttpRequest request, String endpointUrl, RetrySettings setti
         retrySettings = settings;
     }
 
-    public SendResponse send() throws IOException, InterruptedException {
+    public Response send() throws IOException, InterruptedException {
 
         if (retrySettings.getMaximumNumberOfRetries() == 0) {
             Response response =  httpRequest.SendRequest();
@@ -84,7 +83,7 @@ public SendResponse send() throws IOException, InterruptedException {
 
     }
 
-    public void sendAsync (final SendAsyncCallback callback) throws IOException, InterruptedException{
+    public void sendAsync (final Callback callback) throws IOException, InterruptedException{
 
         InjectionResponseParser parser = new InjectionResponseParser();
         Duration waitInterval = retrySettings.getNextWaitInterval(attempts);
@@ -109,7 +108,7 @@ public void onResponse(Call call, Response response) throws IOException {
                 }
 
                 else {
-                    callback.onResponse(response);
+                    callback.onResponse(call, response);
                 }
 
             }
@@ -137,7 +136,7 @@ public void onFailure(Call call, IOException exception) {
                 }
                 else {
                     attempts = retrySettings.getMaximumNumberOfRetries() + 1;
-                    callback.onError(exception);
+                    callback.onFailure(call, exception);
                 }
 
             }

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

@@ -1,6 +1,7 @@
 package com.socketLabs.injectionApi.core;
 
 import com.socketLabs.injectionApi.SendResponse;
+import okhttp3.Call;
 
 import java.io.IOException;