This is an automated email from the ASF dual-hosted git repository. bvahdat 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 4d55f4a cleanups for camel-netty4 to camel-netty component renaming 4d55f4a is described below commit 4d55f4ac3fc6ff9120f568a36a3e0ccf2fee7b41 Author: Babak Vahdat <bvah...@apache.org> AuthorDate: Thu Aug 15 23:18:52 2019 +0200 cleanups for camel-netty4 to camel-netty component renaming --- .../org/apache/camel/component/netty/http/ContextPathMatcher.java | 4 +--- .../org/apache/camel/component/netty/http/RestContextPathMatcher.java | 2 +- .../org/apache/camel/component/netty/http/RestNettyHttpBinding.java | 2 +- .../camel/component/netty/http/handlers/HttpClientChannelHandler.java | 1 - .../camel/component/netty/http/handlers/HttpServerChannelHandler.java | 4 ++-- .../netty/http/handlers/HttpServerMultiplexChannelHandler.java | 3 +-- .../apache/camel/component/netty/http/rest/RestNettyHttpGetTest.java | 1 - .../component/netty/http/rest/RestNettyHttpGetWildcardsTest.java | 1 - 8 files changed, 6 insertions(+), 12 deletions(-) diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/ContextPathMatcher.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/ContextPathMatcher.java index 486271c..e40d75a 100644 --- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/ContextPathMatcher.java +++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/ContextPathMatcher.java @@ -16,10 +16,8 @@ */ package org.apache.camel.component.netty.http; -import org.apache.camel.component.netty.http.handlers.HttpServerChannelHandler; - /** - * A matcher used for selecting the correct {@link HttpServerChannelHandler} + * A matcher used for selecting the correct {@link org.apache.camel.component.netty.http.handlers.HttpServerChannelHandler} * to handle an incoming {@link io.netty.handler.codec.http.HttpRequest} when you use multiple routes on the same * port. * <p/> diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/RestContextPathMatcher.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/RestContextPathMatcher.java index 9e55594..24d1cba 100644 --- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/RestContextPathMatcher.java +++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/RestContextPathMatcher.java @@ -20,7 +20,7 @@ import java.util.Locale; /** - * A {@link ContextPathMatcher} that supports the Rest DSL. + * A {@link org.apache.camel.component.netty.http.ContextPathMatcher} that supports the Rest DSL. */ public class RestContextPathMatcher extends DefaultContextPathMatcher { diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/RestNettyHttpBinding.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/RestNettyHttpBinding.java index 5eebdb1..71f3324 100644 --- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/RestNettyHttpBinding.java +++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/RestNettyHttpBinding.java @@ -25,7 +25,7 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.spi.HeaderFilterStrategy; /** - * A {@link NettyHttpBinding} that supports the Rest DSL. + * A {@link org.apache.camel.component.netty.http.NettyHttpBinding} that supports the Rest DSL. */ public class RestNettyHttpBinding extends DefaultNettyHttpBinding { diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpClientChannelHandler.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpClientChannelHandler.java index ba299e5..132bfb2 100644 --- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpClientChannelHandler.java +++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpClientChannelHandler.java @@ -26,7 +26,6 @@ import io.netty.handler.codec.http.FullHttpResponse; import io.netty.handler.codec.http.HttpUtil; import org.apache.camel.Exchange; import org.apache.camel.Message; -import org.apache.camel.component.netty.http.NettyHttpProducer; import org.apache.camel.component.netty.NettyConstants; import org.apache.camel.component.netty.handlers.ClientChannelHandler; import org.apache.camel.component.netty.http.NettyHttpProducer; diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java index 062e824..20016ee 100644 --- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java +++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java @@ -36,15 +36,15 @@ import io.netty.handler.codec.http.HttpUtil; import org.apache.camel.Exchange; import org.apache.camel.LoggingLevel; import org.apache.camel.Message; -import org.apache.camel.component.netty.http.NettyHttpConstants; -import org.apache.camel.component.netty.http.SecurityAuthenticator; import org.apache.camel.component.netty.NettyConverter; import org.apache.camel.component.netty.NettyHelper; import org.apache.camel.component.netty.handlers.ServerChannelHandler; import org.apache.camel.component.netty.http.HttpPrincipal; import org.apache.camel.component.netty.http.NettyHttpConfiguration; +import org.apache.camel.component.netty.http.NettyHttpConstants; import org.apache.camel.component.netty.http.NettyHttpConsumer; import org.apache.camel.component.netty.http.NettyHttpSecurityConfiguration; +import org.apache.camel.component.netty.http.SecurityAuthenticator; import org.apache.camel.spi.CamelLogger; import org.apache.camel.support.ObjectHelper; import org.apache.camel.util.StringHelper; diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerMultiplexChannelHandler.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerMultiplexChannelHandler.java index 3845b88..1195a10 100644 --- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerMultiplexChannelHandler.java +++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerMultiplexChannelHandler.java @@ -35,7 +35,6 @@ import io.netty.handler.codec.http.HttpResponse; import io.netty.util.Attribute; import io.netty.util.AttributeKey; import org.apache.camel.Exchange; -import org.apache.camel.component.netty.http.HttpServerInitializerFactory; import org.apache.camel.component.netty.http.HttpServerConsumerChannelFactory; import org.apache.camel.component.netty.http.NettyHttpConfiguration; import org.apache.camel.component.netty.http.NettyHttpConsumer; @@ -51,7 +50,7 @@ import static io.netty.handler.codec.http.HttpResponseStatus.OK; import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1; /** - * A multiplex {@link HttpServerInitializerFactory} which keeps a list of handlers, and delegates to the + * A multiplex {@link org.apache.camel.component.netty.http.HttpServerInitializerFactory} which keeps a list of handlers, and delegates to the * target handler based on the http context path in the incoming request. This is used to allow to reuse * the same Netty consumer, allowing to have multiple routes on the same netty {@link io.netty.bootstrap.ServerBootstrap} */ diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetTest.java index e312abc..b451264 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetTest.java @@ -22,7 +22,6 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.netty.http.RestNettyHttpBinding; import org.apache.camel.component.netty.http.BaseNettyTest; -import org.apache.camel.component.netty.http.RestNettyHttpBinding; import org.junit.Test; public class RestNettyHttpGetTest extends BaseNettyTest { diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetWildcardsTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetWildcardsTest.java index 0601ab6..1f09c8e 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetWildcardsTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/rest/RestNettyHttpGetWildcardsTest.java @@ -22,7 +22,6 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.netty.http.RestNettyHttpBinding; import org.apache.camel.component.netty.http.BaseNettyTest; -import org.apache.camel.component.netty.http.RestNettyHttpBinding; import org.junit.Test; public class RestNettyHttpGetWildcardsTest extends BaseNettyTest {