You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/12/28 11:05:27 UTC
[camel] branch master updated: Avoid non singleton endpoints and
polish code
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 b1f3656 Avoid non singleton endpoints and polish code
b1f3656 is described below
commit b1f3656905a9be680a335250422f326d56e3d056
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Dec 28 12:05:04 2019 +0100
Avoid non singleton endpoints and polish code
---
.../org/apache/camel/component/controlbus/ControlBusEndpoint.java | 6 ------
.../src/main/java/org/apache/camel/component/dns/DnsEndpoint.java | 5 -----
.../apache/camel/component/google/pubsub/GooglePubsubConsumer.java | 6 ++----
.../apache/camel/component/google/pubsub/GooglePubsubEndpoint.java | 4 +++-
.../apache/camel/component/google/pubsub/GooglePubsubProducer.java | 6 ++----
.../org/apache/camel/component/salesforce/SalesforceEndpoint.java | 7 -------
6 files changed, 7 insertions(+), 27 deletions(-)
diff --git a/components/camel-controlbus/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java b/components/camel-controlbus/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
index cf3f80d..47cd6a1 100644
--- a/components/camel-controlbus/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
+++ b/components/camel-controlbus/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
@@ -69,12 +69,6 @@ public class ControlBusEndpoint extends DefaultEndpoint {
}
@Override
- public boolean isSingleton() {
- // we dont want to be enlisted in JMX, so lets just be non-singleton
- return false;
- }
-
- @Override
public ControlBusComponent getComponent() {
return (ControlBusComponent) super.getComponent();
}
diff --git a/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsEndpoint.java b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsEndpoint.java
index 7c909c6..c396637 100644
--- a/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsEndpoint.java
+++ b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsEndpoint.java
@@ -58,11 +58,6 @@ public class DnsEndpoint extends DefaultEndpoint {
throw new UnsupportedOperationException("Consumer not supported");
}
- @Override
- public boolean isSingleton() {
- return false;
- }
-
public DnsType getDnsType() {
return dnsType;
}
diff --git a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
index 50141aa..bfd78cf 100644
--- a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
+++ b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
@@ -68,9 +68,7 @@ class GooglePubsubConsumer extends DefaultConsumer {
localLog.info("Starting Google PubSub consumer for {}/{}", endpoint.getProjectId(), endpoint.getDestinationName());
executor = endpoint.createExecutor();
for (int i = 0; i < endpoint.getConcurrentConsumers(); i++) {
-
executor.submit(new PubsubPoller(i + ""));
-
}
}
@@ -122,7 +120,7 @@ class GooglePubsubConsumer extends DefaultConsumer {
continue;
}
- if (null == pullResponse.getReceivedMessages()) {
+ if (pullResponse.getReceivedMessages() == null) {
continue;
}
@@ -159,7 +157,7 @@ class GooglePubsubConsumer extends DefaultConsumer {
}
}
} catch (Exception e) {
- localLog.error("Failure getting messages from PubSub : ", e);
+ localLog.error("Failure getting messages from PubSub", e);
}
}
}
diff --git a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
index bcde8d0..5b34fd2 100644
--- a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
+++ b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpoint.java
@@ -108,7 +108,9 @@ public class GooglePubsubEndpoint extends DefaultEndpoint {
public Consumer createConsumer(Processor processor) throws Exception {
afterPropertiesSet();
setExchangePattern(ExchangePattern.InOnly);
- return new GooglePubsubConsumer(this, processor);
+ GooglePubsubConsumer consumer = new GooglePubsubConsumer(this, processor);
+ configureConsumer(consumer);
+ return consumer;
}
public ExecutorService createExecutor() {
diff --git a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubProducer.java b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubProducer.java
index ea6c1fa..a0cac7e 100644
--- a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubProducer.java
+++ b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubProducer.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.google.pubsub;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -74,9 +75,6 @@ public class GooglePubsubProducer extends DefaultProducer {
/**
* The method converts a single incoming message into a List
- *
- * @param exchange
- * @return
*/
private static List<Exchange> prepareExchangeList(Exchange exchange) {
@@ -105,7 +103,7 @@ public class GooglePubsubProducer extends DefaultProducer {
Object body = exchange.getIn().getBody();
if (body instanceof String) {
- message.encodeData(((String)body).getBytes("UTF-8"));
+ message.encodeData(((String)body).getBytes(StandardCharsets.UTF_8));
} else if (body instanceof byte[]) {
message.encodeData((byte[])body);
} else {
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java
index 95fa812..1c47195 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceEndpoint.java
@@ -94,13 +94,6 @@ public class SalesforceEndpoint extends DefaultEndpoint {
return (SalesforceComponent)super.getComponent();
}
- @Override
- public boolean isSingleton() {
- // re-use endpoint instance across multiple threads
- // the description of this method is a little confusing
- return true;
- }
-
public SalesforceEndpointConfig getConfiguration() {
return configuration;
}