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/08/21 05:16:42 UTC
[camel] 02/05: CAMEL-13870: Fast property configuration of Camel
endpoints. Work in progress.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13870
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5b4be28217d8d64616b6a5979f4bcf80f9cae180
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Aug 21 06:23:12 2019 +0200
CAMEL-13870: Fast property configuration of Camel endpoints. Work in progress.
---
.../camel/component/file/remote/FtpEndpoint.java | 8 +
.../component/file/remote/FtpsConfiguration.java | 10 +-
.../camel/component/file/remote/FtpsEndpoint.java | 16 ++
...LWithClientAuthAndSSLContextParametersTest.java | 2 +-
.../FileToFtpsExplicitSSLWithClientAuthTest.java | 2 +-
...lientAuthAndGlobalSSLContextParametersTest.java | 2 +-
...thoutClientAuthAndSSLContextParametersTest.java | 2 +-
...FileToFtpsExplicitSSLWithoutClientAuthTest.java | 2 +-
...SWithClientAuthAndSSLContextParametersTest.java | 2 +-
.../FileToFtpsExplicitTLSWithClientAuthTest.java | 2 +-
...thoutClientAuthAndSSLContextParametersTest.java | 2 +-
...FileToFtpsExplicitTLSWithoutClientAuthTest.java | 2 +-
...LWithClientAuthAndSSLContextParametersTest.java | 2 +-
.../FileToFtpsImplicitSSLWithClientAuthTest.java | 2 +-
...thoutClientAuthAndSSLContextParametersTest.java | 2 +-
...FileToFtpsImplicitSSLWithoutClientAuthTest.java | 2 +-
...SWithClientAuthAndSSLContextParametersTest.java | 2 +-
.../FileToFtpsImplicitTLSWithClientAuthTest.java | 2 +-
...thoutClientAuthAndSSLContextParametersTest.java | 2 +-
...FileToFtpsImplicitTLSWithoutClientAuthTest.java | 2 +-
...psWithCustomKeyAndTrustStorePropertiesTest.java | 2 +-
...leToFtpsWithCustomTrustStorePropertiesTest.java | 2 +-
.../file/remote/UriConfigurationTest.java | 4 +-
.../camel-netty/src/main/docs/netty-component.adoc | 9 +-
.../camel/component/netty/NettyConfiguration.java | 10 +-
.../camel/component/netty/NettyEndpoint.java | 3 -
.../apache/camel/component/ssh/SshEndpoint.java | 8 +-
.../endpoint/dsl/NettyEndpointBuilderFactory.java | 240 ---------------------
.../springboot/NettyComponentConfiguration.java | 8 -
29 files changed, 59 insertions(+), 295 deletions(-)
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
index 649688a..af058ab 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpEndpoint.java
@@ -255,6 +255,10 @@ public class FtpEndpoint<T extends FTPFile> extends RemoteFileEndpoint<FTPFile>
this.ftpClientConfig = ftpClientConfig;
}
+ public Map<String, Object> getFtpClientParameters() {
+ return ftpClientParameters;
+ }
+
/**
* Used by FtpComponent to provide additional parameters for the FTPClient
*/
@@ -262,6 +266,10 @@ public class FtpEndpoint<T extends FTPFile> extends RemoteFileEndpoint<FTPFile>
this.ftpClientParameters = ftpClientParameters;
}
+ public Map<String, Object> getFtpClientConfigParameters() {
+ return ftpClientConfigParameters;
+ }
+
/**
* Used by FtpComponent to provide additional parameters for the FTPClientConfig
*/
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsConfiguration.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsConfiguration.java
index e37f3ed..763fff5 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsConfiguration.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsConfiguration.java
@@ -31,7 +31,7 @@ public class FtpsConfiguration extends FtpConfiguration {
// TODO : switch to TLSv1.3 when we fully upgrade to JDK11
private String securityProtocol = "TLSv1.2";
@UriParam(label = "security")
- private boolean isImplicit;
+ private boolean implicit;
@UriParam(label = "security")
private boolean disableSecureDataChannelDefaults;
@UriParam(label = "security")
@@ -66,15 +66,15 @@ public class FtpsConfiguration extends FtpConfiguration {
* true - Implicit Mode / False - Explicit Mode
*/
public boolean isImplicit() {
- return isImplicit;
+ return implicit;
}
/**
- * Set the security mode(Implicit/Explicit).
+ * Set the security mode (Implicit/Explicit).
* true - Implicit Mode / False - Explicit Mode
*/
- public void setIsImplicit(boolean isImplicit) {
- this.isImplicit = isImplicit;
+ public void setImplicit(boolean implicit) {
+ this.implicit = implicit;
}
public boolean isDisableSecureDataChannelDefaults() {
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java
index a89ae92..b1328d8 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsEndpoint.java
@@ -64,6 +64,14 @@ public class FtpsEndpoint extends FtpEndpoint<FTPFile> {
}
@Override
+ public FtpsConfiguration getConfiguration() {
+ if (configuration == null) {
+ configuration = new FtpsConfiguration();
+ }
+ return configuration;
+ }
+
+ @Override
public String getScheme() {
return getFtpsConfiguration().getProtocol();
}
@@ -224,6 +232,10 @@ public class FtpsEndpoint extends FtpEndpoint<FTPFile> {
return (FtpsConfiguration) getConfiguration();
}
+ public Map<String, Object> getFtpClientKeyStoreParameters() {
+ return ftpClientKeyStoreParameters;
+ }
+
/**
* Set the key store parameters
*/
@@ -231,6 +243,10 @@ public class FtpsEndpoint extends FtpEndpoint<FTPFile> {
this.ftpClientKeyStoreParameters = param;
}
+ public Map<String, Object> getFtpClientTrustStoreParameters() {
+ return ftpClientTrustStoreParameters;
+ }
+
/**
* Set the trust store parameters
*/
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithClientAuthAndSSLContextParametersTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithClientAuthAndSSLContextParametersTest.java
index 0a01bff..b4c51b2 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithClientAuthAndSSLContextParametersTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithClientAuthAndSSLContextParametersTest.java
@@ -48,6 +48,6 @@ public class FileToFtpsExplicitSSLWithClientAuthAndSSLContextParametersTest exte
@Override
protected String getFtpUrl() {
return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
- + "&isImplicit=false&sslContextParameters=#sslContextParameters&delete=true";
+ + "&implicit=false&sslContextParameters=#sslContextParameters&delete=true";
}
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithClientAuthTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithClientAuthTest.java
index 4c876a8..4f05426 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithClientAuthTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithClientAuthTest.java
@@ -27,7 +27,7 @@ public class FileToFtpsExplicitSSLWithClientAuthTest extends FtpsServerExplicitS
protected String getFtpUrl() {
return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
- + "&securityProtocol=SSLv3&isImplicit=false&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+ + "&securityProtocol=SSLv3&implicit=false&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+ "&ftpClient.keyStore.algorithm=SunX509&ftpClient.keyStore.password=password&ftpClient.keyStore.keyPassword=password&delete=true";
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthAndGlobalSSLContextParametersTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthAndGlobalSSLContextParametersTest.java
index 48b4e11..89f60dd 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthAndGlobalSSLContextParametersTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthAndGlobalSSLContextParametersTest.java
@@ -46,6 +46,6 @@ public class FileToFtpsExplicitSSLWithoutClientAuthAndGlobalSSLContextParameters
@Override
protected String getFtpUrl() {
return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
- + "&isImplicit=false&delete=true";
+ + "&implicit=false&delete=true";
}
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthAndSSLContextParametersTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthAndSSLContextParametersTest.java
index f1508ce..3c4835e 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthAndSSLContextParametersTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthAndSSLContextParametersTest.java
@@ -42,6 +42,6 @@ public class FileToFtpsExplicitSSLWithoutClientAuthAndSSLContextParametersTest e
@Override
protected String getFtpUrl() {
return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
- + "&isImplicit=false&sslContextParameters=#sslContextParameters&delete=true";
+ + "&implicit=false&sslContextParameters=#sslContextParameters&delete=true";
}
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthTest.java
index d4d6300..ecdf54f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthTest.java
@@ -27,7 +27,7 @@ public class FileToFtpsExplicitSSLWithoutClientAuthTest extends FtpsServerExplic
protected String getFtpUrl() {
return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true&delete=true"
- + "&securityProtocol=SSLv3&isImplicit=false";
+ + "&securityProtocol=SSLv3&implicit=false";
}
@Test
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithClientAuthAndSSLContextParametersTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithClientAuthAndSSLContextParametersTest.java
index 49d67fb..2f3ef64 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithClientAuthAndSSLContextParametersTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithClientAuthAndSSLContextParametersTest.java
@@ -48,6 +48,6 @@ public class FileToFtpsExplicitTLSWithClientAuthAndSSLContextParametersTest exte
@Override
protected String getFtpUrl() {
return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
- + "&isImplicit=false&sslContextParameters=#sslContextParameters&delete=true";
+ + "&implicit=false&sslContextParameters=#sslContextParameters&delete=true";
}
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithClientAuthTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithClientAuthTest.java
index 96a95f4..8a903e7 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithClientAuthTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithClientAuthTest.java
@@ -27,7 +27,7 @@ public class FileToFtpsExplicitTLSWithClientAuthTest extends FtpsServerExplicitT
protected String getFtpUrl() {
return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
- + "&securityProtocol=TLSv1.2&isImplicit=false&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+ + "&securityProtocol=TLSv1.2&implicit=false&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+ "&ftpClient.keyStore.algorithm=SunX509&ftpClient.keyStore.password=password&ftpClient.keyStore.keyPassword=password&delete=true";
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithoutClientAuthAndSSLContextParametersTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithoutClientAuthAndSSLContextParametersTest.java
index 400c17d..939a751 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithoutClientAuthAndSSLContextParametersTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithoutClientAuthAndSSLContextParametersTest.java
@@ -41,6 +41,6 @@ public class FileToFtpsExplicitTLSWithoutClientAuthAndSSLContextParametersTest e
@Override
protected String getFtpUrl() {
return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
- + "&isImplicit=false&sslContextParameters=#sslContextParameters&delete=true";
+ + "&implicit=false&sslContextParameters=#sslContextParameters&delete=true";
}
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithoutClientAuthTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithoutClientAuthTest.java
index eeb4f2b..d47f08a 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithoutClientAuthTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitTLSWithoutClientAuthTest.java
@@ -27,7 +27,7 @@ public class FileToFtpsExplicitTLSWithoutClientAuthTest extends FtpsServerExplic
protected String getFtpUrl() {
return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
- + "&securityProtocol=TLSv1.2&isImplicit=false&delete=true";
+ + "&securityProtocol=TLSv1.2&implicit=false&delete=true";
}
@Test
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithClientAuthAndSSLContextParametersTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithClientAuthAndSSLContextParametersTest.java
index c021585..d02153f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithClientAuthAndSSLContextParametersTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithClientAuthAndSSLContextParametersTest.java
@@ -47,6 +47,6 @@ public class FileToFtpsImplicitSSLWithClientAuthAndSSLContextParametersTest exte
@Override
protected String getFtpUrl() {
return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
- + "&isImplicit=true&sslContextParameters=#sslContextParameters&delete=true";
+ + "&implicit=true&sslContextParameters=#sslContextParameters&delete=true";
}
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithClientAuthTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithClientAuthTest.java
index 55af194..4fefde3 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithClientAuthTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithClientAuthTest.java
@@ -27,7 +27,7 @@ public class FileToFtpsImplicitSSLWithClientAuthTest extends FtpsServerImplicitS
protected String getFtpUrl() {
return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
- + "&securityProtocol=SSLv3&isImplicit=true&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+ + "&securityProtocol=SSLv3&implicit=true&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+ "&ftpClient.keyStore.algorithm=SunX509&ftpClient.keyStore.password=password&ftpClient.keyStore.keyPassword=password&delete=true";
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithoutClientAuthAndSSLContextParametersTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithoutClientAuthAndSSLContextParametersTest.java
index 79f46b0..43c9e09 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithoutClientAuthAndSSLContextParametersTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithoutClientAuthAndSSLContextParametersTest.java
@@ -41,6 +41,6 @@ public class FileToFtpsImplicitSSLWithoutClientAuthAndSSLContextParametersTest e
@Override
protected String getFtpUrl() {
return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
- + "&isImplicit=true&sslContextParameters=#sslContextParameters&delete=true";
+ + "&implicit=true&sslContextParameters=#sslContextParameters&delete=true";
}
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithoutClientAuthTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithoutClientAuthTest.java
index 40ba73e..5cda433 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithoutClientAuthTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitSSLWithoutClientAuthTest.java
@@ -27,7 +27,7 @@ public class FileToFtpsImplicitSSLWithoutClientAuthTest extends FtpsServerImplic
protected String getFtpUrl() {
return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
- + "&securityProtocol=SSLv3&isImplicit=true&delete=true";
+ + "&securityProtocol=SSLv3&implicit=true&delete=true";
}
@Test
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithClientAuthAndSSLContextParametersTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithClientAuthAndSSLContextParametersTest.java
index e8322d6..65baf8a 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithClientAuthAndSSLContextParametersTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithClientAuthAndSSLContextParametersTest.java
@@ -47,6 +47,6 @@ public class FileToFtpsImplicitTLSWithClientAuthAndSSLContextParametersTest exte
@Override
protected String getFtpUrl() {
return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
- + "&isImplicit=true&sslContextParameters=#sslContextParameters&delete=true";
+ + "&implicit=true&sslContextParameters=#sslContextParameters&delete=true";
}
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithClientAuthTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithClientAuthTest.java
index 10fca47..326419f 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithClientAuthTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithClientAuthTest.java
@@ -27,7 +27,7 @@ public class FileToFtpsImplicitTLSWithClientAuthTest extends FtpsServerImplicitT
protected String getFtpUrl() {
return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
- + "&securityProtocol=TLSv1.2&isImplicit=true&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+ + "&securityProtocol=TLSv1.2&implicit=true&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+ "&ftpClient.keyStore.algorithm=SunX509&ftpClient.keyStore.password=password&ftpClient.keyStore.keyPassword=password&delete=true";
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithoutClientAuthAndSSLContextParametersTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithoutClientAuthAndSSLContextParametersTest.java
index d2e9065..7da9a6e 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithoutClientAuthAndSSLContextParametersTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithoutClientAuthAndSSLContextParametersTest.java
@@ -41,6 +41,6 @@ public class FileToFtpsImplicitTLSWithoutClientAuthAndSSLContextParametersTest e
@Override
protected String getFtpUrl() {
return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
- + "&isImplicit=true&sslContextParameters=#sslContextParameters&delete=true";
+ + "&implicit=true&sslContextParameters=#sslContextParameters&delete=true";
}
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithoutClientAuthTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithoutClientAuthTest.java
index cb519b4..6f960e3 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithoutClientAuthTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsImplicitTLSWithoutClientAuthTest.java
@@ -27,7 +27,7 @@ public class FileToFtpsImplicitTLSWithoutClientAuthTest extends FtpsServerImplic
protected String getFtpUrl() {
return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
- + "&securityProtocol=TLSv1.2&isImplicit=true&delete=true";
+ + "&securityProtocol=TLSv1.2&implicit=true&delete=true";
}
@Test
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomKeyAndTrustStorePropertiesTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomKeyAndTrustStorePropertiesTest.java
index e5d4749..b542f02 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomKeyAndTrustStorePropertiesTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomKeyAndTrustStorePropertiesTest.java
@@ -27,7 +27,7 @@ public class FileToFtpsWithCustomKeyAndTrustStorePropertiesTest extends FtpsServ
private String getFtpUrl() {
return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
- + "&securityProtocol=SSLv3&isImplicit=false&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+ + "&securityProtocol=SSLv3&implicit=false&ftpClient.keyStore.file=./src/test/resources/server.jks&ftpClient.keyStore.type=JKS"
+ "&ftpClient.keyStore.algorithm=SunX509&ftpClient.keyStore.password=password&ftpClient.keyStore.keyPassword=password"
+ "&ftpClient.trustStore.file=./src/test/resources/server.jks&ftpClient.trustStore.type=JKS"
+ "&ftpClient.trustStore.algorithm=SunX509&ftpClient.trustStore.password=password&delete=true";
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomTrustStorePropertiesTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomTrustStorePropertiesTest.java
index 0f1d15c..f0f523a 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomTrustStorePropertiesTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsWithCustomTrustStorePropertiesTest.java
@@ -27,7 +27,7 @@ public class FileToFtpsWithCustomTrustStorePropertiesTest extends FtpsServerExpl
private String getFtpUrl() {
return "ftps://admin@localhost:" + getPort() + "/tmp2/camel?password=admin&consumer.initialDelay=2000&disableSecureDataChannelDefaults=true"
- + "&securityProtocol=SSLv3&isImplicit=false&ftpClient.trustStore.file=./src/test/resources/server.jks&ftpClient.trustStore.type=JKS"
+ + "&securityProtocol=SSLv3&implicit=false&ftpClient.trustStore.file=./src/test/resources/server.jks&ftpClient.trustStore.type=JKS"
+ "&ftpClient.trustStore.algorithm=SunX509&ftpClient.trustStore.password=password&delete=true";
}
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java
index c71bacb..e16d9ed 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/UriConfigurationTest.java
@@ -69,7 +69,7 @@ public class UriConfigurationTest extends CamelTestSupport {
@Test
public void testFtpsExplicitConfigurationDefaults() {
- FtpsEndpoint endpoint = context.getEndpoint("ftps://hostname:990?isImplicit=true", FtpsEndpoint.class);
+ FtpsEndpoint endpoint = context.getEndpoint("ftps://hostname:990?implicit=true", FtpsEndpoint.class);
FtpsConfiguration config = endpoint.getFtpsConfiguration();
assertEquals("ftps", config.getProtocol());
@@ -110,7 +110,7 @@ public class UriConfigurationTest extends CamelTestSupport {
@Test
public void testFtpsExplicitConfiguration() {
- FtpsEndpoint endpoint = context.getEndpoint("ftps://user@hostname:1021/some/file?password=secret&binary=true&securityProtocol=SSL&isImplicit=true", FtpsEndpoint.class);
+ FtpsEndpoint endpoint = context.getEndpoint("ftps://user@hostname:1021/some/file?password=secret&binary=true&securityProtocol=SSL&implicit=true", FtpsEndpoint.class);
FtpsConfiguration config = endpoint.getFtpsConfiguration();
assertEquals("ftps", config.getProtocol());
diff --git a/components/camel-netty/src/main/docs/netty-component.adoc b/components/camel-netty/src/main/docs/netty-component.adoc
index 0283a38..4c99a51 100644
--- a/components/camel-netty/src/main/docs/netty-component.adoc
+++ b/components/camel-netty/src/main/docs/netty-component.adoc
@@ -88,7 +88,7 @@ with the following path and query parameters:
|===
-=== Query Parameters (74 parameters):
+=== Query Parameters (71 parameters):
[width="100%",cols="2,5,^1,2",options="header"]
@@ -133,7 +133,6 @@ with the following path and query parameters:
| *useByteBuf* (producer) | If the useByteBuf is true, netty producer will turn the message body into ByteBuf before sending it out. | false | boolean
| *allowSerializedHeaders* (advanced) | Only used for TCP when transferExchange is true. When set to true, serializable objects in headers and properties will be added to the exchange. Otherwise Camel will exclude any non-serializable objects and log it at WARN level. | false | boolean
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
-| *bootstrapConfiguration* (advanced) | To use a custom configured NettyServerBootstrapConfiguration for configuring this endpoint. | | NettyServerBootstrap Configuration
| *channelGroup* (advanced) | To use a explicit ChannelGroup. | | ChannelGroup
| *nativeTransport* (advanced) | Whether to use native transport instead of NIO. Native transport takes advantage of the host operating system and is only supported on some platforms. You need to add the netty JAR for the host operating system you are using. See more details at: \http://netty.io/wiki/native-transports.html | false | boolean
| *options* (advanced) | Allows to configure additional netty options using option. as prefix. For example option.child.keepAlive=false to set the netty option child.keepAlive=false. See the Netty documentation for possible options that can be used. | | Map
@@ -147,12 +146,10 @@ with the following path and query parameters:
| *workerGroup* (advanced) | To use a explicit EventLoopGroup as the boss thread pool. For example to share a thread pool with multiple consumers or producers. By default each consumer or producer has their own worker pool with 2 x cpu count core threads. | | EventLoopGroup
| *allowDefaultCodec* (codec) | The netty component installs a default codec if both, encoder/decoder is null and textline is false. Setting allowDefaultCodec to false prevents the netty component from installing a default codec as the first element in the filter chain. | true | boolean
| *autoAppendDelimiter* (codec) | Whether or not to auto append missing end delimiter when sending using the textline codec. | true | boolean
-| *decoder* (codec) | *Deprecated* A custom ChannelHandler class that can be used to perform special marshalling of inbound payloads. | | ChannelHandler
| *decoderMaxLineLength* (codec) | The max line length to use for the textline codec. | 1024 | int
-| *decoders* (codec) | A list of decoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Registry. Just remember to prefix the value with # so Camel knows it should lookup. | | String
+| *decoders* (codec) | A list of decoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Registry. Just remember to prefix the value with # so Camel knows it should lookup. | | List
| *delimiter* (codec) | The delimiter to use for the textline codec. Possible values are LINE and NULL. | LINE | TextLineDelimiter
-| *encoder* (codec) | *Deprecated* A custom ChannelHandler class that can be used to perform special marshalling of outbound payloads. | | ChannelHandler
-| *encoders* (codec) | A list of encoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Registry. Just remember to prefix the value with # so Camel knows it should lookup. | | String
+| *encoders* (codec) | A list of encoders to be used. You can use a String which have values separated by comma, and have the values be looked up in the Registry. Just remember to prefix the value with # so Camel knows it should lookup. | | List
| *encoding* (codec) | The encoding (a charset name) to use for the textline codec. If not provided, Camel will use the JVM default Charset. | | String
| *textline* (codec) | Only used for TCP. If no codec is specified, you can use this flag to indicate a text line based codec; if not specified or the value is false, then Object Serialization is assumed over TCP. | false | boolean
| *enabledProtocols* (security) | Which protocols to enable when using SSL | TLSv1,TLSv1.1,TLSv1.2 | String
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
index ec9bacf..9c5a69e 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
@@ -61,15 +61,9 @@ public class NettyConfiguration extends NettyServerBootstrapConfiguration implem
private int decoderMaxLineLength = 1024;
@UriParam(label = "codec")
private String encoding;
- @UriParam(label = "codec", description = "To use a single encoder. This options is deprecated use encoders instead.")
- @Deprecated
- private ChannelHandler encoder;
- @UriParam(label = "codec", javaType = "java.lang.String")
+ @UriParam(label = "codec")
private List<ChannelHandler> encoders = new ArrayList<>();
- @UriParam(label = "codec", description = "To use a single decoder. This options is deprecated use encoders instead.")
- @Deprecated
- private ChannelHandler decoder;
- @UriParam(label = "codec", javaType = "java.lang.String")
+ @UriParam(label = "codec")
private List<ChannelHandler> decoders = new ArrayList<>();
@UriParam
private boolean disconnect;
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyEndpoint.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyEndpoint.java
index 9ae5ed6..5f0fd97 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyEndpoint.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyEndpoint.java
@@ -44,9 +44,6 @@ import org.apache.camel.util.ObjectHelper;
public class NettyEndpoint extends DefaultEndpoint implements AsyncEndpoint {
@UriParam
private NettyConfiguration configuration;
- @UriParam(label = "advanced", javaType = "org.apache.camel.component.netty.NettyServerBootstrapConfiguration",
- description = "To use a custom configured NettyServerBootstrapConfiguration for configuring this endpoint.")
- private Object bootstrapConfiguration; // to include in component docs as NettyServerBootstrapConfiguration is a @UriParams class
public NettyEndpoint(String endpointUri, NettyComponent component, NettyConfiguration configuration) {
super(endpointUri, component);
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 041226e..2180257 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
@@ -35,7 +35,7 @@ public class SshEndpoint extends ScheduledPollEndpoint {
protected final Logger log = LoggerFactory.getLogger(getClass());
@UriParam
- private SshConfiguration sshConfiguration;
+ private SshConfiguration configuration;
public SshEndpoint() {
}
@@ -46,7 +46,7 @@ public class SshEndpoint extends ScheduledPollEndpoint {
public SshEndpoint(String uri, SshComponent component, SshConfiguration configuration) {
super(uri, component);
- this.sshConfiguration = configuration;
+ this.configuration = configuration;
}
@Override
@@ -68,11 +68,11 @@ public class SshEndpoint extends ScheduledPollEndpoint {
}
public SshConfiguration getConfiguration() {
- return sshConfiguration;
+ return configuration;
}
public void setConfiguration(SshConfiguration configuration) {
- this.sshConfiguration = configuration;
+ this.configuration = configuration;
}
public String getHost() {
diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java
index 068abcf..eabfefd 100644
--- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java
@@ -384,33 +384,6 @@ public interface NettyEndpointBuilderFactory {
return this;
}
/**
- * A custom ChannelHandler class that can be used to perform special
- * marshalling of inbound payloads.
- *
- * The option is a: <code>io.netty.channel.ChannelHandler</code> type.
- *
- * Group: codec
- */
- @Deprecated
- default NettyEndpointConsumerBuilder decoder(Object decoder) {
- setProperty("decoder", decoder);
- return this;
- }
- /**
- * A custom ChannelHandler class that can be used to perform special
- * marshalling of inbound payloads.
- *
- * The option will be converted to a
- * <code>io.netty.channel.ChannelHandler</code> type.
- *
- * Group: codec
- */
- @Deprecated
- default NettyEndpointConsumerBuilder decoder(String decoder) {
- setProperty("decoder", decoder);
- return this;
- }
- /**
* The max line length to use for the textline codec.
*
* The option is a: <code>int</code> type.
@@ -494,33 +467,6 @@ public interface NettyEndpointBuilderFactory {
return this;
}
/**
- * A custom ChannelHandler class that can be used to perform special
- * marshalling of outbound payloads.
- *
- * The option is a: <code>io.netty.channel.ChannelHandler</code> type.
- *
- * Group: codec
- */
- @Deprecated
- default NettyEndpointConsumerBuilder encoder(Object encoder) {
- setProperty("encoder", encoder);
- return this;
- }
- /**
- * A custom ChannelHandler class that can be used to perform special
- * marshalling of outbound payloads.
- *
- * The option will be converted to a
- * <code>io.netty.channel.ChannelHandler</code> type.
- *
- * Group: codec
- */
- @Deprecated
- default NettyEndpointConsumerBuilder encoder(String encoder) {
- setProperty("encoder", encoder);
- return this;
- }
- /**
* A list of encoders to be used. You can use a String which have values
* separated by comma, and have the values be looked up in the Registry.
* Just remember to prefix the value with # so Camel knows it should
@@ -1252,32 +1198,6 @@ public interface NettyEndpointBuilderFactory {
return this;
}
/**
- * To use a custom configured NettyServerBootstrapConfiguration for
- * configuring this endpoint.
- *
- * The option is a: <code>java.lang.Object</code> type.
- *
- * Group: advanced
- */
- default AdvancedNettyEndpointConsumerBuilder bootstrapConfiguration(
- Object bootstrapConfiguration) {
- setProperty("bootstrapConfiguration", bootstrapConfiguration);
- return this;
- }
- /**
- * To use a custom configured NettyServerBootstrapConfiguration for
- * configuring this endpoint.
- *
- * The option will be converted to a <code>java.lang.Object</code> type.
- *
- * Group: advanced
- */
- default AdvancedNettyEndpointConsumerBuilder bootstrapConfiguration(
- String bootstrapConfiguration) {
- setProperty("bootstrapConfiguration", bootstrapConfiguration);
- return this;
- }
- /**
* To use a explicit ChannelGroup.
*
* The option is a: <code>io.netty.channel.group.ChannelGroup</code>
@@ -1901,33 +1821,6 @@ public interface NettyEndpointBuilderFactory {
return this;
}
/**
- * A custom ChannelHandler class that can be used to perform special
- * marshalling of inbound payloads.
- *
- * The option is a: <code>io.netty.channel.ChannelHandler</code> type.
- *
- * Group: codec
- */
- @Deprecated
- default NettyEndpointProducerBuilder decoder(Object decoder) {
- setProperty("decoder", decoder);
- return this;
- }
- /**
- * A custom ChannelHandler class that can be used to perform special
- * marshalling of inbound payloads.
- *
- * The option will be converted to a
- * <code>io.netty.channel.ChannelHandler</code> type.
- *
- * Group: codec
- */
- @Deprecated
- default NettyEndpointProducerBuilder decoder(String decoder) {
- setProperty("decoder", decoder);
- return this;
- }
- /**
* The max line length to use for the textline codec.
*
* The option is a: <code>int</code> type.
@@ -2011,33 +1904,6 @@ public interface NettyEndpointBuilderFactory {
return this;
}
/**
- * A custom ChannelHandler class that can be used to perform special
- * marshalling of outbound payloads.
- *
- * The option is a: <code>io.netty.channel.ChannelHandler</code> type.
- *
- * Group: codec
- */
- @Deprecated
- default NettyEndpointProducerBuilder encoder(Object encoder) {
- setProperty("encoder", encoder);
- return this;
- }
- /**
- * A custom ChannelHandler class that can be used to perform special
- * marshalling of outbound payloads.
- *
- * The option will be converted to a
- * <code>io.netty.channel.ChannelHandler</code> type.
- *
- * Group: codec
- */
- @Deprecated
- default NettyEndpointProducerBuilder encoder(String encoder) {
- setProperty("encoder", encoder);
- return this;
- }
- /**
* A list of encoders to be used. You can use a String which have values
* separated by comma, and have the values be looked up in the Registry.
* Just remember to prefix the value with # so Camel knows it should
@@ -2707,32 +2573,6 @@ public interface NettyEndpointBuilderFactory {
return this;
}
/**
- * To use a custom configured NettyServerBootstrapConfiguration for
- * configuring this endpoint.
- *
- * The option is a: <code>java.lang.Object</code> type.
- *
- * Group: advanced
- */
- default AdvancedNettyEndpointProducerBuilder bootstrapConfiguration(
- Object bootstrapConfiguration) {
- setProperty("bootstrapConfiguration", bootstrapConfiguration);
- return this;
- }
- /**
- * To use a custom configured NettyServerBootstrapConfiguration for
- * configuring this endpoint.
- *
- * The option will be converted to a <code>java.lang.Object</code> type.
- *
- * Group: advanced
- */
- default AdvancedNettyEndpointProducerBuilder bootstrapConfiguration(
- String bootstrapConfiguration) {
- setProperty("bootstrapConfiguration", bootstrapConfiguration);
- return this;
- }
- /**
* To use a explicit ChannelGroup.
*
* The option is a: <code>io.netty.channel.group.ChannelGroup</code>
@@ -3260,33 +3100,6 @@ public interface NettyEndpointBuilderFactory {
return this;
}
/**
- * A custom ChannelHandler class that can be used to perform special
- * marshalling of inbound payloads.
- *
- * The option is a: <code>io.netty.channel.ChannelHandler</code> type.
- *
- * Group: codec
- */
- @Deprecated
- default NettyEndpointBuilder decoder(Object decoder) {
- setProperty("decoder", decoder);
- return this;
- }
- /**
- * A custom ChannelHandler class that can be used to perform special
- * marshalling of inbound payloads.
- *
- * The option will be converted to a
- * <code>io.netty.channel.ChannelHandler</code> type.
- *
- * Group: codec
- */
- @Deprecated
- default NettyEndpointBuilder decoder(String decoder) {
- setProperty("decoder", decoder);
- return this;
- }
- /**
* The max line length to use for the textline codec.
*
* The option is a: <code>int</code> type.
@@ -3369,33 +3182,6 @@ public interface NettyEndpointBuilderFactory {
return this;
}
/**
- * A custom ChannelHandler class that can be used to perform special
- * marshalling of outbound payloads.
- *
- * The option is a: <code>io.netty.channel.ChannelHandler</code> type.
- *
- * Group: codec
- */
- @Deprecated
- default NettyEndpointBuilder encoder(Object encoder) {
- setProperty("encoder", encoder);
- return this;
- }
- /**
- * A custom ChannelHandler class that can be used to perform special
- * marshalling of outbound payloads.
- *
- * The option will be converted to a
- * <code>io.netty.channel.ChannelHandler</code> type.
- *
- * Group: codec
- */
- @Deprecated
- default NettyEndpointBuilder encoder(String encoder) {
- setProperty("encoder", encoder);
- return this;
- }
- /**
* A list of encoders to be used. You can use a String which have values
* separated by comma, and have the values be looked up in the Registry.
* Just remember to prefix the value with # so Camel knows it should
@@ -3754,32 +3540,6 @@ public interface NettyEndpointBuilderFactory {
return this;
}
/**
- * To use a custom configured NettyServerBootstrapConfiguration for
- * configuring this endpoint.
- *
- * The option is a: <code>java.lang.Object</code> type.
- *
- * Group: advanced
- */
- default AdvancedNettyEndpointBuilder bootstrapConfiguration(
- Object bootstrapConfiguration) {
- setProperty("bootstrapConfiguration", bootstrapConfiguration);
- return this;
- }
- /**
- * To use a custom configured NettyServerBootstrapConfiguration for
- * configuring this endpoint.
- *
- * The option will be converted to a <code>java.lang.Object</code> type.
- *
- * Group: advanced
- */
- default AdvancedNettyEndpointBuilder bootstrapConfiguration(
- String bootstrapConfiguration) {
- setProperty("bootstrapConfiguration", bootstrapConfiguration);
- return this;
- }
- /**
* To use a explicit ChannelGroup.
*
* The option is a: <code>io.netty.channel.group.ChannelGroup</code>
diff --git a/platforms/spring-boot/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java
index cebf1ce..82069c1 100644
--- a/platforms/spring-boot/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java
@@ -186,13 +186,11 @@ public class NettyComponentConfiguration
* A custom ChannelHandler class that can be used to perform special
* marshalling of outbound payloads.
*/
- @Deprecated
private ChannelHandler encoder;
/**
* A custom ChannelHandler class that can be used to perform special
* marshalling of inbound payloads.
*/
- @Deprecated
private ChannelHandler decoder;
/**
* Whether or not to disconnect(close) from Netty Channel right after
@@ -610,24 +608,18 @@ public class NettyComponentConfiguration
this.encoders = encoders;
}
- @Deprecated
- @DeprecatedConfigurationProperty
public ChannelHandler getEncoder() {
return encoder;
}
- @Deprecated
public void setEncoder(ChannelHandler encoder) {
this.encoder = encoder;
}
- @Deprecated
- @DeprecatedConfigurationProperty
public ChannelHandler getDecoder() {
return decoder;
}
- @Deprecated
public void setDecoder(ChannelHandler decoder) {
this.decoder = decoder;
}