CAMEL-10040 camel-ahc - Upgrade AHC client to 2.x - Fixed CS and little fixes
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/801ff094 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/801ff094 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/801ff094 Branch: refs/heads/master Commit: 801ff094a9f28b3275f193536a0bc4df4a54d1a5 Parents: 8f23f17 Author: Andrea Cosentino <anco...@gmail.com> Authored: Tue Jun 28 15:20:06 2016 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Tue Jun 28 19:22:26 2016 +0200 ---------------------------------------------------------------------- .../camel/component/ahc/AhcComponent.java | 4 ++-- .../apache/camel/component/ahc/AhcEndpoint.java | 10 ++++----- .../apache/camel/component/ahc/AhcProducer.java | 22 ++++++++++---------- .../camel/component/ahc/DefaultAhcBinding.java | 4 ++-- 4 files changed, 20 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/801ff094/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java index 24e7f70..6577c60 100644 --- a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java +++ b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcComponent.java @@ -188,14 +188,14 @@ public class AhcComponent extends HeaderFilterStrategyComponent { } /** - * Creates a new client configuration builder using {@code clientConfig} as a template for + * Creates a new client configuration builder using {@code DefaultAsyncHttpClientConfig} as a template for * the builder. * * @param clientConfig the instance to serve as a template for the builder * @return a builder configured with the same options as the supplied config */ static DefaultAsyncHttpClientConfig.Builder cloneConfig(AsyncHttpClientConfig clientConfig) { - DefaultAsyncHttpClientConfig.Builder builder = new DefaultAsyncHttpClientConfig.Builder(clientConfig); + DefaultAsyncHttpClientConfig.Builder builder = new DefaultAsyncHttpClientConfig.Builder(clientConfig); return builder; } } http://git-wip-us.apache.org/repos/asf/camel/blob/801ff094/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcEndpoint.java b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcEndpoint.java index e996379..0afc438 100644 --- a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcEndpoint.java +++ b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcEndpoint.java @@ -20,6 +20,9 @@ import java.net.URI; import java.util.Map; import javax.net.ssl.SSLContext; +import io.netty.handler.ssl.ClientAuth; +import io.netty.handler.ssl.JdkSslContext; + import org.apache.camel.AsyncEndpoint; import org.apache.camel.Consumer; import org.apache.camel.Processor; @@ -38,9 +41,6 @@ import org.asynchttpclient.AsyncHttpClientConfig; import org.asynchttpclient.DefaultAsyncHttpClient; import org.asynchttpclient.DefaultAsyncHttpClientConfig; -import io.netty.handler.ssl.ClientAuth; -import io.netty.handler.ssl.JdkSslContext; - /** * To call external HTTP services using <a href="http://github.com/sonatype/async-http-client";>Async Http Client</a>. */ @@ -260,7 +260,7 @@ public class AhcEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade if (sslContextParameters != null) { SSLContext sslContext = sslContextParameters.createSSLContext(getCamelContext()); - JdkSslContext ssl = new JdkSslContext(sslContext, true, ClientAuth.NONE); + JdkSslContext ssl = new JdkSslContext(sslContext, true, ClientAuth.REQUIRE); builder.setSslContext(ssl); } @@ -269,7 +269,7 @@ public class AhcEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade if (sslContextParameters != null) { DefaultAsyncHttpClientConfig.Builder builder = new DefaultAsyncHttpClientConfig.Builder(); SSLContext sslContext = sslContextParameters.createSSLContext(getCamelContext()); - JdkSslContext ssl = new JdkSslContext(sslContext, true, ClientAuth.NONE); + JdkSslContext ssl = new JdkSslContext(sslContext, true, ClientAuth.REQUIRE); builder.setSslContext(ssl); config = builder.build(); } http://git-wip-us.apache.org/repos/asf/camel/blob/801ff094/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcProducer.java b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcProducer.java index 91356b5..77fe61d 100644 --- a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcProducer.java +++ b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcProducer.java @@ -115,9 +115,9 @@ public class AhcProducer extends DefaultAsyncProducer { return "AhcAsyncHandler for exchangeId: " + exchange.getExchangeId() + " -> " + url; } - @Override - public State onBodyPartReceived(HttpResponseBodyPart bodyPart) - throws Exception { + @Override + public State onBodyPartReceived(HttpResponseBodyPart bodyPart) + throws Exception { // write body parts to stream, which we will bind to the Camel Exchange in onComplete os.write(bodyPart.getBodyPartBytes()); if (log.isTraceEnabled()) { @@ -125,11 +125,11 @@ public class AhcProducer extends DefaultAsyncProducer { } contentLength += bodyPart.length(); return State.CONTINUE; - } + } - @Override - public State onStatusReceived(HttpResponseStatus responseStatus) - throws Exception { + @Override + public State onStatusReceived(HttpResponseStatus responseStatus) + throws Exception { if (log.isTraceEnabled()) { log.trace("{} onStatusReceived {}", exchange.getExchangeId(), responseStatus); } @@ -141,10 +141,10 @@ public class AhcProducer extends DefaultAsyncProducer { exchange.setException(e); } return State.CONTINUE; - } + } - @Override - public State onHeadersReceived(HttpResponseHeaders headers) throws Exception { + @Override + public State onHeadersReceived(HttpResponseHeaders headers) throws Exception { if (log.isTraceEnabled()) { log.trace("{} onHeadersReceived {}", exchange.getExchangeId(), headers); } @@ -154,7 +154,7 @@ public class AhcProducer extends DefaultAsyncProducer { exchange.setException(e); } return State.CONTINUE; - } + } } } http://git-wip-us.apache.org/repos/asf/camel/blob/801ff094/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java ---------------------------------------------------------------------- diff --git a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java index 5f3aefd..c1346b2 100644 --- a/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java +++ b/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/DefaultAhcBinding.java @@ -210,11 +210,11 @@ public class DefaultAhcBinding implements AhcBinding { @Override public void onHeadersReceived(AhcEndpoint endpoint, Exchange exchange, HttpResponseHeaders headers) throws Exception { - List<Entry<String, String>> l = headers.getHeaders().entries(); + List<Entry<String, String>> l = headers.getHeaders().entries(); for (Entry<String, String> entry : headers.getHeaders().entries()) { String key = entry.getKey(); String value = entry.getValue(); - exchange.getOut().getHeaders().put(key, value); + exchange.getOut().getHeaders().put(key, value); } }
