andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add a possibility to create HttpMessage instances with pre-existing Headers

Browse Source 
Motivation:

Allow passing HttpHeaders instance to DefaultHttpMessage
in order to avoid eager creation of Headers to
allow users reuse their Headers instance.

Modifications:

Added a constructor with HttpHeaders to DefaultHttpMessage,
Modified DefaultHttpResponse and DefaultHttpRequest
to receive HttpHeaders instances.
Modified DefaultFullHttpReqest and DefaultFullHttpResponse
to receive HttpHeaders, and updated `duplicate` and
`copy` to use new constructors.

Result:

Users can now pass HttpHeaders instance when
constructing Http Requests and Responses.
This commit is contained in:
Alex Petrov 2015-12-30 22:49:03 +01:00 committed by Norman Maurer
parent f90032933d
commit 0b16c3c513
5 changed files with 73 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
codec-http/src/main/java/io/netty/handler/codec/http/DefaultFullHttpRequest.java
View File

@ -18,6 +18,7 @@ package io.netty.handler.codec.http;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.util.IllegalReferenceCountException;
import static io.netty.util.internal.ObjectUtil.checkNotNull;
/**
* Default implementation of {@link FullHttpRequest}.
@ -25,7 +26,7 @@ import io.netty.util.IllegalReferenceCountException;
public class DefaultFullHttpRequest extends DefaultHttpRequest implements FullHttpRequest {
private final ByteBuf content;
private final HttpHeaders trailingHeader;
private final boolean validateHeaders;
/**
* Used to cache the value of the hash code and avoid {@link IllegalRefCountException}.
*/
@ -46,12 +47,15 @@ public class DefaultFullHttpRequest extends DefaultHttpRequest implements FullHt
public DefaultFullHttpRequest(HttpVersion httpVersion, HttpMethod method, String uri,
ByteBuf content, boolean validateHeaders) {
super(httpVersion, method, uri, validateHeaders);
if (content == null) {
throw new NullPointerException("content");
}
this.content = content;
this.content = checkNotNull(content, "content");
trailingHeader = new DefaultHttpHeaders(validateHeaders);
this.validateHeaders = validateHeaders;
}
public DefaultFullHttpRequest(HttpVersion httpVersion, HttpMethod method, String uri,
ByteBuf content, HttpHeaders headers, HttpHeaders trailingHeader) {
super(httpVersion, method, uri, headers);
this.content = checkNotNull(content, "content");
this.trailingHeader = checkNotNull(trailingHeader, "trailingHeader");
}
@Override
@ -137,13 +141,12 @@ public class DefaultFullHttpRequest extends DefaultHttpRequest implements FullHt
* @return A copy of this object
*/
private FullHttpRequest copy(boolean copyContent, ByteBuf newContent) {
DefaultFullHttpRequest copy = new DefaultFullHttpRequest(
return new DefaultFullHttpRequest(
protocolVersion(), method(), uri(),
copyContent ? content().copy() :
newContent == null ? Unpooled.buffer(0) : newContent);
copy.headers().set(headers());
copy.trailingHeaders().set(trailingHeaders());
return copy;
newContent == null ? Unpooled.buffer(0) : newContent,
headers(),
trailingHeaders());
}
@Override
@ -158,11 +161,8 @@ public class DefaultFullHttpRequest extends DefaultHttpRequest implements FullHt
@Override
public FullHttpRequest duplicate() {
DefaultFullHttpRequest duplicate = new DefaultFullHttpRequest(
protocolVersion(), method(), uri(), content().duplicate(), validateHeaders);
duplicate.headers().set(headers());
duplicate.trailingHeaders().set(trailingHeaders());
return duplicate;
return new DefaultFullHttpRequest(
protocolVersion(), method(), uri(), content().duplicate(), headers(), trailingHeaders());
}
@Override

26
codec-http/src/main/java/io/netty/handler/codec/http/DefaultFullHttpResponse.java
View File

@ -28,7 +28,7 @@ public class DefaultFullHttpResponse extends DefaultHttpResponse implements Full
private final ByteBuf content;
private final HttpHeaders trailingHeaders;
private final boolean validateHeaders;
/**
* Used to cache the value of the hash code and avoid {@link IllegalRefCountException}.
*/
@ -62,7 +62,13 @@ public class DefaultFullHttpResponse extends DefaultHttpResponse implements Full
this.content = checkNotNull(content, "content");
this.trailingHeaders = singleFieldHeaders ? new CombinedHttpHeaders(validateHeaders)
: new DefaultHttpHeaders(validateHeaders);
this.validateHeaders = validateHeaders;
}
public DefaultFullHttpResponse(HttpVersion version, HttpResponseStatus status,
ByteBuf content, HttpHeaders headers, HttpHeaders trailingHeaders) {
super(version, status, headers);
this.content = checkNotNull(content, "content");
this.trailingHeaders = checkNotNull(trailingHeaders, "trailingHeaders");
}
@Override
@ -142,13 +148,12 @@ public class DefaultFullHttpResponse extends DefaultHttpResponse implements Full
* @return A copy of this object
*/
private FullHttpResponse copy(boolean copyContent, ByteBuf newContent) {
DefaultFullHttpResponse copy = new DefaultFullHttpResponse(
return new DefaultFullHttpResponse(
protocolVersion(), status(),
copyContent ? content().copy() :
newContent == null ? Unpooled.buffer(0) : newContent);
copy.headers().set(headers());
copy.trailingHeaders().set(trailingHeaders());
return copy;
newContent == null ? Unpooled.buffer(0) : newContent,
headers(),
trailingHeaders());
}
@Override
@ -163,11 +168,8 @@ public class DefaultFullHttpResponse extends DefaultHttpResponse implements Full
@Override
public FullHttpResponse duplicate() {
DefaultFullHttpResponse duplicate = new DefaultFullHttpResponse(protocolVersion(), status(),
content().duplicate(), validateHeaders);
duplicate.headers().set(headers());
duplicate.trailingHeaders().set(trailingHeaders());
return duplicate;
return new DefaultFullHttpResponse(protocolVersion(), status(),
content().duplicate(), headers(), trailingHeaders());
}
@Override

12
codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpMessage.java
View File

@ -36,9 +36,17 @@ public abstract class DefaultHttpMessage extends DefaultHttpObject implements Ht
* Creates a new instance.
*/
protected DefaultHttpMessage(final HttpVersion version, boolean validateHeaders, boolean singleFieldHeaders) {
this(version,
singleFieldHeaders ? new CombinedHttpHeaders(validateHeaders)
: new DefaultHttpHeaders(validateHeaders));
}
/**
* Creates a new instance.
*/
protected DefaultHttpMessage(final HttpVersion version, HttpHeaders headers) {
this.version = checkNotNull(version, "version");
headers = singleFieldHeaders ? new CombinedHttpHeaders(validateHeaders)
: new DefaultHttpHeaders(validateHeaders);
this.headers = checkNotNull(headers, "headers");
}
@Override

18
codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpRequest.java
View File

@ -29,7 +29,7 @@ public class DefaultHttpRequest extends DefaultHttpMessage implements HttpReques
* Creates a new instance.
*
* @param httpVersion the HTTP version of the request
* @param method the HTTP getMethod of the request
* @param method the HTTP method of the request
* @param uri the URI or path of the request
*/
public DefaultHttpRequest(HttpVersion httpVersion, HttpMethod method, String uri) {
@ -40,7 +40,7 @@ public class DefaultHttpRequest extends DefaultHttpMessage implements HttpReques
* Creates a new instance.
*
* @param httpVersion the HTTP version of the request
* @param method the HTTP getMethod of the request
* @param method the HTTP method of the request
* @param uri the URI or path of the request
* @param validateHeaders validate the header names and values when adding them to the {@link HttpHeaders}
*/
@ -50,6 +50,20 @@ public class DefaultHttpRequest extends DefaultHttpMessage implements HttpReques
this.uri = checkNotNull(uri, "uri");
}
/**
* Creates a new instance.
*
* @param httpVersion the HTTP version of the request
* @param method the HTTP method of the request
* @param uri the URI or path of the request
* @param headers the Headers for this Request
*/
public DefaultHttpRequest(HttpVersion httpVersion, HttpMethod method, String uri, HttpHeaders headers) {
super(httpVersion, headers);
this.method = checkNotNull(method, "method");
this.uri = checkNotNull(uri, "uri");
}
@Override
@Deprecated
public HttpMethod getMethod() {

24
codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpResponse.java
View File

@ -15,6 +15,7 @@
*/
package io.netty.handler.codec.http;
import static io.netty.util.internal.ObjectUtil.checkNotNull;
/**
* The default {@link HttpResponse} implementation.
@ -27,7 +28,7 @@ public class DefaultHttpResponse extends DefaultHttpMessage implements HttpRespo
* Creates a new instance.
*
* @param version the HTTP version of this response
* @param status the getStatus of this response
* @param status the status of this response
*/
public DefaultHttpResponse(HttpVersion version, HttpResponseStatus status) {
this(version, status, true, false);
@ -37,7 +38,7 @@ public class DefaultHttpResponse extends DefaultHttpMessage implements HttpRespo
* Creates a new instance.
*
* @param version the HTTP version of this response
* @param status the getStatus of this response
* @param status the status of this response
* @param validateHeaders validate the header names and values when adding them to the {@link HttpHeaders}
*/
public DefaultHttpResponse(HttpVersion version, HttpResponseStatus status, boolean validateHeaders) {
@ -48,7 +49,7 @@ public class DefaultHttpResponse extends DefaultHttpMessage implements HttpRespo
* Creates a new instance.
*
* @param version the HTTP version of this response
* @param status the getStatus of this response
* @param status the status of this response
* @param validateHeaders validate the header names and values when adding them to the {@link HttpHeaders}
* @param singleFieldHeaders {@code true} to check and enforce that headers with the same name are appended
* to the same entry and comma separated.
@ -59,10 +60,19 @@ public class DefaultHttpResponse extends DefaultHttpMessage implements HttpRespo
public DefaultHttpResponse(HttpVersion version, HttpResponseStatus status, boolean validateHeaders,
boolean singleFieldHeaders) {
super(version, validateHeaders, singleFieldHeaders);
if (status == null) {
throw new NullPointerException("status");
}
this.status = status;
this.status = checkNotNull(status, "status");
}
/**
* Creates a new instance.
*
* @param version the HTTP version of this response
* @param status the status of this response
* @param headers the headers for this HTTP Response
*/
public DefaultHttpResponse(HttpVersion version, HttpResponseStatus status, HttpHeaders headers) {
super(version, headers);
this.status = checkNotNull(status, "status");
}
@Override