Skip to content

Commit 861f444

Browse files
tappenzellertappenzeller
committed
bump netty version, build fixes
1 parent 25b9a53 commit 861f444

55 files changed

Lines changed: 504 additions & 608 deletions

File tree

Some content is hidden

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

‎build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ subprojects {
9797
"-Xep:FutureReturnValueIgnored:OFF",
9898
"-Xep:InlineMeSuggester:OFF",
9999
"-Xep:MissingSummary:OFF",
100+
"-Xep:StringConcatToTextBlock:OFF",
100101
)
101102
}
102103
}

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
versions_ribbon=2.4.4
2-
versions_netty=4.2.11.Final
2+
versions_netty=4.2.12.Final
33
versions_brotli4j=1.16.0
44
release.scope=patch
55
release.version=3.3.0-SNAPSHOT

‎zuul-core/dependencies.lock‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -54,37 +54,37 @@
5454
"project": true
5555
},
5656
"io.netty:netty-bom": {
57-
"locked": "4.2.11.Final"
57+
"locked": "4.2.12.Final"
5858
},
5959
"io.netty:netty-buffer": {
60-
"locked": "4.2.11.Final"
60+
"locked": "4.2.12.Final"
6161
},
6262
"io.netty:netty-codec-haproxy": {
63-
"locked": "4.2.11.Final"
63+
"locked": "4.2.12.Final"
6464
},
6565
"io.netty:netty-codec-http": {
66-
"locked": "4.2.11.Final"
66+
"locked": "4.2.12.Final"
6767
},
6868
"io.netty:netty-codec-http2": {
69-
"locked": "4.2.11.Final"
69+
"locked": "4.2.12.Final"
7070
},
7171
"io.netty:netty-common": {
72-
"locked": "4.2.11.Final"
72+
"locked": "4.2.12.Final"
7373
},
7474
"io.netty:netty-handler": {
75-
"locked": "4.2.11.Final"
75+
"locked": "4.2.12.Final"
7676
},
7777
"io.netty:netty-transport": {
78-
"locked": "4.2.11.Final"
78+
"locked": "4.2.12.Final"
7979
},
8080
"io.netty:netty-transport-native-epoll": {
81-
"locked": "4.2.11.Final"
81+
"locked": "4.2.12.Final"
8282
},
8383
"io.netty:netty-transport-native-io_uring": {
84-
"locked": "4.2.11.Final"
84+
"locked": "4.2.12.Final"
8585
},
8686
"io.netty:netty-transport-native-kqueue": {
87-
"locked": "4.2.11.Final"
87+
"locked": "4.2.12.Final"
8888
},
8989
"io.perfmark:perfmark-api": {
9090
"locked": "0.27.0"
@@ -182,37 +182,37 @@
182182
"project": true
183183
},
184184
"io.netty:netty-bom": {
185-
"locked": "4.2.11.Final"
185+
"locked": "4.2.12.Final"
186186
},
187187
"io.netty:netty-buffer": {
188-
"locked": "4.2.11.Final"
188+
"locked": "4.2.12.Final"
189189
},
190190
"io.netty:netty-codec-haproxy": {
191-
"locked": "4.2.11.Final"
191+
"locked": "4.2.12.Final"
192192
},
193193
"io.netty:netty-codec-http": {
194-
"locked": "4.2.11.Final"
194+
"locked": "4.2.12.Final"
195195
},
196196
"io.netty:netty-codec-http2": {
197-
"locked": "4.2.11.Final"
197+
"locked": "4.2.12.Final"
198198
},
199199
"io.netty:netty-common": {
200-
"locked": "4.2.11.Final"
200+
"locked": "4.2.12.Final"
201201
},
202202
"io.netty:netty-handler": {
203-
"locked": "4.2.11.Final"
203+
"locked": "4.2.12.Final"
204204
},
205205
"io.netty:netty-transport": {
206-
"locked": "4.2.11.Final"
206+
"locked": "4.2.12.Final"
207207
},
208208
"io.netty:netty-transport-native-epoll": {
209-
"locked": "4.2.11.Final"
209+
"locked": "4.2.12.Final"
210210
},
211211
"io.netty:netty-transport-native-io_uring": {
212-
"locked": "4.2.11.Final"
212+
"locked": "4.2.12.Final"
213213
},
214214
"io.netty:netty-transport-native-kqueue": {
215-
"locked": "4.2.11.Final"
215+
"locked": "4.2.12.Final"
216216
},
217217
"io.perfmark:perfmark-api": {
218218
"locked": "0.27.0"
@@ -316,40 +316,40 @@
316316
"locked": "1.10"
317317
},
318318
"io.netty:netty-bom": {
319-
"locked": "4.2.11.Final"
319+
"locked": "4.2.12.Final"
320320
},
321321
"io.netty:netty-buffer": {
322-
"locked": "4.2.11.Final"
322+
"locked": "4.2.12.Final"
323323
},
324324
"io.netty:netty-codec-haproxy": {
325-
"locked": "4.2.11.Final"
325+
"locked": "4.2.12.Final"
326326
},
327327
"io.netty:netty-codec-http": {
328-
"locked": "4.2.11.Final"
328+
"locked": "4.2.12.Final"
329329
},
330330
"io.netty:netty-codec-http2": {
331-
"locked": "4.2.11.Final"
331+
"locked": "4.2.12.Final"
332332
},
333333
"io.netty:netty-common": {
334-
"locked": "4.2.11.Final"
334+
"locked": "4.2.12.Final"
335335
},
336336
"io.netty:netty-handler": {
337-
"locked": "4.2.11.Final"
337+
"locked": "4.2.12.Final"
338338
},
339339
"io.netty:netty-tcnative-boringssl-static": {
340340
"locked": "2.0.75.Final"
341341
},
342342
"io.netty:netty-transport": {
343-
"locked": "4.2.11.Final"
343+
"locked": "4.2.12.Final"
344344
},
345345
"io.netty:netty-transport-native-epoll": {
346-
"locked": "4.2.11.Final"
346+
"locked": "4.2.12.Final"
347347
},
348348
"io.netty:netty-transport-native-io_uring": {
349-
"locked": "4.2.11.Final"
349+
"locked": "4.2.12.Final"
350350
},
351351
"io.netty:netty-transport-native-kqueue": {
352-
"locked": "4.2.11.Final"
352+
"locked": "4.2.12.Final"
353353
},
354354
"io.perfmark:perfmark-api": {
355355
"locked": "0.27.0"
@@ -477,40 +477,40 @@
477477
"project": true
478478
},
479479
"io.netty:netty-bom": {
480-
"locked": "4.2.11.Final"
480+
"locked": "4.2.12.Final"
481481
},
482482
"io.netty:netty-buffer": {
483-
"locked": "4.2.11.Final"
483+
"locked": "4.2.12.Final"
484484
},
485485
"io.netty:netty-codec-haproxy": {
486-
"locked": "4.2.11.Final"
486+
"locked": "4.2.12.Final"
487487
},
488488
"io.netty:netty-codec-http": {
489-
"locked": "4.2.11.Final"
489+
"locked": "4.2.12.Final"
490490
},
491491
"io.netty:netty-codec-http2": {
492-
"locked": "4.2.11.Final"
492+
"locked": "4.2.12.Final"
493493
},
494494
"io.netty:netty-common": {
495-
"locked": "4.2.11.Final"
495+
"locked": "4.2.12.Final"
496496
},
497497
"io.netty:netty-handler": {
498-
"locked": "4.2.11.Final"
498+
"locked": "4.2.12.Final"
499499
},
500500
"io.netty:netty-tcnative-boringssl-static": {
501501
"locked": "2.0.75.Final"
502502
},
503503
"io.netty:netty-transport": {
504-
"locked": "4.2.11.Final"
504+
"locked": "4.2.12.Final"
505505
},
506506
"io.netty:netty-transport-native-epoll": {
507-
"locked": "4.2.11.Final"
507+
"locked": "4.2.12.Final"
508508
},
509509
"io.netty:netty-transport-native-io_uring": {
510-
"locked": "4.2.11.Final"
510+
"locked": "4.2.12.Final"
511511
},
512512
"io.netty:netty-transport-native-kqueue": {
513-
"locked": "4.2.11.Final"
513+
"locked": "4.2.12.Final"
514514
},
515515
"io.perfmark:perfmark-api": {
516516
"locked": "0.27.0"
@@ -595,37 +595,37 @@
595595
"locked": "1.10"
596596
},
597597
"io.netty:netty-bom": {
598-
"locked": "4.2.11.Final"
598+
"locked": "4.2.12.Final"
599599
},
600600
"io.netty:netty-buffer": {
601-
"locked": "4.2.11.Final"
601+
"locked": "4.2.12.Final"
602602
},
603603
"io.netty:netty-codec-haproxy": {
604-
"locked": "4.2.11.Final"
604+
"locked": "4.2.12.Final"
605605
},
606606
"io.netty:netty-codec-http": {
607-
"locked": "4.2.11.Final"
607+
"locked": "4.2.12.Final"
608608
},
609609
"io.netty:netty-codec-http2": {
610-
"locked": "4.2.11.Final"
610+
"locked": "4.2.12.Final"
611611
},
612612
"io.netty:netty-common": {
613-
"locked": "4.2.11.Final"
613+
"locked": "4.2.12.Final"
614614
},
615615
"io.netty:netty-handler": {
616-
"locked": "4.2.11.Final"
616+
"locked": "4.2.12.Final"
617617
},
618618
"io.netty:netty-transport": {
619-
"locked": "4.2.11.Final"
619+
"locked": "4.2.12.Final"
620620
},
621621
"io.netty:netty-transport-native-epoll": {
622-
"locked": "4.2.11.Final"
622+
"locked": "4.2.12.Final"
623623
},
624624
"io.netty:netty-transport-native-io_uring": {
625-
"locked": "4.2.11.Final"
625+
"locked": "4.2.12.Final"
626626
},
627627
"io.netty:netty-transport-native-kqueue": {
628-
"locked": "4.2.11.Final"
628+
"locked": "4.2.12.Final"
629629
},
630630
"io.perfmark:perfmark-api": {
631631
"locked": "0.27.0"
@@ -744,40 +744,40 @@
744744
"locked": "1.10"
745745
},
746746
"io.netty:netty-bom": {
747-
"locked": "4.2.11.Final"
747+
"locked": "4.2.12.Final"
748748
},
749749
"io.netty:netty-buffer": {
750-
"locked": "4.2.11.Final"
750+
"locked": "4.2.12.Final"
751751
},
752752
"io.netty:netty-codec-haproxy": {
753-
"locked": "4.2.11.Final"
753+
"locked": "4.2.12.Final"
754754
},
755755
"io.netty:netty-codec-http": {
756-
"locked": "4.2.11.Final"
756+
"locked": "4.2.12.Final"
757757
},
758758
"io.netty:netty-codec-http2": {
759-
"locked": "4.2.11.Final"
759+
"locked": "4.2.12.Final"
760760
},
761761
"io.netty:netty-common": {
762-
"locked": "4.2.11.Final"
762+
"locked": "4.2.12.Final"
763763
},
764764
"io.netty:netty-handler": {
765-
"locked": "4.2.11.Final"
765+
"locked": "4.2.12.Final"
766766
},
767767
"io.netty:netty-tcnative-boringssl-static": {
768768
"locked": "2.0.75.Final"
769769
},
770770
"io.netty:netty-transport": {
771-
"locked": "4.2.11.Final"
771+
"locked": "4.2.12.Final"
772772
},
773773
"io.netty:netty-transport-native-epoll": {
774-
"locked": "4.2.11.Final"
774+
"locked": "4.2.12.Final"
775775
},
776776
"io.netty:netty-transport-native-io_uring": {
777-
"locked": "4.2.11.Final"
777+
"locked": "4.2.12.Final"
778778
},
779779
"io.netty:netty-transport-native-kqueue": {
780-
"locked": "4.2.11.Final"
780+
"locked": "4.2.12.Final"
781781
},
782782
"io.perfmark:perfmark-api": {
783783
"locked": "0.27.0"

‎zuul-core/src/main/java/com/netflix/netty/common/ByteBufUtil.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public static void touch(ReferenceCounted byteBuf, String hint, String filterNam
5252
}
5353

5454
public static void touch(HttpResponse originResponse, String hint, ZuulMessage msg) {
55-
if (isAdvancedLeakDetection && originResponse instanceof ReferenceCounted) {
56-
((ReferenceCounted) originResponse).touch(hint + msg);
55+
if (isAdvancedLeakDetection && originResponse instanceof ReferenceCounted referenceCounted) {
56+
referenceCounted.touch(hint + msg);
5757
}
5858
}
5959
}

‎zuul-core/src/main/java/com/netflix/netty/common/Http1ConnectionCloseHandler.java‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
public class Http1ConnectionCloseHandler extends ChannelDuplexHandler {
3737
private static final Logger LOG = LoggerFactory.getLogger(Http1ConnectionCloseHandler.class);
3838

39-
private final AtomicBoolean requestInflight = new AtomicBoolean(Boolean.FALSE);
39+
private final AtomicBoolean requestInflight = new AtomicBoolean(false);
4040

4141
@Override
4242
public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
@@ -67,27 +67,21 @@ public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise)
6767
public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
6868
// Track when there's an inflight request.
6969
if (evt instanceof HttpLifecycleChannelHandler.StartEvent) {
70-
requestInflight.set(Boolean.TRUE);
70+
requestInflight.set(true);
7171
} else if (evt instanceof HttpLifecycleChannelHandler.CompleteEvent) {
72-
requestInflight.set(Boolean.FALSE);
72+
requestInflight.set(false);
7373
}
7474

7575
super.userEventTriggered(ctx, evt);
7676
}
7777

7878
protected void closeChannel(ChannelHandlerContext ctx, ConnectionCloseType evt, ChannelPromise promise) {
7979
switch (evt) {
80-
case DELAYED_GRACEFUL:
81-
gracefully(ctx, promise);
82-
break;
83-
case GRACEFUL:
84-
gracefully(ctx, promise);
85-
break;
86-
case IMMEDIATE:
87-
immediately(ctx, promise);
88-
break;
89-
default:
90-
throw new IllegalArgumentException("Unknown ConnectionCloseEvent type! - " + String.valueOf(evt));
80+
case DELAYED_GRACEFUL -> gracefully(ctx, promise);
81+
case GRACEFUL -> gracefully(ctx, promise);
82+
case IMMEDIATE -> immediately(ctx, promise);
83+
default -> throw new IllegalArgumentException(
84+
"Unknown ConnectionCloseEvent type! - " + String.valueOf(evt));
9185
}
9286
}
9387

0 commit comments

Comments
 (0)