refactoring UserStatus

Author: h908714124

src/main/java/com/bernd/GameController.java

@@ -75,7 +75,7 @@ public ViewGame getGame(@PathVariable String id, Principal p) {
 
   @MessageMapping("/game/move")
   public void action(Move move, Principal p) {
-    String id = statusMap.get(getPrincipal(p));
+    String id = statusMap.getRoom(getPrincipal(p));
     if (id == null) {
       return;
     }

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

@@ -14,16 +14,22 @@ public final class StatusMap {
 
   private final Map<String, UserStatus> map = new LinkedHashMap<>();
 
-  public UserStatus put(String user, String room) {
-    return map.put(user, UserStatus.create(room));
+  public UserStatus setRoom(String user, String room) {
+    return map.compute(user, (key, current) -> {
+      if (current == null) {
+        return UserStatus.create(room);
+      } else {
+        return current.touch();
+      }
+    });
   }
 
-  public String get(String user) {
+  public String getRoom(String user) {
     UserStatus status = map.get(user);
     if (status == null) {
       return null;
     }
-    return put(user, status.room()).room();
+    return setRoom(user, status.room()).room();
   }
 
   public String remove(String user) {

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

@@ -1,12 +1,20 @@
 package com.bernd.model;
 
-public record UserStatus(String room, long lastSeen) {
-  private static final long USER_TIMEOUT = 45 * 1000;
-  public static UserStatus create(String room) {
-    return new UserStatus(room, System.currentTimeMillis());
-  }
-
-  public boolean isActive(long current) {
-    return current < lastSeen + USER_TIMEOUT;
-  }
+public record UserStatus(
+        String room,
+        long lastSeen) {
+
+    private static final long USER_TIMEOUT = 45 * 1000;
+
+    public static UserStatus create(String room) {
+        return new UserStatus(room, System.currentTimeMillis());
+    }
+
+    public UserStatus touch() {
+        return new UserStatus(room, System.currentTimeMillis());
+    }
+
+    public boolean isActive(long current) {
+        return current < lastSeen + USER_TIMEOUT;
+    }
 }

src/main/java/com/bernd/util/RoomManager.java

@@ -21,7 +21,7 @@ public void updateRooms(String user, String room) {
   }
 
   public void updateStatus(String user, String room) {
-    UserStatus old = statusMap.put(user, room);
+    UserStatus old = statusMap.setRoom(user, room);
     List<String> users = statusMap.usersInRoom(room);
     if (old == null) {
       sender.sendUsers(room, users);