You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2013/05/25 18:59:12 UTC
git commit: CAMEL-6076: deprecate the xxxRef options and provide the
xxx option if it not exists yet - work in progress
Updated Branches:
refs/heads/master 24da11232 -> 70b8b2105
CAMEL-6076: deprecate the xxxRef options and provide the xxx option if it not exists yet - work in progress
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/70b8b210
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/70b8b210
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/70b8b210
Branch: refs/heads/master
Commit: 70b8b210562eb5f3645df159faca581ebb02ed0e
Parents: 24da112
Author: cmueller <cm...@apache.org>
Authored: Sat May 25 18:58:47 2013 +0200
Committer: cmueller <cm...@apache.org>
Committed: Sat May 25 18:58:47 2013 +0200
----------------------------------------------------------------------
.../apache/camel/component/http/HttpComponent.java | 2 ++
.../camel/component/http4/HttpComponent.java | 10 +++++++++-
2 files changed, 11 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/70b8b210/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 0ba9621..1f2657c 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
@@ -73,6 +73,7 @@ public class HttpComponent extends HeaderFilterStrategyComponent {
*/
protected HttpClientConfigurer createHttpClientConfigurer(Map<String, Object> parameters, Set<AuthMethod> authMethods) {
// prefer to use endpoint configured over component configured
+ // TODO cmueller: remove the "httpClientConfigurerRef" look up in Camel 3.0
HttpClientConfigurer configurer = resolveAndRemoveReferenceParameter(parameters, "httpClientConfigurerRef", HttpClientConfigurer.class);
if (configurer == null) {
// try without ref
@@ -203,6 +204,7 @@ public class HttpComponent extends HeaderFilterStrategyComponent {
}
Map<String, Object> httpClientParameters = new HashMap<String, Object>(parameters);
// must extract well known parameters before we create the endpoint
+ // TODO cmueller: remove the "httpBindingRef" look up in Camel 3.0
HttpBinding binding = resolveAndRemoveReferenceParameter(parameters, "httpBindingRef", HttpBinding.class);
if (binding == null) {
// try without ref
http://git-wip-us.apache.org/repos/asf/camel/blob/70b8b210/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 9d39b8a..f860faa 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
@@ -99,6 +99,7 @@ public class HttpComponent extends HeaderFilterStrategyComponent {
*/
protected HttpClientConfigurer createHttpClientConfigurer(Map<String, Object> parameters, boolean secure) throws Exception {
// prefer to use endpoint configured over component configured
+ // TODO cmueller: remove the "httpClientConfigurerRef" look up in Camel 3.0
HttpClientConfigurer configurer = resolveAndRemoveReferenceParameter(parameters, "httpClientConfigurerRef", HttpClientConfigurer.class);
if (configurer == null) {
// try without ref
@@ -172,16 +173,19 @@ public class HttpComponent extends HeaderFilterStrategyComponent {
// validate that we could resolve all httpClient. parameters as this component is lenient
validateParameters(uri, parameters, "httpClient.");
+ // TODO cmueller: remove the "httpBindingRef" look up in Camel 3.0
HttpBinding httpBinding = resolveAndRemoveReferenceParameter(parameters, "httpBindingRef", HttpBinding.class);
if (httpBinding == null) {
httpBinding = resolveAndRemoveReferenceParameter(parameters, "httpBinding", HttpBinding.class);
}
+ // TODO cmueller: remove the "httpClientConfigurerRef" look up in Camel 3.0
HttpClientConfigurer httpClientConfigurer = resolveAndRemoveReferenceParameter(parameters, "httpClientConfigurerRef", HttpClientConfigurer.class);
if (httpClientConfigurer == null) {
httpClientConfigurer = resolveAndRemoveReferenceParameter(parameters, "httpClientConfigurer", HttpClientConfigurer.class);
}
+ // TODO cmueller: remove the "httpContextRef" look up in Camel 3.0
HttpContext httpContext = resolveAndRemoveReferenceParameter(parameters, "httpContextRef", HttpContext.class);
if (httpContext == null) {
httpContext = resolveAndRemoveReferenceParameter(parameters, "httpContext", HttpContext.class);
@@ -191,9 +195,13 @@ public class HttpComponent extends HeaderFilterStrategyComponent {
if (x509HostnameVerifier == null) {
x509HostnameVerifier = getX509HostnameVerifier();
}
-
+
+ // TODO cmueller: remove the "sslContextParametersRef" look up in Camel 3.0
SSLContextParameters sslContextParameters = resolveAndRemoveReferenceParameter(parameters, "sslContextParametersRef", SSLContextParameters.class);
if (sslContextParameters == null) {
+ sslContextParameters = resolveAndRemoveReferenceParameter(parameters, "sslContextParameters", SSLContextParameters.class);
+ }
+ if (sslContextParameters == null) {
sslContextParameters = getSslContextParameters();
}
String httpMethodRestrict = getAndRemoveParameter(parameters, "httpMethodRestrict", String.class);