DEVX-658: updating okhttp to v5

Author: ShipilA

commercetools/commercetools-okhttp-client5/src/main/java/com/commercetools/http/okhttp4/BuilderOptions.java

@@ -1,5 +1,5 @@
 
-package com.commercetools.http.okhttp4;
+package com.commercetools.http.okhttp5;
 
 import okhttp3.OkHttpClient;
 

commercetools/commercetools-okhttp-client5/src/main/java/com/commercetools/http/okhttp4/CtOkHttp5Client.java

@@ -1,5 +1,5 @@
 
-package com.commercetools.http.okhttp4;
+package com.commercetools.http.okhttp5;
 
 import java.io.IOException;
 import java.util.*;
@@ -29,52 +29,52 @@ public class CtOkHttp5Client extends HttpClientBase {
 
     private final OkHttpClient okHttpClient;
 
-    public CtOkHttp4Client() {
+    public CtOkHttp5Client() {
         super();
         okHttpClient = clientBuilder.get().dispatcher(createDispatcher(MAX_REQUESTS, MAX_REQUESTS)).build();
     }
 
-    public CtOkHttp4Client(final BuilderOptions options) {
+    public CtOkHttp5Client(final BuilderOptions options) {
         super();
         okHttpClient = options.plus(clientBuilder.get().dispatcher(createDispatcher(MAX_REQUESTS, MAX_REQUESTS)))
                 .build();
     }
 
-    public CtOkHttp4Client(final Supplier<OkHttpClient.Builder> builderSupplier) {
+    public CtOkHttp5Client(final Supplier<OkHttpClient.Builder> builderSupplier) {
         super();
         okHttpClient = builderSupplier.get().build();
     }
 
-    public CtOkHttp4Client(final int maxRequests, final int maxRequestsPerHost) {
+    public CtOkHttp5Client(final int maxRequests, final int maxRequestsPerHost) {
         super();
         okHttpClient = clientBuilder.get().dispatcher(createDispatcher(maxRequests, maxRequestsPerHost)).build();
     }
 
-    public CtOkHttp4Client(final int maxRequests, final int maxRequestsPerHost, final BuilderOptions options) {
+    public CtOkHttp5Client(final int maxRequests, final int maxRequestsPerHost, final BuilderOptions options) {
         super();
         okHttpClient = options.plus(clientBuilder.get().dispatcher(createDispatcher(maxRequests, maxRequestsPerHost)))
                 .build();
     }
 
-    public CtOkHttp4Client(final ExecutorService executor) {
+    public CtOkHttp5Client(final ExecutorService executor) {
         super(executor);
         okHttpClient = clientBuilder.get().dispatcher(createDispatcher(executor, MAX_REQUESTS, MAX_REQUESTS)).build();
     }
 
-    public CtOkHttp4Client(final ExecutorService executor, final BuilderOptions options) {
+    public CtOkHttp5Client(final ExecutorService executor, final BuilderOptions options) {
         super(executor);
         okHttpClient = options.plus(clientBuilder.get().dispatcher(createDispatcher(MAX_REQUESTS, MAX_REQUESTS)))
                 .build();
     }
 
-    public CtOkHttp4Client(final ExecutorService executor, final int maxRequests, final int maxRequestsPerHost) {
+    public CtOkHtt54Client(final ExecutorService executor, final int maxRequests, final int maxRequestsPerHost) {
         super(executor);
         okHttpClient = clientBuilder.get()
                 .dispatcher(createDispatcher(executor, maxRequests, maxRequestsPerHost))
                 .build();
     }
 
-    public CtOkHttp4Client(final ExecutorService executor, final int maxRequests, final int maxRequestsPerHost,
+    public CtOkHttp5Client(final ExecutorService executor, final int maxRequests, final int maxRequestsPerHost,
             final BuilderOptions options) {
         super(executor);
         okHttpClient = options
@@ -103,7 +103,7 @@ public okhttp3.Dispatcher createDispatcher(final ExecutorService executor, final
 
     @Override
     public CompletableFuture<ApiHttpResponse<byte[]>> execute(final ApiHttpRequest request) {
-        return makeRequest(okHttpClient, toRequest(request)).thenApplyAsync(CtOkHttp4Client::toResponse, executor());
+        return makeRequest(okHttpClient, toRequest(request)).thenApplyAsync(CtOkHttp5Client::toResponse, executor());
 
     }
 

commercetools/commercetools-okhttp-client5/src/main/java/com/commercetools/http/okhttp4/OkHttp5ClientSupplier.java

@@ -1,21 +1,21 @@
 
-package com.commercetools.http.okhttp4;
+package com.commercetools.http.okhttp5;
 
 import java.util.concurrent.ExecutorService;
 import java.util.function.Supplier;
 
 import io.vrap.rmf.base.client.BaseHttpClientSupplier;
 import io.vrap.rmf.base.client.VrapHttpClient;
 
-public class OkHttp4ClientSupplier extends BaseHttpClientSupplier {
+public class OkHttp5ClientSupplier extends BaseHttpClientSupplier {
 
     @Override
     public VrapHttpClient get() {
-        return new CtOkHttp4Client();
+        return new CtOkHttp5Client();
     }
 
     @Override
     public Supplier<VrapHttpClient> get(ExecutorService executorService) {
-        return () -> new CtOkHttp4Client(executorService);
+        return () -> new CtOkHttp5Client(executorService);
     }
 }

commercetools/commercetools-okhttp-client5/src/main/java/com/commercetools/http/okhttp4/OkHttpClientSolutionInfo.java

@@ -1,5 +1,5 @@
 
-package com.commercetools.http.okhttp4;
+package com.commercetools.http.okhttp5;
 
 import io.vrap.rmf.base.client.SolutionInfo;
 

commercetools/commercetools-okhttp-client5/src/main/resources/META-INF/services/io.vrap.rmf.base.client.ExecutorHttpClientSupplier

@@ -1 +1 @@
-com.commercetools.http.okhttp4.OkHttp4ClientSupplier
+com.commercetools.http.okhttp5.OkHttp4ClientSupplier

commercetools/commercetools-okhttp-client5/src/main/resources/META-INF/services/io.vrap.rmf.base.client.HttpClientSupplier

@@ -1 +1 @@
-com.commercetools.http.okhttp4.OkHttp4ClientSupplier
+com.commercetools.http.okhttp5.OkHttp4ClientSupplier

commercetools/commercetools-okhttp-client5/src/main/resources/META-INF/services/io.vrap.rmf.base.client.SolutionInfo

@@ -1 +1 @@
-com.commercetools.http.okhttp4.OkHttpClientSolutionInfo
+com.commercetools.http.okhttp5.OkHttpClientSolutionInfo

commercetools/commercetools-okhttp-client5/src/test/java/com/commercetools/http/okhttp4/SolutionInfoTest.java

@@ -1,5 +1,5 @@
 
-package com.commercetools.http.okhttp4;
+package com.commercetools.http.okhttp5;
 
 import com.vdurmont.semver4j.Semver;
 

commercetools/commercetools-okhttp-client5/src/test/java/com/commercetools/http/okhttp4/SupplierTest.java

@@ -1,5 +1,5 @@
 
-package com.commercetools.http.okhttp4;
+package com.commercetools.http.okhttp5;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -19,7 +19,7 @@
 public class SupplierTest {
     @Test
     public void testCreate() {
-        Assertions.assertThat(HttpClientSupplier.of().get()).isInstanceOf(CtOkHttp4Client.class);
+        Assertions.assertThat(HttpClientSupplier.of().get()).isInstanceOf(CtOkHttp5Client.class);
     }
 
     @Test
@@ -32,7 +32,7 @@ public void testUnzip() throws IOException {
         gzipOs.close();
         ByteArrayInputStream inputStream = new ByteArrayInputStream(os.toByteArray());
 
-        CtOkHttp4Client.UnzippingInterceptor interceptor = new CtOkHttp4Client.UnzippingInterceptor();
+        CtOkHttp5Client.UnzippingInterceptor interceptor = new CtOkHttp5Client.UnzippingInterceptor();
 
         Response gzipped = new Response.Builder().request(new Request.Builder().url("http://localhost").build())
                 .protocol(Protocol.HTTP_1_1)
@@ -51,7 +51,7 @@ public void testUnzip() throws IOException {
         Assertions.assertThat(unzipped.body().source().isOpen()).isTrue();
         Assertions.assertThat(inputStream.available()).isEqualTo(31);
 
-        ApiHttpResponse<byte[]> response = CtOkHttp4Client.toResponse(unzipped);
+        ApiHttpResponse<byte[]> response = CtOkHttp5Client.toResponse(unzipped);
 
         Assertions.assertThat(gzipped.body().source().isOpen()).isFalse();
         Assertions.assertThat(unzipped.body().source().isOpen()).isFalse();