[camel-quarkus] 03/13: Remove vertx-http itest SSL workaround

[ppalaga]

This is an automated email from the ASF dual-hosted git repository.

ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git

commit 3a18b28418dab1e4dfc41c95f80caf6ead35362a
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Tue Jun 22 13:11:33 2021 +0100

    Remove vertx-http itest SSL workaround
    
    Fixes #2704
---
 .../quarkus/component/http/it/HttpResource.java    |  2 +-
 .../camel/quarkus/component/http/it/HttpRoute.java | 31 ----------------------
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git 
a/integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpResource.java
 
b/integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpResource.java
index ef60e5d..4c0e9ef 100644
--- 
a/integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpResource.java
+++ 
b/integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpResource.java
@@ -367,7 +367,7 @@ public class HttpResource {
     @Produces(MediaType.TEXT_PLAIN)
     public String vertxHttpHttps(@QueryParam("test-port") int port) {
         return producerTemplate
-                
.toF("vertx-http:https://localhost:%d/countries/cz?webClientOptions=#clientOptions";,
 port)
+                
.toF("vertx-http:https://localhost:%d/countries/cz?sslContextParameters=#sslContextParameters";,
 port)
                 .withHeader(Exchange.HTTP_METHOD, "GET")
                 .request(String.class);
     }
diff --git 
a/integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpRoute.java
 
b/integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpRoute.java
index e367383..a1a9a05 100644
--- 
a/integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpRoute.java
+++ 
b/integration-tests/http/src/main/java/org/apache/camel/quarkus/component/http/it/HttpRoute.java
@@ -21,12 +21,7 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import javax.inject.Named;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.TrustManagerFactory;
 
-import io.vertx.core.buffer.Buffer;
-import io.vertx.core.net.KeyStoreOptions;
-import io.vertx.ext.web.client.WebClientOptions;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
@@ -79,32 +74,6 @@ public class HttpRoute extends RouteBuilder {
         return sslContextParameters;
     }
 
-    // TODO: Remove this when vertx-http SSL configuration is fixed:
-    // https://github.com/apache/camel-quarkus/issues/2704
-    @Named
-    public WebClientOptions clientOptions(SSLContextParameters 
sslContextParameters) throws IOException {
-        KeyManagersParameters keyManagers = 
sslContextParameters.getKeyManagers();
-        byte[] keyStoreBytes = 
readStore(keyManagers.getKeyStore().getResource());
-        KeyStoreOptions keyStoreOptions = new KeyStoreOptions();
-        keyStoreOptions.setPassword(keyManagers.getKeyPassword());
-        keyStoreOptions.setProvider(KeyManagerFactory.getDefaultAlgorithm());
-        keyStoreOptions.setType("PKCS12");
-        keyStoreOptions.setValue(Buffer.buffer(keyStoreBytes));
-
-        TrustManagersParameters trustManagers = 
sslContextParameters.getTrustManagers();
-        byte[] trustStoreBytes = 
readStore(trustManagers.getKeyStore().getResource());
-        KeyStoreOptions trustStoreOptions = new KeyStoreOptions();
-        
trustStoreOptions.setPassword(trustManagers.getKeyStore().getPassword());
-        
trustStoreOptions.setProvider(TrustManagerFactory.getDefaultAlgorithm());
-        trustStoreOptions.setType("JKS");
-        trustStoreOptions.setValue(Buffer.buffer(trustStoreBytes));
-
-        return new WebClientOptions()
-                .setSsl(true)
-                .setKeyCertOptions(keyStoreOptions)
-                .setTrustOptions(trustStoreOptions);
-    }
-
     private static byte[] readStore(String path) throws IOException {
         byte[] data = null;
         final InputStream resource = HttpRoute.class.getResourceAsStream(path);