Miscellaneous cleanup in server code

These are drive-by fixes while debugging an issue, no functional changes. Highlight: renaming PacketHandlerFactoryGeneratorClassHelperImplementationDecorator -> PacketHandlerFactory. Looks like the original implementor was having fun with design pattern names.
PhilippvK · May 18, 2024 · 068ddc1 · 068ddc1
1 parent 472b64d
commit 068ddc1
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 28 deletions.
diff --git a/server/src/main/java/org/moparforia/server/Server.java b/server/src/main/java/org/moparforia/server/Server.java
@@ -169,7 +169,7 @@ public void start() {
             return;
         }
 
-        packetHandlers = PacketHandlerFactoryGeneratorClassHelperImplementationDecorator.getPacketHandlers();
+        packetHandlers = PacketHandlerFactory.getPacketHandlers();
         System.out.println("Loaded " + packetHandlers.size() + " packet handler type(s)");
 
         ChannelFactory factory = new NioServerSocketChannelFactory(
@@ -179,16 +179,12 @@ public void start() {
         ServerBootstrap bootstrap = new ServerBootstrap(factory);
         final ClientChannelHandler clientHandler = new ClientChannelHandler(this);
         final IdleStateHandler idleState = new IdleStateHandler(new HashedWheelTimer(1, TimeUnit.SECONDS), 2, 0, 0);
-        bootstrap.setPipelineFactory(new ChannelPipelineFactory() {
-            public ChannelPipeline getPipeline() {
-                return Channels.pipeline(
-                        new DelimiterBasedFrameDecoder(250, Delimiters.lineDelimiter()),
-                        new PacketDecoder(),
-                        new PacketEncoder(),
-                        idleState,
-                        clientHandler);
-            }
-        });
+        bootstrap.setPipelineFactory(() -> Channels.pipeline(
+                new DelimiterBasedFrameDecoder(250, Delimiters.lineDelimiter()),
+                new PacketDecoder(),
+                new PacketEncoder(),
+                idleState,
+                clientHandler));
         bootstrap.setOption("child.tcpNoDelay", true);
         bootstrap.setOption("child.keepAlive", true);
         try {

diff --git a/server/src/main/java/org/moparforia/server/event/ClientDisconnectedEvent.java b/server/src/main/java/org/moparforia/server/event/ClientDisconnectedEvent.java
@@ -16,7 +16,7 @@ public ClientDisconnectedEvent(Channel channel) {
     @Override
     public void process(Server server) {
         Player player;
-        if((player = (Player)channel.getAttachment()) != null) {
+        if ((player = (Player)channel.getAttachment()) != null) {
             if (player.getLobby() != null) {
               player.getLobby().removePlayer(player, Lobby.PART_REASON_USERLEFT,null);
             }

diff --git a/server/src/main/java/org/moparforia/server/event/TimedEvent.java b/server/src/main/java/org/moparforia/server/event/TimedEvent.java
@@ -2,13 +2,12 @@
 
 import org.moparforia.server.Server;
 
-@SuppressWarnings("SameParameterValue")
 public abstract class TimedEvent extends Event {
 
     private final long time;
 
-    public TimedEvent(long time) {
-        this.time = System.currentTimeMillis() + time;
+    public TimedEvent(long milliseconds) {
+        this.time = System.currentTimeMillis() + milliseconds;
     }
 
     @Override

diff --git a/server/src/main/java/org/moparforia/server/net/ClientChannelHandler.java b/server/src/main/java/org/moparforia/server/net/ClientChannelHandler.java
@@ -35,24 +35,24 @@ public void channelIdle(ChannelHandlerContext ctx, IdleStateEvent e) throws Exce
     }
 
     @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws Exception {
+    public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) {
         //noinspection ThrowableResultOfMethodCallIgnored
         e.getCause().printStackTrace();
         e.getChannel().close();
     }
 
     @Override
-    public void channelConnected(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
+    public void channelConnected(ChannelHandlerContext ctx, ChannelStateEvent e) {
         server.addEvent(new ClientConnectedEvent(e.getChannel()));
     }
 
     @Override
-    public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
+    public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) {
         Channel channel = e.getChannel();
         server.addEvent(new ClientDisconnectedEvent(channel));
         final int id = channel.getId();
         if (server.hasPlayer(id)) {
-            server.addEvent(new TimedEvent(30000) { // todo: confirm this time
+            server.addEvent(new TimedEvent(30_000) { // todo: confirm this time
                 @Override
                 public void process(Server server) {
                     if (server.hasPlayer(id) && !server.getPlayer(id).getChannel().isOpen()) {

diff --git a/...orClassHelperImplementationDecorator.java → ...oria/server/net/PacketHandlerFactory.java b/...orClassHelperImplementationDecorator.java → ...oria/server/net/PacketHandlerFactory.java
@@ -6,11 +6,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 
-/**
- * Playforia
- * 14.6.2013
- */
-public class PacketHandlerFactoryGeneratorClassHelperImplementationDecorator {
+public class PacketHandlerFactory {
 
     //todo packethandlers for each game type ( should be pretty much the same for golf and golf2 )
     public static final HashMap<PacketType, ArrayList<PacketHandler>> getPacketHandlers() {
@@ -19,10 +15,10 @@ public static final HashMap<PacketType, ArrayList<PacketHandler>> getPacketHandl
                 new LoginTypeHandler(), new NewHandler(), new PongHandler(), new ReconnectHandler(),
                 new TlogHandler(), new TrackTestLoginHandler(), new VersionHandler(), new LobbyCreateSinglePlayerHandler(),
                 new LobbyMultiplayerHandler(), new LobbyDualplayerHandler(), new QuitHandler()};
-        ArrayList<PacketHandler> data = new ArrayList<PacketHandler>();
-        ArrayList<PacketHandler> command = new ArrayList<PacketHandler>();
-        ArrayList<PacketHandler> string = new ArrayList<PacketHandler>();
-        ArrayList<PacketHandler> none = new ArrayList<PacketHandler>();
+        ArrayList<PacketHandler> data = new ArrayList<>();
+        ArrayList<PacketHandler> command = new ArrayList<>();
+        ArrayList<PacketHandler> string = new ArrayList<>();
+        ArrayList<PacketHandler> none = new ArrayList<>();
         for (PacketHandler handler : handlers) {
             switch (handler.getType()) {
                 case DATA: