Repository: camel Updated Branches: refs/heads/master 36c9839e1 -> 0e62b9f97
Fixed CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0e62b9f9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0e62b9f9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0e62b9f9 Branch: refs/heads/master Commit: 0e62b9f9772784b58982c4cf0e7fd0e79a43d231 Parents: a600621 Author: Andrea Cosentino <anco...@gmail.com> Authored: Thu Oct 20 14:23:00 2016 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Thu Oct 20 14:23:16 2016 +0200 ---------------------------------------------------------------------- .../camel/component/nats/NatsConfiguration.java | 40 ++++++++++---------- .../camel/component/nats/NatsConsumer.java | 10 ++--- .../camel/component/nats/NatsProducer.java | 10 ++--- 3 files changed, 30 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0e62b9f9/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConfiguration.java b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConfiguration.java index 26e0921..0b1d487 100644 --- a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConfiguration.java +++ b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConfiguration.java @@ -222,37 +222,37 @@ public class NatsConfiguration { /** * set set secure option indicating TLS is required */ - public boolean isSecure() { - return secure; - } - - public void setSecure(boolean secure) { - this.secure = secure; - } - + public boolean isSecure() { + return secure; + } + + public void setSecure(boolean secure) { + this.secure = secure; + } + /** * TLS Debug, it will add additional console output */ public boolean isTlsDebug() { - return tlsDebug; - } + return tlsDebug; + } - public void setTlsDebug(boolean tlsDebug) { - this.tlsDebug = tlsDebug; - } + public void setTlsDebug(boolean tlsDebug) { + this.tlsDebug = tlsDebug; + } /** * To configure security using SSLContextParameters */ - public SSLContextParameters getSslContextParameters() { - return sslContextParameters; - } + public SSLContextParameters getSslContextParameters() { + return sslContextParameters; + } - public void setSslContextParameters(SSLContextParameters sslContextParameters) { - this.sslContextParameters = sslContextParameters; - } + public void setSslContextParameters(SSLContextParameters sslContextParameters) { + this.sslContextParameters = sslContextParameters; + } - private static <T> void addPropertyIfNotNull(Properties props, String key, T value) { + private static <T> void addPropertyIfNotNull(Properties props, String key, T value) { if (value != null) { props.put(key, value); } http://git-wip-us.apache.org/repos/asf/camel/blob/0e62b9f9/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConsumer.java b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConsumer.java index e1c46df..37e5171 100644 --- a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConsumer.java +++ b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsConsumer.java @@ -102,11 +102,11 @@ public class NatsConsumer extends DefaultConsumer { Properties prop = getEndpoint().getNatsConfiguration().createProperties(); ConnectionFactory factory = new ConnectionFactory(prop); if (getEndpoint().getNatsConfiguration().getSslContextParameters() != null && getEndpoint().getNatsConfiguration().isSecure()) { - SSLContext sslCtx = getEndpoint().getNatsConfiguration().getSslContextParameters().createSSLContext(getEndpoint().getCamelContext()); - factory.setSSLContext(sslCtx); - if (getEndpoint().getNatsConfiguration().isTlsDebug()) { - factory.setTlsDebug(getEndpoint().getNatsConfiguration().isTlsDebug()); - } + SSLContext sslCtx = getEndpoint().getNatsConfiguration().getSslContextParameters().createSSLContext(getEndpoint().getCamelContext()); + factory.setSSLContext(sslCtx); + if (getEndpoint().getNatsConfiguration().isTlsDebug()) { + factory.setTlsDebug(getEndpoint().getNatsConfiguration().isTlsDebug()); + } } connection = factory.createConnection(); return connection; http://git-wip-us.apache.org/repos/asf/camel/blob/0e62b9f9/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsProducer.java b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsProducer.java index 0ee1236..0efafe2 100644 --- a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsProducer.java +++ b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsProducer.java @@ -86,11 +86,11 @@ public class NatsProducer extends DefaultProducer { Properties prop = getEndpoint().getNatsConfiguration().createProperties(); ConnectionFactory factory = new ConnectionFactory(prop); if (getEndpoint().getNatsConfiguration().getSslContextParameters() != null && getEndpoint().getNatsConfiguration().isSecure()) { - SSLContext sslCtx = getEndpoint().getNatsConfiguration().getSslContextParameters().createSSLContext(getEndpoint().getCamelContext()); - factory.setSSLContext(sslCtx); - if (getEndpoint().getNatsConfiguration().isTlsDebug()) { - factory.setTlsDebug(getEndpoint().getNatsConfiguration().isTlsDebug()); - } + SSLContext sslCtx = getEndpoint().getNatsConfiguration().getSslContextParameters().createSSLContext(getEndpoint().getCamelContext()); + factory.setSSLContext(sslCtx); + if (getEndpoint().getNatsConfiguration().isTlsDebug()) { + factory.setTlsDebug(getEndpoint().getNatsConfiguration().isTlsDebug()); + } } connection = factory.createConnection(); return connection;
