Implementation of the latest stable Netty4 version

pom.xml

@@ -217,8 +217,8 @@
 		</dependency>
 		<dependency>
 			<groupId>io.netty</groupId>
-			<artifactId>netty</artifactId> <!-- Use 'netty-all' for 4.0 or above -->
-			<version>3.10.6.Final</version>
+			<artifactId>netty-all</artifactId>
+			<version>4.1.50.Final</version>
 			<scope>compile</scope>
 		</dependency>
 

src/main/java/net/pms/network/HTTPServer.java

@@ -22,21 +22,24 @@
 import java.net.*;
 import java.nio.channels.ClosedByInterruptException;
 import java.nio.channels.ServerSocketChannel;
-import java.util.concurrent.Executors;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.handler.codec.http.HttpObjectAggregator;
+import io.netty.handler.codec.http.HttpServerCodec;
+import io.netty.handler.stream.ChunkedWriteHandler;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
 import net.pms.PMS;
 import net.pms.configuration.PmsConfiguration;
 import net.pms.newgui.StatusTab.ConnectionState;
 import org.apache.commons.lang3.StringUtils;
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.group.ChannelGroup;
-import org.jboss.netty.channel.group.DefaultChannelGroup;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
-import org.jboss.netty.util.ThreadNameDeterminer;
-import org.jboss.netty.util.ThreadRenamingRunnable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -50,10 +53,10 @@ public class HTTPServer implements Runnable {
 	private boolean stop;
 	private Thread runnable;
 	private InetAddress iafinal;
-	private ChannelFactory factory;
 	private Channel channel;
 	private NetworkInterface networkInterface;
-	private ChannelGroup group;
+	private EventLoopGroup bossGroup;
+	private EventLoopGroup workerGroup;
 
 	// XXX not used
 	@Deprecated
@@ -111,27 +114,32 @@ public boolean start() throws IOException {
 		LOGGER.info("Created socket: {}", address);
 
 		if (configuration.isHTTPEngineV2()) { // HTTP Engine V2
-			ThreadRenamingRunnable.setThreadNameDeterminer(ThreadNameDeterminer.CURRENT);
-			group = new DefaultChannelGroup("HTTPServer");
-			factory = new NioServerSocketChannelFactory(
-				Executors.newCachedThreadPool(new NettyBossThreadFactory()),
-				Executors.newCachedThreadPool(new NettyWorkerThreadFactory())
-			);
-
-			ServerBootstrap bootstrap = new ServerBootstrap(factory);
-			HttpServerPipelineFactory pipeline = new HttpServerPipelineFactory(group);
-			bootstrap.setPipelineFactory(pipeline);
-			bootstrap.setOption("child.tcpNoDelay", true);
-			bootstrap.setOption("child.keepAlive", true);
-			bootstrap.setOption("reuseAddress", true);
-			bootstrap.setOption("child.reuseAddress", true);
-			bootstrap.setOption("child.sendBufferSize", 65536);
-			bootstrap.setOption("child.receiveBufferSize", 65536);
+			bossGroup = new NioEventLoopGroup(1);
+			workerGroup = new NioEventLoopGroup();
+			ServerBootstrap bootstrap = new ServerBootstrap();
+			bootstrap.childOption(ChannelOption.TCP_NODELAY, true)
+					.childOption(ChannelOption.SO_KEEPALIVE, true)
+					.option(ChannelOption.SO_REUSEADDR, true)
+					.childOption(ChannelOption.SO_REUSEADDR, true)
+					.childOption(ChannelOption.SO_SNDBUF, 65536)
+					.childOption(ChannelOption.SO_RCVBUF, 65536);
+			bootstrap.group(bossGroup, workerGroup)
+					.channel(NioServerSocketChannel.class)
+					.localAddress(address)
+					.childHandler(new ChannelInitializer<SocketChannel>() {
+						@Override
+						protected void initChannel(SocketChannel ch) throws Exception {
+							ChannelPipeline pipeline = ch.pipeline();
+							pipeline.addLast("HttpHandler", new HttpServerCodec())
+									// eliminate the need to decode http chunks from the client
+									.addLast("aggregator", new HttpObjectAggregator(64 * 1024))
+									.addLast("chunkedWriter", new ChunkedWriteHandler())
+									.addLast("handler", new RequestHandlerV2());
+						}
+					});
 
 			try {
-				channel = bootstrap.bind(address);
-
-				group.add(channel);
+				channel = bootstrap.bind().channel();
 			} catch (Exception e) {
 				LOGGER.error("Another program is using port " + port + ", which UMS needs.");
 				LOGGER.error("You can change the port UMS uses on the General Configuration tab.");
@@ -208,13 +216,9 @@ public void stop() {
 		}
 
 		if (channel != null) { // HTTP Engine V2
-			if (group != null) {
-				group.close().awaitUninterruptibly();
-			}
-
-			if (factory != null) {
-				factory.releaseExternalResources();
-			}
+			channel.close().syncUninterruptibly();
+			bossGroup.shutdownGracefully();
+			workerGroup.shutdownGracefully();
 		}
 
 		NetworkConfiguration.forgetConfiguration();

src/main/java/net/pms/network/HttpException.java

@@ -1,9 +1,9 @@
 package net.pms.network;
 
-import org.jboss.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpResponseStatus;
 
 public class HttpException extends Exception {
-
+	private static final long serialVersionUID = -4952529888336004924L;
 	private HttpResponseStatus status;
 
 	HttpException(HttpResponseStatus status) {