Merge pull request #347 from ably/any-sync-http

Add ability to generalize over a HTTP request being async or not.
ably · Sep 28, 2017 · b3c8862 · b3c8862
2 parents d2bb116 + b31db28
commit b3c8862
Show file tree

Hide file tree

Showing 38 changed files with 2,251 additions and 1,930 deletions.
diff --git a/lib/src/main/java/io/ably/lib/debug/DebugOptions.java b/lib/src/main/java/io/ably/lib/debug/DebugOptions.java
@@ -4,8 +4,7 @@
 import java.util.List;
 import java.util.Map;
 
-import io.ably.lib.http.Http.RequestBody;
-import io.ably.lib.http.Http.Response;
+import io.ably.lib.http.HttpCore;
 import io.ably.lib.types.AblyException;
 import io.ably.lib.types.ClientOptions;
 import io.ably.lib.types.ProtocolMessage;
@@ -18,8 +17,8 @@ public interface RawProtocolListener {
 	}
 
 	public interface RawHttpListener {
-		public void onRawHttpRequest(String id, HttpURLConnection conn, String method, String authHeader, Map<String, List<String>> requestHeaders, RequestBody requestBody);
-		public void onRawHttpResponse(String id, Response response);
+		public void onRawHttpRequest(String id, HttpURLConnection conn, String method, String authHeader, Map<String, List<String>> requestHeaders, HttpCore.RequestBody requestBody);
+		public void onRawHttpResponse(String id, HttpCore.Response response);
 		public void onRawHttpException(String id, Throwable t);
 	}