You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dh...@apache.org on 2014/10/24 23:43:44 UTC
[5/5] git commit: CAMEL-7934: Updated Camel-olingo2 to use
SSLContextParameters
CAMEL-7934: Updated Camel-olingo2 to use SSLContextParameters
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bc5bfe46
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bc5bfe46
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bc5bfe46
Branch: refs/heads/master
Commit: bc5bfe46a76c6b1d18537639cac5625412f00622
Parents: b4573e3
Author: Dhiraj Bokde <dh...@yahoo.com>
Authored: Fri Oct 24 13:37:59 2014 -0700
Committer: Dhiraj Bokde <dh...@yahoo.com>
Committed: Fri Oct 24 14:43:16 2014 -0700
----------------------------------------------------------------------
.../component/olingo2/Olingo2Component.java | 19 +++++++++++++++----
.../component/olingo2/Olingo2Configuration.java | 16 ++++++++--------
2 files changed, 23 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bc5bfe46/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 866817f..69faa56 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
@@ -16,8 +16,9 @@
*/
package org.apache.camel.component.olingo2;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
import java.util.Map;
-import javax.net.ssl.SSLContext;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
@@ -25,7 +26,9 @@ import org.apache.camel.component.olingo2.api.impl.Olingo2AppImpl;
import org.apache.camel.component.olingo2.internal.Olingo2ApiCollection;
import org.apache.camel.component.olingo2.internal.Olingo2ApiName;
import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.component.AbstractApiComponent;
+import org.apache.camel.util.jsse.SSLContextParameters;
import org.apache.http.HttpHost;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
@@ -122,9 +125,17 @@ public class Olingo2Component extends AbstractApiComponent<Olingo2ApiName, Oling
// set default request config
clientBuilder.setDefaultRequestConfig(requestConfigBuilder.build());
- final SSLContext context = configuration.getSslContext();
- if (context != null) {
- clientBuilder.setSSLContext(context);
+ SSLContextParameters sslContextParameters = configuration.getSslContextParameters();
+ if (sslContextParameters == null) {
+ // use defaults if not specified
+ sslContextParameters = new SSLContextParameters();
+ }
+ try {
+ clientBuilder.setSSLContext(sslContextParameters.createSSLContext());
+ } catch (GeneralSecurityException e) {
+ throw ObjectHelper.wrapRuntimeCamelException(e);
+ } catch (IOException e) {
+ throw ObjectHelper.wrapRuntimeCamelException(e);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/bc5bfe46/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Configuration.java
----------------------------------------------------------------------
diff --git a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Configuration.java b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Configuration.java
index e6ec348..2e2771f 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Configuration.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Configuration.java
@@ -17,10 +17,10 @@
package org.apache.camel.component.olingo2;
import java.util.Map;
-import javax.net.ssl.SSLContext;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
+import org.apache.camel.util.jsse.SSLContextParameters;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.http.HttpHost;
import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
@@ -55,7 +55,7 @@ public class Olingo2Configuration {
private HttpHost proxy;
@UriParam
- private SSLContext sslContext;
+ private SSLContextParameters sslContextParameters;
// for more complex configuration, use a client builder
@UriParam
@@ -109,12 +109,12 @@ public class Olingo2Configuration {
this.proxy = proxy;
}
- public SSLContext getSslContext() {
- return sslContext;
+ public SSLContextParameters getSslContextParameters() {
+ return sslContextParameters;
}
- public void setSslContext(SSLContext sslContext) {
- this.sslContext = sslContext;
+ public void setSslContextParameters(SSLContextParameters sslContextParameters) {
+ this.sslContextParameters = sslContextParameters;
}
public HttpAsyncClientBuilder getHttpAsyncClientBuilder() {
@@ -134,7 +134,7 @@ public class Olingo2Configuration {
.append(connectTimeout)
.append(socketTimeout)
.append(proxy)
- .append(sslContext)
+ .append(sslContextParameters)
.append(httpAsyncClientBuilder)
.hashCode();
}
@@ -149,7 +149,7 @@ public class Olingo2Configuration {
&& connectTimeout == other.connectTimeout
&& socketTimeout == other.socketTimeout
&& proxy == null ? other.proxy == null : proxy.equals(other.proxy)
- && sslContext == null ? other.sslContext == null : sslContext.equals(other.sslContext)
+ && sslContextParameters == null ? other.sslContextParameters == null : sslContextParameters.equals(other.sslContextParameters)
&& httpAsyncClientBuilder == null ? other.httpAsyncClientBuilder == null
: httpAsyncClientBuilder.equals(other.httpAsyncClientBuilder);
}