feat: Jetty HttpClient implementation

Signed-off-by: Marc Nuri <[email protected]>

.github/workflows/e2e-httpclient-tests.yml

@@ -39,7 +39,7 @@ jobs:
       fail-fast: false
       matrix:
         kubernetes: [v1.24.0,v1.23.3, v1.12.10]
-        httpclient: [jdk]
+        httpclient: [jdk,jetty]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -67,7 +67,7 @@ jobs:
       fail-fast: false
       matrix:
         openshift: [v3.11.0, v3.10.0]
-        httpclient: [jdk]
+        httpclient: [jdk,jetty]
     steps:
       - name: Checkout
         uses: actions/checkout@v3

.github/workflows/release-snapshots.yaml

@@ -84,4 +84,4 @@ jobs:
           gpg-private-key: ${{ secrets.SIGNINGKEY }}
           gpg-passphrase: SIGNINGPASSWORD
       - name: Build and release Java 11 modules
-        run: ./mvnw ${MAVEN_ARGS} ${RELEASE_MAVEN_ARGS} -pl "httpclient-jdk" clean deploy
+        run: ./mvnw ${MAVEN_ARGS} ${RELEASE_MAVEN_ARGS} -pl "httpclient-jdk" -pl "httpclient-jetty" clean deploy

httpclient-jdk/pom.xml

@@ -26,7 +26,7 @@
 
   <artifactId>kubernetes-httpclient-jdk</artifactId>
   <packaging>jar</packaging>
-  <name>Fabric8 :: Kubernetes :: JDK HttpClient</name>
+  <name>Fabric8 :: Kubernetes :: HttpClient :: JDK</name>
 
   <properties>
     <maven.compiler.release>11</maven.compiler.release>
@@ -50,6 +50,28 @@
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-client-api</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>kubernetes-client-api</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.fabric8</groupId>
+      <artifactId>mockwebserver</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

httpclient-jdk/src/main/java/io/fabric8/kubernetes/client/jdkhttp/JdkHttpClientBuilderImpl.java

@@ -181,7 +181,7 @@ public Builder preferHttp11() {
   }
 
   @Override
-  public Builder tlsVersions(TlsVersion[] tlsVersions) {
+  public Builder tlsVersions(TlsVersion... tlsVersions) {
     this.tlsVersions = tlsVersions;
     return this;
   }
@@ -192,7 +192,6 @@ public JdkHttpClientBuilderImpl copy(java.net.http.HttpClient httpClient) {
     copy.readTimeout = this.readTimeout;
     copy.sslContext = this.sslContext;
     copy.interceptors = new LinkedHashMap<>(this.interceptors);
-    copy.followRedirects = this.followRedirects;
     copy.proxyAddress = this.proxyAddress;
     copy.proxyAuthorization = this.proxyAuthorization;
     copy.tlsVersions = this.tlsVersions;
@@ -202,4 +201,4 @@ public JdkHttpClientBuilderImpl copy(java.net.http.HttpClient httpClient) {
     return copy;
   }
 
-}
+}

httpclient-jdk/src/main/java/io/fabric8/kubernetes/client/jdkhttp/JdkHttpClientImpl.java

@@ -35,6 +35,7 @@
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
@@ -132,6 +133,11 @@ public List<String> headers(String key) {
       return response.headers().allValues(key);
     }
 
