[camel] 06/06: Fixing tests with older Jetty version

[co...@apache.org]

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

coheigea pushed a commit to branch CAMEL-13563
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 71a9283149fec917d20d18865e42aef74400ed64
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Jun 11 09:31:12 2019 +0100

    Fixing tests with older Jetty version
---
 .../java/org/apache/camel/component/cometd/CometdComponent.java     | 3 ++-
 .../org/apache/camel/component/salesforce/SalesforceComponent.java  | 4 ++--
 .../org/apache/camel/component/websocket/WebsocketComponent.java    | 6 ++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
index b22bbcd..53871b3 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
@@ -232,7 +232,8 @@ public class CometdComponent extends DefaultComponent implements SSLContextParam
             sslParams = retrieveGlobalSslContextParameters();
         }
 
-        SslContextFactory sslContextFactory = new SslContextFactory.Server();
+        SslContextFactory sslContextFactory = new SslContextFactory();
+        sslContextFactory.setEndpointIdentificationAlgorithm(null);
         if (sslParams != null) {
             sslContextFactory.setSslContext(sslParams.createSSLContext(getCamelContext()));
         } else {
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
index 349738a..75e603b 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
@@ -329,7 +329,7 @@ public class SalesforceComponent extends DefaultComponent implements SSLContextP
                 .orElseGet(() -> Optional.ofNullable(retrieveGlobalSslContextParameters())
                 .orElseGet(() -> new SSLContextParameters()));
 
-            final SslContextFactory sslContextFactory = new SslContextFactory.Client();
+            final SslContextFactory sslContextFactory = new SslContextFactory();
             sslContextFactory.setSslContext(contextParameters.createSSLContext(getCamelContext()));
 
             httpClient = createHttpClient(sslContextFactory);
@@ -690,7 +690,7 @@ public class SalesforceComponent extends DefaultComponent implements SSLContextP
         // let's work with a copy for IntrospectionSupport so original properties are intact
         PropertyBindingSupport.bindProperties(camelContext, sslContextParameters, new HashMap<>(properties));
 
-        final SslContextFactory sslContextFactory = new SslContextFactory.Client();
+        final SslContextFactory sslContextFactory = new SslContextFactory();
         sslContextFactory.setSslContext(sslContextParameters.createSSLContext(camelContext));
 
         final SalesforceHttpClient httpClient = createHttpClient(sslContextFactory);
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
index 79f232d..a4de2ca 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
@@ -499,10 +499,12 @@ public class WebsocketComponent extends DefaultComponent implements SSLContextPa
         ServerConnector sslSocketConnector = null;
         if (sslContextParameters != null) {
             SslContextFactory sslContextFactory = new WebSocketComponentSslContextFactory();
+            sslContextFactory.setEndpointIdentificationAlgorithm(null);
             sslContextFactory.setSslContext(sslContextParameters.createSSLContext(getCamelContext()));
             sslSocketConnector = new ServerConnector(server, sslContextFactory);
         } else {
-            SslContextFactory sslContextFactory = new SslContextFactory.Server();
+            SslContextFactory sslContextFactory = new SslContextFactory();
+            sslContextFactory.setEndpointIdentificationAlgorithm(null);
             sslContextFactory.setKeyStorePassword(sslKeyPassword);
             sslContextFactory.setKeyManagerPassword(sslPassword);
             if (sslKeystore != null) {
@@ -518,7 +520,7 @@ public class WebsocketComponent extends DefaultComponent implements SSLContextPa
      * Override the key/trust store check method as it does not account for a factory that has
      * a pre-configured {@link javax.net.ssl.SSLContext}.
      */
-    private static final class WebSocketComponentSslContextFactory extends SslContextFactory.Server {
+    private static final class WebSocketComponentSslContextFactory extends SslContextFactory {
         // This method is for Jetty 7.0.x ~ 7.4.x
         @SuppressWarnings("unused")
         public boolean checkConfig() {