Skip to content

Commit caab7c7

Browse files
author
Stephane Landelle
committed
Move Netty 4 provider to netted package
1 parent 87bf33c commit caab7c7

File tree

123 files changed

+251
-246
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+251
-246
lines changed

‎providers/netty/pom.xml renamed to ‎providers/netty4/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<version>2.0.0-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
9-
<artifactId>async-http-client-netty-provider</artifactId>
9+
<artifactId>async-http-client-netty4-provider</artifactId>
1010
<name>Asynchronous Http Client Netty 4 Provider</name>
1111
<description>
1212
The Async Http Client Netty 4 Provider.
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>io.netty</groupId>
4141
<artifactId>netty-all</artifactId>
42-
<version>4.0.23.Final</version>
42+
<version>4.0.24.Final</version>
4343
</dependency>
4444
<dependency>
4545
<groupId>org.javassist</groupId>

‎providers/netty/src/main/java/org/asynchttpclient/providers/netty/Callback.java renamed to ‎providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/Callback.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1111
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1212
*/
13-
package org.asynchttpclient.providers.netty;
13+
package org.asynchttpclient.providers.netty4;
1414

15-
import org.asynchttpclient.providers.netty.future.NettyResponseFuture;
15+
import org.asynchttpclient.providers.netty4.future.NettyResponseFuture;
1616

