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:04 UTC
[08/13] camel git commit: CAMEL-10650: renaming common methods
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
index d69706b..c1753cf 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
@@ -67,7 +67,7 @@ public class WebsocketComponent extends UriEndpointComponent implements SSLConte
@Metadata(label = "security")
protected SSLContextParameters sslContextParameters;
@Metadata(label = "security", defaultValue = "false")
- protected boolean useGlobalSSLContextParameters;
+ protected boolean useGlobalSslContextParameters;
@Metadata(label = "advanced")
protected ThreadPool threadPool;
@Metadata(defaultValue = "9292")
@@ -300,7 +300,7 @@ public class WebsocketComponent extends UriEndpointComponent implements SSLConte
sslContextParameters = getSslContextParameters();
}
if (sslContextParameters == null) {
- sslContextParameters = getGlobalSSLContextParameters();
+ sslContextParameters = retrieveGlobalSslContextParameters();
}
// prefer to use endpoint configured over component configured
@@ -735,16 +735,16 @@ public class WebsocketComponent extends UriEndpointComponent implements SSLConte
}
@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 Map<String, WebSocketFactory> getSocketFactory() {
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
index 7dee865..ebd2242 100644
--- a/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
+++ b/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketSSLContextGlobalRouteExampleTest.java
@@ -96,7 +96,7 @@ public class WebsocketSSLContextGlobalRouteExampleTest extends CamelTestSupport
sslContextParameters.setServerParameters(scsp);
context.setSSLContextParameters(sslContextParameters);
- ((SSLContextParametersAware) context.getComponent("websocket")).setUseGlobalSSLContextParameters(true);
+ ((SSLContextParametersAware) context.getComponent("websocket")).setUseGlobalSslContextParameters(true);
return context;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/1f3c10ed/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
index c0c7a25..e06efc2 100644
--- a/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
@@ -65,7 +65,7 @@ public class HttpComponentConfiguration {
/**
* Enable usage of global SSL context parameters.
*/
- private Boolean useGlobalSSLContextParameters = false;
+ private Boolean useGlobalSslContextParameters = false;
/**
* To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
* header to and from Camel message.
@@ -122,12 +122,12 @@ public class HttpComponentConfiguration {
}
public Boolean getUseGlobalSSLContextParameters() {
- return useGlobalSSLContextParameters;
+ return useGlobalSslContextParameters;
}
public void setUseGlobalSSLContextParameters(
- Boolean useGlobalSSLContextParameters) {
- this.useGlobalSSLContextParameters = useGlobalSSLContextParameters;
+ Boolean useGlobalSslContextParameters) {
+ this.useGlobalSslContextParameters = useGlobalSslContextParameters;
}
public HeaderFilterStrategy getHeaderFilterStrategy() {