From 068d1b5dedadfe49f885ea11ec7203b33ddf4925 Mon Sep 17 00:00:00 2001
From: Joffrey Bion <joffrey.bion@gmail.com>
Date: Sun, 30 Apr 2023 02:00:26 +0200
Subject: Upgrade to Spring Boot 3.0

---
 sw-server/build.gradle.kts                                             | 3 ++-
 .../sevenwonders/server/config/AnonymousUsersHandshakeHandler.kt       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'sw-server')

diff --git a/sw-server/build.gradle.kts b/sw-server/build.gradle.kts
index 9897a4c8..b71a4526 100644
--- a/sw-server/build.gradle.kts
+++ b/sw-server/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     kotlin("jvm")
     kotlin("plugin.spring")
     kotlin("plugin.serialization")
-    id("org.springframework.boot") version "2.7.5"
+    id("org.springframework.boot") version "3.0.6"
 }
 
 apply(plugin = "io.spring.dependency-management")
@@ -21,6 +21,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-security")
     // required by spring security when using websockets
     implementation("org.springframework.security:spring-security-messaging")
+    implementation(libs.javax.annotation.api)
 
     // logging
     implementation(libs.logback.classic)
diff --git a/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/config/AnonymousUsersHandshakeHandler.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/config/AnonymousUsersHandshakeHandler.kt
index 06b46d17..a50c5574 100644
--- a/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/config/AnonymousUsersHandshakeHandler.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/config/AnonymousUsersHandshakeHandler.kt
@@ -17,7 +17,7 @@ internal class AnonymousUsersHandshakeHandler : DefaultHandshakeHandler() {
         request: ServerHttpRequest,
         wsHandler: WebSocketHandler,
         attributes: Map<String, Any>,
-    ): Principal? {
+    ): Principal {
         var p = super.determineUser(request, wsHandler, attributes)
         if (p == null) {
             p = UsernamePasswordAuthenticationToken("player" + playerId++, null)
-- 
cgit