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 12:43:16 UTC
[camel] branch master updated (455618b -> 38e2376)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 455618b Avoid non singleton endpoints and polish code
new 59eb05d Avoid non singleton endpoints and polish code
new 38e2376 Avoid non singleton endpoints and polish code
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/camel/component/kudu/KuduEndpoint.java | 5 -----
.../apache/camel/component/mail/MailEndpoint.java | 5 -----
.../camel/component/printer/PrinterEndpoint.java | 5 -----
.../component/springldap/SpringLdapEndpoint.java | 5 -----
.../camel/component/ssh/SshConfiguration.java | 17 -----------------
.../apache/camel/component/ssh/SshEndpoint.java | 22 ----------------------
.../apache/camel/component/ssh/SshProducer.java | 7 ++++++-
7 files changed, 6 insertions(+), 60 deletions(-)
[camel] 02/02: Avoid non singleton endpoints and polish code
Posted by da...@apache.org.
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
commit 38e2376b4077c7a40576bc333d214bd830db0716
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Dec 28 13:37:48 2019 +0100
Avoid non singleton endpoints and polish code
---
.../component/springldap/SpringLdapEndpoint.java | 5 -----
.../camel/component/ssh/SshConfiguration.java | 17 -----------------
.../apache/camel/component/ssh/SshEndpoint.java | 22 ----------------------
.../apache/camel/component/ssh/SshProducer.java | 7 ++++++-
4 files changed, 6 insertions(+), 45 deletions(-)
diff --git a/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapEndpoint.java b/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapEndpoint.java
index d36b7f6..7c6ad09 100644
--- a/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapEndpoint.java
+++ b/components/camel-spring-ldap/src/main/java/org/apache/camel/component/springldap/SpringLdapEndpoint.java
@@ -68,11 +68,6 @@ public class SpringLdapEndpoint extends DefaultEndpoint {
}
@Override
- public boolean isSingleton() {
- return false;
- }
-
- @Override
public String createEndpointUri() {
return "spring-ldap://" + templateName + "?operation=" + operation.name() + "&scope=" + getScope();
}
diff --git a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshConfiguration.java b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshConfiguration.java
index 417b755..f1a69ec 100644
--- a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshConfiguration.java
+++ b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshConfiguration.java
@@ -232,23 +232,6 @@ public class SshConfiguration implements Cloneable {
this.timeout = timeout;
}
- /**
- * @deprecated As of version 2.11, replaced by {@link #getCertResource()}
- */
- @Deprecated
- public String getCertFilename() {
- return ((certResource != null) && certResource.startsWith("file:")) ? certResource.substring(5) : null;
- }
-
- /**
- * @deprecated As of version 2.11, replaced by {@link #setCertResource(String)}
- */
- @Deprecated
- @Metadata(deprecationNote = "As of version 2.11, replaced by certResource.")
- public void setCertFilename(String certFilename) {
- this.certResource = "file:" + certFilename;
- }
-
public String getCertResource() {
return certResource;
}
diff --git a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshEndpoint.java b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshEndpoint.java
index 2180257..e471f76 100644
--- a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshEndpoint.java
+++ b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshEndpoint.java
@@ -61,12 +61,6 @@ public class SshEndpoint extends ScheduledPollEndpoint {
return consumer;
}
- @Override
- public boolean isSingleton() {
- // SshClient is not thread-safe to be shared
- return true;
- }
-
public SshConfiguration getConfiguration() {
return configuration;
}
@@ -139,22 +133,6 @@ public class SshEndpoint extends ScheduledPollEndpoint {
getConfiguration().setTimeout(timeout);
}
- /**
- * @deprecated As of version 2.11, replaced by {@link #getCertResource()}
- */
- @Deprecated
- public String getCertFilename() {
- return getConfiguration().getCertFilename();
- }
-
- /**
- * @deprecated As of version 2.11, replaced by {@link #setCertResource(String)}
- */
- @Deprecated
- public void setCertFilename(String certFilename) {
- getConfiguration().setCertFilename(certFilename);
- }
-
public String getCertResource() {
return getConfiguration().getCertResource();
}
diff --git a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshProducer.java b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshProducer.java
index 654e6e8..ad71a2b 100644
--- a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshProducer.java
+++ b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshProducer.java
@@ -26,7 +26,6 @@ import org.apache.sshd.client.SshClient;
public class SshProducer extends DefaultProducer {
private SshEndpoint endpoint;
-
private SshClient client;
public SshProducer(SshEndpoint endpoint) {
@@ -53,6 +52,12 @@ public class SshProducer extends DefaultProducer {
}
@Override
+ public boolean isSingleton() {
+ // SshClient is not thread-safe to be shared
+ return true;
+ }
+
+ @Override
public void process(Exchange exchange) throws Exception {
final Message in = exchange.getIn();
String command = in.getMandatoryBody(String.class);
[camel] 01/02: Avoid non singleton endpoints and polish code
Posted by da...@apache.org.
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
commit 59eb05db834e73b9fd6d046e2d1db8b36a434866
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Dec 28 13:25:10 2019 +0100
Avoid non singleton endpoints and polish code
---
.../src/main/java/org/apache/camel/component/kudu/KuduEndpoint.java | 5 -----
.../src/main/java/org/apache/camel/component/mail/MailEndpoint.java | 5 -----
.../java/org/apache/camel/component/printer/PrinterEndpoint.java | 5 -----
3 files changed, 15 deletions(-)
diff --git a/components/camel-kudu/src/main/java/org/apache/camel/component/kudu/KuduEndpoint.java b/components/camel-kudu/src/main/java/org/apache/camel/component/kudu/KuduEndpoint.java
index b011f80..d857471 100644
--- a/components/camel-kudu/src/main/java/org/apache/camel/component/kudu/KuduEndpoint.java
+++ b/components/camel-kudu/src/main/java/org/apache/camel/component/kudu/KuduEndpoint.java
@@ -137,11 +137,6 @@ public class KuduEndpoint extends DefaultEndpoint {
throw new UnsupportedOperationException("You cannot create consumers on this endpoint");
}
- @Override
- public boolean isSingleton() {
- return true;
- }
-
public String getTableName() {
return tableName;
}
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
index a1b9bbf..61210b3 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailEndpoint.java
@@ -123,11 +123,6 @@ public class MailEndpoint extends ScheduledPollEndpoint implements HeaderFilterS
return answer;
}
- @Override
- public boolean isSingleton() {
- return false;
- }
-
public Exchange createExchange(Message message) {
Exchange exchange = super.createExchange();
exchange.setProperty(Exchange.BINDING, getBinding());
diff --git a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterEndpoint.java b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterEndpoint.java
index 426aabd..2b1e3cb 100644
--- a/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterEndpoint.java
+++ b/components/camel-printer/src/main/java/org/apache/camel/component/printer/PrinterEndpoint.java
@@ -59,11 +59,6 @@ public class PrinterEndpoint extends DefaultEndpoint {
return new PrinterProducer(this, config);
}
- @Override
- public boolean isSingleton() {
- return false;
- }
-
public PrinterConfiguration getConfig() {
return config;
}