You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2019/06/18 08:56:09 UTC
[camel] 01/02: Remove deprecated certFilename property on the ssh
component
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 634b5fc734b4201d303b0d0ec5ddc6dbe1c80f0a
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Jun 18 10:38:20 2019 +0200
Remove deprecated certFilename property on the ssh component
---
components/camel-ssh/src/main/docs/ssh-component.adoc | 7 ++-----
.../org/apache/camel/component/ssh/SshComponent.java | 19 -------------------
docs/components/modules/ROOT/pages/ssh-component.adoc | 7 ++-----
.../ssh/springboot/SshComponentConfiguration.java | 19 -------------------
4 files changed, 4 insertions(+), 48 deletions(-)
diff --git a/components/camel-ssh/src/main/docs/ssh-component.adoc b/components/camel-ssh/src/main/docs/ssh-component.adoc
index d0fca53..31d639f 100644
--- a/components/camel-ssh/src/main/docs/ssh-component.adoc
+++ b/components/camel-ssh/src/main/docs/ssh-component.adoc
@@ -31,7 +31,7 @@ ssh:[username[:password]@]host[:port][?options]
// component options: START
-The SSH component supports 16 options, which are listed below.
+The SSH component supports 15 options, which are listed below.
@@ -47,7 +47,6 @@ The SSH component supports 16 options, which are listed below.
| *keyPairProvider* (security) | Sets the KeyPairProvider reference to use when connecting using Certificates to the remote SSH Server. | | KeyPairProvider
| *keyType* (security) | Sets the key type to pass to the KeyPairProvider as part of authentication. KeyPairProvider.loadKey(...) will be passed this value. Defaults to ssh-rsa. | | String
| *timeout* (common) | Sets the timeout in milliseconds to wait in establishing the remote SSH server connection. Defaults to 30000 milliseconds. | | long
-| *certFilename* (security) | *Deprecated* Sets the resource path of the certificate to use for Authentication. Deprecation note: As of version 2.11, replaced by certResource. | | String
| *certResource* (security) | Sets the resource path of the certificate to use for Authentication. Will use ResourceHelperKeyPairProvider to resolve file based certificate, and depends on keyType setting. | | String
| *channelType* (advanced) | Sets the channel type to pass to the Channel as part of command execution. Defaults to exec. | | String
| *shellPrompt* (advanced) | Sets the shellPrompt to be dropped when response is read after command execution | | String
@@ -137,7 +136,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 31 options, which are listed below.
+The component supports 30 options, which are listed below.
@@ -173,8 +172,6 @@ The component supports 31 options, which are listed below.
| *camel.component.ssh.sleep-for-shell-prompt* | Sets the sleep period in milliseconds to wait reading response from shell prompt. Defaults to 100 milliseconds. | | Long
| *camel.component.ssh.timeout* | Sets the timeout in milliseconds to wait in establishing the remote SSH server connection. Defaults to 30000 milliseconds. | | Long
| *camel.component.ssh.username* | Sets the username to use in logging into the remote SSH server. | | String
-| *camel.component.ssh.cert-filename* | *Deprecated* Sets the resource path of the certificate to use for Authentication. | | String
-| *camel.component.ssh.configuration.cert-filename* | *Deprecated* @deprecated As of version 2.11, replaced by certResource. | | String
|===
// spring-boot-auto-configure options: END
diff --git a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java
index 08acee6..5cc5972 100644
--- a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java
+++ b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java
@@ -176,25 +176,6 @@ public class SshComponent extends DefaultComponent {
getConfiguration().setTimeout(timeout);
}
- /**
- * @deprecated As of version 2.11, replaced by {@link #getCertResource()}
- */
- @Deprecated
- public String getCertFilename() {
- return getConfiguration().getCertFilename();
- }
-
- /**
- * Sets the resource path of the certificate to use for Authentication.
- *
- * @deprecated As of version 2.11, replaced by {@link #setCertResource(String)}
- */
- @Deprecated
- @Metadata(label = "security", deprecationNote = "As of version 2.11, replaced by certResource.")
- public void setCertFilename(String certFilename) {
- getConfiguration().setCertFilename(certFilename);
- }
-
public String getCertResource() {
return getConfiguration().getCertResource();
}
diff --git a/docs/components/modules/ROOT/pages/ssh-component.adoc b/docs/components/modules/ROOT/pages/ssh-component.adoc
index d0fca53..31d639f 100644
--- a/docs/components/modules/ROOT/pages/ssh-component.adoc
+++ b/docs/components/modules/ROOT/pages/ssh-component.adoc
@@ -31,7 +31,7 @@ ssh:[username[:password]@]host[:port][?options]
// component options: START
-The SSH component supports 16 options, which are listed below.
+The SSH component supports 15 options, which are listed below.
@@ -47,7 +47,6 @@ The SSH component supports 16 options, which are listed below.
| *keyPairProvider* (security) | Sets the KeyPairProvider reference to use when connecting using Certificates to the remote SSH Server. | | KeyPairProvider
| *keyType* (security) | Sets the key type to pass to the KeyPairProvider as part of authentication. KeyPairProvider.loadKey(...) will be passed this value. Defaults to ssh-rsa. | | String
| *timeout* (common) | Sets the timeout in milliseconds to wait in establishing the remote SSH server connection. Defaults to 30000 milliseconds. | | long
-| *certFilename* (security) | *Deprecated* Sets the resource path of the certificate to use for Authentication. Deprecation note: As of version 2.11, replaced by certResource. | | String
| *certResource* (security) | Sets the resource path of the certificate to use for Authentication. Will use ResourceHelperKeyPairProvider to resolve file based certificate, and depends on keyType setting. | | String
| *channelType* (advanced) | Sets the channel type to pass to the Channel as part of command execution. Defaults to exec. | | String
| *shellPrompt* (advanced) | Sets the shellPrompt to be dropped when response is read after command execution | | String
@@ -137,7 +136,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 31 options, which are listed below.
+The component supports 30 options, which are listed below.
@@ -173,8 +172,6 @@ The component supports 31 options, which are listed below.
| *camel.component.ssh.sleep-for-shell-prompt* | Sets the sleep period in milliseconds to wait reading response from shell prompt. Defaults to 100 milliseconds. | | Long
| *camel.component.ssh.timeout* | Sets the timeout in milliseconds to wait in establishing the remote SSH server connection. Defaults to 30000 milliseconds. | | Long
| *camel.component.ssh.username* | Sets the username to use in logging into the remote SSH server. | | String
-| *camel.component.ssh.cert-filename* | *Deprecated* Sets the resource path of the certificate to use for Authentication. | | String
-| *camel.component.ssh.configuration.cert-filename* | *Deprecated* @deprecated As of version 2.11, replaced by certResource. | | String
|===
// spring-boot-auto-configure options: END
diff --git a/platforms/spring-boot/components-starter/camel-ssh-starter/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-ssh-starter/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentConfiguration.java
index 3a1de1f..10cf71c 100644
--- a/platforms/spring-boot/components-starter/camel-ssh-starter/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-ssh-starter/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentConfiguration.java
@@ -85,11 +85,6 @@ public class SshComponentConfiguration
*/
private Long timeout;
/**
- * Sets the resource path of the certificate to use for Authentication.
- */
- @Deprecated
- private String certFilename;
- /**
* Sets the resource path of the certificate to use for Authentication. Will
* use ResourceHelperKeyPairProvider to resolve file based certificate, and
* depends on keyType setting.
@@ -195,17 +190,6 @@ public class SshComponentConfiguration
this.timeout = timeout;
}
- @Deprecated
- @DeprecatedConfigurationProperty
- public String getCertFilename() {
- return certFilename;
- }
-
- @Deprecated
- public void setCertFilename(String certFilename) {
- this.certFilename = certFilename;
- }
-
public String getCertResource() {
return certResource;
}
@@ -297,9 +281,6 @@ public class SshComponentConfiguration
* SSH server connection. Defaults to 30000 milliseconds.
*/
private Long timeout = 30000L;
- /**
- * @deprecated As of version 2.11, replaced by certResource.
- */
@Deprecated
private String certFilename;
/**