Big refactoring (server)

I used Intellij IDEA to automatically refactor code to achive 3 goals.
1) get rid of anonymouse classes, and replace the with lamba to get more readeable and clean code (like in TableWaitingDialog).
2) make effectively final  variables actually final to avoid inadvertent changes on it in further releases and keep objects as immutable, as possible.
3)  Get rid of unused imports (most of the changes) in whole project classes.

Mage.Server/pom.xml

@@ -229,8 +229,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.7</source>
+                    <source>1.8</source>
-                    <target>1.7</target>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>

Mage.Server/src/main/java/mage/server/AuthorizedUserRepository.java

@@ -33,7 +33,7 @@ public enum AuthorizedUserRepository {
 
     private Dao<AuthorizedUser, Object> dao;
 
-    private AuthorizedUserRepository() {
+    AuthorizedUserRepository() {
         File file = new File("db");
         if (!file.exists()) {
             file.mkdirs();

Mage.Server/src/main/java/mage/server/ChatManager.java

@@ -50,7 +50,7 @@ import org.apache.log4j.Logger;
 public class ChatManager {
 
     private static final Logger logger = Logger.getLogger(ChatManager.class);
-    private static HashMap<String, String> userMessages = new HashMap<>();
+    private static final HashMap<String, String> userMessages = new HashMap<>();
 
     private static final ChatManager INSTANCE = new ChatManager();
 
@@ -117,7 +117,7 @@ public class ChatManager {
         return false;
     }
     
-    Pattern cardNamePattern = Pattern.compile("\\[(.*?)\\]");
+    final Pattern cardNamePattern = Pattern.compile("\\[(.*?)\\]");
     
     public void broadcast(UUID chatId, String userName, String message, MessageColor color, boolean withTime, MessageType messageType, SoundToPlay soundToPlay) {
         ChatSession chatSession = chatSessions.get(chatId);

Mage.Server/src/main/java/mage/server/DisconnectReason.java

@@ -6,5 +6,5 @@ package mage.server;
  */
 
 public enum DisconnectReason {
-    LostConnection, Disconnected, CleaningUp, ConnectingOtherInstance, AdminDisconnect, SessionExpired, Undefined;
+    LostConnection, Disconnected, CleaningUp, ConnectingOtherInstance, AdminDisconnect, SessionExpired, Undefined
 }

Mage.Server/src/main/java/mage/server/ExtensionPackage.java

@@ -40,9 +40,9 @@ import java.util.Map;
  * @author Lymia
  */
 public abstract class ExtensionPackage {
-    protected List<ExpansionSet> expansions = new ArrayList<>();
+    protected final List<ExpansionSet> expansions = new ArrayList<>();
-    protected Map<String, Class> deckTypes = new HashMap<>();
+    protected final Map<String, Class> deckTypes = new HashMap<>();
-    protected Map<String, Class> draftCubes = new HashMap<>();
+    protected final Map<String, Class> draftCubes = new HashMap<>();
 
     /**
      * @return A list of expansions included in this custom set package.

Mage.Server/src/main/java/mage/server/MageServerImpl.java

@@ -314,12 +314,9 @@ public class MageServerImpl implements MageServer {
 
     @Override
     public void removeTable(final String sessionId, final UUID roomId, final UUID tableId) throws MageException {
-        execute("removeTable", sessionId, new Action() {
+        execute("removeTable", sessionId, () -> {
-            @Override
-            public void execute() {
             UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
             TableManager.getInstance().removeTable(userId, tableId);
-            }
         });
     }
 
@@ -377,13 +374,10 @@ public class MageServerImpl implements MageServer {
 
     @Override
     public void updateDeck(final String sessionId, final UUID tableId, final DeckCardLists deckList) throws MageException, GameException {
-        execute("updateDeck", sessionId, new Action() {
+        execute("updateDeck", sessionId, () -> {
-            @Override
-            public void execute() throws MageException {
             UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
             TableManager.getInstance().updateDeck(userId, tableId, deckList);
             logger.trace("Session " + sessionId + " updated deck");
-            }
         });
     }
 
@@ -470,12 +464,9 @@ public class MageServerImpl implements MageServer {
         if (!TableManager.getInstance().getController(tableId).changeTableStateToStarting()) {
             return false;
         }
-        execute("startMatch", sessionId, new Action() {
+        execute("startMatch", sessionId, () -> {
-            @Override
-            public void execute() {
             UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
             TableManager.getInstance().startMatch(userId, roomId, tableId);
-            }
         });
         return true;
     }
@@ -495,12 +486,9 @@ public class MageServerImpl implements MageServer {
         if (!TableManager.getInstance().getController(tableId).changeTableStateToStarting()) {
             return false;
         }
-        execute("startTournament", sessionId, new Action() {
+        execute("startTournament", sessionId, () -> {
-            @Override
-            public void execute() {
             UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
             TableManager.getInstance().startTournament(userId, roomId, tableId);
-            }
         });
         return true;
     }
@@ -521,12 +509,7 @@ public class MageServerImpl implements MageServer {
     public void sendChatMessage(final UUID chatId, final String userName, final String message) throws MageException {
         try {
             callExecutor.execute(
-                    new Runnable() {
+                    () -> ChatManager.getInstance().broadcast(chatId, userName, StringEscapeUtils.escapeHtml4(message), MessageColor.BLUE, true, ChatMessage.MessageType.TALK, null)
-                @Override
-                public void run() {
-                    ChatManager.getInstance().broadcast(chatId, userName, StringEscapeUtils.escapeHtml4(message), MessageColor.BLUE, true, ChatMessage.MessageType.TALK, null);
-                }
-            }
             );
         } catch (Exception ex) {
             handleException(ex);
@@ -535,27 +518,21 @@ public class MageServerImpl implements MageServer {
 
     @Override
     public void joinChat(final UUID chatId, final String sessionId, final String userName) throws MageException {
-        execute("joinChat", sessionId, new Action() {
+        execute("joinChat", sessionId, () -> {
-            @Override
-            public void execute() {
             UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
             ChatManager.getInstance().joinChat(chatId, userId);
-            }
         });
     }
 
     @Override
     public void leaveChat(final UUID chatId, final String sessionId) throws MageException {
-        execute("leaveChat", sessionId, new Action() {
+        execute("leaveChat", sessionId, () -> {
-            @Override
-            public void execute() {
             if (chatId != null) {
                 UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
                 ChatManager.getInstance().leaveChat(chatId, userId);
             } else {
                 logger.warn("The chatId is null.  sessionId = " + sessionId);
             }
-            }
         });
     }
 
@@ -594,12 +571,9 @@ public class MageServerImpl implements MageServer {
 
     @Override
     public void swapSeats(final String sessionId, final UUID roomId, final UUID tableId, final int seatNum1, final int seatNum2) throws MageException {
-        execute("swapSeats", sessionId, new Action() {
+        execute("swapSeats", sessionId, () -> {
-            @Override
-            public void execute() {
             UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
             TableManager.getInstance().swapSeats(tableId, userId, seatNum1, seatNum2);
-            }
         });
     }
 
@@ -610,12 +584,9 @@ public class MageServerImpl implements MageServer {
             // table was already started, so player can't leave anymore now
             return false;
         }
-        execute("leaveTable", sessionId, new Action() {
+        execute("leaveTable", sessionId, () -> {
-            @Override
-            public void execute() {
             UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
             GamesRoomManager.getInstance().getRoom(roomId).leaveTable(userId, tableId);
-            }
         });
         return true;
     }
@@ -633,34 +604,25 @@ public class MageServerImpl implements MageServer {
 
     @Override
     public void joinGame(final UUID gameId, final String sessionId) throws MageException {
-        execute("joinGame", sessionId, new Action() {
+        execute("joinGame", sessionId, () -> {
-            @Override
-            public void execute() {
             UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
             GameManager.getInstance().joinGame(gameId, userId);
-            }
         });
     }
 
     @Override
     public void joinDraft(final UUID draftId, final String sessionId) throws MageException {
-        execute("joinDraft", sessionId, new Action() {
+        execute("joinDraft", sessionId, () -> {
-            @Override
-            public void execute() {
             UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
             DraftManager.getInstance().joinDraft(draftId, userId);
-            }
         });
     }
 
     @Override
     public void joinTournament(final UUID tournamentId, final String sessionId) throws MageException {
-        execute("joinTournament", sessionId, new Action() {
+        execute("joinTournament", sessionId, () -> {
-            @Override
-            public void execute() {
             UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
             TournamentManager.getInstance().joinTournament(tournamentId, userId);
-            }
         });
     }
 
@@ -688,9 +650,7 @@ public class MageServerImpl implements MageServer {
 
     @Override
     public void sendPlayerUUID(final UUID gameId, final String sessionId, final UUID data) throws MageException {
-        execute("sendPlayerUUID", sessionId, new Action() {
+        execute("sendPlayerUUID", sessionId, () -> {
-            @Override
-            public void execute() {
             User user = SessionManager.getInstance().getUser(sessionId);
             if (user != null) {
 //                    logger.warn("sendPlayerUUID gameId=" + gameId + " sessionId=" + sessionId + " username=" + user.getName());
@@ -698,67 +658,54 @@ public class MageServerImpl implements MageServer {
             } else {
                 logger.warn("Your session expired: gameId=" + gameId + ", sessionId=" + sessionId);
             }
-            }
         });
     }
 
     @Override
     public void sendPlayerString(final UUID gameId, final String sessionId, final String data) throws MageException {
-        execute("sendPlayerString", sessionId, new Action() {
+        execute("sendPlayerString", sessionId, () -> {
-            @Override
-            public void execute() {
             User user = SessionManager.getInstance().getUser(sessionId);
             if (user != null) {
                 user.sendPlayerString(gameId, data);
             } else {
                 logger.warn("Your session expired: gameId=" + gameId + ", sessionId=" + sessionId);
             }
-            }
         });
     }
 
     @Override
     public void sendPlayerManaType(final UUID gameId, final UUID playerId, final String sessionId, final ManaType data) throws MageException {
-        execute("sendPlayerManaType", sessionId, new Action() {
+        execute("sendPlayerManaType", sessionId, () -> {
-            @Override
-            public void execute() {
             User user = SessionManager.getInstance().getUser(sessionId);
             if (user != null) {
                 user.sendPlayerManaType(gameId, playerId, data);
             } else {
                 logger.warn("Your session expired: gameId=" + gameId + ", sessionId=" + sessionId);
             }
-            }
         });
     }
 
     @Override
     public void sendPlayerBoolean(final UUID gameId, final String sessionId, final Boolean data) throws MageException {
-        execute("sendPlayerBoolean", sessionId, new Action() {
+        execute("sendPlayerBoolean", sessionId, () -> {
-            @Override
-            public void execute() {
             User user = SessionManager.getInstance().getUser(sessionId);
             if (user != null) {
                 user.sendPlayerBoolean(gameId, data);
             } else {
                 logger.warn("Your session expired: gameId=" + gameId + ", sessionId=" + sessionId);
             }
-            }
         });
     }
 
     @Override
     public void sendPlayerInteger(final UUID gameId, final String sessionId, final Integer data) throws MageException {
-        execute("sendPlayerInteger", sessionId, new Action() {
+        execute("sendPlayerInteger", sessionId, () -> {
-            @Override
-            public void execute() {
             User user = SessionManager.getInstance().getUser(sessionId);
             if (user != null) {
                 user.sendPlayerInteger(gameId, data);
             } else {
                 logger.warn("Your session expired: gameId=" + gameId + ", sessionId=" + sessionId);
             }
-            }
         });
     }
 
@@ -780,54 +727,43 @@ public class MageServerImpl implements MageServer {
 
     @Override
     public void sendCardMark(final UUID draftId, final String sessionId, final UUID cardPick) throws MageException {
-        execute("sendCardMark", sessionId, new Action() {
+        execute("sendCardMark", sessionId, () -> {
-            @Override
-            public void execute() {
             Session session = SessionManager.getInstance().getSession(sessionId);
             if (session != null) {
                 DraftManager.getInstance().sendCardMark(draftId, session.getUserId(), cardPick);
             } else {
                 logger.error("Session not found sessionId: " + sessionId + "  draftId:" + draftId);
             }
-            }
         });
     }
 
     @Override
     public void quitMatch(final UUID gameId, final String sessionId) throws MageException {
-        execute("quitMatch", sessionId, new Action() {
+        execute("quitMatch", sessionId, () -> {
-            @Override
-            public void execute() {
             Session session = SessionManager.getInstance().getSession(sessionId);
             if (session != null) {
                 GameManager.getInstance().quitMatch(gameId, session.getUserId());
             } else {
                 logger.error("Session not found sessionId: " + sessionId + "  gameId:" + gameId);
             }
-            }
         });
     }
 
     @Override
     public void quitTournament(final UUID tournamentId, final String sessionId) throws MageException {
-        execute("quitTournament", sessionId, new Action() {
+        execute("quitTournament", sessionId, () -> {
-            @Override
-            public void execute() {
             Session session = SessionManager.getInstance().getSession(sessionId);
             if (session != null) {
                 TournamentManager.getInstance().quit(tournamentId, session.getUserId());
             } else {
                 logger.error("Session not found sessionId: " + sessionId + "  tournamentId:" + tournamentId);
             }
-            }
         });
     }
 
     @Override
     public void quitDraft(final UUID draftId, final String sessionId) throws MageException {
-        execute("quitDraft", sessionId, new Action() {
+        execute("quitDraft", sessionId, () -> {
-            @Override
-            public void execute() {
             Session session = SessionManager.getInstance().getSession(sessionId);
             if (session == null) {
                 logger.error("Session not found sessionId: " + sessionId + "  draftId:" + draftId);
@@ -839,22 +775,18 @@ public class MageServerImpl implements MageServer {
                 UUID tournamentId = table.getTournament().getId();
                 TournamentManager.getInstance().quit(tournamentId, session.getUserId());
             }
-            }
         });
     }
 
     @Override
     public void sendPlayerAction(final PlayerAction playerAction, final UUID gameId, final String sessionId, final Object data) throws MageException {
-        execute("sendPlayerAction", sessionId, new Action() {
+        execute("sendPlayerAction", sessionId, () -> {
-            @Override
-            public void execute() {
             Session session = SessionManager.getInstance().getSession(sessionId);
             if (session == null) {
                 logger.error("Session not found sessionId: " + sessionId + "  gameId:" + gameId);
                 return;
             }
             GameManager.getInstance().sendPlayerAction(playerAction, gameId, session.getUserId(), data);
-            }
         });
     }
 
@@ -882,20 +814,15 @@ public class MageServerImpl implements MageServer {
 
     @Override
     public void watchGame(final UUID gameId, final String sessionId) throws MageException {
-        execute("watchGame", sessionId, new Action() {
+        execute("watchGame", sessionId, () -> {
-            @Override
-            public void execute() {
             UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
             GameManager.getInstance().watchGame(gameId, userId);
-            }
         });
     }
 
     @Override
     public void stopWatching(final UUID gameId, final String sessionId) throws MageException {
-        execute("stopWatching", sessionId, new Action() {
+        execute("stopWatching", sessionId, () -> {
-            @Override
-            public void execute() {
             UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
             User user = UserManager.getInstance().getUser(userId);
             if (user != null) {
@@ -903,73 +830,54 @@ public class MageServerImpl implements MageServer {
                 user.removeGameWatchInfo(gameId);
             }
 
-            }
         });
     }
 
     @Override
     public void replayGame(final UUID gameId, final String sessionId) throws MageException {
-        execute("replayGame", sessionId, new Action() {
+        execute("replayGame", sessionId, () -> {
-            @Override
-            public void execute() {
             UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
             ReplayManager.getInstance().replayGame(gameId, userId);
-            }
         });
     }
 
     @Override
     public void startReplay(final UUID gameId, final String sessionId) throws MageException {
-        execute("startReplay", sessionId, new Action() {
+        execute("startReplay", sessionId, () -> {
-            @Override
-            public void execute() {
             UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
             ReplayManager.getInstance().startReplay(gameId, userId);
-            }
         });
     }
 
     @Override
     public void stopReplay(final UUID gameId, final String sessionId) throws MageException {
-        execute("stopReplay", sessionId, new Action() {
+        execute("stopReplay", sessionId, () -> {
-            @Override
-            public void execute() {
             UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
             ReplayManager.getInstance().stopReplay(gameId, userId);
-            }
         });
     }
 
     @Override
     public void nextPlay(final UUID gameId, final String sessionId) throws MageException {
-        execute("nextPlay", sessionId, new Action() {
+        execute("nextPlay", sessionId, () -> {
-            @Override
-            public void execute() {
             UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
             ReplayManager.getInstance().nextPlay(gameId, userId);
-            }
         });
     }
 
     @Override
     public void previousPlay(final UUID gameId, final String sessionId) throws MageException {
-        execute("previousPlay", sessionId, new Action() {
+        execute("previousPlay", sessionId, () -> {
-            @Override
-            public void execute() {
             UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
             ReplayManager.getInstance().previousPlay(gameId, userId);
-            }
         });
     }
 
     @Override
     public void skipForward(final UUID gameId, final String sessionId, final int moves) throws MageException {
-        execute("skipForward", sessionId, new Action() {
+        execute("skipForward", sessionId, () -> {
-            @Override
-            public void execute() {
             UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
             ReplayManager.getInstance().skipForward(gameId, userId, moves);
-            }
         });
     }
 
@@ -996,14 +904,11 @@ public class MageServerImpl implements MageServer {
 
     @Override
     public void cheat(final UUID gameId, final String sessionId, final UUID playerId, final DeckCardLists deckList) throws MageException {
-        execute("cheat", sessionId, new Action() {
+        execute("cheat", sessionId, () -> {
-            @Override
-            public void execute() {
             if (testMode) {
                 UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
                 GameManager.getInstance().cheat(gameId, userId, playerId, deckList);
             }
-            }
         });
     }
 
@@ -1071,19 +976,12 @@ public class MageServerImpl implements MageServer {
 
     @Override
     public void disconnectUser(final String sessionId, final String userSessionId) throws MageException {
-        execute("disconnectUser", sessionId, new Action() {
+        execute("disconnectUser", sessionId, () -> SessionManager.getInstance().disconnectUser(sessionId, userSessionId));
-            @Override
-            public void execute() {
-                SessionManager.getInstance().disconnectUser(sessionId, userSessionId);
-            }
-        });
     }
 
     @Override
     public void muteUser(final String sessionId, final String userName, final long durationMinutes) throws MageException {
-        execute("muteUser", sessionId, new Action() {
+        execute("muteUser", sessionId, () -> {
-            @Override
-            public void execute() {
             User user = UserManager.getInstance().getUserByName(userName);
             if (user != null) {
                 Date muteUntil = new Date(Calendar.getInstance().getTimeInMillis() + (durationMinutes * Timer.ONE_MINUTE));
@@ -1091,15 +989,12 @@ public class MageServerImpl implements MageServer {
                 user.setChatLockedUntil(muteUntil);
             }
 
-            }
         });
     }
 
     @Override
     public void lockUser(final String sessionId, final String userName, final long durationMinutes) throws MageException {
-        execute("lockUser", sessionId, new Action() {
+        execute("lockUser", sessionId, () -> {
-            @Override
-            public void execute() {
             User user = UserManager.getInstance().getUserByName(userName);
             if (user != null) {
                 Date lockUntil = new Date(Calendar.getInstance().getTimeInMillis() + (durationMinutes * Timer.ONE_MINUTE));
@@ -1110,15 +1005,12 @@ public class MageServerImpl implements MageServer {
                 }
             }
 
-            }
         });
     }
 
     @Override
     public void toggleActivation(final String sessionId, final String userName) throws MageException {
-        execute("toggleActivation", sessionId, new Action() {
+        execute("toggleActivation", sessionId, () -> {
-            @Override
-            public void execute() {
             User user = UserManager.getInstance().getUserByName(userName);
             if (user != null) {
                 user.setActive(!user.isActive());
@@ -1127,18 +1019,12 @@ public class MageServerImpl implements MageServer {
                 }
             }
 
-            }
         });
     }
 
     @Override
     public void endUserSession(final String sessionId, final String userSessionId) throws MageException {
-        execute("endUserSession", sessionId, new Action() {
+        execute("endUserSession", sessionId, () -> SessionManager.getInstance().endUserSession(sessionId, userSessionId));
-            @Override
-            public void execute() {
-                SessionManager.getInstance().endUserSession(sessionId, userSessionId);
-            }
-        });
     }
 
     /**
@@ -1150,12 +1036,9 @@ public class MageServerImpl implements MageServer {
      */
     @Override
     public void removeTable(final String sessionId, final UUID tableId) throws MageException {
-        execute("removeTable", sessionId, new Action() {
+        execute("removeTable", sessionId, () -> {
-            @Override
-            public void execute() {
             UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
             TableManager.getInstance().removeTable(userId, tableId);
-            }
         });
     }
 
@@ -1172,12 +1055,9 @@ public class MageServerImpl implements MageServer {
     @Override
     public void sendFeedbackMessage(final String sessionId, final String username, final String title, final String type, final String message, final String email) throws MageException {
         if (title != null && message != null) {
-            execute("sendFeedbackMessage", sessionId, new Action() {
+            execute("sendFeedbackMessage", sessionId, () -> {
-                @Override
-                public void execute() {
                 String host = SessionManager.getInstance().getSession(sessionId).getHost();
                 FeedbackServiceImpl.instance.feedback(username, title, type, message, email, host);
-                }
             });
         }
     }
@@ -1185,9 +1065,7 @@ public class MageServerImpl implements MageServer {
     @Override
     public void sendBroadcastMessage(final String sessionId, final String message) throws MageException {
         if (message != null) {
-            execute("sendBroadcastMessage", sessionId, new Action() {
+            execute("sendBroadcastMessage", sessionId, () -> {
-                @Override
-                public void execute() {
                 for (User user : UserManager.getInstance().getUsers()) {
                     if (message.toLowerCase(Locale.ENGLISH).startsWith("warn")) {
                         user.fireCallback(new ClientCallback("serverMessage", null, new ChatMessage("SERVER", message, null, MessageColor.RED)));
@@ -1195,18 +1073,12 @@ public class MageServerImpl implements MageServer {
                         user.fireCallback(new ClientCallback("serverMessage", null, new ChatMessage("SERVER", message, null, MessageColor.BLUE)));
                     }
                 }
-                }
             }, true);
         }
     }
 
     private void sendErrorMessageToClient(final String sessionId, final String message) throws MageException {
-        execute("sendErrorMessageToClient", sessionId, new Action() {
+        execute("sendErrorMessageToClient", sessionId, () -> SessionManager.getInstance().sendErrorMessageToClient(sessionId, message));
-            @Override
-            public void execute() {
-                SessionManager.getInstance().sendErrorMessageToClient(sessionId, message);
-            }
-        });
     }
 
     protected void execute(final String actionName, final String sessionId, final Action action, boolean checkAdminRights) throws MageException {
@@ -1222,9 +1094,7 @@ public class MageServerImpl implements MageServer {
         if (SessionManager.getInstance().isValidSession(sessionId)) {
             try {
                 callExecutor.execute(
-                        new Runnable() {
+                        () -> {
-                    @Override
-                    public void run() {
                             if (SessionManager.getInstance().isValidSession(sessionId)) {
                                 try {
                                     action.execute();
@@ -1233,7 +1103,6 @@ public class MageServerImpl implements MageServer {
                                 }
                             }
                         }
-                }
                 );
             } catch (Exception ex) {
                 handleException(ex);

Mage.Server/src/main/java/mage/server/Main.java

@@ -92,7 +92,7 @@ public class Main {
     private static final File pluginFolder = new File("plugins");
     private static final File extensionFolder = new File("extensions");
 
-    public static PluginClassLoader classLoader = new PluginClassLoader();
+    public static final PluginClassLoader classLoader = new PluginClassLoader();
     public static TransporterServer server;
     protected static boolean testMode;
     protected static boolean fastDbMode;
@@ -437,12 +437,7 @@ public class Main {
             directory.mkdirs();
         }
         File[] files = directory.listFiles(
-                new FilenameFilter() {
+                (dir, name) -> name.endsWith(".game")
-            @Override
-            public boolean accept(File dir, String name) {
-                return name.endsWith(".game");
-            }
-        }
         );
         for (File file : files) {
             file.delete();

Mage.Server/src/main/java/mage/server/TableController.java

@@ -90,7 +90,7 @@ public class TableController {
     private Tournament tournament;
 
     private ScheduledFuture<?> futureTimeout;
-    protected static ScheduledExecutorService timeoutExecutor = ThreadExecutor.getInstance().getTimeoutExecutor();
+    protected static final ScheduledExecutorService timeoutExecutor = ThreadExecutor.getInstance().getTimeoutExecutor();
 
     public TableController(UUID roomId, UUID userId, MatchOptions options) {
         this.userId = userId;
@@ -128,9 +128,7 @@ public class TableController {
 
     private void init() {
         match.addTableEventListener(
-                new Listener<TableEvent>() {
+                (Listener<TableEvent>) event -> {
-            @Override
-            public void event(TableEvent event) {
                     try {
                         switch (event.getEventType()) {
                             case SIDEBOARD:
@@ -141,7 +139,6 @@ public class TableController {
                         logger.fatal("Table event listener error", ex);
                     }
                 }
-        }
         );
     }
 
@@ -814,12 +811,7 @@ public class TableController {
         cancelTimeout();
         if (seconds > 0) {
             futureTimeout = timeoutExecutor.schedule(
-                    new Runnable() {
+                    () -> autoSideboard(),
-                @Override
-                public void run() {
-                    autoSideboard();
-                }
-            },
                     seconds, TimeUnit.SECONDS
             );
         }

Mage.Server/src/main/java/mage/server/TableManager.java

@@ -64,7 +64,7 @@ import org.apache.log4j.Logger;
  */
 public class TableManager {
 
-    protected static ScheduledExecutorService expireExecutor = Executors.newSingleThreadScheduledExecutor();
+    protected static final ScheduledExecutorService expireExecutor = Executors.newSingleThreadScheduledExecutor();
 
     // protected static ScheduledExecutorService expireExecutor = ThreadExecutor.getInstance().getExpireExecutor();
     
@@ -87,15 +87,12 @@ public class TableManager {
     }
 
     private TableManager() {
-        expireExecutor.scheduleAtFixedRate(new Runnable() {
+        expireExecutor.scheduleAtFixedRate(() -> {
-            @Override
-            public void run() {
             try {
                 checkTableHealthState();
             } catch(Exception ex) {
                 logger.fatal("Check table health state job error:", ex);
             }
-            }
         }, EXPIRE_CHECK_PERIOD, EXPIRE_CHECK_PERIOD, TimeUnit.MINUTES);
     }
 

Mage.Server/src/main/java/mage/server/User.java

@@ -70,7 +70,7 @@ public class User {
 
     public enum UserState {
 
-        Created, Connected, Disconnected, Reconnected, Expired;
+        Created, Connected, Disconnected, Reconnected, Expired
     }
 
     private final UUID userId;

Mage.Server/src/main/java/mage/server/UserManager.java

@@ -52,7 +52,7 @@ import org.apache.log4j.Logger;
  */
 public class UserManager {
 
-    protected static ScheduledExecutorService expireExecutor = Executors.newSingleThreadScheduledExecutor();
+    protected static final ScheduledExecutorService expireExecutor = Executors.newSingleThreadScheduledExecutor();
 
     private static final Logger LOGGER = Logger.getLogger(UserManager.class);
 
@@ -68,12 +68,7 @@ public class UserManager {
     }
 
     private UserManager() {
-        expireExecutor.scheduleAtFixedRate(new Runnable() {
+        expireExecutor.scheduleAtFixedRate(() -> checkExpired(), 60, 60, TimeUnit.SECONDS);
-            @Override
-            public void run() {
-                checkExpired();
-            }
-        }, 60, 60, TimeUnit.SECONDS);
     }
 
     public User createUser(String userName, String host, AuthorizedUser authorizedUser) {
@@ -137,9 +132,7 @@ public class UserManager {
             final User user = users.get(userId);
             if (user != null) {
                 USER_EXECUTOR.execute(
-                        new Runnable() {
+                        () -> {
-                    @Override
-                    public void run() {
                             try {
                                 LOGGER.info("USER REMOVE - " + user.getName() + " (" + reason.toString() + ")  userId: " + userId + " [" + user.getGameInfo() + "]");
                                 user.remove(reason);
@@ -151,7 +144,6 @@ public class UserManager {
                                 usersByName.remove(user.getName());
                             }
                         }
-                }
                 );
             } else {
                 LOGGER.warn("Trying to remove userId: " + userId + " - but it does not exist.");
@@ -212,16 +204,13 @@ public class UserManager {
     }
 
     public void updateUserHistory() {
-        USER_EXECUTOR.execute(new Runnable() {
+        USER_EXECUTOR.execute(() -> {
-            @Override
-            public void run() {
             for (String updatedUser : UserStatsRepository.instance.updateUserStats()) {
                 User user = getUserByName(updatedUser);
                 if (user != null) {
                     user.resetUserStats();
                 }
             }
-            }
         });
     }
 }

Mage.Server/src/main/java/mage/server/draft/CubeFactory.java

@@ -44,7 +44,7 @@ public class CubeFactory {
     private static final CubeFactory INSTANCE = new CubeFactory();
     private static final Logger logger = Logger.getLogger(CubeFactory.class);
 
-    private Map<String, Class> draftCubes = new LinkedHashMap<String, Class>();
+    private final Map<String, Class> draftCubes = new LinkedHashMap<String, Class>();
 
     public static CubeFactory getInstance() {
         return INSTANCE;
@@ -57,8 +57,8 @@ public class CubeFactory {
         DraftCube draftCube;
         Constructor<?> con;
         try {
-            con = draftCubes.get(draftCubeName).getConstructor(new Class[]{});
+            con = draftCubes.get(draftCubeName).getConstructor();
-            draftCube = (DraftCube)con.newInstance(new Object[] {});
+            draftCube = (DraftCube)con.newInstance();
         } catch (Exception ex) {
             logger.fatal("CubeFactory error", ex);
             return null;
@@ -73,8 +73,8 @@ public class CubeFactory {
         DraftCube draftCube;
         Constructor<?> con;
         try {
-            con = draftCubes.get(draftCubeName).getConstructor(new Class[]{Deck.class});
+            con = draftCubes.get(draftCubeName).getConstructor(Deck.class);
-            draftCube = (DraftCube)con.newInstance(new Object[] {cubeFromDeck});
+            draftCube = (DraftCube)con.newInstance(cubeFromDeck);
         } catch (Exception ex) {
             logger.fatal("CubeFactory error", ex);
             return null;

Mage.Server/src/main/java/mage/server/draft/DraftController.java

@@ -74,9 +74,7 @@ public class DraftController {
 
     private void init() {
         draft.addTableEventListener(
-            new Listener<TableEvent> () {
+                (Listener<TableEvent>) event -> {
-                @Override
-                public void event(TableEvent event) {
                     try {
                         switch (event.getEventType()) {
                             case UPDATE:
@@ -91,12 +89,9 @@ public class DraftController {
                         logger.fatal("Table event listener error", ex);
                     }
                 }
-            }
         );
         draft.addPlayerQueryEventListener(
-            new Listener<PlayerQueryEvent> () {
+                (Listener<PlayerQueryEvent>) event -> {
-                @Override
-                public void event(PlayerQueryEvent event) {
                     try {
                         switch (event.getQueryType()) {
                             case PICK_CARD:
@@ -108,7 +103,6 @@ public class DraftController {
                         logger.fatal("Table event listener error", ex);
                     }
                 }
-            }
         );
         for (DraftPlayer player: draft.getPlayers()) {
             if (!player.getPlayer().isHuman()) {
@@ -156,12 +150,7 @@ public class DraftController {
         if (!draft.isStarted() && allJoined()) {
             draft.setStarted();
             ThreadExecutor.getInstance().getCallExecutor().execute(
-                new Runnable() {
+                    () -> startDraft());
-                    @Override
-                    public void run() {
-                        startDraft();
-                    }
-            });
         }
     }
 

Mage.Server/src/main/java/mage/server/draft/DraftSession.java

@@ -52,14 +52,14 @@ public class DraftSession {
 
     protected final static Logger logger = Logger.getLogger(DraftSession.class);
 
-    protected UUID userId;
+    protected final UUID userId;
-    protected UUID playerId;
+    protected final UUID playerId;
-    protected Draft draft;
+    protected final Draft draft;
     protected boolean killed = false;
     protected UUID markedCard;
 
     private ScheduledFuture<?> futureTimeout;
-    protected static ScheduledExecutorService timeoutExecutor = ThreadExecutor.getInstance().getTimeoutExecutor();
+    protected static final ScheduledExecutorService timeoutExecutor = ThreadExecutor.getInstance().getTimeoutExecutor();
 
     public DraftSession(Draft draft, UUID userId, UUID playerId) {
         this.userId = userId;
@@ -125,12 +125,7 @@ public class DraftSession {
         cancelTimeout();
         if (seconds > 0) {
             futureTimeout = timeoutExecutor.schedule(
-                new Runnable() {
+                    () -> DraftManager.getInstance().timeout(draft.getId(), userId),
-                    @Override
-                    public void run() {
-                        DraftManager.getInstance().timeout(draft.getId(), userId);
-                    }
-                },
                 seconds, TimeUnit.SECONDS
             );
         }

Mage.Server/src/main/java/mage/server/game/DeckValidatorFactory.java

@@ -57,8 +57,8 @@ public class DeckValidatorFactory {
         DeckValidator validator;
         Constructor<?> con;
         try {
-            con = deckTypes.get(deckType).getConstructor(new Class[]{});
+            con = deckTypes.get(deckType).getConstructor();
-            validator = (DeckValidator)con.newInstance(new Object[] {});
+            validator = (DeckValidator)con.newInstance();
         } catch (Exception ex) {
             logger.fatal("DeckValidatorFactory error", ex);
             return null;

Mage.Server/src/main/java/mage/server/game/GameController.java

@@ -99,24 +99,24 @@ public class GameController implements GameCallback {
     private static final ExecutorService gameExecutor = ThreadExecutor.getInstance().getGameExecutor();
     private static final Logger logger = Logger.getLogger(GameController.class);
 
-    protected ScheduledExecutorService joinWaitingExecutor = Executors.newSingleThreadScheduledExecutor();
+    protected final ScheduledExecutorService joinWaitingExecutor = Executors.newSingleThreadScheduledExecutor();
 
     private ScheduledFuture<?> futureTimeout;
-    protected static ScheduledExecutorService timeoutIdleExecutor = ThreadExecutor.getInstance().getTimeoutIdleExecutor();
+    protected static final ScheduledExecutorService timeoutIdleExecutor = ThreadExecutor.getInstance().getTimeoutIdleExecutor();
 
-    private ConcurrentHashMap<UUID, GameSessionPlayer> gameSessions = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<UUID, GameSessionPlayer> gameSessions = new ConcurrentHashMap<>();
-    private ConcurrentHashMap<UUID, GameSessionWatcher> watchers = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<UUID, GameSessionWatcher> watchers = new ConcurrentHashMap<>();
-    private ConcurrentHashMap<UUID, PriorityTimer> timers = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<UUID, PriorityTimer> timers = new ConcurrentHashMap<>();
 
-    private ConcurrentHashMap<UUID, UUID> userPlayerMap;
+    private final ConcurrentHashMap<UUID, UUID> userPlayerMap;
-    private UUID gameSessionId;
+    private final UUID gameSessionId;
-    private Game game;
+    private final Game game;
-    private UUID chatId;
+    private final UUID chatId;
-    private UUID tableId;
+    private final UUID tableId;
-    private UUID choosingPlayerId;
+    private final UUID choosingPlayerId;
     private Future<?> gameFuture;
     private boolean useTimeout = true;
-    private GameOptions gameOptions;
+    private final GameOptions gameOptions;
 
     private UUID userReqestingRollback;
     private int turnsToRollback;
@@ -155,9 +155,7 @@ public class GameController implements GameCallback {
 
     private void init() {
         game.addTableEventListener(
-                new Listener<TableEvent>() {
+                (Listener<TableEvent>) event -> {
-            @Override
-            public void event(TableEvent event) {
                     try {
                         PriorityTimer timer;
                         UUID playerId;
@@ -166,11 +164,11 @@ public class GameController implements GameCallback {
                                 updateGame();
                                 break;
                             case INFO:
-                            ChatManager.getInstance().broadcast(chatId, "", event.getMessage(), MessageColor.BLACK, true, ChatMessage.MessageType.GAME, null);
+                                ChatManager.getInstance().broadcast(chatId, "", event.getMessage(), MessageColor.BLACK, true, MessageType.GAME, null);
                                 logger.trace(game.getId() + " " + event.getMessage());
                                 break;
                             case STATUS:
-                            ChatManager.getInstance().broadcast(chatId, "", event.getMessage(), MessageColor.ORANGE, event.getWithTime(), ChatMessage.MessageType.GAME, null);
+                                ChatManager.getInstance().broadcast(chatId, "", event.getMessage(), MessageColor.ORANGE, event.getWithTime(), MessageType.GAME, null);
                                 logger.trace(game.getId() + " " + event.getMessage());
                                 break;
                             case ERROR:
@@ -218,12 +216,9 @@ public class GameController implements GameCallback {
                         logger.fatal("Table event listener error ", ex);
                     }
                 }
-        }
         );
         game.addPlayerQueryEventListener(
-                new Listener<PlayerQueryEvent>() {
+                (Listener<PlayerQueryEvent>) event -> {
-            @Override
-            public void event(PlayerQueryEvent event) {
                     logger.trace(new StringBuilder(event.getPlayerId().toString()).append("--").append(event.getQueryType()).append("--").append(event.getMessage()).toString());
                     try {
                         switch (event.getQueryType()) {
@@ -272,17 +267,13 @@ public class GameController implements GameCallback {
                         logger.fatal("Player event listener error ", ex);
                     }
                 }
-        }
         );
-        joinWaitingExecutor.scheduleAtFixedRate(new Runnable() {
+        joinWaitingExecutor.scheduleAtFixedRate(() -> {
-            @Override
-            public void run() {
             try {
                 sendInfoAboutPlayersNotJoinedYet();
             } catch (Exception ex) {
                 logger.fatal("Send info about player not joined yet:", ex);
             }
-            }
         }, 15, 15, TimeUnit.SECONDS);
         checkStart();
     }
@@ -303,12 +294,9 @@ public class GameController implements GameCallback {
         final UUID initPlayerId = playerId;
         long delayMs = 250L; // run each 250 ms
 
-        Action executeOnNoTimeLeft = new Action() {
+        Action executeOnNoTimeLeft = () -> {
-            @Override
-            public void execute() throws MageException {
             game.timerTimeout(initPlayerId);
             logger.debug("Player has no time left to end the match: " + initPlayerId + ". Conceding.");
-            }
         };
 
         PriorityTimer timer = new PriorityTimer(count, delayMs, executeOnNoTimeLeft);
@@ -402,12 +390,7 @@ public class GameController implements GameCallback {
         if (allJoined()) {
             joinWaitingExecutor.shutdownNow();
             ThreadExecutor.getInstance().getCallExecutor().execute(
-                    new Runnable() {
+                    () -> startGame());
-                @Override
-                public void run() {
-                    startGame();
-                }
-            });
         }
     }
 
@@ -703,49 +686,24 @@ public class GameController implements GameCallback {
     }
 
     public void sendPlayerUUID(UUID userId, final UUID data) {
-        sendMessage(userId, new Command() {
+        sendMessage(userId, playerId -> getGameSession(playerId).sendPlayerUUID(data));
-            @Override
-            public void execute(UUID playerId) {
-                getGameSession(playerId).sendPlayerUUID(data);
-            }
-        });
     }
 
     public void sendPlayerString(UUID userId, final String data) {
-        sendMessage(userId, new Command() {
+        sendMessage(userId, playerId -> getGameSession(playerId).sendPlayerString(data));
-            @Override
-            public void execute(UUID playerId) {
-                getGameSession(playerId).sendPlayerString(data);
-            }
-        });
     }
 
     public void sendPlayerManaType(UUID userId, final UUID manaTypePlayerId, final ManaType data) {
-        sendMessage(userId, new Command() {
+        sendMessage(userId, playerId -> getGameSession(playerId).sendPlayerManaType(data, manaTypePlayerId));
-            @Override
-            public void execute(UUID playerId) {
-                getGameSession(playerId).sendPlayerManaType(data, manaTypePlayerId);
-            }
-        });
     }
 
     public void sendPlayerBoolean(UUID userId, final Boolean data) {
-        sendMessage(userId, new Command() {
+        sendMessage(userId, playerId -> getGameSession(playerId).sendPlayerBoolean(data));
-            @Override
-            public void execute(UUID playerId) {
-                getGameSession(playerId).sendPlayerBoolean(data);
-            }
-        });
 
     }
 
     public void sendPlayerInteger(UUID userId, final Integer data) {
-        sendMessage(userId, new Command() {
+        sendMessage(userId, playerId -> getGameSession(playerId).sendPlayerInteger(data));
-            @Override
-            public void execute(UUID playerId) {
-                getGameSession(playerId).sendPlayerInteger(data);
-            }
-        });
 
     }
 
@@ -779,120 +737,69 @@ public class GameController implements GameCallback {
     }
 
     private synchronized void ask(UUID playerId, final String question, final Map<String, Serializable> options) throws MageException {
-        perform(playerId, new Command() {
+        perform(playerId, playerId1 -> getGameSession(playerId1).ask(question, options));
-            @Override
-            public void execute(UUID playerId) {
-                getGameSession(playerId).ask(question, options);
-            }
-        });
 
     }
 
     private synchronized void chooseAbility(UUID playerId, final String objectName, final List<? extends Ability> choices) throws MageException {
-        perform(playerId, new Command() {
+        perform(playerId, playerId1 -> getGameSession(playerId1).chooseAbility(new AbilityPickerView(objectName, choices)));
-            @Override
-            public void execute(UUID playerId) {
-                getGameSession(playerId).chooseAbility(new AbilityPickerView(objectName, choices));
-            }
-        });
     }
 
     private synchronized void choosePile(UUID playerId, final String message, final List<? extends Card> pile1, final List<? extends Card> pile2) throws MageException {
-        perform(playerId, new Command() {
+        perform(playerId, playerId1 -> getGameSession(playerId1).choosePile(message, new CardsView(pile1), new CardsView(pile2)));
-            @Override
-            public void execute(UUID playerId) {
-                getGameSession(playerId).choosePile(message, new CardsView(pile1), new CardsView(pile2));
-            }
-        });
     }
 
     private synchronized void chooseMode(UUID playerId, final Map<UUID, String> modes) throws MageException {
-        perform(playerId, new Command() {
+        perform(playerId, playerId1 -> getGameSession(playerId1).chooseAbility(new AbilityPickerView(modes)));
-            @Override
-            public void execute(UUID playerId) {
-                getGameSession(playerId).chooseAbility(new AbilityPickerView(modes));
-            }
-        });
     }
 
     private synchronized void chooseChoice(UUID playerId, final Choice choice) throws MageException {
-        perform(playerId, new Command() {
+        perform(playerId, playerId1 -> getGameSession(playerId1).chooseChoice(choice));
-            @Override
-            public void execute(UUID playerId) {
-                getGameSession(playerId).chooseChoice(choice);
-            }
-        });
     }
 
     private synchronized void target(UUID playerId, final String question, final Cards cards, final List<Permanent> perms, final Set<UUID> targets, final boolean required, final Map<String, Serializable> options) throws MageException {
-        perform(playerId, new Command() {
+        perform(playerId, playerId1 -> {
-            @Override
-            public void execute(UUID playerId) {
             if (cards != null) {
                 // Zone targetZone = (Zone) options.get("targetZone");
                 // Are there really situations where a player selects from a list of face down cards?
                 // So always show face up for selection
                 // boolean showFaceDown = targetZone != null && targetZone.equals(Zone.PICK);
                 boolean showFaceDown = true;
-                    getGameSession(playerId).target(question, new CardsView(game, cards.getCards(game), showFaceDown, true), targets, required, options);
+                getGameSession(playerId1).target(question, new CardsView(game, cards.getCards(game), showFaceDown, true), targets, required, options);
             } else if (perms != null) {
                 CardsView permsView = new CardsView();
                 for (Permanent perm : perms) {
-                        permsView.put(perm.getId(), new PermanentView(perm, game.getCard(perm.getId()), playerId, game));
+                    permsView.put(perm.getId(), new PermanentView(perm, game.getCard(perm.getId()), playerId1, game));
                 }
-                    getGameSession(playerId).target(question, permsView, targets, required, options);
+                getGameSession(playerId1).target(question, permsView, targets, required, options);
             } else {
-                    getGameSession(playerId).target(question, new CardsView(), targets, required, options);
+                getGameSession(playerId1).target(question, new CardsView(), targets, required, options);
-                }
             }
         });
 
     }
 
     private synchronized void target(UUID playerId, final String question, final Collection<? extends Ability> abilities, final boolean required, final Map<String, Serializable> options) throws MageException {
-        perform(playerId, new Command() {
+        perform(playerId, playerId1 -> {
-            @Override
-            public void execute(UUID playerId) {
             CardsView cardsView = new CardsView(abilities, game);
-                getGameSession(playerId).target(question, cardsView, null, required, options);
+            getGameSession(playerId1).target(question, cardsView, null, required, options);
-            }
         });
     }
 
     private synchronized void select(final UUID playerId, final String message, final Map<String, Serializable> options) throws MageException {
-        perform(playerId, new Command() {
+        perform(playerId, playerId1 -> getGameSession(playerId1).select(message, options));
-            @Override
-            public void execute(UUID playerId) {
-                getGameSession(playerId).select(message, options);
-            }
-        });
     }
 
     private synchronized void playMana(UUID playerId, final String message, final Map<String, Serializable> options) throws MageException {
-        perform(playerId, new Command() {
+        perform(playerId, playerId1 -> getGameSession(playerId1).playMana(message, options));
-            @Override
-            public void execute(UUID playerId) {
-                getGameSession(playerId).playMana(message, options);
-            }
-        });
     }
 
     private synchronized void playXMana(UUID playerId, final String message) throws MageException {
-        perform(playerId, new Command() {
+        perform(playerId, playerId1 -> getGameSession(playerId1).playXMana(message));
-            @Override
-            public void execute(UUID playerId) {
-                getGameSession(playerId).playXMana(message);
-            }
-        });
     }
 
     private synchronized void amount(UUID playerId, final String message, final int min, final int max) throws MageException {
-        perform(playerId, new Command() {
+        perform(playerId, playerId1 -> getGameSession(playerId1).getAmount(message, min, max));
-            @Override
-            public void execute(UUID playerId) {
-                getGameSession(playerId).getAmount(message, min, max);
-            }
-        });
     }
 
     private void informOthers(UUID playerId) throws MageException {
@@ -939,12 +846,7 @@ public class GameController implements GameCallback {
     }
 
     private synchronized void informPersonal(UUID playerId, final String message) throws MageException {
-        perform(playerId, new Command() {
+        perform(playerId, playerId1 -> getGameSession(playerId1).informPersonal(message));
-            @Override
-            public void execute(UUID playerId) {
-                getGameSession(playerId).informPersonal(message);
-            }
-        });
     }
 
     private void error(String message, Exception ex) {
@@ -977,12 +879,9 @@ public class GameController implements GameCallback {
         try {
             OutputStream file = new FileOutputStream("saved/" + game.getId().toString() + ".game");
             OutputStream buffer = new BufferedOutputStream(file);
-            ObjectOutput output = new ObjectOutputStream(new GZIPOutputStream(buffer));
+            try (ObjectOutput output = new ObjectOutputStream(new GZIPOutputStream(buffer))) {
-            try {
                 output.writeObject(game);
                 output.writeObject(game.getGameStates());
-            } finally {
-                output.close();
             }
             logger.debug("Saved game:" + game.getId());
             return true;
@@ -1074,12 +973,7 @@ public class GameController implements GameCallback {
         }
         cancelTimeout();
         futureTimeout = timeoutIdleExecutor.schedule(
-                new Runnable() {
+                () -> idleTimeout(playerId),
-            @Override
-            public void run() {
-                idleTimeout(playerId);
-            }
-        },
                 Main.isTestMode() ? 3600 : ConfigSettings.getInstance().getMaxSecondsIdle(),
                 TimeUnit.SECONDS
         );

Mage.Server/src/main/java/mage/server/game/GameFactory.java

@@ -64,8 +64,8 @@ public class GameFactory {
         Match match;
         Constructor<Match> con;
         try {
-            con = games.get(gameType).getConstructor(new Class[]{MatchOptions.class});
+            con = games.get(gameType).getConstructor(MatchOptions.class);
-            match = con.newInstance(new Object[] {options});
+            match = con.newInstance(options);
         } catch (Exception ex) {
             logger.fatal("Error creating match - " + gameType, ex);
             return null;

Mage.Server/src/main/java/mage/server/game/GameReplay.java

@@ -87,16 +87,12 @@ public class GameReplay {
         try{
             InputStream file = new FileInputStream("saved/" + gameId.toString() + ".game");
             InputStream buffer = new BufferedInputStream(file);
-            ObjectInput input = new CopierObjectInputStream(Main.classLoader, new GZIPInputStream(buffer));
+            try (ObjectInput input = new CopierObjectInputStream(Main.classLoader, new GZIPInputStream(buffer))) {
-            try {
                 Game loadGame = (Game) input.readObject();
                 GameStates states = (GameStates) input.readObject();
                 loadGame.loadGameStates(states);
                 return loadGame;
             }
-            finally {
-                input.close();
-            }
         }
         catch(ClassNotFoundException ex) {
             logger.fatal("Cannot load game. Class not found.", ex);

Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java

@@ -282,9 +282,7 @@ public class GameSessionPlayer extends GameSessionWatcher {
             final Player player = game.getPlayer(playerId);
             if (player != null && player.isInGame()) {
                 callExecutor.execute(
-                        new Runnable() {
+                        () -> {
-                    @Override
-                    public void run() {
                             try {
                                 if (game.getStartTime() == null) {
                                     // gameController is still waiting to start the game
@@ -309,7 +307,6 @@ public class GameSessionPlayer extends GameSessionWatcher {
                                 }
                             }
                         }
-                }
                 );
 
             }

Mage.Server/src/main/java/mage/server/game/GameSessionWatcher.java

@@ -51,10 +51,10 @@ public class GameSessionWatcher {
 
     protected final static Logger logger = Logger.getLogger(GameSessionWatcher.class);
 
-    protected UUID userId;
+    protected final UUID userId;
-    protected Game game;
+    protected final Game game;
     protected boolean killed = false;
-    protected boolean isPlayer;
+    protected final boolean isPlayer;
 
     public GameSessionWatcher(UUID userId, Game game, boolean isPlayer) {
         this.userId = userId;

Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java

@@ -73,16 +73,13 @@ public class GamesRoomImpl extends RoomImpl implements GamesRoom, Serializable {
     private final ConcurrentHashMap<UUID, Table> tables = new ConcurrentHashMap<>();
 
     public GamesRoomImpl() {
-        UPDATE_EXECUTOR.scheduleAtFixedRate(new Runnable() {
+        UPDATE_EXECUTOR.scheduleAtFixedRate(() -> {
-            @Override
-            public void run() {
             try {
                 update();
             } catch (Exception ex) {
                 LOGGER.fatal("Games room update exception! " + ex.toString(), ex);
             }
 
-            }
         }, 2, 2, TimeUnit.SECONDS);
     }
 
@@ -95,7 +92,7 @@ public class GamesRoomImpl extends RoomImpl implements GamesRoom, Serializable {
         ArrayList<TableView> tableList = new ArrayList<>();
         ArrayList<MatchView> matchList = new ArrayList<>();
         List<Table> allTables = new ArrayList<>(tables.values());
-        Collections.sort(allTables, new TableListSorter());
+        allTables.sort(new TableListSorter());
         for (Table table : allTables) {
             if (table.getState() != TableState.FINISHED) {
                 tableList.add(new TableView(table));
@@ -136,7 +133,7 @@ public class GamesRoomImpl extends RoomImpl implements GamesRoom, Serializable {
             }
         }
 
-        Collections.sort(users, new UserNameSorter());
+        users.sort(new UserNameSorter());
         List<RoomUsersView> roomUserInfo = new ArrayList<>();
         roomUserInfo.add(new RoomUsersView(users,
                 GameManager.getInstance().getNumberActiveGames(),

Mage.Server/src/main/java/mage/server/game/PlayerFactory.java

@@ -59,8 +59,8 @@ public class PlayerFactory {
         try {
             Class playerTypeClass = playerTypes.get(playerType);
             if (playerTypeClass != null) {
-                con = playerTypeClass.getConstructor(new Class[]{String.class, RangeOfInfluence.class, int.class});
+                con = playerTypeClass.getConstructor(String.class, RangeOfInfluence.class, int.class);
-                player = (Player)con.newInstance(new Object[] {name, range, skill});
+                player = (Player)con.newInstance(name, range, skill);
                 logger.trace("Player created: " + name + " - " + player.getId());
                 return player;
             }

Mage.Server/src/main/java/mage/server/game/ReplaySession.java

@@ -43,7 +43,7 @@ import mage.view.GameView;
 public class ReplaySession implements GameCallback {
 
     private final GameReplay replay;
-    protected UUID userId;
+    protected final UUID userId;
 
     ReplaySession(UUID gameId, UUID userId) {
         this.replay = new GameReplay(gameId);

Mage.Server/src/main/java/mage/server/record/TableRecordRepository.java

@@ -24,7 +24,7 @@ public enum TableRecordRepository {
 
     private Dao<TableRecord, Object> dao;
 
-    private TableRecordRepository() {
+    TableRecordRepository() {
         File file = new File("db");
         if (!file.exists()) {
             file.mkdirs();

Mage.Server/src/main/java/mage/server/record/UserStatsRepository.java

@@ -30,7 +30,7 @@ public enum UserStatsRepository {
 
     private Dao<UserStats, Object> dao;
 
-    private UserStatsRepository() {
+    UserStatsRepository() {
         File file = new File("db");
         if (!file.exists()) {
             file.mkdirs();

Mage.Server/src/main/java/mage/server/services/impl/FeedbackServiceImpl.java

@@ -12,7 +12,7 @@ import java.util.Calendar;
 public enum FeedbackServiceImpl implements FeedbackService {
     instance;
 
-    private static Logger log = Logger.getLogger(FeedbackServiceImpl.class);
+    private static final Logger log = Logger.getLogger(FeedbackServiceImpl.class);
 
     @Override
     public void feedback(String username, String title, String type, String message, String email, String host) {

Mage.Server/src/main/java/mage/server/tournament/TournamentController.java

@@ -88,9 +88,7 @@ public class TournamentController {
 
     private void init() {
         tournament.addTableEventListener(
-                new Listener<TableEvent>() {
+                (Listener<TableEvent>) event -> {
-            @Override
-            public void event(TableEvent event) {
                     switch (event.getEventType()) {
                         case CHECK_STATE_PLAYERS:
                             checkPlayersState();
@@ -133,12 +131,9 @@ public class TournamentController {
                             break;
                     }
                 }
-        }
         );
         tournament.addPlayerQueryEventListener(
-                new Listener<PlayerQueryEvent>() {
+                (Listener<PlayerQueryEvent>) event -> {
-            @Override
-            public void event(PlayerQueryEvent event) {
                     try {
                         switch (event.getQueryType()) {
                             case CONSTRUCT:
@@ -149,7 +144,6 @@ public class TournamentController {
                         logger.fatal("Player event listener error", ex);
                     }
                 }
-        }
         );
         for (TournamentPlayer player : tournament.getPlayers()) {
             if (!player.getPlayer().isHuman()) {
@@ -208,12 +202,7 @@ public class TournamentController {
     private void checkStart() {
         if (!started && allJoined()) {
             ThreadExecutor.getInstance().getCallExecutor().execute(
-                    new Runnable() {
+                    () -> startTournament());
-                @Override
-                public void run() {
-                    startTournament();
-                }
-            });
         }
     }
 

Mage.Server/src/main/java/mage/server/tournament/TournamentFactory.java

@@ -66,8 +66,8 @@ public class TournamentFactory {
         Tournament tournament;
         Constructor<Tournament> con;
         try {
-            con = tournaments.get(tournamentType).getConstructor(new Class[]{TournamentOptions.class});
+            con = tournaments.get(tournamentType).getConstructor(TournamentOptions.class);
-            tournament = con.newInstance(new Object[] {options});
+            tournament = con.newInstance(options);
             // transfer set information, create short info string for included sets
             tournament.setTournamentType(tournamentTypes.get(tournamentType));
             if (tournament.getTournamentType().isLimited()) {

Mage.Server/src/main/java/mage/server/tournament/TournamentSession.java

@@ -49,14 +49,14 @@ import java.util.concurrent.TimeUnit;
 public class TournamentSession {
     protected final static Logger logger = Logger.getLogger(TournamentSession.class);
 
-    protected UUID userId;
+    protected final UUID userId;
-    protected UUID playerId;
+    protected final UUID playerId;
-    protected UUID tableId;
+    protected final UUID tableId;
-    protected Tournament tournament;
+    protected final Tournament tournament;
     protected boolean killed = false;
 
     private ScheduledFuture<?> futureTimeout;
-    protected static ScheduledExecutorService timeoutExecutor = ThreadExecutor.getInstance().getTimeoutExecutor();
+    protected static final ScheduledExecutorService timeoutExecutor = ThreadExecutor.getInstance().getTimeoutExecutor();
 
     public TournamentSession(Tournament tournament, UUID userId, UUID tableId, UUID playerId) {
         this.userId = userId;
@@ -129,15 +129,12 @@ public class TournamentSession {
         cancelTimeout();
         if (seconds > 0) {
             futureTimeout = timeoutExecutor.schedule(
-                new Runnable() {
+                    () -> {
-                    @Override
-                    public void run() {
                         try {
                             TournamentManager.getInstance().timeout(tournament.getId(), userId);
                         } catch (Exception e) {
                             logger.fatal("TournamentSession error - userId " + userId + " tId " + tournament.getId(), e);
                         }
-                    }
                     },
                 seconds, TimeUnit.SECONDS
             );

Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java

@@ -74,12 +74,7 @@ public class ServerMessagesUtil {
 
     public ServerMessagesUtil() {
         updateExecutor = Executors.newSingleThreadScheduledExecutor();
-        updateExecutor.scheduleAtFixedRate(new Runnable() {
+        updateExecutor.scheduleAtFixedRate(() -> reloadMessages(), 5, 5 * 60, TimeUnit.SECONDS);
-            @Override
-            public void run() {
-                reloadMessages();
-            }
-        }, 5, 5 * 60, TimeUnit.SECONDS);
     }
 
     public static ServerMessagesUtil getInstance() {

Mage.Server/src/main/java/mage/server/util/SystemUtil.java

@@ -56,8 +56,7 @@ public class SystemUtil {
 
             logger.info("Parsing init.txt... ");
 
-            Scanner scanner = new Scanner(f);
+            try (Scanner scanner = new Scanner(f)) {
-            try {
                 while (scanner.hasNextLine()) {
                     String line = scanner.nextLine().trim();
                     if (line.trim().isEmpty() || line.startsWith("#")) {
@@ -114,8 +113,6 @@ public class SystemUtil {
                         swapWithAnyCard(game, player, card, gameZone);
                     }
                 }
-            } finally {
-                scanner.close();
             }
         } catch (Exception e) {
             logger.fatal("", e);