34
34
import org .asynchttpclient .proxy .ProxyServerSelector ;
35
35
import org .asynchttpclient .util .ProxyUtils ;
36
36
37
- import java .io .IOException ;
38
- import java .io .InputStream ;
39
37
import java .util .*;
40
38
import java .util .concurrent .ThreadFactory ;
41
39
import java .util .function .Consumer ;
@@ -355,8 +353,23 @@ public ProxyServerSelector getProxyServerSelector() {
355
353
return proxyServerSelector ;
356
354
}
357
355
358
- // timeouts
356
+ // websocket
357
+ @ Override
358
+ public boolean isAggregateWebSocketFrameFragments () {
359
+ return aggregateWebSocketFrameFragments ;
360
+ }
361
+
362
+ @ Override
363
+ public int getWebSocketMaxBufferSize () {
364
+ return webSocketMaxBufferSize ;
365
+ }
359
366
367
+ @ Override
368
+ public int getWebSocketMaxFrameSize () {
369
+ return webSocketMaxFrameSize ;
370
+ }
371
+
372
+ // timeouts
360
373
@ Override
361
374
public int getConnectTimeout () {
362
375
return connectTimeout ;
@@ -428,11 +441,6 @@ public boolean isValidateResponseHeaders() {
428
441
return validateResponseHeaders ;
429
442
}
430
443
431
- @ Override
432
- public boolean isAggregateWebSocketFrameFragments () {
433
- return aggregateWebSocketFrameFragments ;
434
- }
435
-
436
444
// ssl
437
445
@ Override
438
446
public boolean isUseOpenSsl () {
@@ -563,16 +571,6 @@ public int getChunkedFileChunkSize() {
563
571
return chunkedFileChunkSize ;
564
572
}
565
573
566
- @ Override
567
- public int getWebSocketMaxBufferSize () {
568
- return webSocketMaxBufferSize ;
569
- }
570
-
571
- @ Override
572
- public int getWebSocketMaxFrameSize () {
573
- return webSocketMaxFrameSize ;
574
- }
575
-
576
574
@ Override
577
575
public Map <ChannelOption <Object >, Object > getChannelOptions () {
578
576
return channelOptions ;
@@ -648,13 +646,19 @@ public static class Builder {
648
646
private boolean useProxySelector = defaultUseProxySelector ();
649
647
private boolean useProxyProperties = defaultUseProxyProperties ();
650
648
private boolean validateResponseHeaders = defaultValidateResponseHeaders ();
649
+
650
+ // websocket
651
651
private boolean aggregateWebSocketFrameFragments = defaultAggregateWebSocketFrameFragments ();
652
+ private int webSocketMaxBufferSize = defaultWebSocketMaxBufferSize ();
653
+ private int webSocketMaxFrameSize = defaultWebSocketMaxFrameSize ();
654
+
652
655
// timeouts
653
656
private int connectTimeout = defaultConnectTimeout ();
654
657
private int requestTimeout = defaultRequestTimeout ();
655
658
private int readTimeout = defaultReadTimeout ();
656
659
private int shutdownQuietPeriod = defaultShutdownQuietPeriod ();
657
660
private int shutdownTimeout = defaultShutdownTimeout ();
661
+
658
662
// keep-alive
659
663
private boolean keepAlive = defaultKeepAlive ();
660
664
private int pooledConnectionIdleTimeout = defaultPooledConnectionIdleTimeout ();
@@ -664,6 +668,7 @@ public static class Builder {
664
668
private int maxConnectionsPerHost = defaultMaxConnectionsPerHost ();
665
669
private ChannelPool channelPool ;
666
670
private KeepAliveStrategy keepAliveStrategy = new DefaultKeepAliveStrategy ();
671
+
667
672
// ssl
668
673
private boolean useOpenSsl = defaultUseOpenSsl ();
669
674
private boolean useInsecureTrustManager = defaultUseInsecureTrustManager ();
@@ -675,6 +680,7 @@ public static class Builder {
675
680
private int sslSessionTimeout = defaultSslSessionTimeout ();
676
681
private SslContext sslContext ;
677
682
private SslEngineFactory sslEngineFactory ;
683
+
678
684
// cookie store
679
685
private CookieStore cookieStore = new ThreadSafeCookieStore ();
680
686
@@ -692,8 +698,6 @@ public static class Builder {
692
698
private int httpClientCodecMaxChunkSize = defaultHttpClientCodecMaxChunkSize ();
693
699
private int httpClientCodecInitialBufferSize = defaultHttpClientCodecInitialBufferSize ();
694
700
private int chunkedFileChunkSize = defaultChunkedFileChunkSize ();
695
- private int webSocketMaxBufferSize = defaultWebSocketMaxBufferSize ();
696
- private int webSocketMaxFrameSize = defaultWebSocketMaxFrameSize ();
697
701
private boolean useNativeTransport = defaultUseNativeTransport ();
698
702
private ByteBufAllocator allocator ;
699
703
private Map <ChannelOption <Object >, Object > channelOptions = new HashMap <>();
@@ -722,6 +726,11 @@ public Builder(AsyncHttpClientConfig config) {
722
726
keepEncodingHeader = config .isKeepEncodingHeader ();
723
727
proxyServerSelector = config .getProxyServerSelector ();
724
728
729
+ // websocket
730
+ aggregateWebSocketFrameFragments = config .isAggregateWebSocketFrameFragments ();
731
+ webSocketMaxBufferSize = config .getWebSocketMaxBufferSize ();
732
+ webSocketMaxFrameSize = config .getWebSocketMaxFrameSize ();
733
+
725
734
// timeouts
726
735
connectTimeout = config .getConnectTimeout ();
727
736
requestTimeout = config .getRequestTimeout ();
@@ -766,8 +775,6 @@ public Builder(AsyncHttpClientConfig config) {
766
775
httpClientCodecMaxHeaderSize = config .getHttpClientCodecMaxHeaderSize ();
767
776
httpClientCodecMaxChunkSize = config .getHttpClientCodecMaxChunkSize ();
768
777
chunkedFileChunkSize = config .getChunkedFileChunkSize ();
769
- webSocketMaxBufferSize = config .getWebSocketMaxBufferSize ();
770
- webSocketMaxFrameSize = config .getWebSocketMaxFrameSize ();
771
778
channelOptions .putAll (config .getChannelOptions ());
772
779
eventLoopGroup = config .getEventLoopGroup ();
773
780
useNativeTransport = config .isUseNativeTransport ();
@@ -851,11 +858,6 @@ public Builder setValidateResponseHeaders(boolean validateResponseHeaders) {
851
858
return this ;
852
859
}
853
860
854
- public Builder setAggregateWebSocketFrameFragments (boolean aggregateWebSocketFrameFragments ) {
855
- this .aggregateWebSocketFrameFragments = aggregateWebSocketFrameFragments ;
856
- return this ;
857
- }
858
-
859
861
public Builder setProxyServer (ProxyServer proxyServer ) {
860
862
this .proxyServerSelector = uri -> proxyServer ;
861
863
return this ;
@@ -875,6 +877,22 @@ public Builder setUseProxyProperties(boolean useProxyProperties) {
875
877
return this ;
876
878
}
877
879
880
+ // websocket
881
+ public Builder setAggregateWebSocketFrameFragments (boolean aggregateWebSocketFrameFragments ) {
882
+ this .aggregateWebSocketFrameFragments = aggregateWebSocketFrameFragments ;
883
+ return this ;
884
+ }
885
+
886
+ public Builder setWebSocketMaxBufferSize (int webSocketMaxBufferSize ) {
887
+ this .webSocketMaxBufferSize = webSocketMaxBufferSize ;
888
+ return this ;
889
+ }
890
+
891
+ public Builder setWebSocketMaxFrameSize (int webSocketMaxFrameSize ) {
892
+ this .webSocketMaxFrameSize = webSocketMaxFrameSize ;
893
+ return this ;
894
+ }
895
+
878
896
// timeouts
879
897
public Builder setConnectTimeout (int connectTimeout ) {
880
898
this .connectTimeout = connectTimeout ;
@@ -1082,16 +1100,6 @@ public Builder setChunkedFileChunkSize(int chunkedFileChunkSize) {
1082
1100
return this ;
1083
1101
}
1084
1102
1085
- public Builder setWebSocketMaxBufferSize (int webSocketMaxBufferSize ) {
1086
- this .webSocketMaxBufferSize = webSocketMaxBufferSize ;
1087
- return this ;
1088
- }
1089
-
1090
- public Builder setWebSocketMaxFrameSize (int webSocketMaxFrameSize ) {
1091
- this .webSocketMaxFrameSize = webSocketMaxFrameSize ;
1092
- return this ;
1093
- }
1094
-
1095
1103
@ SuppressWarnings ("unchecked" )
1096
1104
public <T > Builder addChannelOption (ChannelOption <T > name , T value ) {
1097
1105
channelOptions .put ((ChannelOption <Object >) name , value );
0 commit comments