Repository: camel Updated Branches: refs/heads/master e0fed4569 -> 179399aa8
remove deprecated sslContextParametersRef that is already removed elsewhere Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8bd8ee11 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8bd8ee11 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8bd8ee11 Branch: refs/heads/master Commit: 8bd8ee11887276c85d66533914135a1f47c82e9a Parents: e0fed45 Author: Jonathan Anstey <jans...@gmail.com> Authored: Fri Apr 7 10:20:09 2017 -0230 Committer: Jonathan Anstey <jans...@gmail.com> Committed: Fri Apr 7 14:44:58 2017 -0230 ---------------------------------------------------------------------- .../camel/component/websocket/WebsocketComponent.java | 12 ++---------- .../WebsocketSSLContextInUriRouteExampleTest.java | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8bd8ee11/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java ---------------------------------------------------------------------- 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 9b8c878..04169d0 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 @@ -276,11 +276,8 @@ public class WebsocketComponent extends UriEndpointComponent { @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { - // TODO cmueller: remove the "sslContextParametersRef" look up in Camel 3.0 - SSLContextParameters sslContextParameters = resolveAndRemoveReferenceParameter(parameters, "sslContextParametersRef", SSLContextParameters.class); - if (sslContextParameters == null) { - sslContextParameters = resolveAndRemoveReferenceParameter(parameters, "sslContextParameters", SSLContextParameters.class); - } + SSLContextParameters sslContextParameters = resolveAndRemoveReferenceParameter(parameters, "sslContextParameters", SSLContextParameters.class); + Boolean enableJmx = getAndRemoveParameter(parameters, "enableJmx", Boolean.class); String staticResources = getAndRemoveParameter(parameters, "staticResources", String.class); int port = extractPortNumber(remaining); @@ -294,11 +291,6 @@ public class WebsocketComponent extends UriEndpointComponent { endpoint.setEnableJmx(isEnableJmx()); } - /* - if (sslContextParameters == null) { - sslContextParameters = this.sslContextParameters; - } */ - // prefer to use endpoint configured over component configured if (sslContextParameters == null) { // fallback to component configured http://git-wip-us.apache.org/repos/asf/camel/blob/8bd8ee11/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java index 7e87226..235b641 100644 --- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java +++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextInUriRouteExampleTest.java @@ -67,7 +67,7 @@ public class WebsocketSSLContextInUriRouteExampleTest extends CamelTestSupport { URL trustStoreUrl = this.getClass().getClassLoader().getResource("jsse/localhost.ks"); setSystemProp("javax.net.ssl.trustStore", trustStoreUrl.toURI().getPath()); - uri = "websocket://" + server + ":" + port + "/test?sslContextParametersRef=#sslContextParameters"; + uri = "websocket://" + server + ":" + port + "/test?sslContextParameters=#sslContextParameters"; super.setUp(); }
