You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2017/04/11 14:12:05 UTC
[09/13] camel git commit: CAMEL-10650: renaming common methods
CAMEL-10650: renaming common methods
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1f3c10ed
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1f3c10ed
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1f3c10ed
Branch: refs/heads/master
Commit: 1f3c10edd2a00b85165069b1cd03fb6e1be3dd75
Parents: d51aa65
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Tue Apr 11 13:34:42 2017 +0200
Committer: Nicola Ferraro <ni...@gmail.com>
Committed: Tue Apr 11 16:04:22 2017 +0200
----------------------------------------------------------------------
.../org/apache/camel/SSLContextParametersAware.java | 8 ++++----
.../org/apache/camel/component/ahc/AhcComponent.java | 12 ++++++------
...onentClientConfigGlobalSslContextParametersTest.java | 4 ++--
.../apache/camel/component/cometd/CometdComponent.java | 12 ++++++------
...obalContextParametersCometdProducerConsumerTest.java | 2 +-
.../apache/camel/component/consul/ConsulComponent.java | 12 ++++++------
.../org/apache/camel/component/cxf/CxfComponent.java | 12 ++++++------
.../camel/component/cxf/jaxrs/CxfRsComponent.java | 12 ++++++------
.../component/cxf/jaxrs/CxfRsGlobalSslProducerTest.java | 2 +-
.../apache/camel/component/cxf/ssl/SslGlobalTest.java | 2 +-
.../org/apache/camel/component/etcd/EtcdComponent.java | 12 ++++++------
.../camel/component/file/remote/FtpsComponent.java | 12 ++++++------
...houtClientAuthAndGlobalSSLContextParametersTest.java | 2 +-
.../org/apache/camel/component/http/HttpComponent.java | 10 +++++-----
.../org/apache/camel/component/http4/HttpComponent.java | 12 ++++++------
.../org/apache/camel/component/irc/IrcComponent.java | 12 ++++++------
.../camel/component/jetty/JettyHttpComponent.java | 12 ++++++------
.../apache/camel/component/kafka/KafkaComponent.java | 12 ++++++------
.../camel/component/lumberjack/LumberjackComponent.java | 12 ++++++------
.../lumberjack/LumberjackComponentGlobalSSLTest.java | 2 +-
.../org/apache/camel/component/mail/MailComponent.java | 12 ++++++------
.../apache/camel/component/mina2/Mina2Component.java | 12 ++++++------
.../mina2/Mina2SslGlobalContextParametersTcpTest.java | 2 +-
.../org/apache/camel/component/nats/NatsComponent.java | 12 ++++++------
.../camel/component/netty/http/NettyHttpComponent.java | 12 ++++++------
.../component/netty/http/NettyHttpGlobalSSLTest.java | 2 +-
.../apache/camel/component/netty/NettyComponent.java | 12 ++++++------
.../netty/NettyGlobalSSLContextParametersTest.java | 2 +-
.../camel/component/netty4/http/NettyHttpComponent.java | 12 ++++++------
.../apache/camel/component/netty4/NettyComponent.java | 12 ++++++------
.../netty4/NettyGlobalSSLContextParametersTest.java | 2 +-
.../camel/component/olingo2/Olingo2Component.java | 12 ++++++------
.../camel/component/olingo4/Olingo4Component.java | 12 ++++++------
.../camel/component/restlet/RestletComponent.java | 12 ++++++------
.../RestletHttpsWithGlobalSSLContextParametersTest.java | 2 +-
.../camel/component/salesforce/SalesforceComponent.java | 12 ++++++------
.../camel/component/servicenow/ServiceNowComponent.java | 12 ++++++------
.../component/spring/ws/SpringWebserviceComponent.java | 12 ++++++------
.../apache/camel/component/stomp/StompComponent.java | 12 ++++++------
.../component/stomp/StompGlobalSslConsumerTest.java | 2 +-
.../camel/component/undertow/UndertowComponent.java | 12 ++++++------
.../camel/component/websocket/WebsocketComponent.java | 12 ++++++------
.../WebsocketSSLContextGlobalRouteExampleTest.java | 2 +-
.../http/springboot/HttpComponentConfiguration.java | 8 ++++----
44 files changed, 195 insertions(+), 195 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/camel-core/src/main/java/org/apache/camel/SSLContextParametersAware.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/SSLContextParametersAware.java b/camel-core/src/main/java/org/apache/camel/SSLContextParametersAware.java
index 07f684a..7c10e20 100644
--- a/camel-core/src/main/java/org/apache/camel/SSLContextParametersAware.java
+++ b/camel-core/src/main/java/org/apache/camel/SSLContextParametersAware.java
@@ -26,8 +26,8 @@ public interface SSLContextParametersAware extends CamelContextAware {
/**
* Returns the global {@link SSLContextParameters} if enabled on the implementing object, null otherwise.
*/
- default SSLContextParameters getGlobalSSLContextParameters() {
- if (isUseGlobalSSLContextParameters()) {
+ default SSLContextParameters retrieveGlobalSslContextParameters() {
+ if (isUseGlobalSslContextParameters()) {
return getCamelContext().getSSLContextParameters();
}
return null;
@@ -36,11 +36,11 @@ public interface SSLContextParametersAware extends CamelContextAware {
/**
* Determine if the implementing object is using global SSL context parameters.
*/
- boolean isUseGlobalSSLContextParameters();
+ boolean isUseGlobalSslContextParameters();
/**
* Enable usage of global SSL context parameters.
*/
- void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters);
+ void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java
index cef473d..2a487fb 100644
--- a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java
+++ b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java
@@ -56,7 +56,7 @@ public class AhcComponent extends HeaderFilterStrategyComponent implements SSLCo
@Metadata(label = "security")
private SSLContextParameters sslContextParameters;
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
@Metadata(label = "advanced")
private boolean allowJavaSerializedObject;
@@ -70,7 +70,7 @@ public class AhcComponent extends HeaderFilterStrategyComponent implements SSLCo
SSLContextParameters ssl = getSslContextParameters();
if (ssl == null) {
- ssl = getGlobalSSLContextParameters();
+ ssl = retrieveGlobalSslContextParameters();
}
// Do not set the HTTP URI because we still have all of the Camel internal
@@ -214,16 +214,16 @@ public class AhcComponent extends HeaderFilterStrategyComponent implements SSLCo
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
protected String createAddressUri(String uri, String remaining) {
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigGlobalSslContextParametersTest.java
----------------------------------------------------------------------
diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigGlobalSslContextParametersTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigGlobalSslContextParametersTest.java
index 4aa3254..1fc2b76 100644
--- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigGlobalSslContextParametersTest.java
+++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcComponentClientConfigGlobalSslContextParametersTest.java
@@ -28,8 +28,8 @@ public class AhcComponentClientConfigGlobalSslContextParametersTest extends AhcC
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
context.setSSLContextParameters(createSSLContextParameters());
- ((SSLContextParametersAware) context.getComponent("ahc")).setUseGlobalSSLContextParameters(true);
- ((SSLContextParametersAware) context.getComponent("jetty")).setUseGlobalSSLContextParameters(true);
+ ((SSLContextParametersAware) context.getComponent("ahc")).setUseGlobalSslContextParameters(true);
+ ((SSLContextParametersAware) context.getComponent("jetty")).setUseGlobalSslContextParameters(true);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
index 66845d2..b92611c 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
@@ -70,7 +70,7 @@ public class CometdComponent extends UriEndpointComponent implements SSLContextP
@Metadata(label = "security")
private SSLContextParameters sslContextParameters;
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
class ConnectorRef {
Connector connector;
@@ -229,7 +229,7 @@ public class CometdComponent extends UriEndpointComponent implements SSLContextP
ServerConnector sslSocketConnector = null;
SSLContextParameters sslParams = this.sslContextParameters;
if (sslParams == null) {
- sslParams = getGlobalSSLContextParameters();
+ sslParams = retrieveGlobalSslContextParameters();
}
if (sslParams != null) {
SslContextFactory sslContextFactory = new CometdComponentSslContextFactory();
@@ -329,16 +329,16 @@ public class CometdComponent extends UriEndpointComponent implements SSLContextP
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
protected Server createServer() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslGlobalContextParametersCometdProducerConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslGlobalContextParametersCometdProducerConsumerTest.java b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslGlobalContextParametersCometdProducerConsumerTest.java
index b818a84..e71063f 100644
--- a/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslGlobalContextParametersCometdProducerConsumerTest.java
+++ b/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/SslGlobalContextParametersCometdProducerConsumerTest.java
@@ -95,7 +95,7 @@ public class SslGlobalContextParametersCometdProducerConsumerTest extends CamelT
sslContextParameters.setTrustManagers(tmp);
context.setSSLContextParameters(sslContextParameters);
- ((SSLContextParametersAware) context.getComponent("cometd")).setUseGlobalSSLContextParameters(true);
+ ((SSLContextParametersAware) context.getComponent("cometd")).setUseGlobalSslContextParameters(true);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulComponent.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulComponent.java
index ff9070c..f248527 100644
--- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulComponent.java
+++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulComponent.java
@@ -45,7 +45,7 @@ public class ConsulComponent extends DefaultComponent implements SSLContextParam
@Metadata(label = "advanced")
private ConsulConfiguration configuration = new ConsulConfiguration();
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
public ConsulComponent() {
super();
@@ -97,16 +97,16 @@ public class ConsulComponent extends DefaultComponent implements SSLContextParam
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
public String getAclToken() {
@@ -164,7 +164,7 @@ public class ConsulComponent extends DefaultComponent implements SSLContextParam
// using global ssl context parameters if set
if (configuration.getSslContextParameters() == null) {
- configuration.setSslContextParameters(getGlobalSSLContextParameters());
+ configuration.setSslContextParameters(retrieveGlobalSslContextParameters());
}
setProperties(configuration, parameters);
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
index 2734e21..1ab8b9c 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
@@ -40,7 +40,7 @@ public class CxfComponent extends HeaderFilterStrategyComponent implements SSLCo
@Metadata(label = "advanced")
private Boolean allowStreaming;
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
public CxfComponent() {
super(CxfEndpoint.class);
@@ -63,16 +63,16 @@ public class CxfComponent extends HeaderFilterStrategyComponent implements SSLCo
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
/**
@@ -134,7 +134,7 @@ public class CxfComponent extends HeaderFilterStrategyComponent implements SSLCo
// use global ssl config if set
if (result.getSslContextParameters() == null) {
- result.setSslContextParameters(getGlobalSSLContextParameters());
+ result.setSslContextParameters(retrieveGlobalSslContextParameters());
}
return result;
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
index 82b3a2d..abb61ee 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
@@ -42,7 +42,7 @@ public class CxfRsComponent extends HeaderFilterStrategyComponent implements SSL
private static final Logger LOG = LoggerFactory.getLogger(CxfRsComponent.class);
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
public CxfRsComponent() {
super(CxfRsEndpoint.class);
@@ -119,7 +119,7 @@ public class CxfRsComponent extends HeaderFilterStrategyComponent implements SSL
// use global ssl config if set
if (answer.getSslContextParameters() == null) {
- answer.setSslContextParameters(getGlobalSSLContextParameters());
+ answer.setSslContextParameters(retrieveGlobalSslContextParameters());
}
return answer;
@@ -132,15 +132,15 @@ public class CxfRsComponent extends HeaderFilterStrategyComponent implements SSL
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsGlobalSslProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsGlobalSslProducerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsGlobalSslProducerTest.java
index f9be03e..4509cd3 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsGlobalSslProducerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsGlobalSslProducerTest.java
@@ -55,7 +55,7 @@ public class CxfRsGlobalSslProducerTest extends CamelSpringTestSupport {
CamelContext context = super.createCamelContext();
SSLContextParameters parameters = context.getRegistry().lookupByNameAndType("mySslContext", SSLContextParameters.class);
context.setSSLContextParameters(parameters);
- ((SSLContextParametersAware) context.getComponent("cxfrs")).setUseGlobalSSLContextParameters(true);
+ ((SSLContextParametersAware) context.getComponent("cxfrs")).setUseGlobalSslContextParameters(true);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java
index 8310437..67b6f5b 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java
@@ -49,7 +49,7 @@ public class SslGlobalTest extends CamelSpringTestSupport {
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
SSLContextParameters parameters = context.getRegistry().lookupByNameAndType("mySslContext", SSLContextParameters.class);
- ((SSLContextParametersAware) context.getComponent("cxf")).setUseGlobalSSLContextParameters(true);
+ ((SSLContextParametersAware) context.getComponent("cxf")).setUseGlobalSslContextParameters(true);
context.setSSLContextParameters(parameters);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdComponent.java b/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdComponent.java
index 7322675..61fd875 100644
--- a/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdComponent.java
+++ b/components/camel-etcd/src/main/java/org/apache/camel/component/etcd/EtcdComponent.java
@@ -35,7 +35,7 @@ public class EtcdComponent extends DefaultComponent implements SSLContextParamet
@Metadata(label = "advanced")
private EtcdConfiguration configuration = new EtcdConfiguration();
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
public EtcdComponent() {
super();
@@ -109,16 +109,16 @@ public class EtcdComponent extends DefaultComponent implements SSLContextParamet
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
@Override
@@ -164,7 +164,7 @@ public class EtcdComponent extends DefaultComponent implements SSLContextParamet
setProperties(configuration, parameters);
if (configuration.getSslContextParameters() == null) {
- configuration.setSslContextParameters(getGlobalSSLContextParameters());
+ configuration.setSslContextParameters(retrieveGlobalSslContextParameters());
}
return configuration;
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsComponent.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsComponent.java
index 162f13f..60c9125 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsComponent.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpsComponent.java
@@ -36,7 +36,7 @@ import org.apache.commons.net.ftp.FTPFile;
public class FtpsComponent extends FtpComponent implements SSLContextParametersAware {
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
public FtpsComponent() {
setEndpointClass(FtpsEndpoint.class);
@@ -64,7 +64,7 @@ public class FtpsComponent extends FtpComponent implements SSLContextParametersA
extractAndSetFtpClientParameters(parameters, endpoint);
if (endpoint.getSslContextParameters() == null) {
- endpoint.setSslContextParameters(getGlobalSSLContextParameters());
+ endpoint.setSslContextParameters(retrieveGlobalSslContextParameters());
}
return endpoint;
@@ -95,16 +95,16 @@ public class FtpsComponent extends FtpComponent implements SSLContextParametersA
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpsExplicitSSLWithoutClientAuthAndGlobalSSLContextParametersTest.java
----------------------------------------------------------------------
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 69c7238..cdcfb46 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
@@ -39,7 +39,7 @@ public class FileToFtpsExplicitSSLWithoutClientAuthAndGlobalSSLContextParameters
sslContextParameters.setTrustManagers(tmp);
context.setSSLContextParameters(sslContextParameters);
- ((SSLContextParametersAware) context.getComponent("ftps")).setUseGlobalSSLContextParameters(true);
+ ((SSLContextParametersAware) context.getComponent("ftps")).setUseGlobalSslContextParameters(true);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
index 4f6089a..01c1730 100644
--- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
+++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
@@ -61,7 +61,7 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
@Metadata(label = "advanced")
protected HttpConnectionManager httpConnectionManager;
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
public HttpComponent() {
super(HttpEndpoint.class);
@@ -375,16 +375,16 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
index cf3f362..b465374 100644
--- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
+++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
@@ -86,7 +86,7 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
+ " If you need to use 2 or more different instances, you need to define a new HttpComponent per instance you need.")
protected SSLContextParameters sslContextParameters;
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
@Metadata(label = "security", description = "To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier.")
protected HostnameVerifier x509HostnameVerifier = new DefaultHostnameVerifier();
@Metadata(label = "producer", description = "To use a custom org.apache.http.client.CookieStore."
@@ -188,7 +188,7 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
sslContextParameters = getSslContextParameters();
}
if (sslContextParameters == null) {
- sslContextParameters = getGlobalSSLContextParameters();
+ sslContextParameters = retrieveGlobalSslContextParameters();
}
String httpMethodRestrict = getAndRemoveParameter(parameters, "httpMethodRestrict", String.class);
@@ -461,16 +461,16 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
public HostnameVerifier getX509HostnameVerifier() {
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
index d0c5f04..60b4de6 100644
--- a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
+++ b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
@@ -40,7 +40,7 @@ public class IrcComponent extends UriEndpointComponent implements SSLContextPara
private final transient Map<String, IRCConnection> connectionCache = new HashMap<String, IRCConnection>();
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
public IrcComponent() {
super(IrcEndpoint.class);
@@ -83,7 +83,7 @@ public class IrcComponent extends UriEndpointComponent implements SSLContextPara
SSLContextParameters sslParams = configuration.getSslContextParameters();
if (sslParams == null) {
- sslParams = getGlobalSSLContextParameters();
+ sslParams = retrieveGlobalSslContextParameters();
}
if (sslParams != null) {
@@ -154,15 +154,15 @@ public class IrcComponent extends UriEndpointComponent implements SSLContextPara
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 98076f1..71db799 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -129,7 +129,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent implements
protected Long continuationTimeout;
protected boolean useContinuation = true;
protected SSLContextParameters sslContextParameters;
- protected boolean useGlobalSSLContextParameters;
+ protected boolean useGlobalSslContextParameters;
protected Integer requestBufferSize;
protected Integer requestHeaderSize;
protected Integer responseBufferSize;
@@ -187,7 +187,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent implements
UrlRewrite urlRewrite = resolveAndRemoveReferenceParameter(parameters, "urlRewrite", UrlRewrite.class);
SSLContextParameters sslContextParameters = resolveAndRemoveReferenceParameter(parameters, "sslContextParameters", SSLContextParameters.class);
SSLContextParameters ssl = sslContextParameters != null ? sslContextParameters : this.sslContextParameters;
- ssl = ssl != null ? ssl : getGlobalSSLContextParameters();
+ ssl = ssl != null ? ssl : retrieveGlobalSslContextParameters();
String proxyHost = getAndRemoveParameter(parameters, "proxyHost", String.class, getProxyHost());
Integer proxyPort = getAndRemoveParameter(parameters, "proxyPort", Integer.class, getProxyPort());
Integer httpClientMinThreads = getAndRemoveParameter(parameters, "httpClientMinThreads", Integer.class, this.httpClientMinThreads);
@@ -951,8 +951,8 @@ public abstract class JettyHttpComponent extends HttpCommonComponent implements
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
@@ -960,8 +960,8 @@ public abstract class JettyHttpComponent extends HttpCommonComponent implements
*/
@Override
@Metadata(description = "Enable usage of global SSL context parameters", label = "security", defaultValue = "false")
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
public Integer getResponseBufferSize() {
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaComponent.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaComponent.java
index 3f83633..34b3fd5 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaComponent.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaComponent.java
@@ -33,7 +33,7 @@ public class KafkaComponent extends UriEndpointComponent implements SSLContextPa
@Metadata(label = "advanced")
private ExecutorService workerPool;
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
public KafkaComponent() {
super(KafkaEndpoint.class);
@@ -66,7 +66,7 @@ public class KafkaComponent extends UriEndpointComponent implements SSLContextPa
setProperties(endpoint, params);
if (endpoint.getConfiguration().getSslContextParameters() == null) {
- endpoint.getConfiguration().setSslContextParameters(getGlobalSSLContextParameters());
+ endpoint.getConfiguration().setSslContextParameters(retrieveGlobalSslContextParameters());
}
return endpoint;
@@ -115,16 +115,16 @@ public class KafkaComponent extends UriEndpointComponent implements SSLContextPa
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java
index ff782a8..d4b8378 100644
--- a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java
+++ b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackComponent.java
@@ -33,7 +33,7 @@ public class LumberjackComponent extends UriEndpointComponent implements SSLCont
@Metadata(label = "security")
private SSLContextParameters sslContextParameters;
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
public LumberjackComponent() {
this(LumberjackEndpoint.class);
@@ -62,7 +62,7 @@ public class LumberjackComponent extends UriEndpointComponent implements SSLCont
setProperties(answer, parameters);
if (answer.getSslContextParameters() == null) {
- answer.setSslContextParameters(getGlobalSSLContextParameters());
+ answer.setSslContextParameters(retrieveGlobalSslContextParameters());
}
return answer;
@@ -81,16 +81,16 @@ public class LumberjackComponent extends UriEndpointComponent implements SSLCont
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java
----------------------------------------------------------------------
diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java
index 11f2061..188e950 100644
--- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java
+++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentGlobalSSLTest.java
@@ -45,7 +45,7 @@ public class LumberjackComponentGlobalSSLTest extends CamelTestSupport {
CamelContext context = super.createCamelContext();
context.setSSLContextParameters(createServerSSLContextParameters());
LumberjackComponent component = (LumberjackComponent) context.getComponent("lumberjack");
- component.setUseGlobalSSLContextParameters(true);
+ component.setUseGlobalSslContextParameters(true);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
index 5ccf9d2..efc5c7b 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailComponent.java
@@ -42,7 +42,7 @@ public class MailComponent extends UriEndpointComponent implements SSLContextPar
@Metadata(label = "advanced")
private ContentTypeResolver contentTypeResolver;
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
public MailComponent() {
super(MailEndpoint.class);
@@ -103,7 +103,7 @@ public class MailComponent extends UriEndpointComponent implements SSLContextPar
// Use global ssl if present
if (endpoint.getConfiguration().getSslContextParameters() == null) {
- endpoint.getConfiguration().setSslContextParameters(getGlobalSSLContextParameters());
+ endpoint.getConfiguration().setSslContextParameters(retrieveGlobalSslContextParameters());
}
return endpoint;
@@ -153,15 +153,15 @@ public class MailComponent extends UriEndpointComponent implements SSLContextPar
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Component.java
----------------------------------------------------------------------
diff --git a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Component.java b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Component.java
index 7b93726..5eb6d09 100644
--- a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Component.java
+++ b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Component.java
@@ -38,7 +38,7 @@ public class Mina2Component extends UriEndpointComponent implements SSLContextPa
@Metadata(label = "advanced")
private Mina2Configuration configuration;
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
public Mina2Component() {
super(Mina2Endpoint.class);
@@ -71,7 +71,7 @@ public class Mina2Component extends UriEndpointComponent implements SSLContextPa
setProperties(config, parameters);
if (config.getSslContextParameters() == null) {
- config.setSslContextParameters(getGlobalSSLContextParameters());
+ config.setSslContextParameters(retrieveGlobalSslContextParameters());
}
return createEndpoint(uri, config);
@@ -121,16 +121,16 @@ public class Mina2Component extends UriEndpointComponent implements SSLContextPa
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslGlobalContextParametersTcpTest.java
----------------------------------------------------------------------
diff --git a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslGlobalContextParametersTcpTest.java b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslGlobalContextParametersTcpTest.java
index af4aa2d..2a2438f 100644
--- a/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslGlobalContextParametersTcpTest.java
+++ b/components/camel-mina2/src/test/java/org/apache/camel/component/mina2/Mina2SslGlobalContextParametersTcpTest.java
@@ -31,7 +31,7 @@ public class Mina2SslGlobalContextParametersTcpTest extends BaseMina2Test {
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
context.setSSLContextParameters(createSslContextParameters());
- ((SSLContextParametersAware) context.getComponent("mina2")).setUseGlobalSSLContextParameters(true);
+ ((SSLContextParametersAware) context.getComponent("mina2")).setUseGlobalSslContextParameters(true);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsComponent.java b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsComponent.java
index dd0072d..4607867 100644
--- a/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsComponent.java
+++ b/components/camel-nats/src/main/java/org/apache/camel/component/nats/NatsComponent.java
@@ -26,7 +26,7 @@ import org.apache.camel.spi.Metadata;
public class NatsComponent extends DefaultComponent implements SSLContextParametersAware {
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
@Override
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
@@ -35,7 +35,7 @@ public class NatsComponent extends DefaultComponent implements SSLContextParamet
config.setServers(remaining);
if (config.getSslContextParameters() == null) {
- config.setSslContextParameters(getGlobalSSLContextParameters());
+ config.setSslContextParameters(retrieveGlobalSslContextParameters());
}
NatsEndpoint endpoint = new NatsEndpoint(uri, this, config);
@@ -43,16 +43,16 @@ public class NatsComponent extends DefaultComponent implements SSLContextParamet
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
index 239622b..4954efe 100644
--- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
+++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
@@ -63,7 +63,7 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt
@Metadata(label = "security")
private NettyHttpSecurityConfiguration securityConfiguration;
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
public NettyHttpComponent() {
// use the http configuration and filter strategy
@@ -144,7 +144,7 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt
setProperties(config, parameters);
if (config.getSslContextParameters() == null) {
- config.setSslContextParameters(getGlobalSSLContextParameters());
+ config.setSslContextParameters(retrieveGlobalSslContextParameters());
}
// validate config
@@ -257,16 +257,16 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
public synchronized HttpServerConsumerChannelFactory getMultiplexChannelHandler(int port) {
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGlobalSSLTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGlobalSSLTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGlobalSSLTest.java
index a12c337..d8c7a66 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGlobalSSLTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGlobalSSLTest.java
@@ -78,7 +78,7 @@ public class NettyHttpGlobalSSLTest extends CamelTestSupport {
sslContextParameters.setTrustManagers(trustManagers);
context.setSSLContextParameters(sslContextParameters);
- ((SSLContextParametersAware) context.getComponent("netty-http")).setUseGlobalSSLContextParameters(true);
+ ((SSLContextParametersAware) context.getComponent("netty-http")).setUseGlobalSslContextParameters(true);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyComponent.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyComponent.java
index 9f87838..8a86a51 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyComponent.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyComponent.java
@@ -43,7 +43,7 @@ public class NettyComponent extends UriEndpointComponent implements SSLContextPa
@Metadata(label = "advanced", defaultValue = "16")
private int maximumPoolSize = 16;
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
public NettyComponent() {
super(NettyEndpoint.class);
@@ -77,7 +77,7 @@ public class NettyComponent extends UriEndpointComponent implements SSLContextPa
}
if (config.getSslContextParameters() == null) {
- config.setSslContextParameters(getGlobalSSLContextParameters());
+ config.setSslContextParameters(retrieveGlobalSslContextParameters());
}
// validate config
@@ -124,16 +124,16 @@ public class NettyComponent extends UriEndpointComponent implements SSLContextPa
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
public Timer getTimer() {
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyGlobalSSLContextParametersTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyGlobalSSLContextParametersTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyGlobalSSLContextParametersTest.java
index 61d8658..2020d2d 100644
--- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyGlobalSSLContextParametersTest.java
+++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyGlobalSSLContextParametersTest.java
@@ -58,7 +58,7 @@ public class NettyGlobalSSLContextParametersTest extends BaseNettyTest {
context.setSSLContextParameters(sslContextParameters);
- ((SSLContextParametersAware) context.getComponent("netty")).setUseGlobalSSLContextParameters(true);
+ ((SSLContextParametersAware) context.getComponent("netty")).setUseGlobalSslContextParameters(true);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
index b82ac5b..0475416 100644
--- a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
+++ b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
@@ -65,7 +65,7 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt
@Metadata(label = "security")
private NettyHttpSecurityConfiguration securityConfiguration;
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
public NettyHttpComponent() {
// use the http configuration and filter strategy
@@ -149,7 +149,7 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt
// set default ssl config
if (config.getSslContextParameters() == null) {
- config.setSslContextParameters(getGlobalSSLContextParameters());
+ config.setSslContextParameters(retrieveGlobalSslContextParameters());
}
// validate config
@@ -267,16 +267,16 @@ public class NettyHttpComponent extends NettyComponent implements HeaderFilterSt
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
public synchronized HttpServerConsumerChannelFactory getMultiplexChannelHandler(int port) {
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java
index 2e365e2..c5ddf67 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java
+++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyComponent.java
@@ -41,7 +41,7 @@ public class NettyComponent extends UriEndpointComponent implements SSLContextPa
@Metadata(label = "advanced")
private volatile EventExecutorGroup executorService;
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
public NettyComponent() {
super(NettyEndpoint.class);
@@ -88,7 +88,7 @@ public class NettyComponent extends UriEndpointComponent implements SSLContextPa
}
if (config.getSslContextParameters() == null) {
- config.setSslContextParameters(getGlobalSSLContextParameters());
+ config.setSslContextParameters(retrieveGlobalSslContextParameters());
}
// validate config
@@ -128,16 +128,16 @@ public class NettyComponent extends UriEndpointComponent implements SSLContextPa
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
public EventExecutorGroup getExecutorService() {
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyGlobalSSLContextParametersTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyGlobalSSLContextParametersTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyGlobalSSLContextParametersTest.java
index c469a52..c0babbe 100644
--- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyGlobalSSLContextParametersTest.java
+++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyGlobalSSLContextParametersTest.java
@@ -56,7 +56,7 @@ public class NettyGlobalSSLContextParametersTest extends BaseNettyTest {
sslContextParameters.setServerParameters(scsp);
context.setSSLContextParameters(sslContextParameters);
- ((SSLContextParametersAware) context.getComponent("netty4")).setUseGlobalSSLContextParameters(true);
+ ((SSLContextParametersAware) context.getComponent("netty4")).setUseGlobalSslContextParameters(true);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java
----------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java
index 6fd46d5..4e7973d 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java
@@ -41,7 +41,7 @@ import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
public class Olingo2Component extends AbstractApiComponent<Olingo2ApiName, Olingo2Configuration, Olingo2ApiCollection> implements SSLContextParametersAware {
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
// component level shared proxy
private Olingo2AppWrapper apiProxy;
@@ -129,16 +129,16 @@ public class Olingo2Component extends AbstractApiComponent<Olingo2ApiName, Oling
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
private Olingo2AppWrapper createOlingo2App(Olingo2Configuration configuration) {
@@ -163,7 +163,7 @@ public class Olingo2Component extends AbstractApiComponent<Olingo2ApiName, Oling
SSLContextParameters sslContextParameters = configuration.getSslContextParameters();
if (sslContextParameters == null) {
// use global ssl config
- sslContextParameters = getGlobalSSLContextParameters();
+ sslContextParameters = retrieveGlobalSslContextParameters();
}
if (sslContextParameters == null) {
// use defaults if not specified
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Component.java
----------------------------------------------------------------------
diff --git a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Component.java b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Component.java
index c8e1455..0f17d73 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Component.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Component.java
@@ -41,7 +41,7 @@ import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
public class Olingo4Component extends AbstractApiComponent<Olingo4ApiName, Olingo4Configuration, Olingo4ApiCollection> implements SSLContextParametersAware {
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
// component level shared proxy
private Olingo4AppWrapper apiProxy;
@@ -149,7 +149,7 @@ public class Olingo4Component extends AbstractApiComponent<Olingo4ApiName, Oling
SSLContextParameters sslContextParameters = configuration.getSslContextParameters();
if (sslContextParameters == null) {
// use global ssl config
- sslContextParameters = getGlobalSSLContextParameters();
+ sslContextParameters = retrieveGlobalSslContextParameters();
}
if (sslContextParameters == null) {
// use defaults if not specified
@@ -178,16 +178,16 @@ public class Olingo4Component extends AbstractApiComponent<Olingo4ApiName, Oling
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
public void closeApiProxy(Olingo4AppWrapper apiProxy) {
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
index 94095be..b3cc885 100644
--- a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
+++ b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
@@ -115,7 +115,7 @@ public class RestletComponent extends HeaderFilterStrategyComponent implements R
@Metadata(label = "advanced")
private List<String> enabledConverters;
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
public RestletComponent() {
this(new Component());
@@ -166,7 +166,7 @@ public class RestletComponent extends HeaderFilterStrategyComponent implements R
}
if (result.getSslContextParameters() == null) {
- result.setSslContextParameters(getGlobalSSLContextParameters());
+ result.setSslContextParameters(retrieveGlobalSslContextParameters());
}
return result;
@@ -731,16 +731,16 @@ public class RestletComponent extends HeaderFilterStrategyComponent implements R
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletHttpsWithGlobalSSLContextParametersTest.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletHttpsWithGlobalSSLContextParametersTest.java b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletHttpsWithGlobalSSLContextParametersTest.java
index 6511108..b549b26 100644
--- a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletHttpsWithGlobalSSLContextParametersTest.java
+++ b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletHttpsWithGlobalSSLContextParametersTest.java
@@ -55,7 +55,7 @@ public class RestletHttpsWithGlobalSSLContextParametersTest extends RestletTestS
context.setSSLContextParameters(sslContextParameters);
- ((SSLContextParametersAware) context.getComponent("restlet")).setUseGlobalSSLContextParameters(true);
+ ((SSLContextParametersAware) context.getComponent("restlet")).setUseGlobalSslContextParameters(true);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
index b138553..3147f53 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
@@ -134,7 +134,7 @@ public class SalesforceComponent extends DefaultComponent implements VerifiableC
label = "common,security")
private SSLContextParameters sslContextParameters;
@Metadata(description = "Enable usage of global SSL context parameters", label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
// Proxy host and port
@Metadata(description = "Hostname of the HTTP proxy server to use.", label = "common,proxy")
@@ -299,7 +299,7 @@ public class SalesforceComponent extends DefaultComponent implements VerifiableC
// set ssl context parameters if set
SSLContextParameters contextParameters = sslContextParameters;
if (contextParameters == null) {
- contextParameters = getGlobalSSLContextParameters();
+ contextParameters = retrieveGlobalSslContextParameters();
}
if (contextParameters == null) {
contextParameters = new SSLContextParameters();
@@ -528,13 +528,13 @@ public class SalesforceComponent extends DefaultComponent implements VerifiableC
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
public String getHttpProxyHost() {
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowComponent.java b/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowComponent.java
index af8fa9a..8a5ab9e 100644
--- a/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowComponent.java
+++ b/components/camel-servicenow/src/main/java/org/apache/camel/component/servicenow/ServiceNowComponent.java
@@ -37,7 +37,7 @@ public class ServiceNowComponent extends UriEndpointComponent implements Verifia
@Metadata(label = "advanced")
private ServiceNowConfiguration configuration;
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
public ServiceNowComponent() {
super(ServiceNowEndpoint.class);
@@ -82,7 +82,7 @@ public class ServiceNowComponent extends UriEndpointComponent implements Verifia
}
if (configuration.getSslContextParameters() == null) {
- configuration.setSslContextParameters(getGlobalSSLContextParameters());
+ configuration.setSslContextParameters(retrieveGlobalSslContextParameters());
}
return new ServiceNowEndpoint(uri, this, configuration, instanceName);
@@ -171,16 +171,16 @@ public class ServiceNowComponent extends UriEndpointComponent implements Verifia
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java
index a7249fe..f32532b 100644
--- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java
+++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java
@@ -50,7 +50,7 @@ public class SpringWebserviceComponent extends UriEndpointComponent implements S
private static final Logger LOG = LoggerFactory.getLogger(SpringWebserviceComponent.class);
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
public SpringWebserviceComponent() {
super(SpringWebserviceEndpoint.class);
@@ -76,7 +76,7 @@ public class SpringWebserviceComponent extends UriEndpointComponent implements S
configureMessageFilter(configuration);
if (configuration.getSslContextParameters() == null) {
- configuration.setSslContextParameters(getGlobalSSLContextParameters());
+ configuration.setSslContextParameters(retrieveGlobalSslContextParameters());
}
return new SpringWebserviceEndpoint(this, uri, configuration);
@@ -190,16 +190,16 @@ public class SpringWebserviceComponent extends UriEndpointComponent implements S
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java
index 3b6854d..6519e7d 100644
--- a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java
+++ b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java
@@ -34,7 +34,7 @@ public class StompComponent extends UriEndpointComponent implements SSLContextPa
private String passcode;
private String host;
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
public StompComponent() {
super(StompEndpoint.class);
@@ -53,7 +53,7 @@ public class StompComponent extends UriEndpointComponent implements SSLContextPa
setProperties(endpoint, parameters);
if (config.getSslContextParameters() == null) {
- config.setSslContextParameters(getGlobalSSLContextParameters());
+ config.setSslContextParameters(retrieveGlobalSslContextParameters());
}
return endpoint;
@@ -99,16 +99,16 @@ public class StompComponent extends UriEndpointComponent implements SSLContextPa
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompGlobalSslConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompGlobalSslConsumerTest.java b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompGlobalSslConsumerTest.java
index aa1d942..7245243 100644
--- a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompGlobalSslConsumerTest.java
+++ b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompGlobalSslConsumerTest.java
@@ -27,7 +27,7 @@ public class StompGlobalSslConsumerTest extends StompConsumerTest {
CamelContext context = super.createCamelContext();
context.setSSLContextParameters(getClientSSLContextParameters());
- ((SSLContextParametersAware) context.getComponent("stomp")).setUseGlobalSSLContextParameters(true);
+ ((SSLContextParametersAware) context.getComponent("stomp")).setUseGlobalSslContextParameters(true);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
index 3c57475..22b2b66 100644
--- a/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
+++ b/components/camel-undertow/src/main/java/org/apache/camel/component/undertow/UndertowComponent.java
@@ -66,7 +66,7 @@ public class UndertowComponent extends DefaultComponent implements RestConsumerF
@Metadata(label = "security")
private SSLContextParameters sslContextParameters;
@Metadata(label = "security", defaultValue = "false")
- private boolean useGlobalSSLContextParameters;
+ private boolean useGlobalSslContextParameters;
@Metadata(label = "advanced")
private UndertowHostOptions hostOptions;
@@ -88,7 +88,7 @@ public class UndertowComponent extends DefaultComponent implements RestConsumerF
// determine sslContextParameters
SSLContextParameters sslParams = this.sslContextParameters;
if (sslParams == null) {
- sslParams = getGlobalSSLContextParameters();
+ sslParams = retrieveGlobalSslContextParameters();
}
// create the endpoint first
@@ -334,16 +334,16 @@ public class UndertowComponent extends DefaultComponent implements RestConsumerF
}
@Override
- public boolean isUseGlobalSSLContextParameters() {
- return this.useGlobalSSLContextParameters;
+ public boolean isUseGlobalSslContextParameters() {
+ return this.useGlobalSslContextParameters;
}
/**
* Enable usage of global SSL context parameters.
*/
@Override
- public void setUseGlobalSSLContextParameters(boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ public void setUseGlobalSslContextParameters(boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
public UndertowHostOptions getHostOptions() {