Part 1 of cleaning up netty server management.

menacher · menacher · commit 0ebfb79ceda2 · 2013-06-26T22:03:08.000-04:00
diff --git a/nadron/src/main/java/io/nadron/server/netty/FlashPolicyServer.java b/nadron/src/main/java/io/nadron/server/netty/FlashPolicyServer.java
diff --git a/nadron/src/main/java/io/nadron/server/netty/FlashPolicyServerChannelInitalizer.java b/nadron/src/main/java/io/nadron/server/netty/FlashPolicyServerChannelInitalizer.java
@@ -12,7 +12,7 @@
 /**
  * @author <a href="http://www.waywardmonkeys.com/">Bruce Mitchener</a>
  */
-public class FlashPolicyServerPipelineFactory extends ChannelInitializer<SocketChannel>
+public class FlashPolicyServerChannelInitalizer extends ChannelInitializer<SocketChannel>
 {
 
 	// TODO make this configurable from spring.
diff --git a/nadron/src/main/java/io/nadron/server/netty/LoginPipelineFactory.java b/nadron/src/main/java/io/nadron/server/netty/LoginPipelineFactory.java
diff --git a/nadron/src/main/java/io/nadron/server/netty/NettyUDPServer.java b/nadron/src/main/java/io/nadron/server/netty/NettyUDPServer.java
@@ -56,7 +56,6 @@ public void startServer() throws Exception
 					.channel(NioDatagramChannel.class)
 					.handler(getChannelInitializer())
 					.bind(nettyConfig.getSocketAddress()).channel();
-			// Check if all channels need be closed.
 			ALL_CHANNELS.add(channel);
 		} 
 		catch (Exception e) 
diff --git a/nadron/src/main/java/io/nadron/server/netty/ProtocolMultiplexerChannelInitializer.java b/nadron/src/main/java/io/nadron/server/netty/ProtocolMultiplexerChannelInitializer.java
@@ -9,7 +9,7 @@
 import io.netty.handler.timeout.IdleStateHandler;
 
 
-public class ProtocolMultiplexerPipelineFactory extends
+public class ProtocolMultiplexerChannelInitializer extends
 	ChannelInitializer<SocketChannel>
 {
 	// TODO make this configurable from spring.
diff --git a/nadron/src/main/java/io/nadron/server/netty/UDPChannelInitializer.java b/nadron/src/main/java/io/nadron/server/netty/UDPChannelInitializer.java
@@ -8,7 +8,7 @@
 
 
 
-public class UDPChannelPipelineFactory extends ChannelInitializer<DatagramChannel>
+public class UDPChannelInitializer extends ChannelInitializer<DatagramChannel>
 {
 	/**
 	 * This pipeline will be shared across all the channels. In Netty UDP
@@ -21,12 +21,12 @@ public class UDPChannelPipelineFactory extends ChannelInitializer<DatagramChanne
 	// Create a default pipeline implementation.
 	private UDPUpstreamHandler upstream;
 
-	public UDPChannelPipelineFactory()
+	public UDPChannelInitializer()
 	{
 
 	}
 
-	public UDPChannelPipelineFactory(UDPUpstreamHandler upstream)
+	public UDPChannelInitializer(UDPUpstreamHandler upstream)
 	{
 		this.upstream = upstream;
 	}

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`/**`
`13`	`13`	`* @author <a href="http://www.waywardmonkeys.com/">Bruce Mitchener</a>`
`14`	`14`	`*/`
`15`		`-public class FlashPolicyServerPipelineFactory extends ChannelInitializer<SocketChannel>`
	`15`	`+public class FlashPolicyServerChannelInitalizer extends ChannelInitializer<SocketChannel>`
`16`	`16`	`{`
`17`	`17`
`18`	`18`	`// TODO make this configurable from spring.`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ public void startServer() throws Exception`
`56`	`56`	`.channel(NioDatagramChannel.class)`
`57`	`57`	`.handler(getChannelInitializer())`
`58`	`58`	`.bind(nettyConfig.getSocketAddress()).channel();`
`59`		`- // Check if all channels need be closed.`
`60`	`59`	`ALL_CHANNELS.add(channel);`
`61`	`60`	`}`
`62`	`61`	`catch (Exception e)`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`import io.netty.handler.timeout.IdleStateHandler;`
`10`	`10`
`11`	`11`
`12`		`-public class ProtocolMultiplexerPipelineFactory extends`
	`12`	`+public class ProtocolMultiplexerChannelInitializer extends`
`13`	`13`	`ChannelInitializer<SocketChannel>`
`14`	`14`	`{`
`15`	`15`	`// TODO make this configurable from spring.`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`
`10`	`10`
`11`		`-public class UDPChannelPipelineFactory extends ChannelInitializer<DatagramChannel>`
	`11`	`+public class UDPChannelInitializer extends ChannelInitializer<DatagramChannel>`
`12`	`12`	`{`
`13`	`13`	`/**`
`14`	`14`	`* This pipeline will be shared across all the channels. In Netty UDP`
`@@ -21,12 +21,12 @@ public class UDPChannelPipelineFactory extends ChannelInitializer<DatagramChanne`
`21`	`21`	`// Create a default pipeline implementation.`
`22`	`22`	`private UDPUpstreamHandler upstream;`
`23`	`23`
`24`		`- public UDPChannelPipelineFactory()`
	`24`	`+ public UDPChannelInitializer()`
`25`	`25`	`{`
`26`	`26`
`27`	`27`	`}`
`28`	`28`
`29`		`- public UDPChannelPipelineFactory(UDPUpstreamHandler upstream)`
	`29`	`+ public UDPChannelInitializer(UDPUpstreamHandler upstream)`
`30`	`30`	`{`
`31`	`31`	`this.upstream = upstream;`
`32`	`32`	`}`