Переработка закрытия листнеров по код-ревью

Author: denrus

server/src/main/java/ru/croccode/hypernull/match/Match.java

@@ -365,23 +365,4 @@ private void collectCoins() {
 			}
 		}
 	}
-
-	public void finished() {
-		//TODO Надо ли оповещать через MatchListener, что матч совсем всё?
-		for (MatchListener<K> listener : listeners) {
-			try {
-				listener.close();
-			} catch (Exception e) {
-				throw new RuntimeException(
-                    String.format(
-                        "Ошибка при закрытии слушателя %s матча %s: %s",
-                        listener.getClass().getSimpleName(),
-                        this,//TODO id?
-                        e.getMessage()
-				    ),
-                    e
-                );
-			}
-		}
-	}
 }

server/src/main/java/ru/croccode/hypernull/match/MatchListener.java

@@ -5,7 +5,7 @@
 import ru.croccode.hypernull.domain.MatchMap;
 import ru.croccode.hypernull.geometry.Point;
 
-public interface MatchListener<K> extends AutoCloseable{
+public interface MatchListener<K> {
 
 	void matchStarted(MatchMap map, MatchConfig config, Map<K, String> botNames);
 

server/src/main/java/ru/croccode/hypernull/server/AsciiMatchPrinter.java

@@ -33,11 +33,6 @@ public class AsciiMatchPrinter implements MatchListener<Integer> {
 
 	private int round;
 
-	@Override
-	public void close() {
-		//nothing
-	}
-
 	static class BotState {
 
 		String name = Strings.empty();

server/src/main/java/ru/croccode/hypernull/server/HyperNull.java

@@ -90,12 +90,14 @@ private void runMatch(MatchMode mode, List<MatchRequest> matchRequests) {
 		String matchId = MatchId.nextId();
 		MatchMap map = mapRegistry.randomMap(numBots);
 		MatchConfig config = buildMatchConfig(mode, map);
-		List<MatchListener<Integer>> listeners = Arrays.asList(
+		try (MatchFileLogger<Integer> fileLogger = new MatchFileLogger<>(matchId, this.matchLogsFolder)) {
+			List<MatchListener<Integer>> listeners = Arrays.asList(
 				new AsciiMatchPrinter(),
-				new MatchFileLogger<>(matchId, this.matchLogsFolder)
-		);
-		Match<Integer> match = new Match<>(map, config, botNames, listeners);
-		new MatchRunner(match, botSessions).run();
+				fileLogger
+			);
+			Match<Integer> match = new Match<>(map, config, botNames, listeners);
+			new MatchRunner(match, botSessions).run();
+		}
 	}
 
 	private MatchConfig buildMatchConfig(MatchMode mode, MatchMap map) {

server/src/main/java/ru/croccode/hypernull/server/MatchFileLogger.java

@@ -6,6 +6,7 @@
 import ru.croccode.hypernull.match.MatchConfig;
 import ru.croccode.hypernull.match.MatchListener;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.lang.reflect.Field;
@@ -14,7 +15,7 @@
 import java.nio.file.Paths;
 import java.util.Map;
 
-public class MatchFileLogger<K> implements MatchListener<K> {
+public class MatchFileLogger<K> implements MatchListener<K>, Closeable {
 
     private final static String LOG_FILE_TEMPLATE = "%s/match_%s.log";
 

server/src/main/java/ru/croccode/hypernull/server/MatchRunner.java

@@ -93,7 +93,6 @@ public void run() {
 			}
 			match.completeRound(botMoves);
 		}
-		match.finished();
 		new ArrayList<>(botSessions.keySet()).forEach(this::closeSession);
 	}