Merge pull request #8 from telstra/maintain/v3

release 3.3

Author: zhanganderson

README.md

@@ -68,7 +68,7 @@ Add this dependency to your project's POM:
 <dependency>
   <groupId>com.telstra.messaging</groupId>
   <artifactId>telstra-messaging</artifactId>
-  <version>3.2-SNAPSHOT</version>
+  <version>3.3-SNAPSHOT</version>
 </dependency>
 ```
 

build.gradle

@@ -95,8 +95,8 @@ if(hasProperty('target') && target == 'android') {
 
 dependencies {
     compile 'io.swagger.core.v3:swagger-annotations:2.0.0'
-    compile 'com.squareup.okhttp:okhttp:2.7.5'
-    compile 'com.squareup.okhttp:logging-interceptor:2.7.5'
+    compile 'com.squareup.okhttp3:okhttp:4.12.0'
+    compile 'com.squareup.okhttp3:logging-interceptor:4.12.0'
     compile 'com.google.code.gson:gson:2.8.1'
     compile 'io.gsonfire:gson-fire:1.8.3'
     compile 'org.threeten:threetenbp:1.3.5'

build.sbt

@@ -10,8 +10,8 @@ lazy val root = (project in file(".")).
     resolvers += Resolver.mavenLocal,
     libraryDependencies ++= Seq(
       "io.swagger.core.v3" % "swagger-annotations" % "2.0.0",
-      "com.squareup.okhttp" % "okhttp" % "2.7.5",
-      "com.squareup.okhttp" % "logging-interceptor" % "2.7.5",
+      "com.squareup.okhttp3" % "okhttp" % "4.12.0",
+      "com.squareup.okhttp3" % "logging-interceptor" % "4.12.0",
       "com.google.code.gson" % "gson" % "2.8.1",
       "io.gsonfire" % "gson-fire" % "1.8.3" % "compile",
       "org.threeten" % "threetenbp" % "1.3.5" % "compile",

pom.xml

@@ -5,7 +5,7 @@
   <artifactId>telstra-messaging</artifactId>
   <packaging>jar</packaging>
   <name>telstra-messaging</name>
-  <version>3.2-SNAPSHOT</version>
+  <version>3.3-SNAPSHOT</version>
   <url>https://github.com/swagger-api/swagger-codegen</url>
   <description>Swagger Java</description>
   <scm>
@@ -170,12 +170,12 @@
       <version>${swagger-core-version}</version>
     </dependency>
     <dependency>
-      <groupId>com.squareup.okhttp</groupId>
+      <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
       <version>${okhttp-version}</version>
     </dependency>
     <dependency>
-      <groupId>com.squareup.okhttp</groupId>
+      <groupId>com.squareup.okhttp3</groupId>
       <artifactId>logging-interceptor</artifactId>
       <version>${okhttp-version}</version>
     </dependency>
@@ -220,7 +220,7 @@
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <swagger-core-version>2.0.0</swagger-core-version>
-    <okhttp-version>2.7.5</okhttp-version>
+    <okhttp-version>4.12.0</okhttp-version>
     <gson-version>2.8.1</gson-version>
     <gson-fire-version>1.8.3</gson-fire-version>
     <threetenbp-version>1.3.5</threetenbp-version>

src/main/java/com/telstra/ApiClient.java

@@ -12,16 +12,15 @@
 
 package com.telstra;
 
-import com.squareup.okhttp.*;
-import com.squareup.okhttp.internal.http.HttpMethod;
-import com.squareup.okhttp.logging.HttpLoggingInterceptor;
-import com.squareup.okhttp.logging.HttpLoggingInterceptor.Level;
+import okhttp3.*;
+import okhttp3.internal.http.HttpMethod;
+import okhttp3.logging.HttpLoggingInterceptor;
+import okhttp3.logging.HttpLoggingInterceptor.Level;
 import okio.BufferedSink;
 import okio.Okio;
 import org.threeten.bp.LocalDate;
 import org.threeten.bp.OffsetDateTime;
 import org.threeten.bp.format.DateTimeFormatter;
-
 import javax.net.ssl.*;
 import java.io.File;
 import java.io.IOException;
@@ -494,7 +493,7 @@ public ApiClient setTempFolderPath(String tempFolderPath) {
      * @return Timeout in milliseconds
      */
     public int getConnectTimeout() {
-        return httpClient.getConnectTimeout();
+        return httpClient.connectTimeoutMillis();
     }
 
     /**
@@ -505,7 +504,7 @@ public int getConnectTimeout() {
      * @return Api client
      */
     public ApiClient setConnectTimeout(int connectionTimeout) {
-        httpClient.setConnectTimeout(connectionTimeout, TimeUnit.MILLISECONDS);
+        httpClient = httpClient.newBuilder().connectTimeout(connectionTimeout, TimeUnit.MILLISECONDS).build();
         return this;
     }
 
@@ -515,7 +514,7 @@ public ApiClient setConnectTimeout(int connectionTimeout) {
      * @return Timeout in milliseconds
      */
     public int getReadTimeout() {
-        return httpClient.getReadTimeout();
+        return httpClient.readTimeoutMillis();
     }
 
     /**
@@ -527,7 +526,7 @@ public int getReadTimeout() {
      * @return Api client
      */
     public ApiClient setReadTimeout(int readTimeout) {
-        httpClient.setReadTimeout(readTimeout, TimeUnit.MILLISECONDS);
+        httpClient = httpClient.newBuilder().readTimeout(readTimeout, TimeUnit.MILLISECONDS).build();
         return this;
     }
 
@@ -537,7 +536,7 @@ public ApiClient setReadTimeout(int readTimeout) {
      * @return Timeout in milliseconds
      */
     public int getWriteTimeout() {
-        return httpClient.getWriteTimeout();
+        return httpClient.writeTimeoutMillis();
     }
 
     /**
@@ -549,7 +548,7 @@ public int getWriteTimeout() {
      * @return Api client
      */
     public ApiClient setWriteTimeout(int writeTimeout) {
-        httpClient.setWriteTimeout(writeTimeout, TimeUnit.MILLISECONDS);
+        httpClient = httpClient.newBuilder().writeTimeout(writeTimeout, TimeUnit.MILLISECONDS).build();
         return this;
     }
 
@@ -940,12 +939,13 @@ public <T> void executeAsync(Call call, ApiCallback<T> callback) {
     public <T> void executeAsync(Call call, final Type returnType, final ApiCallback<T> callback) {
         call.enqueue(new Callback() {
             @Override
-            public void onFailure(Request request, IOException e) {
+            public void onFailure(Call call, IOException e) {
                 callback.onFailure(new ApiException(e), 0, null);
+
             }
 
             @Override
-            public void onResponse(Response response) throws IOException {
+            public void onResponse(Call call, Response response) throws IOException {
                 T result;
                 try {
                     result = (T) handleResponse(response, returnType);
@@ -972,14 +972,6 @@ public <T> T handleResponse(Response response, Type returnType) throws ApiExcept
         if (response.isSuccessful()) {
             if (returnType == null || response.code() == 204) {
                 // returning null if the returnType is not defined,
-                // or the status code is 204 (No Content)
-                if (response.body() != null) {
-                    try {
-                        response.body().close();
-                    } catch (IOException e) {
-                        throw new ApiException(response.message(), e, response.code(), response.headers().toMultimap());
-                    }
-                }
                 return null;
             } else {
                 return deserialize(response, returnType);
@@ -1165,7 +1157,7 @@ public void updateParamsForAuth(String[] authNames, List<Pair> queryParams, Map<
      * @return RequestBody
      */
     public RequestBody buildRequestBodyFormEncoding(Map<String, Object> formParams) {
-        FormEncodingBuilder formBuilder  = new FormEncodingBuilder();
+        FormBody.Builder formBuilder = new FormBody.Builder();
         for (Entry<String, Object> param : formParams.entrySet()) {
             formBuilder.add(param.getKey(), parameterToString(param.getValue()));
         }
@@ -1180,7 +1172,7 @@ public RequestBody buildRequestBodyFormEncoding(Map<String, Object> formParams)
      * @return RequestBody
      */
     public RequestBody buildRequestBodyMultipart(Map<String, Object> formParams) {
-        MultipartBuilder mpBuilder = new MultipartBuilder().type(MultipartBuilder.FORM);
+        MultipartBody.Builder mpBuilder = new MultipartBody.Builder().setType(MultipartBody.FORM);
         for (Entry<String, Object> param : formParams.entrySet()) {
             if (param.getValue() instanceof File) {
                 File file = (File) param.getValue();
@@ -1254,11 +1246,11 @@ public void checkServerTrusted(X509Certificate[] chain, String authType) throws
             if (keyManagers != null || trustManagers != null) {
                 SSLContext sslContext = SSLContext.getInstance("TLS");
                 sslContext.init(keyManagers, trustManagers, new SecureRandom());
-                httpClient.setSslSocketFactory(sslContext.getSocketFactory());
+                httpClient = httpClient.newBuilder().sslSocketFactory(sslContext.getSocketFactory()).build();
             } else {
-                httpClient.setSslSocketFactory(null);
+                httpClient = httpClient.newBuilder().sslSocketFactory(null).build();
             }
-            httpClient.setHostnameVerifier(hostnameVerifier);
+            httpClient = httpClient.newBuilder().hostnameVerifier(hostnameVerifier).build();
         } catch (GeneralSecurityException e) {
             throw new RuntimeException(e);
         }

src/main/java/com/telstra/GzipRequestInterceptor.java

@@ -12,7 +12,7 @@
 
 package com.telstra;
 
-import com.squareup.okhttp.*;
+import okhttp3.*;
 import okio.Buffer;
 import okio.BufferedSink;
 import okio.GzipSink;

src/main/java/com/telstra/ProgressRequestBody.java

@@ -12,8 +12,8 @@
 
 package com.telstra;
 
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.RequestBody;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
 
 import java.io.IOException;
 

src/main/java/com/telstra/ProgressResponseBody.java

@@ -11,9 +11,8 @@
  */
 
 package com.telstra;
-
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.ResponseBody;
+import okhttp3.MediaType;
+import okhttp3.ResponseBody;
 
 import java.io.IOException;
 
@@ -44,12 +43,12 @@ public MediaType contentType() {
     }
 
     @Override
-    public long contentLength() throws IOException {
+    public long contentLength() {
         return responseBody.contentLength();
     }
 
     @Override
-    public BufferedSource source() throws IOException {
+    public BufferedSource source()  {
         if (bufferedSource == null) {
             bufferedSource = Okio.buffer(source(responseBody.source()));
         }

src/main/java/com/telstra/auth/HttpBasicAuth.java

@@ -13,9 +13,7 @@
 package com.telstra.auth;
 
 import com.telstra.Pair;
-
-import com.squareup.okhttp.Credentials;
-
+import okhttp3.*;
 import java.util.Map;
 import java.util.List;
 

src/main/java/com/telstra/messaging/AuthenticationApi.java

@@ -88,7 +88,7 @@ public static ApiClient getAuthToken(ApiClient apiClient) {
      * @return Call to execute
      * @throws ApiException If fail to serialize the request body object
      */
-    public com.squareup.okhttp.Call authTokenCall(String clientId, String clientSecret, String grantType, String scope, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    public okhttp3.Call authTokenCall(String clientId, String clientSecret, String grantType, String scope, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         Object localVarPostBody = null;
 
         // create path and map variables
@@ -122,10 +122,10 @@ public com.squareup.okhttp.Call authTokenCall(String clientId, String clientSecr
         localVarHeaderParams.put("Content-Type", localVarContentType);
 
         if(progressListener != null) {
-            apiClient.getHttpClient().networkInterceptors().add(new com.squareup.okhttp.Interceptor() {
+            apiClient.getHttpClient().networkInterceptors().add(new okhttp3.Interceptor() {
                 @Override
-                public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Chain chain) throws IOException {
-                    com.squareup.okhttp.Response originalResponse = chain.proceed(chain.request());
+                public okhttp3.Response intercept(okhttp3.Interceptor.Chain chain) throws IOException {
+                    okhttp3.Response originalResponse = chain.proceed(chain.request());
                     return originalResponse.newBuilder()
                     .body(new ProgressResponseBody(originalResponse.body(), progressListener))
                     .build();
@@ -138,7 +138,7 @@ public com.squareup.okhttp.Response intercept(com.squareup.okhttp.Interceptor.Ch
     }
 
     @SuppressWarnings("rawtypes")
-    private com.squareup.okhttp.Call authTokenValidateBeforeCall(String clientId, String clientSecret, String grantType, String scope, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
+    private okhttp3.Call authTokenValidateBeforeCall(String clientId, String clientSecret, String grantType, String scope, final ProgressResponseBody.ProgressListener progressListener, final ProgressRequestBody.ProgressRequestListener progressRequestListener) throws ApiException {
         // verify the required parameter 'clientId' is set
         if (clientId == null) {
             throw new ApiException("Missing the required parameter 'clientId' when calling authToken(Async)");
@@ -156,7 +156,7 @@ private com.squareup.okhttp.Call authTokenValidateBeforeCall(String clientId, St
             throw new ApiException("Missing the required parameter 'scope' when calling authToken(Async)");
         }
 
-        com.squareup.okhttp.Call call = authTokenCall(clientId, clientSecret, grantType, scope, progressListener, progressRequestListener);
+        okhttp3.Call call = authTokenCall(clientId, clientSecret, grantType, scope, progressListener, progressRequestListener);
         return call;
     }
 
@@ -186,7 +186,7 @@ public OAuth authToken(String clientId, String clientSecret, String grantType, S
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      */
     public ApiResponse<OAuth> authTokenWithHttpInfo(String clientId, String clientSecret, String grantType, String scope) throws ApiException {
-        com.squareup.okhttp.Call call = authTokenValidateBeforeCall(clientId, clientSecret, grantType, scope, null, null);
+        okhttp3.Call call = authTokenValidateBeforeCall(clientId, clientSecret, grantType, scope, null, null);
         Type localVarReturnType = new TypeToken<OAuth>(){}.getType();
         return apiClient.execute(call, localVarReturnType);
     }
@@ -202,7 +202,7 @@ public ApiResponse<OAuth> authTokenWithHttpInfo(String clientId, String clientSe
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
      */
-    public com.squareup.okhttp.Call authTokenAsync(String clientId, String clientSecret, String grantType, String scope, final ApiCallback<OAuth> callback) throws ApiException {
+    public okhttp3.Call authTokenAsync(String clientId, String clientSecret, String grantType, String scope, final ApiCallback<OAuth> callback) throws ApiException {
 
         ProgressResponseBody.ProgressListener progressListener = null;
         ProgressRequestBody.ProgressRequestListener progressRequestListener = null;
@@ -223,7 +223,7 @@ public void onRequestProgress(long bytesWritten, long contentLength, boolean don
             };
         }
 
-        com.squareup.okhttp.Call call = authTokenValidateBeforeCall(clientId, clientSecret, grantType, scope, progressListener, progressRequestListener);
+        okhttp3.Call call = authTokenValidateBeforeCall(clientId, clientSecret, grantType, scope, progressListener, progressRequestListener);
         Type localVarReturnType = new TypeToken<OAuth>(){}.getType();
         apiClient.executeAsync(call, localVarReturnType, callback);
         return call;