+    @Override
+    public Map<String, List<String>> headers() {
+      return response.headers().map();
+    }
+
     @Override
     public int code() {
       return response.statusCode();
@@ -334,13 +340,7 @@ public CompletableFuture<WebSocketResponse> internalBuildAsync(JdkWebSocketImpl.
     // use a responseholder to convey both the exception and the websocket
     CompletableFuture<WebSocketResponse> response = new CompletableFuture<>();
 
-    URI uri = request.uri();
-    if (uri.getScheme().startsWith("http")) {
-      // the jdk logic expects a ws uri
-      // after the https://bugs.java.com/bugdatabase/view_bug.do?bug_id=8245245 it just does the reverse of this
-      // to convert back to http(s) ...
-      uri = URI.create("ws" + uri.toString().substring(4));
-    }
+    URI uri = WebSocket.toWebSocketUri(request.uri());
     newBuilder.buildAsync(uri, new JdkWebSocketImpl.ListenerAdapter(listener, queueSize)).whenComplete((w, t) -> {
       if (t instanceof CompletionException && t.getCause() != null) {
         t = t.getCause();

httpclient-jdk/src/main/java/io/fabric8/kubernetes/client/jdkhttp/JdkHttpRequestImpl.java

@@ -26,11 +26,12 @@
 import java.nio.ByteBuffer;
 import java.time.Duration;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.Flow.Subscriber;
 
-class JdkHttpRequestImpl implements HttpRequest {
+import static io.fabric8.kubernetes.client.http.StandardHttpHeaders.CONTENT_TYPE;
 
-  private static final String CONTENT_TYPE = "Content-Type";
+class JdkHttpRequestImpl implements HttpRequest {
 
   public static class BuilderImpl implements Builder {
 
@@ -141,6 +142,11 @@ public List<String> headers(String key) {
     return request.headers().allValues(key);
   }
 
+  @Override
+  public Map<String, List<String>> headers() {
+    return request.headers().map();
+  }
+
   @Override
   public URI uri() {
     return request.uri();

httpclient-jdk/src/test/java/io/fabric8/kubernetes/client/jdkhttp/JdkHttpClientAsyncBodyTest.java

@@ -0,0 +1,50 @@
+/**
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.fabric8.kubernetes.client.jdkhttp;
+
+import io.fabric8.kubernetes.client.http.AbstractAsyncBodyTest;
+import io.fabric8.kubernetes.client.http.HttpClient;
+import org.junit.jupiter.api.Disabled;
+
+
+@SuppressWarnings("java:S2187")
+public class JdkHttpClientAsyncBodyTest  extends AbstractAsyncBodyTest {
+  @Override
+  protected HttpClient.Factory getHttpClientFactory() {
+    return new JdkHttpClientFactory();
+  }
+
+  // TODO: Check tests validate expected behavior
+  @Disabled("TODO: Check tests validate expected behavior")
+  @Override
+  public void consumeLinesProcessedAfterConsume() throws Exception {
+    super.consumeLinesProcessedAfterConsume();
+  }
+
+  // TODO: Check tests validate expected behavior
+  @Disabled("TODO: Check tests validate expected behavior")
+  @Override
+  public void consumeLinesNotProcessedIfCancelled() throws Exception {
+    super.consumeLinesNotProcessedIfCancelled();
+  }
+
+  // TODO: Check tests validate expected behavior
+  @Disabled("TODO: Check tests validate expected behavior")
+  @Override
+  public void consumeByteBufferLinesProcessedAfterConsume() throws Exception {
+    super.consumeByteBufferLinesProcessedAfterConsume();
+  }
+}

httpclient-jdk/src/test/java/io/fabric8/kubernetes/client/jdkhttp/JdkHttpClientInterceptorTest.java

@@ -0,0 +1,40 @@
+/**
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.fabric8.kubernetes.client.jdkhttp;
+
+import io.fabric8.kubernetes.client.http.AbstractInterceptorTest;
+import io.fabric8.kubernetes.client.http.HttpClient;
+import org.junit.jupiter.api.Disabled;
+
+@SuppressWarnings("java:S2187")
+public class JdkHttpClientInterceptorTest extends AbstractInterceptorTest {
+  @Override
+  protected HttpClient.Factory getHttpClientFactory() {
+    return new JdkHttpClientFactory();
+  }
+
+  // TODO: Check implementation
+  @Disabled("TODO: Check implementation")
+  @Override
+  public void afterHttpFailureReplacesResponseInConsumeLines() {
+  }
+
+  // TODO: Check implementation
+  @Disabled("TODO: Check implementation")
+  @Override
+  public void afterHttpFailureReplacesResponseInConsumeBytes() {
+  }
+}

httpclient-jdk/src/test/java/io/fabric8/kubernetes/client/jdkhttp/JdkHttpClientPostTest.java

@@ -0,0 +1,27 @@
+/**
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.fabric8.kubernetes.client.jdkhttp;
+
+import io.fabric8.kubernetes.client.http.AbstractHttpPostTest;
+import io.fabric8.kubernetes.client.http.HttpClient;
+
+@SuppressWarnings("java:S2187")
+public class JdkHttpClientPostTest  extends AbstractHttpPostTest {
+  @Override
+  protected HttpClient.Factory getHttpClientFactory() {
+    return new JdkHttpClientFactory();
+  }
+}

httpclient-jdk/src/test/java/io/fabric8/kubernetes/client/jdkhttp/JdkHttpClientProxyTest.java

@@ -0,0 +1,27 @@
+/**
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.fabric8.kubernetes.client.jdkhttp;
+
+import io.fabric8.kubernetes.client.http.AbstractHttpClientProxyTest;
+import io.fabric8.kubernetes.client.http.HttpClient;
+
+@SuppressWarnings("java:S2187")
+public class JdkHttpClientProxyTest extends AbstractHttpClientProxyTest {
+  @Override
+  protected HttpClient.Factory getHttpClientFactory() {
+    return new JdkHttpClientFactory();
+  }
+}

httpclient-jdk/src/test/java/io/fabric8/kubernetes/client/jdkhttp/JdkHttpClientWebSocketSendTest.java

@@ -0,0 +1,27 @@
+/**
+ * Copyright (C) 2015 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.fabric8.kubernetes.client.jdkhttp;
+
+import io.fabric8.kubernetes.client.http.AbstractWebSocketSendTest;
+import io.fabric8.kubernetes.client.http.HttpClient;
+
+@SuppressWarnings("java:S2187")
+public class JdkHttpClientWebSocketSendTest extends AbstractWebSocketSendTest {
+  @Override
+  protected HttpClient.Factory getHttpClientFactory() {
+    return new JdkHttpClientFactory();
+  }
+}