Merge pull request #1994 from lneves/master

netty update

frameworks/Java/netty/README.md

@@ -7,9 +7,9 @@ This is the netty portion of a [benchmarking test suite](../) comparing a variet
 
 ## Versions
 
-* [Java OpenJDK 1.7.0_09](http://openjdk.java.net/)
-* [Netty 4.0.30](http://netty.io/)
-* [Jackson 2.5.0](http://wiki.fasterxml.com/JacksonHome)
+* [Java OpenJDK 1.8](http://openjdk.java.net/)
+* [Netty 4.1](http://netty.io/)
+* [Jackson 2.7](http://wiki.fasterxml.com/JacksonHome)
 
 ## References
 * https://github.com/netty/netty/tree/master/example/src/main/java/io/netty/example/http/snoop

frameworks/Java/netty/pom.xml

@@ -12,12 +12,12 @@
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-codec-http</artifactId>
-			<version>4.0.34.Final</version>
+			<version>4.1.0.CR4</version>
 		</dependency>
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-transport-native-epoll</artifactId>
-			<version>4.0.34.Final</version>
+			<version>4.1.0.CR4</version>
 			<classifier>linux-x86_64</classifier>
 		</dependency>
 		<dependency>

frameworks/Java/netty/src/main/java/hello/HelloServerHandler.java

@@ -17,14 +17,16 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.codec.http.DefaultFullHttpResponse;
 import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.handler.codec.http.HttpHeaders;
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpVersion;
+import io.netty.util.AsciiString;
 import io.netty.util.CharsetUtil;
 import io.netty.util.concurrent.FastThreadLocal;
 
-public class HelloServerHandler extends SimpleChannelInboundHandler<Object> {
+public class HelloServerHandler extends SimpleChannelInboundHandler<HttpRequest> {
 
 	private static final FastThreadLocal<DateFormat> FORMAT = new FastThreadLocal<DateFormat>() {
 		@Override
@@ -54,19 +56,19 @@ public class HelloServerHandler extends SimpleChannelInboundHandler<Object> {
 	private static final byte[] STATIC_PLAINTEXT = "Hello, World!".getBytes(CharsetUtil.UTF_8);
 	private static final int STATIC_PLAINTEXT_LEN = STATIC_PLAINTEXT.length;
 	private static final ByteBuf PLAINTEXT_CONTENT_BUFFER = Unpooled.unreleasableBuffer(Unpooled.directBuffer().writeBytes(STATIC_PLAINTEXT));
-	private static final CharSequence PLAINTEXT_CLHEADER_VALUE = HttpHeaders.newEntity(String.valueOf(STATIC_PLAINTEXT_LEN));
-	private static final CharSequence JSON_CLHEADER_VALUE = HttpHeaders.newEntity(String.valueOf(jsonLen()));
-
-	private static final CharSequence TYPE_PLAIN = HttpHeaders.newEntity("text/plain; charset=UTF-8");
-	private static final CharSequence TYPE_JSON = HttpHeaders.newEntity("application/json; charset=UTF-8");
-	private static final CharSequence SERVER_NAME = HttpHeaders.newEntity("Netty");
-	private static final CharSequence CONTENT_TYPE_ENTITY = HttpHeaders.newEntity(HttpHeaders.Names.CONTENT_TYPE);
-	private static final CharSequence DATE_ENTITY = HttpHeaders.newEntity(HttpHeaders.Names.DATE);
-	private static final CharSequence CONTENT_LENGTH_ENTITY = HttpHeaders.newEntity(HttpHeaders.Names.CONTENT_LENGTH);
-	private static final CharSequence SERVER_ENTITY = HttpHeaders.newEntity(HttpHeaders.Names.SERVER);
+	private static final CharSequence PLAINTEXT_CLHEADER_VALUE = new AsciiString(String.valueOf(STATIC_PLAINTEXT_LEN));
+	private static final CharSequence JSON_CLHEADER_VALUE = new AsciiString(String.valueOf(jsonLen()));
+
+	private static final CharSequence TYPE_PLAIN = new AsciiString("text/plain; charset=UTF-8");
+	private static final CharSequence TYPE_JSON = new AsciiString("application/json; charset=UTF-8");
+	private static final CharSequence SERVER_NAME = new AsciiString("Netty");
+	private static final CharSequence CONTENT_TYPE_ENTITY = HttpHeaderNames.CONTENT_TYPE;
+	private static final CharSequence DATE_ENTITY = HttpHeaderNames.DATE;
+	private static final CharSequence CONTENT_LENGTH_ENTITY = HttpHeaderNames.CONTENT_LENGTH;
+	private static final CharSequence SERVER_ENTITY = HttpHeaderNames.SERVER;
 	private static final ObjectMapper MAPPER = newMapper();
 
-	private volatile CharSequence date = HttpHeaders.newEntity(FORMAT.get().format(new Date()));
+	private volatile CharSequence date = new AsciiString(FORMAT.get().format(new Date()));
 
 	HelloServerHandler(ScheduledExecutorService service) {
 		service.scheduleWithFixedDelay(new Runnable() {
@@ -74,34 +76,31 @@ public class HelloServerHandler extends SimpleChannelInboundHandler<Object> {
 
 			@Override
 			public void run() {
-				date = HttpHeaders.newEntity(format.format(new Date()));
+				date = new AsciiString(format.format(new Date()));
 			}
 		}, 1000, 1000, TimeUnit.MILLISECONDS);
 
 	}
 
 	@Override
-	public void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception {
-		if (msg instanceof HttpRequest) {
-			HttpRequest request = (HttpRequest) msg;
-			String uri = request.getUri();
-			switch (uri) {
-			case "/plaintext":
-				writeResponse(ctx, request, PLAINTEXT_CONTENT_BUFFER.duplicate(), TYPE_PLAIN, PLAINTEXT_CLHEADER_VALUE);
-				return;
-			case "/json":
-				byte[] json = MAPPER.writeValueAsBytes(newMsg());
-				writeResponse(ctx, request, Unpooled.wrappedBuffer(json), TYPE_JSON, JSON_CLHEADER_VALUE);
-				return;
-			}
-			FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.NOT_FOUND, Unpooled.EMPTY_BUFFER, false);
-			ctx.write(response).addListener(ChannelFutureListener.CLOSE);
+	public void channelRead0(ChannelHandlerContext ctx, HttpRequest msg) throws Exception {
+		HttpRequest request = (HttpRequest) msg;
+		String uri = request.uri();
+		switch (uri) {
+		case "/plaintext":
+			writeResponse(ctx, request, PLAINTEXT_CONTENT_BUFFER.duplicate(), TYPE_PLAIN, PLAINTEXT_CLHEADER_VALUE);
+			return;
+		case "/json":
+			byte[] json = MAPPER.writeValueAsBytes(newMsg());
+			writeResponse(ctx, request, Unpooled.wrappedBuffer(json), TYPE_JSON, JSON_CLHEADER_VALUE);
+			return;
 		}
+		FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.NOT_FOUND, Unpooled.EMPTY_BUFFER, false);
+		ctx.write(response).addListener(ChannelFutureListener.CLOSE);
 	}
 
 	private void writeResponse(ChannelHandlerContext ctx, HttpRequest request, ByteBuf buf, CharSequence contentType, CharSequence contentLength) {
-		// Decide whether to close the connection or not.
-		boolean keepAlive = HttpHeaders.isKeepAlive(request);
+
 		// Build the response object.
 		FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK, buf, false);
 		HttpHeaders headers = response.headers();
@@ -111,11 +110,7 @@ public class HelloServerHandler extends SimpleChannelInboundHandler<Object> {
 		headers.set(CONTENT_LENGTH_ENTITY, contentLength);
 
 		// Close the non-keep-alive connection after the write operation is done.
-		if (!keepAlive) {
-			ctx.write(response).addListener(ChannelFutureListener.CLOSE);
-		} else {
-			ctx.write(response, ctx.voidPromise());
-		}
+		ctx.write(response, ctx.voidPromise());
 	}
 
 	@Override