This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 515ba9d Updating Netty
515ba9d is described below
commit 515ba9d707830185f6e4123197767893e41a556e
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Thu Jul 11 13:13:39 2019 +0100
Updating Netty
---
.../karaf/features/src/main/resources/features.xml | 2 ++
parent/pom.xml | 2 +-
.../http/netty/client/NettyHttpConduit.java | 4 +--
.../http/netty/server/NettyHttpServletHandler.java | 19 +++++++------
.../server/interceptor/HttpSessionInterceptor.java | 5 ++--
.../server/servlet/NettyHttpServletRequest.java | 32 ++++++++++------------
.../netty/server/servlet/NettyServletResponse.java | 27 ++++++++++--------
.../transport/http/netty/server/util/Utils.java | 2 +-
8 files changed, 49 insertions(+), 44 deletions(-)
diff --git a/osgi/karaf/features/src/main/resources/features.xml
b/osgi/karaf/features/src/main/resources/features.xml
index 45f68af..77f3d65 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -191,6 +191,7 @@
<bundle
start-level="40">mvn:io.netty/netty-handler/${cxf.netty.version}</bundle>
<bundle
start-level="40">mvn:io.netty/netty-buffer/${cxf.netty.version}</bundle>
<bundle
start-level="40">mvn:io.netty/netty-transport/${cxf.netty.version}</bundle>
+ <bundle
start-level="40">mvn:io.netty/netty-resolver/${cxf.netty.version}</bundle>
<bundle
start-level="40">mvn:io.netty/netty-codec/${cxf.netty.version}</bundle>
<bundle
start-level="40">mvn:io.netty/netty-codec-http/${cxf.netty.version}</bundle>
<bundle
start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http-netty-client/${project.version}</bundle>
@@ -201,6 +202,7 @@
<bundle
start-level="40">mvn:io.netty/netty-handler/${cxf.netty.version}</bundle>
<bundle
start-level="40">mvn:io.netty/netty-buffer/${cxf.netty.version}</bundle>
<bundle
start-level="40">mvn:io.netty/netty-transport/${cxf.netty.version}</bundle>
+ <bundle
start-level="40">mvn:io.netty/netty-resolver/${cxf.netty.version}</bundle>
<bundle
start-level="40">mvn:io.netty/netty-codec/${cxf.netty.version}</bundle>
<bundle
start-level="40">mvn:io.netty/netty-codec-http/${cxf.netty.version}</bundle>
<bundle
start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http-netty-server/${project.version}</bundle>
diff --git a/parent/pom.xml b/parent/pom.xml
index 33c38b2..f61f581 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -165,7 +165,7 @@
<cxf.msv.version>2013.6.1</cxf.msv.version>
<cxf.neethi.version>3.1.1</cxf.neethi.version>
<cxf.netty.version.range>[4,5)</cxf.netty.version.range>
- <cxf.netty.version>4.0.56.Final</cxf.netty.version>
+ <cxf.netty.version>4.1.37.Final</cxf.netty.version>
<cxf.oauth.version>20100527</cxf.oauth.version>
<cxf.olingo.version>2.0.11</cxf.olingo.version>
<cxf.openjpa.version>2.4.3</cxf.openjpa.version>
diff --git
a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
index f4931d8..7bd3a2e 100644
---
a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
+++
b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
@@ -448,12 +448,12 @@ public class NettyHttpConduit extends
URLConnectionHTTPConduit implements BusLif
@Override
protected int getResponseCode() throws IOException {
- return getHttpResponse().getStatus().code();
+ return getHttpResponse().status().code();
}
@Override
protected String getResponseMessage() throws IOException {
- return getHttpResponse().getStatus().reasonPhrase();
+ return getHttpResponse().status().reasonPhrase();
}
@Override
diff --git
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletHandler.java
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletHandler.java
index 88fad7e..6e583c2 100644
---
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletHandler.java
+++
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletHandler.java
@@ -43,11 +43,12 @@ import io.netty.handler.codec.TooLongFrameException;
import io.netty.handler.codec.http.DefaultFullHttpResponse;
import io.netty.handler.codec.http.DefaultHttpResponse;
import io.netty.handler.codec.http.FullHttpResponse;
-import io.netty.handler.codec.http.HttpHeaders;
-import io.netty.handler.codec.http.HttpHeaders.Names;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaderValues;
import io.netty.handler.codec.http.HttpRequest;
import io.netty.handler.codec.http.HttpResponse;
import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpUtil;
import io.netty.handler.codec.http.HttpVersion;
import io.netty.handler.timeout.IdleState;
import io.netty.handler.timeout.IdleStateEvent;
@@ -101,17 +102,17 @@ public class NettyHttpServletHandler extends
ChannelInboundHandlerAdapter {
@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws
Exception {
HttpRequest request = (HttpRequest) msg;
- if (HttpHeaders.is100ContinueExpected(request)) {
+ if (HttpUtil.is100ContinueExpected(request)) {
ctx.write(new DefaultHttpResponse(HttpVersion.HTTP_1_1,
HttpResponseStatus.CONTINUE));
}
// find the nettyHttpContextHandler by lookup the request url
- NettyHttpContextHandler nettyHttpContextHandler =
pipelineFactory.getNettyHttpHandler(request.getUri());
+ NettyHttpContextHandler nettyHttpContextHandler =
pipelineFactory.getNettyHttpHandler(request.uri());
if (nettyHttpContextHandler != null) {
handleHttpServletRequest(ctx, request, nettyHttpContextHandler);
} else {
throw new RuntimeException(
- new Fault(new Message("NO_NETTY_SERVLET_HANDLER_FOUND",
LOG, request.getUri())));
+ new Fault(new Message("NO_NETTY_SERVLET_HANDLER_FOUND",
LOG, request.uri())));
}
}
@@ -138,15 +139,15 @@ public class NettyHttpServletHandler extends
ChannelInboundHandlerAdapter {
nettyServletResponse.getWriter().flush();
- boolean keepAlive = HttpHeaders.isKeepAlive(request);
+ boolean keepAlive = HttpUtil.isKeepAlive(request);
if (keepAlive) {
// Add 'Content-Length' header only for a keep-alive connection.
- response.headers().set(Names.CONTENT_LENGTH,
response.content().readableBytes());
+ response.headers().set(HttpHeaderNames.CONTENT_LENGTH,
response.content().readableBytes());
// Add keep alive header as per:
// -
//
http://www.w3.org/Protocols/HTTP/1.1/draft-ietf-http-v11-spec-01.html#Connection
- response.headers().set(Names.CONNECTION,
HttpHeaders.Values.KEEP_ALIVE);
+ response.headers().set(HttpHeaderNames.CONNECTION,
HttpHeaderValues.KEEP_ALIVE);
}
// write response...
@@ -191,7 +192,7 @@ public class NettyHttpServletHandler extends
ChannelInboundHandlerAdapter {
FullHttpResponse response = new
DefaultFullHttpResponse(HttpVersion.HTTP_1_1,
status,
content);
- response.headers().set(Names.CONTENT_TYPE, "text/plain;
charset=UTF-8");
+ response.headers().set(HttpHeaderNames.CONTENT_TYPE, "text/plain;
charset=UTF-8");
ctx.write(response).addListener(ChannelFutureListener.CLOSE);
}
diff --git
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/interceptor/HttpSessionInterceptor.java
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/interceptor/HttpSessionInterceptor.java
index 89aff3b..9a074f5 100644
---
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/interceptor/HttpSessionInterceptor.java
+++
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/interceptor/HttpSessionInterceptor.java
@@ -27,8 +27,7 @@ import
org.apache.cxf.transport.http.netty.server.session.HttpSessionStore;
import org.apache.cxf.transport.http.netty.server.util.Utils;
import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.http.HttpHeaders;
-import io.netty.handler.codec.http.HttpHeaders.Names;
+import io.netty.handler.codec.http.HttpHeaderNames;
import io.netty.handler.codec.http.HttpRequest;
import io.netty.handler.codec.http.HttpResponse;
import io.netty.handler.codec.http.cookie.ClientCookieEncoder;
@@ -69,7 +68,7 @@ public class HttpSessionInterceptor implements
NettyInterceptor {
NettyHttpSession s = HttpSessionThreadLocal.get();
if (s != null && !this.sessionRequestedByCookie) {
// setup the Cookie for session
- HttpHeaders.addHeader(response, Names.SET_COOKIE,
+ response.headers().set(HttpHeaderNames.SET_COOKIE,
ClientCookieEncoder.STRICT.encode(NettyHttpSession.SESSION_ID_KEY, s.getId()));
}
diff --git
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java
index 20136b3..a535512 100644
---
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java
+++
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyHttpServletRequest.java
@@ -46,14 +46,14 @@ import
org.apache.cxf.transport.http.netty.server.util.Utils;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.http.HttpContent;
-import io.netty.handler.codec.http.HttpHeaders;
-import io.netty.handler.codec.http.HttpHeaders.Names;
+import io.netty.handler.codec.http.HttpHeaderNames;
import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpUtil;
import io.netty.handler.codec.http.QueryStringDecoder;
import io.netty.handler.codec.http.cookie.ServerCookieDecoder;
import io.netty.handler.ssl.SslHandler;
-import static io.netty.handler.codec.http.HttpHeaders.Names.COOKIE;
+import static io.netty.handler.codec.http.HttpHeaderNames.COOKIE;
public class NettyHttpServletRequest implements HttpServletRequest {
@@ -84,10 +84,10 @@ public class NettyHttpServletRequest implements
HttpServletRequest {
this.originalRequest = request;
this.contextPath = contextPath;
this.uriParser = new URIParser(contextPath);
- uriParser.parse(request.getUri());
+ uriParser.parse(request.uri());
this.inputStream = new NettyServletInputStream((HttpContent)request);
this.reader = new BufferedReader(new InputStreamReader(inputStream));
- this.queryStringDecoder = new QueryStringDecoder(request.getUri());
+ this.queryStringDecoder = new QueryStringDecoder(request.uri());
// setup the SSL security attributes
this.channelHandlerContext = ctx;
SslHandler sslHandler =
channelHandlerContext.pipeline().get(SslHandler.class);
@@ -149,7 +149,7 @@ public class NettyHttpServletRequest implements
HttpServletRequest {
@Override
public String getHeader(String name) {
- return HttpHeaders.getHeader(this.originalRequest, name);
+ return this.originalRequest.headers().get(name);
}
@SuppressWarnings("rawtypes")
@@ -166,12 +166,12 @@ public class NettyHttpServletRequest implements
HttpServletRequest {
@Override
public int getIntHeader(String name) {
- return HttpHeaders.getIntHeader(this.originalRequest, name, -1);
+ return this.originalRequest.headers().getInt(name, -1);
}
@Override
public String getMethod() {
- return this.originalRequest.getMethod().name();
+ return this.originalRequest.method().name();
}
@Override
@@ -207,13 +207,12 @@ public class NettyHttpServletRequest implements
HttpServletRequest {
@Override
public int getContentLength() {
- return (int) HttpHeaders.getContentLength(this.originalRequest, -1);
+ return HttpUtil.getContentLength(this.originalRequest, -1);
}
@Override
public String getContentType() {
- return HttpHeaders.getHeader(this.originalRequest,
- HttpHeaders.Names.CONTENT_TYPE);
+ return
this.originalRequest.headers().get(HttpHeaderNames.CONTENT_TYPE);
}
@Override
@@ -258,7 +257,7 @@ public class NettyHttpServletRequest implements
HttpServletRequest {
@Override
public String getProtocol() {
- return this.originalRequest.getProtocolVersion().toString();
+ return this.originalRequest.protocolVersion().toString();
}
@Override
@@ -317,8 +316,8 @@ public class NettyHttpServletRequest implements
HttpServletRequest {
@Override
public Locale getLocale() {
- String locale = HttpHeaders.getHeader(this.originalRequest,
- Names.ACCEPT_LANGUAGE, DEFAULT_LOCALE.toString());
+ String locale = this.originalRequest.headers().get(
+ HttpHeaderNames.ACCEPT_LANGUAGE, DEFAULT_LOCALE.toString());
return new Locale(locale);
}
@@ -402,9 +401,8 @@ public class NettyHttpServletRequest implements
HttpServletRequest {
@Override
public Enumeration getLocales() {
Collection<Locale> locales = Utils
- .parseAcceptLanguageHeader(HttpHeaders
- .getHeader(this.originalRequest,
- HttpHeaders.Names.ACCEPT_LANGUAGE));
+ .parseAcceptLanguageHeader(this.originalRequest.headers().get(
+ HttpHeaderNames.ACCEPT_LANGUAGE));
if (locales == null || locales.isEmpty()) {
locales = new ArrayList<>();
diff --git
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletResponse.java
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletResponse.java
index 96f8813..96e862a 100644
---
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletResponse.java
+++
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/servlet/NettyServletResponse.java
@@ -29,11 +29,13 @@ import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import io.netty.handler.codec.http.HttpContent;
-import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpHeaderNames;
import io.netty.handler.codec.http.HttpResponse;
import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpUtil;
+import io.netty.util.AsciiString;
-import static io.netty.handler.codec.http.HttpHeaders.Names.LOCATION;
+import static io.netty.handler.codec.http.HttpHeaderNames.LOCATION;
public class NettyServletResponse implements HttpServletResponse {
@@ -57,15 +59,15 @@ public class NettyServletResponse implements
HttpServletResponse {
}
public void addDateHeader(String name, long date) {
- HttpHeaders.addHeader(this.originalResponse, name, date);
+ this.originalResponse.headers().set(name, date);
}
public void addHeader(String name, String value) {
- HttpHeaders.addHeader(this.originalResponse, name, value);
+ this.originalResponse.headers().set(name, value);
}
public void addIntHeader(String name, int value) {
- HttpHeaders.addIntHeader(this.originalResponse, name, value);
+ this.originalResponse.headers().set(name, value);
}
@Override
@@ -92,15 +94,19 @@ public class NettyServletResponse implements
HttpServletResponse {
}
public void setDateHeader(String name, long date) {
- HttpHeaders.setHeader(this.originalResponse, name, date);
+ this.originalResponse.headers().set(name, date);
+ }
+
+ public void setHeader(AsciiString name, String value) {
+ this.originalResponse.headers().set(name, value);
}
public void setHeader(String name, String value) {
- HttpHeaders.setHeader(this.originalResponse, name, value);
+ this.originalResponse.headers().set(name, value);
}
public void setIntHeader(String name, int value) {
- HttpHeaders.setIntHeader(this.originalResponse, name, value);
+ this.originalResponse.headers().set(name, value);
}
@@ -124,13 +130,12 @@ public class NettyServletResponse implements
HttpServletResponse {
@Override
public void setContentType(String type) {
- HttpHeaders.setHeader(this.originalResponse,
- HttpHeaders.Names.CONTENT_TYPE, type);
+ this.originalResponse.headers().set(HttpHeaderNames.CONTENT_TYPE,
type);
}
@Override
public void setContentLength(int len) {
- HttpHeaders.setContentLength(this.originalResponse, len);
+ HttpUtil.setContentLength(this.originalResponse, len);
}
@Override
diff --git
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/util/Utils.java
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/util/Utils.java
index 1f55c19..47b6621 100644
---
a/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/util/Utils.java
+++
b/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/util/Utils.java
@@ -38,7 +38,7 @@ import io.netty.handler.codec.http.HttpRequest;
import io.netty.handler.codec.http.cookie.Cookie;
import io.netty.handler.codec.http.cookie.ServerCookieDecoder;
-import static io.netty.handler.codec.http.HttpHeaders.Names.COOKIE;
+import static io.netty.handler.codec.http.HttpHeaderNames.COOKIE;
public final class Utils {
