remove class OpenGames

Author: h908714124

src/main/java/com/bernd/CleanupController.java

@@ -1,7 +1,6 @@
 package com.bernd;
 
 import com.bernd.model.Game;
-import com.bernd.model.OpenGame;
 import com.bernd.model.StatusMap;
 import com.bernd.util.Sender;
 import java.util.List;
@@ -12,35 +11,32 @@
 @Component
 public class CleanupController {
 
-  private final Sender sender;
-  private final StatusMap statusMap;
-  private final OpenGames openGames;
-  private final Games games;
+    private final Sender sender;
+    private final StatusMap statusMap;
+    private final Games games;
 
-  CleanupController(
-      Sender sender,
-      StatusMap statusMap,
-      OpenGames openGames,
-      Games games) {
-    this.sender = sender;
-    this.statusMap = statusMap;
-    this.openGames = openGames;
-    this.games = games;
-  }
-
-  @Scheduled(fixedDelay = 40 * 1000)
-  public void runScheduled() {
-    Map<String, List<String>> updatedRooms = statusMap.removeInactiveUsers();
-    for (Map.Entry<String, List<String>> e : updatedRooms.entrySet()) {
-      String room = e.getKey();
-      List<String> users = e.getValue();
-      sender.sendUsers(room, users);
+    CleanupController(
+            Sender sender,
+            StatusMap statusMap,
+            Games games) {
+        this.sender = sender;
+        this.statusMap = statusMap;
+        this.games = games;
     }
-    List<Game> games = this.games.games();
-    for (Game game : games) {
-      if (updatedRooms.getOrDefault(game.id(), List.of()).isEmpty()) {
-        this.games.remove(game.id());
-      }
+
+    @Scheduled(fixedDelay = 40 * 1000)
+    public void runScheduled() {
+        Map<String, List<String>> updatedRooms = statusMap.removeInactiveUsers();
+        for (Map.Entry<String, List<String>> e : updatedRooms.entrySet()) {
+            String room = e.getKey();
+            List<String> users = e.getValue();
+            sender.sendUsers(room, users);
+        }
+        List<Game> games = this.games.games();
+        for (Game game : games) {
+            if (updatedRooms.getOrDefault(game.id(), List.of()).isEmpty()) {
+                this.games.remove(game.id());
+            }
+        }
     }
-  }
 }

src/main/java/com/bernd/OpenGames.java

@@ -19,7 +19,7 @@ public UserStatus setRoom(String user, String room) {
             if (current == null) {
                 return UserStatus.create(room);
             } else {
-                return current.touch();
+                return current.toBuilder().room(room).touch().build();
             }
         });
     }

src/main/java/com/bernd/model/StatusMap.java

@@ -17,10 +17,6 @@ public static UserStatus create(String room) {
                 null);
     }
 
-    public UserStatus touch() {
-        return toBuilder().lastSeen(System.currentTimeMillis()).build();
-    }
-
     public UserStatus removeOpenGame() {
         if (openGame == null) {
             return this;
@@ -66,6 +62,11 @@ public Builder room(String room) {
             return this;
         }
 
+        public Builder touch() {
+            this.lastSeen = System.currentTimeMillis();
+            return this;
+        }
+
         public Builder lastSeen(long lastSeen) {
             this.lastSeen = lastSeen;
             return this;