Skip to content
This repository was archived by the owner on Mar 3, 2026. It is now read-only.

Commit e588f72

Browse files
jknackjknack
committed
Update netty version fix jooby-project#984 
1 parent a15d0e9 commit e588f72

File tree

3 files changed

+46
-56
lines changed

3 files changed

+46
-56
lines changed

‎modules/coverage-report/src/test/java/org/jooby/issues/Issue418.java‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,6 @@
11
package org.jooby.issues;
22

3-
import static org.junit.Assert.assertEquals;
4-
import static org.junit.Assert.assertNotNull;
5-
import static org.junit.Assert.assertTrue;
6-
7-
import java.io.IOException;
8-
import java.io.InputStream;
9-
import java.io.OutputStream;
10-
import java.net.InetSocketAddress;
11-
import java.net.Socket;
12-
import java.net.SocketTimeoutException;
13-
import java.nio.ByteBuffer;
14-
import java.nio.charset.StandardCharsets;
15-
import java.util.HashMap;
16-
import java.util.Map;
17-
import java.util.concurrent.CountDownLatch;
18-
import java.util.concurrent.Phaser;
19-
import java.util.concurrent.TimeUnit;
20-
import java.util.concurrent.atomic.AtomicReference;
21-
3+
import com.google.common.collect.ImmutableMap;
224
import org.eclipse.jetty.http.HttpFields;
235
import org.eclipse.jetty.http.HttpURI;
246
import org.eclipse.jetty.http.HttpVersion;
@@ -44,9 +26,25 @@
4426
import org.jooby.MediaType;
4527
import org.jooby.Results;
4628
import org.jooby.test.ServerFeature;
29+
import static org.junit.Assert.assertEquals;
30+
import static org.junit.Assert.assertNotNull;
31+
import static org.junit.Assert.assertTrue;
4732
import org.junit.Test;
4833

49-
import com.google.common.collect.ImmutableMap;
34+
import java.io.IOException;
35+
import java.io.InputStream;
36+
import java.io.OutputStream;
37+
import java.net.InetSocketAddress;
38+
import java.net.Socket;
39+
import java.net.SocketTimeoutException;
40+
import java.nio.ByteBuffer;
41+
import java.nio.charset.StandardCharsets;
42+
import java.util.HashMap;
43+
import java.util.Map;
44+
import java.util.concurrent.CountDownLatch;
45+
import java.util.concurrent.Phaser;
46+
import java.util.concurrent.TimeUnit;
47+
import java.util.concurrent.atomic.AtomicReference;
5048

5149
public class Issue418 extends ServerFeature {
5250

‎modules/jooby-netty/src/main/java/org/jooby/internal/netty/NettyRequest.java‎

Lines changed: 26 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -203,36 +203,14 @@
203203
*/
204204
package org.jooby.internal.netty;
205205

206-
import com.google.common.escape.Escapers;
207-
import static io.netty.channel.ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE;
208-
209-
import java.io.IOException;
210-
import java.io.InputStream;
211-
import java.net.InetSocketAddress;
212-
import java.net.URLDecoder;
213-
import java.util.Collections;
214-
import java.util.List;
215-
import java.util.Optional;
216-
import java.util.concurrent.Executor;
217-
import java.util.function.Function;
218-
import java.util.stream.Collectors;
219-
220-
import org.jooby.MediaType;
221-
import org.jooby.Router;
222-
import org.jooby.Sse;
223-
import org.jooby.spi.NativePushPromise;
224-
import org.jooby.spi.NativeRequest;
225-
import org.jooby.spi.NativeUpload;
226-
import org.jooby.spi.NativeWebSocket;
227-
228206
import com.google.common.collect.ArrayListMultimap;
229207
import com.google.common.collect.ImmutableList;
230208
import com.google.common.collect.Multimap;
231-
232209
import io.netty.buffer.ByteBuf;
233210
import io.netty.buffer.ByteBufHolder;
234211
import io.netty.buffer.ByteBufInputStream;
235212
import io.netty.channel.Channel;
213+
import static io.netty.channel.ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE;
236214
import io.netty.channel.ChannelHandlerContext;
237215
import io.netty.handler.codec.http.FullHttpRequest;
238216
import io.netty.handler.codec.http.HttpContent;
@@ -252,6 +230,23 @@
252230
import io.netty.handler.codec.http2.HttpConversionUtil;
253231
import io.netty.util.AttributeKey;
254232
import io.netty.util.ReferenceCounted;
233+
import org.jooby.MediaType;
234+
import org.jooby.Router;
235+
import org.jooby.Sse;
236+
import org.jooby.spi.NativePushPromise;
237+
import org.jooby.spi.NativeRequest;
238+
import org.jooby.spi.NativeUpload;
239+
import org.jooby.spi.NativeWebSocket;
240+
241+
import java.io.IOException;
242+
import java.io.InputStream;
243+
import java.net.InetSocketAddress;
244+
import java.util.Collections;
245+
import java.util.List;
246+
import java.util.Optional;
247+
import java.util.concurrent.Executor;
248+
import java.util.function.Function;
249+
import java.util.stream.Collectors;
255250

256251
public class NettyRequest implements NativeRequest {
257252

@@ -265,7 +260,8 @@ public class NettyRequest implements NativeRequest {
265260
.newInstance(NettyRequest.class.getName() + ".async");
266261

267262
public static final AttributeKey<Boolean> SECURE = AttributeKey
268-
.newInstance(NettyRequest.class.getName() + ".secure");;
263+
.newInstance(NettyRequest.class.getName() + ".secure");
264+
;
269265

270266
private HttpRequest req;
271267

@@ -292,7 +288,7 @@ public NettyRequest(final ChannelHandlerContext ctx,
292288
this.req = req;
293289
this.tmpdir = tmpdir;
294290
this.query = new QueryStringDecoder(req.uri());
295-
this.path = Router.decode(query.path());
291+
this.path = Router.decode(query.path());
296292
this.wsMaxMessageSize = wsMaxMessageSize;
297293
Channel channel = ctx.channel();
298294
channel.attr(ASYNC).set(false);
@@ -480,15 +476,11 @@ private Multimap<String, String> decodeParams() throws IOException {
480476
};
481477
while (hasNext.apply(decoder)) {
482478
HttpData field = (HttpData) decoder.next();
483-
try {
484-
String name = field.getName();
485-
if (field.getHttpDataType() == HttpDataType.FileUpload) {
486-
files.put(name, new NettyUpload((FileUpload) field, tmpdir));
487-
} else {
488-
params.put(name, field.getString());
489-
}
490-
} finally {
491-
field.release();
479+
String name = field.getName();
480+
if (field.getHttpDataType() == HttpDataType.FileUpload) {
481+
files.put(name, new NettyUpload((FileUpload) field, tmpdir));
482+
} else {
483+
params.put(name, field.getString());
492484
}
493485
}
494486
} finally {

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2979,8 +2979,8 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true
29792979
<undertow.version>1.4.20.Final</undertow.version>
29802980
<servlet.version>3.1.0</servlet.version>
29812981
<jetty.version>9.4.7.v20170914</jetty.version>
2982-
<netty.version>4.1.16.Final</netty.version>
2983-
<boringssl.version>2.0.6.Final</boringssl.version>
2982+
<netty.version>4.1.20.Final</netty.version>
2983+
<boringssl.version>2.0.7.Final</boringssl.version>
29842984
<javassist.version>3.20.0-GA</javassist.version>
29852985
<javax.ws.rs-api.version>2.0</javax.ws.rs-api.version>
29862986
<slf4j-api.version>1.7.25</slf4j-api.version>

0 commit comments

Comments
 (0)