camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [2/2] camel git commit: CAMEL-10764: Regen code
Date Mon, 30 Jan 2017 14:59:24 GMT
CAMEL-10764: Regen code


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bdf9f5da
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bdf9f5da
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bdf9f5da

Branch: refs/heads/master
Commit: bdf9f5dad3cbca618764ac521663f4932c1f9175
Parents: bcc9917
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Mon Jan 30 15:59:14 2017 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Mon Jan 30 15:59:14 2017 +0100

----------------------------------------------------------------------
 .../camel-http4/src/main/docs/http4-component.adoc   |  4 ++--
 .../http4/springboot/HttpComponentConfiguration.java | 15 ++++++---------
 2 files changed, 8 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/bdf9f5da/components/camel-http4/src/main/docs/http4-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/main/docs/http4-component.adoc b/components/camel-http4/src/main/docs/http4-component.adoc
index 318b596..4c2a57c 100644
--- a/components/camel-http4/src/main/docs/http4-component.adoc
+++ b/components/camel-http4/src/main/docs/http4-component.adoc
@@ -66,7 +66,7 @@ The HTTP4 component supports 13 options which are listed below.
 | allowJavaSerializedObject | producer | false | boolean | Whether to allow java serialization
when a request uses context-type=application/x-java-serialized-object This is by default turned
off. If you enable this then be aware that Java will deserialize the incoming data from the
request to Java and that can be a potential security risk.
 | httpContext | advanced |  | HttpContext | To use a custom org.apache.http.protocol.HttpContext
when executing requests.
 | sslContextParameters | security |  | SSLContextParameters | To configure security using
SSLContextParameters. Important: Only one instance of org.apache.camel.util.jsse.SSLContextParameters
is supported per HttpComponent. If you need to use 2 or more different instances you need
to define a new HttpComponent per instance you need.
-| x509HostnameVerifier | security |  | X509HostnameVerifier | To use a custom X509HostnameVerifier
such as org.apache.http.conn.ssl.StrictHostnameVerifier or org.apache.http.conn.ssl.AllowAllHostnameVerifier.
+| x509HostnameVerifier | security |  | HostnameVerifier | To use a custom X509HostnameVerifier
such as DefaultHostnameVerifier or org.apache.http.conn.ssl.NoopHostnameVerifier.
 | maxTotalConnections | advanced | 200 | int | The maximum number of connections.
 | connectionsPerRoute | advanced | 20 | int | The maximum number of connections per route.
 | connectionTimeToLive | advanced |  | long | The time for connection to live the time unit
is millisecond the default value is always keep alive.
@@ -650,4 +650,4 @@ property.
    <property name="sslContextParameters" ref="sslContextParams2"/>
    <property name="x509HostnameVerifier" ref="hostnameVerifier"/>
 </bean>
-----------------------------------------------------------------------------
\ No newline at end of file
+----------------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/camel/blob/bdf9f5da/platforms/spring-boot/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentConfiguration.java
b/platforms/spring-boot/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentConfiguration.java
index ee1dfc5..12faaf6 100644
--- a/platforms/spring-boot/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-http4-starter/src/main/java/org/apache/camel/component/http4/springboot/HttpComponentConfiguration.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.http4.springboot;
 
+import javax.net.ssl.HostnameVerifier;
 import org.apache.camel.component.http4.HttpClientConfigurer;
 import org.apache.camel.http.common.HttpBinding;
 import org.apache.camel.http.common.HttpConfiguration;
@@ -23,7 +24,6 @@ import org.apache.camel.spi.HeaderFilterStrategy;
 import org.apache.camel.util.jsse.SSLContextParameters;
 import org.apache.http.client.CookieStore;
 import org.apache.http.conn.HttpClientConnectionManager;
-import org.apache.http.conn.ssl.X509HostnameVerifier;
 import org.apache.http.protocol.HttpContext;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
@@ -81,12 +81,10 @@ public class HttpComponentConfiguration {
     @NestedConfigurationProperty
     private SSLContextParameters sslContextParameters;
     /**
-     * To use a custom X509HostnameVerifier such as
-     * org.apache.http.conn.ssl.StrictHostnameVerifier or
-     * org.apache.http.conn.ssl.AllowAllHostnameVerifier.
+     * To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or
+     * org.apache.http.conn.ssl.NoopHostnameVerifier.
      */
-    @NestedConfigurationProperty
-    private X509HostnameVerifier x509HostnameVerifier;
+    private HostnameVerifier x509HostnameVerifier;
     /**
      * The maximum number of connections.
      */
@@ -175,12 +173,11 @@ public class HttpComponentConfiguration {
         this.sslContextParameters = sslContextParameters;
     }
 
-    public X509HostnameVerifier getX509HostnameVerifier() {
+    public HostnameVerifier getX509HostnameVerifier() {
         return x509HostnameVerifier;
     }
 
-    public void setX509HostnameVerifier(
-            X509HostnameVerifier x509HostnameVerifier) {
+    public void setX509HostnameVerifier(HostnameVerifier x509HostnameVerifier) {
         this.x509HostnameVerifier = x509HostnameVerifier;
     }
 


Mime
View raw message