schedule prune

Author: h908714124

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

@@ -0,0 +1,31 @@
+package com.bernd;
+
+import com.bernd.model.StatusMap;
+import com.bernd.util.Sender;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class CleanupController {
+
+  private final Sender sender;
+  private final StatusMap statusMap;
+
+  CleanupController(Sender sender, StatusMap statusMap) {
+    this.sender = sender;
+    this.statusMap = statusMap;
+  }
+
+  @Scheduled(fixedDelay = 40 * 1000)
+  public void runScheduled() {
+    Map<String, List<String>> updatedRooms = statusMap.prune();
+    for (Map.Entry<String, List<String>> e : updatedRooms.entrySet()) {
+      String room = e.getKey();
+      List<String> users = e.getValue();
+      sender.sendUsers(room, users);
+    }
+  }
+}

src/main/java/com/bernd/PageLoadConfig.java renamed to src/main/java/com/bernd/config/PageLoadConfig.java

@@ -1,4 +1,4 @@
-package com.bernd;
+package com.bernd.config;
 
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/bernd/config/SchedulingConfig.java

@@ -0,0 +1,9 @@
+package com.bernd.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@Configuration
+@EnableScheduling
+public class SchedulingConfig {
+}

src/main/java/com/bernd/util/SecurityConfig.java renamed to src/main/java/com/bernd/config/SecurityConfig.java

@@ -1,5 +1,6 @@
-package com.bernd.util;
+package com.bernd.config;
 
+import com.bernd.util.AuthFilter;
 import org.springframework.boot.autoconfigure.security.SecurityProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/bernd/StompUser.java renamed to src/main/java/com/bernd/config/StompUser.java

@@ -1,4 +1,4 @@
-package com.bernd;
+package com.bernd.config;
 
 import java.security.Principal;
 

src/main/java/com/bernd/UserInterceptor.java renamed to src/main/java/com/bernd/config/UserInterceptor.java

@@ -1,4 +1,4 @@
-package com.bernd;
+package com.bernd.config;
 
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.JWTVerifier;

src/main/java/com/bernd/WebSocketConfig.java renamed to src/main/java/com/bernd/config/WebSocketConfig.java

@@ -1,4 +1,4 @@
-package com.bernd;
+package com.bernd.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;

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

@@ -5,16 +5,12 @@
 import org.springframework.stereotype.Component;
 
 import java.util.List;
-import java.util.Map;
 
 @Component
 public class RoomManager {
 
-  private static final long SCAN_TIMEOUT = 40 * 1000;
-
   private final Sender sender;
   private final StatusMap statusMap;
-  private long lastScan;
 
   public RoomManager(Sender sender, StatusMap statusMap) {
     this.sender = sender;
@@ -23,15 +19,6 @@ public RoomManager(Sender sender, StatusMap statusMap) {
 
   public void updateRooms(String user, String room) {
     updateStatus(user, room);
-    if (lastScan + SCAN_TIMEOUT < System.currentTimeMillis()) {
-      Map<String, List<String>> updatedRooms = statusMap.prune();
-      for (Map.Entry<String, List<String>> e : updatedRooms.entrySet()) {
-        String r = e.getKey();
-        List<String> users = e.getValue();
-        sender.sendUsers(r, users);
-      }
-      lastScan = System.currentTimeMillis();
-    }
   }
 
   public void updateStatus(String user, String room) {