1717
public abstract class Callback {
1818

‎providers/netty/src/main/java/org/asynchttpclient/providers/netty/DiscardEvent.java renamed to ‎providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/DiscardEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1111
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1212
*/
13-
package org.asynchttpclient.providers.netty;
13+
package org.asynchttpclient.providers.netty4;
1414

1515
/**
1616
* Simple marker for stopping publishing bytes.

‎providers/netty/src/main/java/org/asynchttpclient/providers/netty/NettyAsyncHttpProvider.java renamed to ‎providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/NettyAsyncHttpProvider.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1313
*/
14-
package org.asynchttpclient.providers.netty;
14+
package org.asynchttpclient.providers.netty4;
1515

1616
import io.netty.util.HashedWheelTimer;
1717
import io.netty.util.Timer;
@@ -23,9 +23,9 @@
2323
import org.asynchttpclient.AsyncHttpProvider;
2424
import org.asynchttpclient.ListenableFuture;
2525
import org.asynchttpclient.Request;
26-
import org.asynchttpclient.providers.netty.channel.ChannelManager;
27-
import org.asynchttpclient.providers.netty.channel.pool.ChannelPoolPartitionSelector;
28-
import org.asynchttpclient.providers.netty.request.NettyRequestSender;
26+
import org.asynchttpclient.providers.netty4.channel.ChannelManager;
27+
import org.asynchttpclient.providers.netty4.channel.pool.ChannelPoolPartitionSelector;
28+
import org.asynchttpclient.providers.netty4.request.NettyRequestSender;
2929
import org.slf4j.Logger;
3030
import org.slf4j.LoggerFactory;
3131

‎providers/netty/src/main/java/org/asynchttpclient/providers/netty/NettyAsyncHttpProviderConfig.java renamed to ‎providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/NettyAsyncHttpProviderConfig.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1313
*/
14-
package org.asynchttpclient.providers.netty;
14+
package org.asynchttpclient.providers.netty4;
1515

1616
import io.netty.buffer.ByteBuf;
1717
import io.netty.channel.Channel;
@@ -26,13 +26,13 @@
2626

2727
import org.asynchttpclient.AsyncHttpProviderConfig;
2828
import org.asynchttpclient.SSLEngineFactory;
29-
import org.asynchttpclient.providers.netty.channel.pool.ChannelPool;
30-
import org.asynchttpclient.providers.netty.handler.ConnectionStrategy;
31-
import org.asynchttpclient.providers.netty.handler.Http1Point1ConnectionStrategy;
32-
import org.asynchttpclient.providers.netty.response.EagerNettyResponseBodyPart;
33-
import org.asynchttpclient.providers.netty.response.LazyNettyResponseBodyPart;
34-
import org.asynchttpclient.providers.netty.response.NettyResponseBodyPart;
35-
import org.asynchttpclient.providers.netty.ws.NettyWebSocket;
29+
import org.asynchttpclient.providers.netty4.channel.pool.ChannelPool;
30+
import org.asynchttpclient.providers.netty4.handler.ConnectionStrategy;
31+
import org.asynchttpclient.providers.netty4.handler.Http1Point1ConnectionStrategy;
32+
import org.asynchttpclient.providers.netty4.response.EagerNettyResponseBodyPart;
33+
import org.asynchttpclient.providers.netty4.response.LazyNettyResponseBodyPart;
34+
import org.asynchttpclient.providers.netty4.response.NettyResponseBodyPart;
35+
import org.asynchttpclient.providers.netty4.ws.NettyWebSocket;
3636

3737
/**
3838
* This class can be used to pass Netty's internal configuration options. See

‎providers/netty/src/main/java/org/asynchttpclient/providers/netty/channel/ChannelManager.java renamed to ‎providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/channel/ChannelManager.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1313
*/
14-
package org.asynchttpclient.providers.netty.channel;
14+
package org.asynchttpclient.providers.netty4.channel;
1515

16-
import static org.asynchttpclient.providers.netty.util.HttpUtils.WEBSOCKET;
17-
import static org.asynchttpclient.providers.netty.util.HttpUtils.isSecure;
18-
import static org.asynchttpclient.providers.netty.util.HttpUtils.isWebSocket;
16+
import static org.asynchttpclient.providers.netty4.util.HttpUtils.WEBSOCKET;
17+
import static org.asynchttpclient.providers.netty4.util.HttpUtils.isSecure;
18+
import static org.asynchttpclient.providers.netty4.util.HttpUtils.isWebSocket;
1919
import io.netty.bootstrap.Bootstrap;
2020
import io.netty.channel.Channel;
2121
import io.netty.channel.ChannelInitializer;
@@ -47,17 +47,17 @@
4747
import org.asynchttpclient.ConnectionPoolPartitioning;
4848
import org.asynchttpclient.ProxyServer;
4949
import org.asynchttpclient.SSLEngineFactory;
50-
import org.asynchttpclient.providers.netty.Callback;
51-
import org.asynchttpclient.providers.netty.NettyAsyncHttpProviderConfig;
52-
import org.asynchttpclient.providers.netty.channel.pool.ChannelPool;
53-
import org.asynchttpclient.providers.netty.channel.pool.ChannelPoolPartitionSelector;
54-
import org.asynchttpclient.providers.netty.channel.pool.DefaultChannelPool;
55-
import org.asynchttpclient.providers.netty.channel.pool.NoopChannelPool;
56-
import org.asynchttpclient.providers.netty.future.NettyResponseFuture;
57-
import org.asynchttpclient.providers.netty.handler.HttpProtocol;
58-
import org.asynchttpclient.providers.netty.handler.Processor;
59-
import org.asynchttpclient.providers.netty.handler.WebSocketProtocol;
60-
import org.asynchttpclient.providers.netty.request.NettyRequestSender;
50+
import org.asynchttpclient.providers.netty4.Callback;
51+
import org.asynchttpclient.providers.netty4.NettyAsyncHttpProviderConfig;
52+
import org.asynchttpclient.providers.netty4.channel.pool.ChannelPool;
53+
import org.asynchttpclient.providers.netty4.channel.pool.ChannelPoolPartitionSelector;
54+
import org.asynchttpclient.providers.netty4.channel.pool.DefaultChannelPool;
55+
import org.asynchttpclient.providers.netty4.channel.pool.NoopChannelPool;
56+
import org.asynchttpclient.providers.netty4.future.NettyResponseFuture;
57+
import org.asynchttpclient.providers.netty4.handler.HttpProtocol;
58+
import org.asynchttpclient.providers.netty4.handler.Processor;
59+
import org.asynchttpclient.providers.netty4.handler.WebSocketProtocol;
60+
import org.asynchttpclient.providers.netty4.request.NettyRequestSender;
6161
import org.asynchttpclient.uri.Uri;
6262
import org.slf4j.Logger;
6363
import org.slf4j.LoggerFactory;

‎providers/netty/src/main/java/org/asynchttpclient/providers/netty/channel/Channels.java renamed to ‎providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/channel/Channels.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1313
*/
14-
package org.asynchttpclient.providers.netty.channel;
14+
package org.asynchttpclient.providers.netty4.channel;
1515

1616
import io.netty.channel.Channel;
1717
import io.netty.util.Attribute;
1818
import io.netty.util.AttributeKey;
1919

20-
import org.asynchttpclient.providers.netty.DiscardEvent;
20+
import org.asynchttpclient.providers.netty4.DiscardEvent;
2121
import org.slf4j.Logger;
2222
import org.slf4j.LoggerFactory;
2323

‎providers/netty/src/main/java/org/asynchttpclient/providers/netty/channel/CleanupChannelGroup.java renamed to ‎providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/channel/CleanupChannelGroup.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* See the License for the specific language governing permissions and
2626
* limitations under the License.
2727
*/
28-
package org.asynchttpclient.providers.netty.channel;
28+
package org.asynchttpclient.providers.netty4.channel;
2929

3030
import io.netty.channel.Channel;
3131
import io.netty.channel.group.ChannelGroupFuture;

‎providers/netty/src/main/java/org/asynchttpclient/providers/netty/channel/SslInitializer.java renamed to ‎providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/channel/SslInitializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* License for the specific language governing permissions and limitations
1414
* under the License.
1515
*/
16-
package org.asynchttpclient.providers.netty.channel;
16+
package org.asynchttpclient.providers.netty4.channel;
1717

1818
import io.netty.channel.ChannelHandlerContext;
1919
import io.netty.channel.ChannelOutboundHandlerAdapter;

‎providers/netty/src/main/java/org/asynchttpclient/providers/netty/channel/pool/ChannelPool.java renamed to ‎providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/channel/pool/ChannelPool.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1313
*/
14-
package org.asynchttpclient.providers.netty.channel.pool;
14+
package org.asynchttpclient.providers.netty4.channel.pool;
1515

1616
import io.netty.channel.Channel;
1717

‎providers/netty/src/main/java/org/asynchttpclient/providers/netty/channel/pool/ChannelPoolPartitionSelector.java renamed to ‎providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/channel/pool/ChannelPoolPartitionSelector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1313
*/
14-
package org.asynchttpclient.providers.netty.channel.pool;
14+
package org.asynchttpclient.providers.netty4.channel.pool;
1515

1616
public interface ChannelPoolPartitionSelector {
1717

‎providers/netty/src/main/java/org/asynchttpclient/providers/netty/channel/pool/DefaultChannelPool.java renamed to ‎providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/channel/pool/DefaultChannelPool.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1313
*/
14-
package org.asynchttpclient.providers.netty.channel.pool;
14+
package org.asynchttpclient.providers.netty4.channel.pool;
1515

1616
import static org.asynchttpclient.util.DateUtils.millisTime;
1717
import io.netty.channel.Channel;
@@ -30,8 +30,8 @@
3030
import java.util.concurrent.atomic.AtomicBoolean;
3131

3232
import org.asynchttpclient.AsyncHttpClientConfig;
33-
import org.asynchttpclient.providers.netty.channel.Channels;
34-
import org.asynchttpclient.providers.netty.future.NettyResponseFuture;
33+
import org.asynchttpclient.providers.netty4.channel.Channels;
34+
import org.asynchttpclient.providers.netty4.future.NettyResponseFuture;
3535
import org.slf4j.Logger;
3636
import org.slf4j.LoggerFactory;
3737

‎providers/netty/src/main/java/org/asynchttpclient/providers/netty/channel/pool/NoopChannelPool.java renamed to ‎providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/channel/pool/NoopChannelPool.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1313
*/
14-
package org.asynchttpclient.providers.netty.channel.pool;
14+
package org.asynchttpclient.providers.netty4.channel.pool;
1515

1616
import io.netty.channel.Channel;
1717

‎providers/netty/src/main/java/org/asynchttpclient/providers/netty/future/NettyResponseFuture.java renamed to ‎providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/future/NettyResponseFuture.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1313
*/
14-
package org.asynchttpclient.providers.netty.future;
14+
package org.asynchttpclient.providers.netty4.future;
1515

1616
import static org.asynchttpclient.util.DateUtils.millisTime;
1717
import io.netty.channel.Channel;
@@ -35,9 +35,9 @@
3535
import org.asynchttpclient.ProxyServer;
3636
import org.asynchttpclient.Request;
3737
import org.asynchttpclient.listenable.AbstractListenableFuture;
38-
import org.asynchttpclient.providers.netty.channel.Channels;
39-
import org.asynchttpclient.providers.netty.request.NettyRequest;
40-
import org.asynchttpclient.providers.netty.request.timeout.TimeoutsHolder;
38+
import org.asynchttpclient.providers.netty4.channel.Channels;
39+
import org.asynchttpclient.providers.netty4.request.NettyRequest;
40+
import org.asynchttpclient.providers.netty4.request.timeout.TimeoutsHolder;
4141
import org.asynchttpclient.uri.Uri;
4242
import org.slf4j.Logger;
4343
import org.slf4j.LoggerFactory;

‎providers/netty/src/main/java/org/asynchttpclient/providers/netty/future/StackTraceInspector.java renamed to ‎providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/future/StackTraceInspector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1111
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1212
*/
13-
package org.asynchttpclient.providers.netty.future;
13+
package org.asynchttpclient.providers.netty4.future;
1414

1515
public class StackTraceInspector {
1616

‎providers/netty/src/main/java/org/asynchttpclient/providers/netty/handler/ConnectionStrategy.java renamed to ‎providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/handler/ConnectionStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1313
*/
14-
package org.asynchttpclient.providers.netty.handler;
14+
package org.asynchttpclient.providers.netty4.handler;
1515

1616
import io.netty.handler.codec.http.HttpRequest;
1717
import io.netty.handler.codec.http.HttpResponse;

‎providers/netty/src/main/java/org/asynchttpclient/providers/netty/handler/Http1Point1ConnectionStrategy.java renamed to ‎providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/handler/Http1Point1ConnectionStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1313
*/
14-
package org.asynchttpclient.providers.netty.handler;
14+
package org.asynchttpclient.providers.netty4.handler;
1515

1616
import io.netty.handler.codec.http.HttpHeaders;
1717
import io.netty.handler.codec.http.HttpMessage;

‎providers/netty/src/main/java/org/asynchttpclient/providers/netty/handler/HttpProtocol.java renamed to ‎providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/handler/HttpProtocol.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1313
*/
14-
package org.asynchttpclient.providers.netty.handler;
14+
package org.asynchttpclient.providers.netty4.handler;
1515

1616
import static io.netty.handler.codec.http.HttpResponseStatus.CONTINUE;
1717
import static io.netty.handler.codec.http.HttpResponseStatus.OK;
1818
import static io.netty.handler.codec.http.HttpResponseStatus.PROXY_AUTHENTICATION_REQUIRED;
1919
import static io.netty.handler.codec.http.HttpResponseStatus.UNAUTHORIZED;
20-
import static org.asynchttpclient.providers.netty.util.HttpUtils.getNTLM;
20+
import static org.asynchttpclient.providers.netty4.util.HttpUtils.getNTLM;
2121
import static org.asynchttpclient.util.AsyncHttpProviderUtils.getDefaultPort;
2222
import io.netty.buffer.ByteBuf;
2323
import io.netty.channel.Channel;
@@ -41,15 +41,15 @@
4141
import org.asynchttpclient.RequestBuilder;
4242
import org.asynchttpclient.ntlm.NTLMEngine;
4343
import org.asynchttpclient.ntlm.NTLMEngineException;
44-
import org.asynchttpclient.providers.netty.Callback;
45-
import org.asynchttpclient.providers.netty.NettyAsyncHttpProviderConfig;
46-
import org.asynchttpclient.providers.netty.channel.ChannelManager;
47-
import org.asynchttpclient.providers.netty.channel.Channels;
48-
import org.asynchttpclient.providers.netty.future.NettyResponseFuture;
49-
import org.asynchttpclient.providers.netty.request.NettyRequestSender;
50-
import org.asynchttpclient.providers.netty.response.NettyResponseBodyPart;
51-
import org.asynchttpclient.providers.netty.response.NettyResponseHeaders;
52-
import org.asynchttpclient.providers.netty.response.NettyResponseStatus;
44+
import org.asynchttpclient.providers.netty4.Callback;
45+
import org.asynchttpclient.providers.netty4.NettyAsyncHttpProviderConfig;
46+
import org.asynchttpclient.providers.netty4.channel.ChannelManager;
47+
import org.asynchttpclient.providers.netty4.channel.Channels;
48+
import org.asynchttpclient.providers.netty4.future.NettyResponseFuture;
49+
import org.asynchttpclient.providers.netty4.request.NettyRequestSender;
50+
import org.asynchttpclient.providers.netty4.response.NettyResponseBodyPart;
51+
import org.asynchttpclient.providers.netty4.response.NettyResponseHeaders;
52+
import org.asynchttpclient.providers.netty4.response.NettyResponseStatus;
5353
import org.asynchttpclient.spnego.SpnegoEngine;
5454
import org.asynchttpclient.uri.Uri;
5555

‎providers/netty/src/main/java/org/asynchttpclient/providers/netty/handler/Processor.java renamed to ‎providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/handler/Processor.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1313
*/
14-
package org.asynchttpclient.providers.netty.handler;
14+
package org.asynchttpclient.providers.netty4.handler;
1515

1616
import static org.asynchttpclient.util.AsyncHttpProviderUtils.REMOTELY_CLOSED_EXCEPTION;
1717
import io.netty.channel.Channel;
@@ -25,13 +25,13 @@
2525
import java.nio.channels.ClosedChannelException;
2626

2727
import org.asynchttpclient.AsyncHttpClientConfig;
28-
import org.asynchttpclient.providers.netty.Callback;
29-
import org.asynchttpclient.providers.netty.DiscardEvent;
30-
import org.asynchttpclient.providers.netty.channel.ChannelManager;
31-
import org.asynchttpclient.providers.netty.channel.Channels;
32-
import org.asynchttpclient.providers.netty.future.NettyResponseFuture;
33-
import org.asynchttpclient.providers.netty.future.StackTraceInspector;
34-
import org.asynchttpclient.providers.netty.request.NettyRequestSender;
28+
import org.asynchttpclient.providers.netty4.Callback;
29+
import org.asynchttpclient.providers.netty4.DiscardEvent;
30+
import org.asynchttpclient.providers.netty4.channel.ChannelManager;
31+
import org.asynchttpclient.providers.netty4.channel.Channels;
32+
import org.asynchttpclient.providers.netty4.future.NettyResponseFuture;
33+
import org.asynchttpclient.providers.netty4.future.StackTraceInspector;
34+
import org.asynchttpclient.providers.netty4.request.NettyRequestSender;
3535
import org.slf4j.Logger;
3636
import org.slf4j.LoggerFactory;
3737

‎providers/netty/src/main/java/org/asynchttpclient/providers/netty/handler/Protocol.java renamed to ‎providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/handler/Protocol.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
* See the Apache License Version 2.0 for the specific language governing permissions and limitations there under.
1313
*/
14-
package org.asynchttpclient.providers.netty.handler;
14+
package org.asynchttpclient.providers.netty4.handler;
1515

1616
import static io.netty.handler.codec.http.HttpHeaders.Names.ACCEPT;
1717
import static io.netty.handler.codec.http.HttpHeaders.Names.ACCEPT_CHARSET;
@@ -23,8 +23,8 @@
2323
import static io.netty.handler.codec.http.HttpResponseStatus.MOVED_PERMANENTLY;
2424
import static io.netty.handler.codec.http.HttpResponseStatus.SEE_OTHER;
2525
import static io.netty.handler.codec.http.HttpResponseStatus.TEMPORARY_REDIRECT;
26-
import static org.asynchttpclient.providers.netty.util.HttpUtils.HTTP;
27-
import static org.asynchttpclient.providers.netty.util.HttpUtils.WEBSOCKET;
26+
import static org.asynchttpclient.providers.netty4.util.HttpUtils.HTTP;
27+
import static org.asynchttpclient.providers.netty4.util.HttpUtils.WEBSOCKET;
2828
import static org.asynchttpclient.util.AsyncHttpProviderUtils.followRedirect;
2929
import io.netty.channel.Channel;
3030
import io.netty.handler.codec.http.HttpHeaders;
@@ -51,12 +51,12 @@
5151
import org.asynchttpclient.filter.FilterContext;
5252
import org.asynchttpclient.filter.FilterException;
5353
import org.asynchttpclient.filter.ResponseFilter;
54-
import org.asynchttpclient.providers.netty.Callback;
55-
import org.asynchttpclient.providers.netty.NettyAsyncHttpProviderConfig;
56-
import org.asynchttpclient.providers.netty.channel.ChannelManager;
57-
import org.asynchttpclient.providers.netty.channel.Channels;
58-
import org.asynchttpclient.providers.netty.future.NettyResponseFuture;
59-
import org.asynchttpclient.providers.netty.request.NettyRequestSender;
54+
import org.asynchttpclient.providers.netty4.Callback;
55+
import org.asynchttpclient.providers.netty4.NettyAsyncHttpProviderConfig;
56+
import org.asynchttpclient.providers.netty4.channel.ChannelManager;
57+
import org.asynchttpclient.providers.netty4.channel.Channels;
58+
import org.asynchttpclient.providers.netty4.future.NettyResponseFuture;
59+
import org.asynchttpclient.providers.netty4.request.NettyRequestSender;
6060
import org.asynchttpclient.uri.Uri;
6161
import org.slf4j.Logger;
6262
import org.slf4j.LoggerFactory;

0 commit comments

Comments
 (0)