SWI-9389 Client Updates (#226)

* SWI-9389 Client Updates

* update template

* update test

Author: ckoegel

custom_templates/libraries/okhttp-gson/ApiClient.mustache

@@ -224,6 +224,7 @@ public class ApiClient {
             }
         }
         RetryingOAuth retryingOAuth = new RetryingOAuth(client, tokenUrl, clientId, OAuthFlow.{{#lambda.uppercase}}{{#lambda.snakecase}}{{flow}}{{/lambda.snakecase}}{{/lambda.uppercase}}, clientSecret, parameters);
+        initHttpClient(client, Collections.<Interceptor>singletonList(retryingOAuth));
         authentications.put("{{name}}", retryingOAuth);{{#authMethods}}{{#isBasic}}{{#isBasicBasic}}
         authentications.put("{{name}}", new HttpBasicAuth());{{/isBasicBasic}}{{#isBasicBearer}}
         authentications.put("{{name}}", new HttpBearerAuth("{{scheme}}"));{{/isBasicBearer}}{{/isBasic}}{{#isApiKey}}
@@ -281,7 +282,11 @@ public class ApiClient {
     }
 
     protected void initHttpClient(List<Interceptor> interceptors) {
-        OkHttpClient.Builder builder = new OkHttpClient.Builder();
+        initHttpClient(new OkHttpClient(), interceptors);
+    }
+
+    protected void initHttpClient(OkHttpClient okHttpClient, List<Interceptor> interceptors) {
+        OkHttpClient.Builder builder = okHttpClient.newBuilder();
         builder.addNetworkInterceptor(getProgressInterceptor());
         for (Interceptor interceptor: interceptors) {
             builder.addInterceptor(interceptor);

src/main/java/com/bandwidth/sdk/ApiClient.java

@@ -182,6 +182,7 @@ public ApiClient(String clientId, String clientSecret, Map<String, String> param
             }
         }
         RetryingOAuth retryingOAuth = new RetryingOAuth(client, tokenUrl, clientId, OAuthFlow.APPLICATION, clientSecret, parameters);
+        initHttpClient(client, Collections.<Interceptor>singletonList(retryingOAuth));
         authentications.put("OAuth2", retryingOAuth);
         authentications.put("Basic", new HttpBasicAuth());
 
@@ -230,7 +231,11 @@ protected void initHttpClient() {
     }
 
     protected void initHttpClient(List<Interceptor> interceptors) {
-        OkHttpClient.Builder builder = new OkHttpClient.Builder();
+        initHttpClient(new OkHttpClient(), interceptors);
+    }
+
+    protected void initHttpClient(OkHttpClient okHttpClient, List<Interceptor> interceptors) {
+        OkHttpClient.Builder builder = okHttpClient.newBuilder();
         builder.addNetworkInterceptor(getProgressInterceptor());
         for (Interceptor interceptor: interceptors) {
             builder.addInterceptor(interceptor);

src/test/java/com/bandwidth/sdk/unit/api/ApiClientTest.java

@@ -17,6 +17,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.sameInstance;
 import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.contains;
 
 import java.util.Map;
 
@@ -33,7 +34,7 @@ public void testHttpClient() throws Exception {
         assertThat(defaultOauthClient.getHttpClient(), instanceOf(OkHttpClient.class));
         assertThat(customOauthClient.getHttpClient(), instanceOf(OkHttpClient.class));
         assertThat(defaultOauthClient.getHttpClient(), not(sameInstance(customOauthClient.getHttpClient())));
-        assertThat(customOauthClient.getHttpClient(), sameInstance(httpClient));
+        assertThat(customOauthClient.getHttpClient().interceptors(), contains(instanceOf(RetryingOAuth.class)));
     }
 
     @Test