You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/07/19 08:53:23 UTC
[camel] branch master updated: CAMEL-12664 - Moved getConnection to
Endpoint
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new e5772ec CAMEL-12664 - Moved getConnection to Endpoint
e5772ec is described below
commit e5772ecc7da8b0fae1212d2d984dc575bcadba2c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jul 19 10:52:41 2018 +0200
CAMEL-12664 - Moved getConnection to Endpoint
---
.../org/apache/camel/component/nats/NatsConsumer.java | 13 +------------
.../org/apache/camel/component/nats/NatsEndpoint.java | 19 +++++++++++++++++++
.../org/apache/camel/component/nats/NatsProducer.java | 13 +------------
3 files changed, 21 insertions(+), 24 deletions(-)
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 51d9593..df81dc5 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
@@ -66,7 +66,7 @@ public class NatsConsumer extends DefaultConsumer {
executor = getEndpoint().createExecutor();
LOG.debug("Getting Nats Connection");
- connection = getConnection();
+ connection = getEndpoint().getConnection();
executor.submit(new NatsConsumingTask(connection, getEndpoint().getNatsConfiguration()));
}
@@ -102,17 +102,6 @@ public class NatsConsumer extends DefaultConsumer {
}
}
- private Connection getConnection() throws InterruptedException, IllegalArgumentException, GeneralSecurityException, IOException {
- Builder builder = getEndpoint().getNatsConfiguration().createOptions();
- if (getEndpoint().getNatsConfiguration().getSslContextParameters() != null && getEndpoint().getNatsConfiguration().isSecure()) {
- SSLContext sslCtx = getEndpoint().getNatsConfiguration().getSslContextParameters().createSSLContext(getEndpoint().getCamelContext());
- builder.sslContext(sslCtx);
- }
- Options options = builder.build();
- connection = Nats.connect(options);
- return connection;
- }
-
public boolean isActive() {
return active;
}
diff --git a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsEndpoint.java b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsEndpoint.java
index 09e7ea5..b89ac69 100644
--- a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsEndpoint.java
+++ b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsEndpoint.java
@@ -16,8 +16,12 @@
*/
package org.apache.camel.component.nats;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
import java.util.concurrent.ExecutorService;
+import javax.net.ssl.SSLContext;
+
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -25,6 +29,11 @@ import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
+import io.nats.client.Connection;
+import io.nats.client.Nats;
+import io.nats.client.Options;
+import io.nats.client.Options.Builder;
+
/**
* The nats component allows you produce and consume messages from <a href="http://nats.io/">NATS</a>.
*/
@@ -61,4 +70,14 @@ public class NatsEndpoint extends DefaultEndpoint {
public NatsConfiguration getNatsConfiguration() {
return configuration;
}
+
+ public Connection getConnection() throws InterruptedException, IllegalArgumentException, GeneralSecurityException, IOException {
+ Builder builder = getNatsConfiguration().createOptions();
+ if (getNatsConfiguration().getSslContextParameters() != null && getNatsConfiguration().isSecure()) {
+ SSLContext sslCtx = getNatsConfiguration().getSslContextParameters().createSSLContext(getCamelContext());
+ builder.sslContext(sslCtx);
+ }
+ Options options = builder.build();
+ return Nats.connect(options);
+ }
}
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 085b8ab..844f65f 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
@@ -70,7 +70,7 @@ public class NatsProducer extends DefaultProducer {
LOG.debug("Starting Nats Producer");
LOG.debug("Getting Nats Connection");
- connection = getConnection();
+ connection = getEndpoint().getConnection();
}
@Override
@@ -88,15 +88,4 @@ public class NatsProducer extends DefaultProducer {
}
}
- private Connection getConnection() throws InterruptedException, IllegalArgumentException, GeneralSecurityException, IOException {
- Builder builder = getEndpoint().getNatsConfiguration().createOptions();
- if (getEndpoint().getNatsConfiguration().getSslContextParameters() != null && getEndpoint().getNatsConfiguration().isSecure()) {
- SSLContext sslCtx = getEndpoint().getNatsConfiguration().getSslContextParameters().createSSLContext(getEndpoint().getCamelContext());
- builder.sslContext(sslCtx);
- }
- Options options = builder.build();
- connection = Nats.connect(options);
- return connection;
- }
-
}