joerg/netty-http
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update to netty 4.1.91, do not release bytebuf in content()/json() method

Browse source
This commit is contained in:
Jörg Prante 2023-04-17 17:26:06 +02:00
parent 9435cc649b
commit 73a8c219c6
3 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -1,5 +1,5 @@
group = org.xbib group = org.xbib
name = netty-http name = netty-http
version = 4.1.90.0 version = 4.1.91.0
org.gradle.warning.mode = ALL org.gradle.warning.mode = ALL

25
netty-http-client-api/src/main/java/org/xbib/netty/http/client/api/Request.java
View file

@ -2,7 +2,6 @@ package org.xbib.netty.http.client.api;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.ByteBufUtil;
import io.netty.buffer.PooledByteBufAllocator; import io.netty.buffer.PooledByteBufAllocator;
import io.netty.handler.codec.http.DefaultHttpHeaders; import io.netty.handler.codec.http.DefaultHttpHeaders;
import io.netty.handler.codec.http.HttpHeaderNames; import io.netty.handler.codec.http.HttpHeaderNames;
@ -588,22 +587,12 @@ public final class Request {
} }
public Builder text(String text) { public Builder text(String text) {
ByteBuf byteBuf = ByteBufUtil.writeUtf8(allocator, text); content(text, HttpHeaderValues.TEXT_PLAIN);
try {
content(byteBuf, HttpHeaderValues.TEXT_PLAIN);
} finally {
byteBuf.release();
}
return this; return this;
} }
public Builder json(String json) { public Builder json(String json) {
ByteBuf byteBuf = ByteBufUtil.writeUtf8(allocator, json); content(json, HttpHeaderValues.APPLICATION_JSON);
try {
content(byteBuf, HttpHeaderValues.APPLICATION_JSON);
} finally {
byteBuf.release();
}
return this; return this;
} }
@ -612,11 +601,6 @@ public final class Request {
return this; return this;
} }
public Builder content(ByteBuf byteBuf) {
this.content = byteBuf;
return this;
}
public Builder content(CharSequence charSequence, CharSequence contentType) { public Builder content(CharSequence charSequence, CharSequence contentType) {
content(charSequence.toString().getBytes(HttpUtil.getCharset(contentType, StandardCharsets.UTF_8)), content(charSequence.toString().getBytes(HttpUtil.getCharset(contentType, StandardCharsets.UTF_8)),
AsciiString.of(contentType)); AsciiString.of(contentType));
@ -638,6 +622,11 @@ public final class Request {
return this; return this;
} }
public Builder content(ByteBuf byteBuf) {
this.content = byteBuf;
return this;
}
public Builder setResponseListener(ResponseListener<HttpResponse> responseListener) { public Builder setResponseListener(ResponseListener<HttpResponse> responseListener) {
this.responseListener = responseListener; this.responseListener = responseListener;
return this; return this;

6
settings.gradle
View file

@ -13,7 +13,7 @@ dependencyResolutionManagement {
version('groovy', '4.0.11') version('groovy', '4.0.11')
version('spock', '2.4-M1-groovy-4.0') version('spock', '2.4-M1-groovy-4.0')
version('junit', '5.9.2') version('junit', '5.9.2')
version('netty', '4.1.90.Final') version('netty', '4.1.91.Final')
version('netty-tcnative', '2.0.59.Final') version('netty-tcnative', '2.0.59.Final')
library('groovy-core', 'org.codehaus.groovy', 'groovy').versionRef('groovy') library('groovy-core', 'org.codehaus.groovy', 'groovy').versionRef('groovy')
library('spock-core', 'org.spockframework', 'spock-core').versionRef('spock') library('spock-core', 'org.spockframework', 'spock-core').versionRef('spock')
@ -32,8 +32,8 @@ dependencyResolutionManagement {
library('jackson', 'com.fasterxml.jackson.core', 'jackson-databind').version('2.12.7') library('jackson', 'com.fasterxml.jackson.core', 'jackson-databind').version('2.12.7')
library('javassist', 'org.javassist', 'javassist').version('3.29.1-GA') library('javassist', 'org.javassist', 'javassist').version('3.29.1-GA')
library('guice', 'org.xbib', 'guice').version('5.0.1.0') library('guice', 'org.xbib', 'guice').version('5.0.1.0')
library('net', 'org.xbib', 'net').version('3.1.0') library('net', 'org.xbib', 'net').version('3.2.0')
library('net-path', 'org.xbib', 'net-path').version('3.1.0') library('net-path', 'org.xbib', 'net-path').version('3.2.0')
} }
} }
} }