From 85f155c77b8038d1b2813d12ee7724dd81916acb Mon Sep 17 00:00:00 2001
From: Henry Martin <62612165+HENRYMARTIN5@users.noreply.github.com>
Date: Mon, 13 Oct 2025 20:58:14 -0500
Subject: [PATCH] chore: Bump Javalin (#2126)

---
 build.gradle                                       |  2 +-
 .../org/photonvision/server/DataSocketHandler.java |  2 +-
 .../main/java/org/photonvision/server/Server.java  | 14 +++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0f8a20e27..4831d0382 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,7 +36,7 @@ ext {
     wpimathVersion = wpilibVersion
     openCVYear = "2025"
     openCVversion = "4.10.0-3"
-    javalinVersion = "5.6.2"
+    javalinVersion = "6.7.0"
     libcameraDriverVersion = "v2025.0.4"
     rknnVersion = "dev-v2025.0.0-5-g666c0c6"
     rubikVersion = "dev-v2025.1.0-8-g067a316"
diff --git a/photon-server/src/main/java/org/photonvision/server/DataSocketHandler.java b/photon-server/src/main/java/org/photonvision/server/DataSocketHandler.java
index 69bbd92fe..0c2f1cd83 100644
--- a/photon-server/src/main/java/org/photonvision/server/DataSocketHandler.java
+++ b/photon-server/src/main/java/org/photonvision/server/DataSocketHandler.java
@@ -87,7 +87,7 @@ public class DataSocketHandler {
             var reason = context.reason() != null ? context.reason() : "Connection closed by client";
             logger.info("Closing websocket connection from " + host + " for reason: " + reason);
         } else {
-            logger.info("Closing websockets for user " + context.getSessionId());
+            logger.info("Closing websockets for user " + context.sessionId());
         }
     }
 
diff --git a/photon-server/src/main/java/org/photonvision/server/Server.java b/photon-server/src/main/java/org/photonvision/server/Server.java
index b202b8507..ad9bf1c6a 100644
--- a/photon-server/src/main/java/org/photonvision/server/Server.java
+++ b/photon-server/src/main/java/org/photonvision/server/Server.java
@@ -18,7 +18,7 @@
 package org.photonvision.server;
 
 import io.javalin.Javalin;
-import io.javalin.plugin.bundled.CorsPluginConfig;
+import io.javalin.plugin.bundled.CorsPlugin;
 import java.net.InetSocketAddress;
 import java.util.List;
 import java.util.StringJoiner;
@@ -60,10 +60,14 @@ public class Server {
                         javalinConfig -> {
                             javalinConfig.showJavalinBanner = false;
                             javalinConfig.staticFiles.add("web");
-                            javalinConfig.plugins.enableCors(
-                                    corsContainer -> {
-                                        corsContainer.add(CorsPluginConfig::anyHost);
-                                    });
+                            javalinConfig.registerPlugin(
+                                    new CorsPlugin(
+                                            cors -> {
+                                                cors.addRule(
+                                                        it -> {
+                                                            it.anyHost();
+                                                        });
+                                            }));
 
                             javalinConfig.requestLogger.http(
                                     (ctx, ms) -> {