summaryrefslogtreecommitdiff
path: root/sw-server
diff options
context:
space:
mode:
authorJoffrey Bion <joffrey.bion@gmail.com>2023-04-30 02:00:26 +0200
committerJoffrey Bion <joffrey.bion@gmail.com>2023-04-30 02:37:21 +0200
commit068d1b5dedadfe49f885ea11ec7203b33ddf4925 (patch)
tree8aa9bbcc52a998fa57e1d6d54b804c73e05ff20b /sw-server
parentUpgrade Kotlin to 1.8.21 (diff)
downloadseven-wonders-068d1b5dedadfe49f885ea11ec7203b33ddf4925.tar.gz
seven-wonders-068d1b5dedadfe49f885ea11ec7203b33ddf4925.tar.bz2
seven-wonders-068d1b5dedadfe49f885ea11ec7203b33ddf4925.zip
Upgrade to Spring Boot 3.0
Diffstat (limited to 'sw-server')
-rw-r--r--sw-server/build.gradle.kts3
-rw-r--r--sw-server/src/main/kotlin/org/luxons/sevenwonders/server/config/AnonymousUsersHandshakeHandler.kt2
2 files changed, 3 insertions, 2 deletions
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)
bgstack15