You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/01/18 10:52:39 UTC
[camel] branch master updated: Fixed CS for camel-http4
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 0726840 Fixed CS for camel-http4
0726840 is described below
commit 07268408b3884a350917a4492c0be73f9a96904a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jan 18 11:52:20 2019 +0100
Fixed CS for camel-http4
---
.../main/java/org/apache/camel/component/http4/HttpComponent.java | 3 ++-
.../java/org/apache/camel/component/http4/HttpPollingConsumer.java | 4 ++--
.../main/java/org/apache/camel/component/http4/HttpProducer.java | 6 +++---
.../apache/camel/component/http4/HttpCustomComponentNameTest.java | 2 +-
.../http4/HttpsTwoComponentsSslContextParametersGetTest.java | 2 +-
5 files changed, 9 insertions(+), 8 deletions(-)
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 afee58d..0b46278 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
@@ -164,7 +164,8 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa
return CompositeHttpConfigurer.combineConfigurers(configurer, new BasicAuthenticationHttpClientConfigurer(authUsername, authPassword, authDomain, authHost));
} else if (this.httpConfiguration != null) {
if ("basic".equalsIgnoreCase(this.httpConfiguration.getAuthMethod())) {
- return CompositeHttpConfigurer.combineConfigurers(configurer, new BasicAuthenticationHttpClientConfigurer(this.httpConfiguration.getAuthUsername(), this.httpConfiguration.getAuthPassword(), this.httpConfiguration.getAuthDomain(), this.httpConfiguration.getAuthHost()));
+ return CompositeHttpConfigurer.combineConfigurers(configurer, new BasicAuthenticationHttpClientConfigurer(this.httpConfiguration.getAuthUsername(),
+ this.httpConfiguration.getAuthPassword(), this.httpConfiguration.getAuthDomain(), this.httpConfiguration.getAuthHost()));
}
}
diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java
index 52fd926..d82ac4a 100644
--- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java
+++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java
@@ -22,8 +22,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.http.common.HttpHelper;
-import org.apache.camel.support.PollingConsumerSupport;
import org.apache.camel.spi.HeaderFilterStrategy;
+import org.apache.camel.support.PollingConsumerSupport;
import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
@@ -169,4 +169,4 @@ public class HttpPollingConsumer extends PollingConsumerSupport {
protected void doStop() throws Exception {
}
-}
\ No newline at end of file
+}
diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
index eed7d50..d59f090 100644
--- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
+++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
@@ -44,14 +44,14 @@ import org.apache.camel.converter.stream.CachedOutputStream;
import org.apache.camel.http.common.HttpHelper;
import org.apache.camel.http.common.HttpOperationFailedException;
import org.apache.camel.http.common.HttpProtocolHeaderFilterStrategy;
-import org.apache.camel.support.DefaultProducer;
import org.apache.camel.spi.HeaderFilterStrategy;
-import org.apache.camel.support.SynchronizationAdapter;
+import org.apache.camel.support.DefaultProducer;
import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.GZIPHelper;
-import org.apache.camel.util.IOHelper;
import org.apache.camel.support.MessageHelper;
import org.apache.camel.support.ObjectHelper;
+import org.apache.camel.support.SynchronizationAdapter;
+import org.apache.camel.util.IOHelper;
import org.apache.camel.util.URISupport;
import org.apache.http.Header;
import org.apache.http.HttpEntity;
diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpCustomComponentNameTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpCustomComponentNameTest.java
index 7dfeb33..0c093bd 100644
--- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpCustomComponentNameTest.java
+++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpCustomComponentNameTest.java
@@ -18,9 +18,9 @@ package org.apache.camel.component.http4;
import org.apache.camel.Component;
import org.apache.camel.Endpoint;
+import org.apache.camel.support.ServiceHelper;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.camel.support.ServiceHelper;
import org.junit.Test;
public class HttpCustomComponentNameTest extends CamelTestSupport {
diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java
index a2da530..ecfa531 100644
--- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java
+++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsTwoComponentsSslContextParametersGetTest.java
@@ -18,8 +18,8 @@ package org.apache.camel.component.http4;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.support.jsse.SSLContextParameters;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.apache.http.impl.bootstrap.HttpServer;
import org.apache.http.impl.bootstrap.ServerBootstrap;