You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/05/26 15:38:41 UTC
svn commit: r778701 - in
/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http:
CompositeHttpConfigurer.java HttpComponent.java
ProxyHttpClientConfigurer.java
Author: ningjiang
Date: Tue May 26 13:38:41 2009
New Revision: 778701
URL: http://svn.apache.org/viewvc?rev=778701&view=rev
Log:
CAMEL-1599 Fixed the cs errors
Modified:
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CompositeHttpConfigurer.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/ProxyHttpClientConfigurer.java
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CompositeHttpConfigurer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CompositeHttpConfigurer.java?rev=778701&r1=778700&r2=778701&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CompositeHttpConfigurer.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/CompositeHttpConfigurer.java Tue May 26 13:38:41 2009
@@ -36,7 +36,7 @@
}
public void configureHttpClient(HttpClient client) {
- for(HttpClientConfigurer configurer : configurers) {
+ for (HttpClientConfigurer configurer : configurers) {
configurer.configureHttpClient(client);
}
}
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java?rev=778701&r1=778700&r2=778701&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java Tue May 26 13:38:41 2009
@@ -93,17 +93,15 @@
String host = getAndRemoveParameter(parameters, "proxyHost", String.class);
Integer port = getAndRemoveParameter(parameters, "proxyPort", Integer.class);
if (host != null && port != null) {
- String proxyUsername = getAndRemoveParameter(parameters, "proxyUsername", String.class);
+ String proxyUsername = getAndRemoveParameter(parameters, "proxyUsername", String.class);
String proxyPassword = getAndRemoveParameter(parameters, "proxyPassword", String.class);
- if(proxyUsername!=null && proxyPassword!=null){
- httpClientConfigurer = CompositeHttpConfigurer.combineConfigurers(
- httpClientConfigurer,
- new ProxyHttpClientConfigurer(host, port, proxyUsername, proxyPassword));
- } else {
- httpClientConfigurer = CompositeHttpConfigurer.combineConfigurers(
- httpClientConfigurer,
- new ProxyHttpClientConfigurer(host, port));
- }
+ if (proxyUsername != null && proxyPassword != null) {
+ httpClientConfigurer = CompositeHttpConfigurer.combineConfigurers(
+ httpClientConfigurer, new ProxyHttpClientConfigurer(host, port, proxyUsername, proxyPassword));
+ } else {
+ httpClientConfigurer = CompositeHttpConfigurer.combineConfigurers(
+ httpClientConfigurer, new ProxyHttpClientConfigurer(host, port));
+ }
}
matchOnUriPrefix = Boolean.parseBoolean(getAndRemoveParameter(parameters, "matchOnUriPrefix", String.class));
}
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/ProxyHttpClientConfigurer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/ProxyHttpClientConfigurer.java?rev=778701&r1=778700&r2=778701&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/ProxyHttpClientConfigurer.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/ProxyHttpClientConfigurer.java Tue May 26 13:38:41 2009
@@ -44,13 +44,13 @@
this.username = username;
this.password = password;
}
-
- public void configureHttpClient(HttpClient client) {
- client.getHostConfiguration().setProxy(host, port);
-
- if(username!=null && password!=null){
- Credentials defaultcreds = new UsernamePasswordCredentials(username, password);
- client.getState().setProxyCredentials(AuthScope.ANY, defaultcreds);
- }
- }
+
+ public void configureHttpClient(HttpClient client) {
+ client.getHostConfiguration().setProxy(host, port);
+
+ if (username != null && password != null) {
+ Credentials defaultcreds = new UsernamePasswordCredentials(username, password);
+ client.getState().setProxyCredentials(AuthScope.ANY, defaultcreds);
+ }
+ }
}