Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit f36bec4

Browse files
Broaden channel initialization to whole Channel, not only Pipeline
1 parent d44ca8c commit f36bec4

File tree

4 files changed

+34
-34
lines changed

4 files changed

+34
-34
lines changed

‎client/src/main/java/org/asynchttpclient/AsyncHttpClientConfig.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.asynchttpclient;
22

33
import io.netty.buffer.ByteBuf;
4+
import io.netty.channel.Channel;
45
import io.netty.channel.ChannelOption;
5-
import io.netty.channel.ChannelPipeline;
66
import io.netty.channel.EventLoopGroup;
77
import io.netty.handler.ssl.SslContext;
88
import io.netty.util.Timer;
@@ -268,9 +268,9 @@ public interface AsyncHttpClientConfig {
268268

269269
boolean isUseNativeTransport();
270270

271-
AdditionalPipelineInitializergetHttpAdditionalPipelineInitializer();
271+
AdditionalChannelInitializergetHttpAdditionalChannelInitializer();
272272

273-
AdditionalPipelineInitializergetWsAdditionalPipelineInitializer();
273+
AdditionalChannelInitializergetWsAdditionalChannelInitializer();
274274

275275
ResponseBodyPartFactory getResponseBodyPartFactory();
276276

@@ -280,9 +280,9 @@ public interface AsyncHttpClientConfig {
280280

281281
KeepAliveStrategy getKeepAliveStrategy();
282282

283-
interface AdditionalPipelineInitializer {
283+
interface AdditionalChannelInitializer {
284284

285-
void initPipeline(ChannelPipelinepipeline) throws Exception;
285+
void initChannel(Channelchannel) throws Exception;
286286
}
287287

288288
enum ResponseBodyPartFactory {

‎client/src/main/java/org/asynchttpclient/DefaultAsyncHttpClientConfig.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ public class DefaultAsyncHttpClientConfig implements AsyncHttpClientConfig {
119119
private final boolean useNativeTransport;
120120
private final Timer nettyTimer;
121121
private final ThreadFactory threadFactory;
122-
private final AdditionalPipelineInitializerhttpAdditionalPipelineInitializer;
123-
private final AdditionalPipelineInitializerwsAdditionalPipelineInitializer;
122+
private final AdditionalChannelInitializerhttpAdditionalChannelInitializer;
123+
private final AdditionalChannelInitializerwsAdditionalChannelInitializer;
124124
private final ResponseBodyPartFactory responseBodyPartFactory;
125125

126126
private DefaultAsyncHttpClientConfig(//
@@ -182,8 +182,8 @@ private DefaultAsyncHttpClientConfig(//
182182
boolean useNativeTransport,//
183183
Timer nettyTimer,//
184184
ThreadFactory threadFactory,//
185-
AdditionalPipelineInitializerhttpAdditionalPipelineInitializer,//
186-
AdditionalPipelineInitializerwsAdditionalPipelineInitializer,//
185+
AdditionalChannelInitializerhttpAdditionalChannelInitializer,//
186+
AdditionalChannelInitializerwsAdditionalChannelInitializer,//
187187
ResponseBodyPartFactory responseBodyPartFactory) {
188188

189189
// http
@@ -244,8 +244,8 @@ private DefaultAsyncHttpClientConfig(//
244244
this.useNativeTransport = useNativeTransport;
245245
this.nettyTimer = nettyTimer;
246246
this.threadFactory = threadFactory;
247-
this.httpAdditionalPipelineInitializer = httpAdditionalPipelineInitializer;
248-
this.wsAdditionalPipelineInitializer = wsAdditionalPipelineInitializer;
247+
this.httpAdditionalChannelInitializer = httpAdditionalChannelInitializer;
248+
this.wsAdditionalChannelInitializer = wsAdditionalChannelInitializer;
249249
this.responseBodyPartFactory = responseBodyPartFactory;
250250
}
251251

@@ -497,13 +497,13 @@ public ThreadFactory getThreadFactory() {
497497
}
498498

499499
@Override
500-
public AdditionalPipelineInitializergetHttpAdditionalPipelineInitializer() {
501-
return httpAdditionalPipelineInitializer;
500+
public AdditionalChannelInitializergetHttpAdditionalChannelInitializer() {
501+
return httpAdditionalChannelInitializer;
502502
}
503503

504504
@Override
505-
public AdditionalPipelineInitializergetWsAdditionalPipelineInitializer() {
506-
return wsAdditionalPipelineInitializer;
505+
public AdditionalChannelInitializergetWsAdditionalChannelInitializer() {
506+
return wsAdditionalChannelInitializer;
507507
}
508508

509509
@Override
@@ -576,8 +576,8 @@ public static class Builder {
576576
private EventLoopGroup eventLoopGroup;
577577
private Timer nettyTimer;
578578
private ThreadFactory threadFactory;
579-
private AdditionalPipelineInitializerhttpAdditionalPipelineInitializer;
580-
private AdditionalPipelineInitializerwsAdditionalPipelineInitializer;
579+
private AdditionalChannelInitializerhttpAdditionalChannelInitializer;
580+
private AdditionalChannelInitializerwsAdditionalChannelInitializer;
581581
private ResponseBodyPartFactory responseBodyPartFactory = ResponseBodyPartFactory.EAGER;
582582

583583
public Builder() {
@@ -641,8 +641,8 @@ public Builder(AsyncHttpClientConfig config) {
641641
useNativeTransport = config.isUseNativeTransport();
642642
nettyTimer = config.getNettyTimer();
643643
threadFactory = config.getThreadFactory();
644-
httpAdditionalPipelineInitializer = config.getHttpAdditionalPipelineInitializer();
645-
wsAdditionalPipelineInitializer = config.getWsAdditionalPipelineInitializer();
644+
httpAdditionalChannelInitializer = config.getHttpAdditionalChannelInitializer();
645+
wsAdditionalChannelInitializer = config.getWsAdditionalChannelInitializer();
646646
responseBodyPartFactory = config.getResponseBodyPartFactory();
647647
}
648648

@@ -928,13 +928,13 @@ public Builder setThreadFactory(ThreadFactory threadFactory) {
928928
return this;
929929
}
930930

931-
public Builder setHttpAdditionalPipelineInitializer(AdditionalPipelineInitializerhttpAdditionalPipelineInitializer) {
932-
this.httpAdditionalPipelineInitializer = httpAdditionalPipelineInitializer;
931+
public Builder setHttpAdditionalChannelInitializer(AdditionalChannelInitializerhttpAdditionalChannelInitializer) {
932+
this.httpAdditionalChannelInitializer = httpAdditionalChannelInitializer;
933933
return this;
934934
}
935935

936-
public Builder setWsAdditionalPipelineInitializer(AdditionalPipelineInitializerwsAdditionalPipelineInitializer) {
937-
this.wsAdditionalPipelineInitializer = wsAdditionalPipelineInitializer;
936+
public Builder setWsAdditionalChannelInitializer(AdditionalChannelInitializerwsAdditionalChannelInitializer) {
937+
this.wsAdditionalChannelInitializer = wsAdditionalChannelInitializer;
938938
return this;
939939
}
940940

@@ -1006,8 +1006,8 @@ public DefaultAsyncHttpClientConfig build() {
10061006
useNativeTransport, //
10071007
nettyTimer, //
10081008
threadFactory, //
1009-
httpAdditionalPipelineInitializer, //
1010-
wsAdditionalPipelineInitializer, //
1009+
httpAdditionalChannelInitializer, //
1010+
wsAdditionalChannelInitializer, //
10111011
responseBodyPartFactory);
10121012
}
10131013
}

‎client/src/main/java/org/asynchttpclient/netty/channel/ChannelManager.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,8 @@ protected void initChannel(Channel ch) throws Exception {
253253

254254
ch.config().setOption(ChannelOption.AUTO_READ, false);
255255

256-
if (config.getHttpAdditionalPipelineInitializer() != null)
257-
config.getHttpAdditionalPipelineInitializer().initPipeline(ch.pipeline());
256+
if (config.getHttpAdditionalChannelInitializer() != null)
257+
config.getHttpAdditionalChannelInitializer().initChannel(ch);
258258
}
259259
});
260260

@@ -265,8 +265,8 @@ protected void initChannel(Channel ch) throws Exception {
265265
.addLast(HTTP_CLIENT_CODEC, newHttpClientCodec())//
266266
.addLast(AHC_WS_HANDLER, wsHandler);
267267

268-
if (config.getWsAdditionalPipelineInitializer() != null)
269-
config.getWsAdditionalPipelineInitializer().initPipeline(ch.pipeline());
268+
if (config.getWsAdditionalChannelInitializer() != null)
269+
config.getWsAdditionalChannelInitializer().initChannel(ch);
270270
}
271271
});
272272
}

‎client/src/test/java/org/asynchttpclient/netty/EventPipelineTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
import static org.asynchttpclient.Dsl.*;
1717
import static org.testng.Assert.*;
18+
import io.netty.channel.Channel;
1819
import io.netty.channel.ChannelHandlerContext;
1920
import io.netty.channel.ChannelInboundHandlerAdapter;
20-
import io.netty.channel.ChannelPipeline;
2121
import io.netty.handler.codec.http.HttpMessage;
2222

2323
import java.util.concurrent.CountDownLatch;
@@ -34,13 +34,13 @@ public class EventPipelineTest extends AbstractBasicTest {
3434
@Test(groups = { "standalone", "netty_provider" })
3535
public void asyncPipelineTest() throws Exception {
3636

37-
AsyncHttpClientConfig.AdditionalPipelineInitializer httpAdditionalPipelineInitializer = new AsyncHttpClientConfig.AdditionalPipelineInitializer() {
38-
public void initPipeline(ChannelPipelinepipeline) throws Exception {
39-
pipeline.addBefore("inflater", "copyEncodingHeader", new CopyEncodingHandler());
37+
AsyncHttpClientConfig.AdditionalChannelInitializer httpAdditionalPipelineInitializer = new AsyncHttpClientConfig.AdditionalChannelInitializer() {
38+
public void initChannel(Channelchannel) throws Exception {
39+
channel.pipeline().addBefore("inflater", "copyEncodingHeader", new CopyEncodingHandler());
4040
}
4141
};
4242

43-
try (AsyncHttpClient p = asyncHttpClient(config().setHttpAdditionalPipelineInitializer(httpAdditionalPipelineInitializer))) {
43+
try (AsyncHttpClient p = asyncHttpClient(config().setHttpAdditionalChannelInitializer(httpAdditionalPipelineInitializer))) {
4444
final CountDownLatch l = new CountDownLatch(1);
4545
p.executeRequest(get(getTargetUrl()), new AsyncCompletionHandlerAdapter() {
4646
@Override

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /