Added tests for JDKHttpClient, fixed bug

Stephan · Stephan · commit 5ee2173fbe4f · 2017-10-01T18:22:34.000+11:00
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/httpclient/jdk/JDKHttpClient.java b/scribejava-core/src/main/java/com/github/scribejava/core/httpclient/jdk/JDKHttpClient.java
@@ -33,9 +33,13 @@ public void close() throws IOException {
     public <T> Future<T> executeAsync(String userAgent, Map<String, String> headers, Verb httpVerb, String completeUrl,
             byte[] bodyContents, OAuthAsyncRequestCallback<T> callback, OAuthRequest.ResponseConverter<T> converter) {
         try {
-            final T response = converter.convert(execute(userAgent, headers, httpVerb, completeUrl, bodyContents));
-            callback.onCompleted(response);
-            return new JDKHttpFuture<>(response);
+            final Response response = execute(userAgent, headers, httpVerb, completeUrl, bodyContents);
+            @SuppressWarnings("unchecked")
+            final T t = converter == null ? (T) response : converter.convert(response);
+            if (callback != null) {
+                callback.onCompleted(t);
+            }
+            return new JDKHttpFuture<>(t);
         } catch (InterruptedException | ExecutionException | IOException e) {
             callback.onThrowable(e);
             return new JDKHttpFuture<>(e);
@@ -46,11 +50,13 @@ public <T> Future<T> executeAsync(String userAgent, Map<String, String> headers,
     public <T> Future<T> executeAsync(String userAgent, Map<String, String> headers, Verb httpVerb, String completeUrl,
             String bodyContents, OAuthAsyncRequestCallback<T> callback, OAuthRequest.ResponseConverter<T> converter) {
         try {
-            final T response = converter.convert(execute(userAgent, headers, httpVerb, completeUrl, bodyContents));
+            final Response response = execute(userAgent, headers, httpVerb, completeUrl, bodyContents);
+            @SuppressWarnings("unchecked")
+            final T t = converter == null ? (T) response : converter.convert(response);
             if (callback != null) {
-                callback.onCompleted(response);
+                callback.onCompleted(t);
             }
-            return new JDKHttpFuture<>(response);
+            return new JDKHttpFuture<>(t);
         } catch (InterruptedException | ExecutionException | IOException e) {
             if (callback != null) {
                 callback.onThrowable(e);
diff --git a/scribejava-core/src/test/java/com/github/scribejava/core/httpclient/jdk/JDKHttpClientTest.java b/scribejava-core/src/test/java/com/github/scribejava/core/httpclient/jdk/JDKHttpClientTest.java
@@ -0,0 +1,12 @@
+package com.github.scribejava.core.httpclient.jdk;
+
+import com.github.scribejava.core.AbstractClientTest;
+import com.github.scribejava.core.httpclient.HttpClient;
+
+public class JDKHttpClientTest extends AbstractClientTest {
+
+    @Override
+    protected HttpClient createNewClient() {
+        return new JDKHttpClient(JDKHttpClientConfig.defaultConfig());
+    }
+}
