diff --git a/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/AuthorizationPolicyTest.java b/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/AuthorizationPolicyTest.java
index f0d1ba1478e..d0a86707426 100644
--- a/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/AuthorizationPolicyTest.java
+++ b/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/AuthorizationPolicyTest.java
@@ -29,7 +29,7 @@
import io.fabric8.kubernetes.api.model.DeletionPropagation;
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
-import okhttp3.mockwebserver.RecordedRequest;
+import io.fabric8.mockwebserver.http.RecordedRequest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/DestinationRuleTest.java b/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/DestinationRuleTest.java
index 44a4091b093..88735f032c1 100644
--- a/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/DestinationRuleTest.java
+++ b/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/DestinationRuleTest.java
@@ -27,7 +27,7 @@
import io.fabric8.kubernetes.api.model.DeletionPropagation;
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
-import okhttp3.mockwebserver.RecordedRequest;
+import io.fabric8.mockwebserver.http.RecordedRequest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/GatewayTest.java b/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/GatewayTest.java
index 67df8eadd96..7d607c7c4d5 100644
--- a/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/GatewayTest.java
+++ b/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/GatewayTest.java
@@ -25,7 +25,7 @@
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import io.fabric8.kubernetes.client.utils.Serialization;
-import okhttp3.mockwebserver.RecordedRequest;
+import io.fabric8.mockwebserver.http.RecordedRequest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.snakeyaml.engine.v2.api.Load;
diff --git a/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/PeerAuthenticationTest.java b/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/PeerAuthenticationTest.java
index 0eb665a497b..660b302d526 100644
--- a/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/PeerAuthenticationTest.java
+++ b/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/PeerAuthenticationTest.java
@@ -24,7 +24,7 @@
import io.fabric8.kubernetes.api.model.DeletionPropagation;
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
-import okhttp3.mockwebserver.RecordedRequest;
+import io.fabric8.mockwebserver.http.RecordedRequest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/ServiceEntryTest.java b/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/ServiceEntryTest.java
index 49ff961e39e..c1c282f4a7a 100644
--- a/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/ServiceEntryTest.java
+++ b/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/ServiceEntryTest.java
@@ -23,7 +23,7 @@
import io.fabric8.kubernetes.api.model.DeletionPropagation;
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
-import okhttp3.mockwebserver.RecordedRequest;
+import io.fabric8.mockwebserver.http.RecordedRequest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/SidecarTest.java b/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/SidecarTest.java
index c48e6d9ddf1..b121fc4ad08 100644
--- a/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/SidecarTest.java
+++ b/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/SidecarTest.java
@@ -22,7 +22,7 @@
import io.fabric8.kubernetes.api.model.DeletionPropagation;
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
-import okhttp3.mockwebserver.RecordedRequest;
+import io.fabric8.mockwebserver.http.RecordedRequest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/VirtualServiceTest.java b/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/VirtualServiceTest.java
index b121b5940c6..c24d1f99ee2 100644
--- a/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/VirtualServiceTest.java
+++ b/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/VirtualServiceTest.java
@@ -35,7 +35,7 @@
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import io.fabric8.kubernetes.client.utils.Serialization;
-import okhttp3.mockwebserver.RecordedRequest;
+import io.fabric8.mockwebserver.http.RecordedRequest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.snakeyaml.engine.v2.api.Load;
diff --git a/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/WorkloadEntryTest.java b/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/WorkloadEntryTest.java
index 576e153ea39..6a33cf52dd0 100644
--- a/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/WorkloadEntryTest.java
+++ b/extensions/istio/tests/src/test/java/io/fabric8/istio/test/v1beta1/WorkloadEntryTest.java
@@ -21,7 +21,7 @@
import io.fabric8.kubernetes.api.model.DeletionPropagation;
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
-import okhttp3.mockwebserver.RecordedRequest;
+import io.fabric8.mockwebserver.http.RecordedRequest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/extensions/knative/tests/src/test/java/io/fabric8/knative/test/ServiceTest.java b/extensions/knative/tests/src/test/java/io/fabric8/knative/test/ServiceTest.java
index be21b7233db..a3ae73214a4 100644
--- a/extensions/knative/tests/src/test/java/io/fabric8/knative/test/ServiceTest.java
+++ b/extensions/knative/tests/src/test/java/io/fabric8/knative/test/ServiceTest.java
@@ -21,7 +21,7 @@
import io.fabric8.kubernetes.api.model.DeletionPropagation;
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
-import okhttp3.mockwebserver.RecordedRequest;
+import io.fabric8.mockwebserver.http.RecordedRequest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/extensions/tekton/tests/src/test/java/io/fabric8/tekton/v1beta1/PipelineTest.java b/extensions/tekton/tests/src/test/java/io/fabric8/tekton/v1beta1/PipelineTest.java
index d73c004d561..38f4e5369d3 100644
--- a/extensions/tekton/tests/src/test/java/io/fabric8/tekton/v1beta1/PipelineTest.java
+++ b/extensions/tekton/tests/src/test/java/io/fabric8/tekton/v1beta1/PipelineTest.java
@@ -18,8 +18,8 @@
import io.fabric8.kubernetes.api.model.DeletionPropagation;
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
+import io.fabric8.mockwebserver.http.RecordedRequest;
import io.fabric8.tekton.client.TektonClient;
-import okhttp3.mockwebserver.RecordedRequest;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/httpclient-okhttp/src/test/java/io/fabric8/kubernetes/client/okhttp/ConnectionPoolLeakageTest.java b/httpclient-okhttp/src/test/java/io/fabric8/kubernetes/client/okhttp/ConnectionPoolLeakageTest.java
index 906ed1981ba..38e7d61c8c9 100644
--- a/httpclient-okhttp/src/test/java/io/fabric8/kubernetes/client/okhttp/ConnectionPoolLeakageTest.java
+++ b/httpclient-okhttp/src/test/java/io/fabric8/kubernetes/client/okhttp/ConnectionPoolLeakageTest.java
@@ -18,10 +18,10 @@
import io.fabric8.kubernetes.client.http.AsyncBody;
import io.fabric8.kubernetes.client.http.HttpClient;
import io.fabric8.kubernetes.client.http.HttpResponse;
+import io.fabric8.mockwebserver.MockWebServer;
+import io.fabric8.mockwebserver.http.MockResponse;
import okhttp3.ConnectionPool;
import okhttp3.Protocol;
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.MockWebServer;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
@@ -53,7 +53,7 @@ void setUp() {
}
@AfterEach
- void tearDown() throws Exception {
+ void tearDown() {
server.shutdown();
connectionPool.evictAll();
}
@@ -63,7 +63,7 @@ void tearDown() throws Exception {
@ValueSource(strings = { "h2_prior_knowledge", "http/1.1" })
void consumeBytes(String protocol) throws Exception {
final Protocol p = Protocol.get(protocol);
- server.setProtocols(Collections.singletonList(p));
+ server.setProtocols(Collections.singletonList(io.fabric8.mockwebserver.vertx.Protocol.get(p.toString())));
server.start();
clientBuilder.getBuilder().protocols(Collections.singletonList(p));
try (HttpClient httpClient = clientBuilder.build()) {
diff --git a/httpclient-okhttp/src/test/java/io/fabric8/kubernetes/client/okhttp/OkHttpClientProxyTest.java b/httpclient-okhttp/src/test/java/io/fabric8/kubernetes/client/okhttp/OkHttpClientProxyTest.java
index 9972a2db619..af93da9be2d 100644
--- a/httpclient-okhttp/src/test/java/io/fabric8/kubernetes/client/okhttp/OkHttpClientProxyTest.java
+++ b/httpclient-okhttp/src/test/java/io/fabric8/kubernetes/client/okhttp/OkHttpClientProxyTest.java
@@ -25,8 +25,8 @@ protected HttpClient.Factory getHttpClientFactory() {
return new OkHttpClientFactory();
}
- @Override
- protected void proxyConfigurationOtherAuthAddsRequiredHeaders() throws Exception {
- // OkHttp uses a response intercept to add the auth proxy headers in case the original response failed
- }
+ // @Override
+ // protected void proxyConfigurationOtherAuthAddsRequiredHeaders() throws Exception {
+ // // OkHttp uses a response intercept to add the auth proxy headers in case the original response failed
+ // }
}
diff --git a/junit/kubernetes-server-mock/pom.xml b/junit/kubernetes-server-mock/pom.xml
index bb1d4de8e08..2729673896f 100644
--- a/junit/kubernetes-server-mock/pom.xml
+++ b/junit/kubernetes-server-mock/pom.xml
@@ -41,6 +41,16 @@
io.fabric8
mockwebserver
+
+ org.junit.jupiter
+ junit-jupiter-api
+ provided
+
+
+ junit
+ junit
+ provided
+
org.junit.jupiter
@@ -54,11 +64,6 @@
${slf4j.version}
test
-
- org.junit.jupiter
- junit-jupiter-api
- provided
-
org.junit.jupiter
junit-jupiter-params
diff --git a/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java b/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
index d35ad46e60e..5d1ff1e4309 100644
--- a/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
+++ b/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesAttributesExtractor.java
@@ -24,7 +24,7 @@
import io.fabric8.mockwebserver.crud.Attribute;
import io.fabric8.mockwebserver.crud.AttributeExtractor;
import io.fabric8.mockwebserver.crud.AttributeSet;
-import okhttp3.HttpUrl;
+import io.fabric8.mockwebserver.http.HttpUrl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesCrudDispatcher.java b/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesCrudDispatcher.java
index b916969e7e9..5af8e8e4940 100644
--- a/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesCrudDispatcher.java
+++ b/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesCrudDispatcher.java
@@ -30,9 +30,8 @@
import io.fabric8.mockwebserver.crud.Attribute;
import io.fabric8.mockwebserver.crud.AttributeSet;
import io.fabric8.mockwebserver.crud.CrudDispatcher;
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.RecordedRequest;
-import okhttp3.mockwebserver.SocketPolicy;
+import io.fabric8.mockwebserver.http.MockResponse;
+import io.fabric8.mockwebserver.http.RecordedRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -292,7 +291,6 @@ public MockResponse handleWatch(String path) {
.filter(entry -> watch.attributeMatches(entry.getKey()))
.forEach(entry -> watch.sendWebSocketResponse(entry.getValue(), Action.ADDED))));
watchEventListeners.add(watchEventListener);
- mockResponse.setSocketPolicy(SocketPolicy.KEEP_OPEN);
return mockResponse.withWebSocketUpgrade(watchEventListener);
}
diff --git a/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMixedDispatcher.java b/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMixedDispatcher.java
index 7daa72e0105..29f891ae13d 100644
--- a/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMixedDispatcher.java
+++ b/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMixedDispatcher.java
@@ -19,11 +19,11 @@
import io.fabric8.mockwebserver.ServerRequest;
import io.fabric8.mockwebserver.ServerResponse;
import io.fabric8.mockwebserver.dsl.HttpMethod;
+import io.fabric8.mockwebserver.http.Dispatcher;
+import io.fabric8.mockwebserver.http.MockResponse;
+import io.fabric8.mockwebserver.http.RecordedRequest;
import io.fabric8.mockwebserver.internal.MockDispatcher;
import io.fabric8.mockwebserver.internal.SimpleRequest;
-import okhttp3.mockwebserver.Dispatcher;
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.RecordedRequest;
import java.util.Collections;
import java.util.List;
@@ -58,7 +58,7 @@ public KubernetesMixedDispatcher(
}
@Override
- public MockResponse dispatch(RecordedRequest request) throws InterruptedException {
+ public MockResponse dispatch(RecordedRequest request) {
final Queue responseQueue = responses.get(
new SimpleRequest(HttpMethod.valueOf(request.getMethod()), request.getPath()));
if (responseQueue != null && !responseQueue.isEmpty()) {
diff --git a/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServer.java b/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServer.java
index db94c7113d0..2297f9de441 100644
--- a/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServer.java
+++ b/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServer.java
@@ -37,11 +37,11 @@
import io.fabric8.kubernetes.client.utils.Serialization;
import io.fabric8.mockwebserver.Context;
import io.fabric8.mockwebserver.DefaultMockServer;
+import io.fabric8.mockwebserver.MockWebServer;
import io.fabric8.mockwebserver.ServerRequest;
import io.fabric8.mockwebserver.ServerResponse;
+import io.fabric8.mockwebserver.http.Dispatcher;
import io.fabric8.mockwebserver.internal.MockDispatcher;
-import okhttp3.mockwebserver.Dispatcher;
-import okhttp3.mockwebserver.MockWebServer;
import java.net.HttpURLConnection;
import java.net.InetAddress;
diff --git a/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServerExtension.java b/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServerExtension.java
index 7ad84905817..ae9fc1d8104 100644
--- a/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServerExtension.java
+++ b/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServerExtension.java
@@ -20,11 +20,11 @@
import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
import io.fabric8.kubernetes.client.utils.Serialization;
import io.fabric8.mockwebserver.Context;
+import io.fabric8.mockwebserver.MockWebServer;
import io.fabric8.mockwebserver.ServerRequest;
import io.fabric8.mockwebserver.ServerResponse;
+import io.fabric8.mockwebserver.http.Dispatcher;
import io.fabric8.mockwebserver.internal.MockDispatcher;
-import okhttp3.mockwebserver.Dispatcher;
-import okhttp3.mockwebserver.MockWebServer;
import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
diff --git a/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesServer.java b/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesServer.java
index ea3b39a14d7..16fd77a1ee7 100644
--- a/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesServer.java
+++ b/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesServer.java
@@ -18,11 +18,11 @@
import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
import io.fabric8.kubernetes.client.dsl.base.CustomResourceDefinitionContext;
import io.fabric8.mockwebserver.Context;
+import io.fabric8.mockwebserver.MockWebServer;
import io.fabric8.mockwebserver.ServerRequest;
import io.fabric8.mockwebserver.ServerResponse;
import io.fabric8.mockwebserver.dsl.MockServerExpectation;
-import okhttp3.mockwebserver.MockWebServer;
-import okhttp3.mockwebserver.RecordedRequest;
+import io.fabric8.mockwebserver.http.RecordedRequest;
import org.junit.rules.ExternalResource;
import java.net.InetAddress;
diff --git a/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/WatchEventsListener.java b/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/WatchEventsListener.java
index ab11a0f61f3..ba81bbd4dff 100644
--- a/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/WatchEventsListener.java
+++ b/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/WatchEventsListener.java
@@ -22,10 +22,10 @@
import io.fabric8.kubernetes.client.utils.Serialization;
import io.fabric8.mockwebserver.Context;
import io.fabric8.mockwebserver.crud.AttributeSet;
+import io.fabric8.mockwebserver.http.Response;
+import io.fabric8.mockwebserver.http.WebSocket;
+import io.fabric8.mockwebserver.http.WebSocketListener;
import io.fabric8.mockwebserver.internal.WebSocketMessage;
-import okhttp3.Response;
-import okhttp3.WebSocket;
-import okhttp3.WebSocketListener;
import org.slf4j.Logger;
import java.util.Set;
diff --git a/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/crud/KubernetesCrudDispatcherHandler.java b/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/crud/KubernetesCrudDispatcherHandler.java
index a82e349ec0a..459014f5ff5 100644
--- a/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/crud/KubernetesCrudDispatcherHandler.java
+++ b/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/crud/KubernetesCrudDispatcherHandler.java
@@ -21,8 +21,8 @@
import io.fabric8.kubernetes.client.utils.Serialization;
import io.fabric8.kubernetes.client.utils.Utils;
import io.fabric8.mockwebserver.crud.AttributeSet;
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.RecordedRequest;
+import io.fabric8.mockwebserver.http.MockResponse;
+import io.fabric8.mockwebserver.http.RecordedRequest;
import java.net.HttpURLConnection;
diff --git a/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/crud/PatchHandler.java b/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/crud/PatchHandler.java
index d6518043375..cc1cfc94594 100644
--- a/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/crud/PatchHandler.java
+++ b/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/crud/PatchHandler.java
@@ -22,9 +22,9 @@
import io.fabric8.kubernetes.client.utils.Serialization;
import io.fabric8.kubernetes.client.utils.Utils;
import io.fabric8.mockwebserver.crud.AttributeSet;
+import io.fabric8.mockwebserver.http.MediaType;
+import io.fabric8.mockwebserver.http.MockResponse;
import io.fabric8.zjsonpatch.JsonPatch;
-import okhttp3.MediaType;
-import okhttp3.mockwebserver.MockResponse;
import java.net.HttpURLConnection;
import java.util.Iterator;
diff --git a/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/crud/PostHandler.java b/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/crud/PostHandler.java
index 9980caaa97b..a3c016a263d 100644
--- a/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/crud/PostHandler.java
+++ b/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/crud/PostHandler.java
@@ -23,7 +23,7 @@
import io.fabric8.kubernetes.client.utils.Utils;
import io.fabric8.mockwebserver.crud.Attribute;
import io.fabric8.mockwebserver.crud.AttributeSet;
-import okhttp3.mockwebserver.MockResponse;
+import io.fabric8.mockwebserver.http.MockResponse;
import java.net.HttpURLConnection;
import java.time.ZoneOffset;
diff --git a/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/crud/PutHandler.java b/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/crud/PutHandler.java
index 81ebd0f02e8..75ebd3d255b 100644
--- a/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/crud/PutHandler.java
+++ b/junit/kubernetes-server-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/crud/PutHandler.java
@@ -19,7 +19,7 @@
import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
import io.fabric8.kubernetes.client.utils.Serialization;
import io.fabric8.mockwebserver.crud.AttributeSet;
-import okhttp3.mockwebserver.MockResponse;
+import io.fabric8.mockwebserver.http.MockResponse;
import java.net.HttpURLConnection;
import java.util.Map;
diff --git a/junit/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesMixedDispatcherTest.java b/junit/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesMixedDispatcherTest.java
index 1c78461ad62..3a8f76d65a1 100644
--- a/junit/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesMixedDispatcherTest.java
+++ b/junit/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesMixedDispatcherTest.java
@@ -20,12 +20,12 @@
import io.fabric8.mockwebserver.ServerRequest;
import io.fabric8.mockwebserver.ServerResponse;
import io.fabric8.mockwebserver.dsl.HttpMethod;
+import io.fabric8.mockwebserver.http.Buffer;
+import io.fabric8.mockwebserver.http.Headers;
+import io.fabric8.mockwebserver.http.MockResponse;
+import io.fabric8.mockwebserver.http.RecordedRequest;
import io.fabric8.mockwebserver.internal.SimpleRequest;
import io.fabric8.mockwebserver.internal.SimpleResponse;
-import okhttp3.Headers;
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.RecordedRequest;
-import okio.Buffer;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
@@ -59,7 +59,7 @@ void setUp() {
@Test
@DisplayName("dispatch, with matching expectation, returns expectation")
- void dispatchWithMatchingExpectation() throws Exception {
+ void dispatchWithMatchingExpectation() {
// Given
responses.compute(new SimpleRequest(HttpMethod.GET, "/api/v1/resources/my-resource"), (k, v) -> new ArrayDeque<>())
.add(new SimpleResponse(true, 200, "resourceBody", null));
@@ -76,7 +76,7 @@ void dispatchWithMatchingExpectation() throws Exception {
@Test
@DisplayName("dispatch, with existing CRUD resource, returns CRUD resource")
- void dispatchWithCrudExistentResource() throws Exception {
+ void dispatchWithCrudExistentResource() {
// Given
final Buffer requestBody = new Buffer();
requestBody.writeString("{\"kind\": \"Resource\", \"apiVersion\": \"v1\",\"metadata\": {\"name\": \"my-resource\"}}",
diff --git a/junit/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/crud/KubernetesCrudDispatcherTestBase.java b/junit/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/crud/KubernetesCrudDispatcherTestBase.java
index feaa3aec369..60c23af07d8 100644
--- a/junit/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/crud/KubernetesCrudDispatcherTestBase.java
+++ b/junit/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/crud/KubernetesCrudDispatcherTestBase.java
@@ -19,7 +19,7 @@
import io.fabric8.kubernetes.client.server.mock.KubernetesCrudDispatcher;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import io.fabric8.mockwebserver.Context;
-import okhttp3.mockwebserver.MockWebServer;
+import io.fabric8.mockwebserver.MockWebServer;
import org.assertj.core.api.Condition;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
diff --git a/junit/openshift-server-mock/pom.xml b/junit/openshift-server-mock/pom.xml
index 44f93f1b38a..4f98748e8ba 100644
--- a/junit/openshift-server-mock/pom.xml
+++ b/junit/openshift-server-mock/pom.xml
@@ -44,6 +44,13 @@
assertj-core
test
+
+
+ junit
+ junit
+ provided
+
+
org.junit.jupiter
junit-jupiter-api
diff --git a/junit/openshift-server-mock/src/main/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServer.java b/junit/openshift-server-mock/src/main/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServer.java
index 454137c78f2..3f31342618a 100644
--- a/junit/openshift-server-mock/src/main/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServer.java
+++ b/junit/openshift-server-mock/src/main/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServer.java
@@ -17,12 +17,12 @@
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import io.fabric8.mockwebserver.Context;
+import io.fabric8.mockwebserver.MockWebServer;
import io.fabric8.mockwebserver.ServerRequest;
import io.fabric8.mockwebserver.ServerResponse;
+import io.fabric8.mockwebserver.http.Dispatcher;
import io.fabric8.openshift.client.NamespacedOpenShiftClient;
import io.fabric8.openshift.client.OpenShiftConfig;
-import okhttp3.mockwebserver.Dispatcher;
-import okhttp3.mockwebserver.MockWebServer;
import java.util.Map;
import java.util.Queue;
diff --git a/junit/openshift-server-mock/src/main/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtension.java b/junit/openshift-server-mock/src/main/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtension.java
index 7cb0a6eba84..b03e389aa3a 100644
--- a/junit/openshift-server-mock/src/main/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtension.java
+++ b/junit/openshift-server-mock/src/main/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtension.java
@@ -18,11 +18,11 @@
import io.fabric8.kubernetes.client.server.mock.KubernetesMixedDispatcher;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServerExtension;
import io.fabric8.mockwebserver.Context;
+import io.fabric8.mockwebserver.MockWebServer;
import io.fabric8.mockwebserver.ServerRequest;
import io.fabric8.mockwebserver.ServerResponse;
import io.fabric8.openshift.client.NamespacedOpenShiftClient;
import io.fabric8.openshift.client.OpenShiftClient;
-import okhttp3.mockwebserver.MockWebServer;
import org.junit.jupiter.api.extension.ExtensionContext;
import java.lang.reflect.Field;
diff --git a/junit/openshift-server-mock/src/main/java/io/fabric8/openshift/client/server/mock/OpenShiftServer.java b/junit/openshift-server-mock/src/main/java/io/fabric8/openshift/client/server/mock/OpenShiftServer.java
index b670b7c51c9..c2a1bdd1d35 100644
--- a/junit/openshift-server-mock/src/main/java/io/fabric8/openshift/client/server/mock/OpenShiftServer.java
+++ b/junit/openshift-server-mock/src/main/java/io/fabric8/openshift/client/server/mock/OpenShiftServer.java
@@ -18,12 +18,12 @@
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMixedDispatcher;
import io.fabric8.mockwebserver.Context;
+import io.fabric8.mockwebserver.MockWebServer;
import io.fabric8.mockwebserver.ServerRequest;
import io.fabric8.mockwebserver.ServerResponse;
import io.fabric8.mockwebserver.dsl.MockServerExpectation;
+import io.fabric8.mockwebserver.http.RecordedRequest;
import io.fabric8.openshift.client.NamespacedOpenShiftClient;
-import okhttp3.mockwebserver.MockWebServer;
-import okhttp3.mockwebserver.RecordedRequest;
import org.junit.rules.ExternalResource;
import java.util.HashMap;
diff --git a/kubernetes-client-api/src/test/java/io/fabric8/kubernetes/client/http/AbstractHttpClientProxyHttpsTest.java b/kubernetes-client-api/src/test/java/io/fabric8/kubernetes/client/http/AbstractHttpClientProxyHttpsTest.java
index fe7b8c059f7..2c21a9ff2a1 100644
--- a/kubernetes-client-api/src/test/java/io/fabric8/kubernetes/client/http/AbstractHttpClientProxyHttpsTest.java
+++ b/kubernetes-client-api/src/test/java/io/fabric8/kubernetes/client/http/AbstractHttpClientProxyHttpsTest.java
@@ -15,22 +15,20 @@
*/
package io.fabric8.kubernetes.client.http;
+import io.fabric8.kubernetes.client.RequestConfigBuilder;
import io.fabric8.kubernetes.client.internal.SSLUtils;
import io.fabric8.mockwebserver.Context;
import io.fabric8.mockwebserver.DefaultMockServer;
+import io.fabric8.mockwebserver.MockWebServer;
import io.fabric8.mockwebserver.ServerRequest;
import io.fabric8.mockwebserver.ServerResponse;
import io.fabric8.mockwebserver.dsl.HttpMethod;
+import io.fabric8.mockwebserver.http.Headers;
+import io.fabric8.mockwebserver.http.RecordedRequest;
import io.fabric8.mockwebserver.internal.MockDispatcher;
-import io.fabric8.mockwebserver.internal.MockSSLContextFactory;
import io.fabric8.mockwebserver.internal.SimpleRequest;
import io.fabric8.mockwebserver.internal.SimpleResponse;
import io.fabric8.mockwebserver.utils.ResponseProvider;
-import okhttp3.Headers;
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.MockWebServer;
-import okhttp3.mockwebserver.RecordedRequest;
-import okhttp3.mockwebserver.SocketPolicy;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName;
@@ -49,42 +47,32 @@
public abstract class AbstractHttpClientProxyHttpsTest {
- private static SocketPolicy defaultResponseSocketPolicy;
private static Map> responses;
- private static DefaultMockServer server;
+ private static DefaultMockServer proxyServer;
@BeforeAll
static void beforeAll() {
- defaultResponseSocketPolicy = SocketPolicy.KEEP_OPEN;
responses = new HashMap<>();
- final MockWebServer okHttpMockWebServer = new MockWebServer();
- final MockDispatcher dispatcher = new MockDispatcher(responses) {
- @Override
- public MockResponse peek() {
- return new MockResponse().setSocketPolicy(defaultResponseSocketPolicy);
- }
- };
- server = new DefaultMockServer(new Context(), okHttpMockWebServer, responses, dispatcher, true);
- server.start();
- okHttpMockWebServer.useHttps(MockSSLContextFactory.create().getSocketFactory(), true);
+ proxyServer = new DefaultMockServer(new Context(), new MockWebServer(), responses, new MockDispatcher(responses), false);
+ proxyServer.start();
}
@AfterAll
static void afterAll() {
- server.shutdown();
+ proxyServer.shutdown();
}
protected abstract HttpClient.Factory getHttpClientFactory();
@Test
- @DisplayName("Proxied HttpClient adds required headers to the request")
+ @DisplayName("Proxied HttpClient with basic authorization adds required headers to the request")
protected void proxyConfigurationAddsRequiredHeadersForHttps() throws Exception {
final AtomicReference initialConnectRequest = new AtomicReference<>();
final ResponseProvider bodyProvider = new ResponseProvider() {
@Override
public String getBody(RecordedRequest request) {
- return "";
+ return "\n";
}
@Override
@@ -93,7 +81,6 @@ public void setHeaders(Headers headers) {
@Override
public int getStatusCode(RecordedRequest request) {
- defaultResponseSocketPolicy = SocketPolicy.UPGRADE_TO_SSL_AT_END; // for jetty to upgrade after the challenge
if (request.getHeader(StandardHttpHeaders.PROXY_AUTHORIZATION) != null) {
initialConnectRequest.compareAndSet(null, request);
return 200;
@@ -107,20 +94,20 @@ public Headers getHeaders() {
}
};
- responses.computeIfAbsent(new SimpleRequest(HttpMethod.CONNECT, "/"), k -> new ArrayDeque<>())
+ responses.computeIfAbsent(new SimpleRequest(HttpMethod.CONNECT, "example.com:443"), k -> new ArrayDeque<>())
.add(new SimpleResponse(true, bodyProvider, null, 0, TimeUnit.SECONDS));
// Given
final HttpClient.Builder builder = getHttpClientFactory().newBuilder()
.sslContext(null, SSLUtils.trustManagers(null, null, true, null, null))
- .proxyAddress(new InetSocketAddress("localhost", server.getPort()))
+ .proxyAddress(new InetSocketAddress("localhost", proxyServer.getPort()))
.proxyAuthorization(basicCredentials("auth", "cred"));
+ builder.tag(new RequestConfigBuilder().withRequestRetryBackoffInterval(1).build());
try (HttpClient client = builder.build()) {
- // When
- client.sendAsync(client.newHttpRequestBuilder()
- .uri(String.format("https://0.0.0.0:%s/not-found", server.getPort() + 1)).build(), String.class)
+ // When (just send and ignore response, we only care about the CONNECT request headers)
+ client.sendAsync(client.newHttpRequestBuilder().uri("https://example.com/proxied").build(), String.class)
+ .exceptionally(t -> null)
.get(30, TimeUnit.SECONDS);
-
- // if it fails, then authorization was not set
+ // Then
assertThat(initialConnectRequest)
.doesNotHaveNullValue()
.hasValueMatching(r -> r.getHeader("Proxy-Authorization").equals("Basic YXV0aDpjcmVk"));
diff --git a/kubernetes-client-api/src/test/java/io/fabric8/kubernetes/client/http/AbstractHttpClientProxyTest.java b/kubernetes-client-api/src/test/java/io/fabric8/kubernetes/client/http/AbstractHttpClientProxyTest.java
index c04397ad8aa..92e6878c95b 100644
--- a/kubernetes-client-api/src/test/java/io/fabric8/kubernetes/client/http/AbstractHttpClientProxyTest.java
+++ b/kubernetes-client-api/src/test/java/io/fabric8/kubernetes/client/http/AbstractHttpClientProxyTest.java
@@ -16,9 +16,9 @@
package io.fabric8.kubernetes.client.http;
import io.fabric8.mockwebserver.DefaultMockServer;
+import io.fabric8.mockwebserver.http.Headers;
+import io.fabric8.mockwebserver.http.RecordedRequest;
import io.fabric8.mockwebserver.utils.ResponseProvider;
-import okhttp3.Headers;
-import okhttp3.mockwebserver.RecordedRequest;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName;
@@ -30,19 +30,20 @@
import static io.fabric8.kubernetes.client.utils.HttpClientUtils.basicCredentials;
import static org.assertj.core.api.Assertions.assertThat;
+@SuppressWarnings("HttpUrlsUsage")
public abstract class AbstractHttpClientProxyTest {
- private static DefaultMockServer server;
+ private static DefaultMockServer proxyServer;
@BeforeAll
static void beforeAll() {
- server = new DefaultMockServer(false);
- server.start();
+ proxyServer = new DefaultMockServer(false);
+ proxyServer.start();
}
@AfterAll
static void afterAll() {
- server.shutdown();
+ proxyServer.shutdown();
}
protected abstract HttpClient.Factory getHttpClientFactory();
@@ -50,7 +51,7 @@ static void afterAll() {
@Test
@DisplayName("Proxied HttpClient with basic authorization adds required headers to the request")
protected void proxyConfigurationBasicAuthAddsRequiredHeaders() throws Exception {
- server.expect().get().withPath("/").andReply(new ResponseProvider
+
+ junit
+ junit
+ ${junit4.version}
+ test
+
org.junit.jupiter
junit-jupiter-api