From 352cd751406732576a9431bfc80fe2fa05ef306d Mon Sep 17 00:00:00 2001 From: Janis Date: Wed, 26 Nov 2025 19:12:02 +0100 Subject: [PATCH] chore: rebasing --- build.sbt | 2 +- knockoutwhist | 2 +- .../app/util/WebsocketEventMapper.scala | 1 + .../mapper/GameStateChangeEventMapper.scala | 18 ------------------ 4 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 knockoutwhistweb/app/util/mapper/GameStateChangeEventMapper.scala diff --git a/build.sbt b/build.sbt index 487601e..53846e6 100644 --- a/build.sbt +++ b/build.sbt @@ -40,7 +40,7 @@ lazy val knockoutwhistweb = project.in(file("knockoutwhistweb")) libraryDependencies += "de.mkammerer" % "argon2-jvm" % "2.12", libraryDependencies += "com.auth0" % "java-jwt" % "4.5.0", libraryDependencies += "com.github.ben-manes.caffeine" % "caffeine" % "3.2.3", - libraryDependencies += "com.fasterxml.jackson.module" %% "jackson-module-scala" % "2.16.1", + libraryDependencies += "tools.jackson.module" %% "jackson-module-scala" % "3.0.2", JsEngineKeys.engineType := JsEngineKeys.EngineType.Node ) diff --git a/knockoutwhist b/knockoutwhist index c5dd02a..b34066d 160000 --- a/knockoutwhist +++ b/knockoutwhist @@ -1 +1 @@ -Subproject commit c5dd02a5e826eaa6a6fa07c0847f94f9868709a6 +Subproject commit b34066d920fdde174a11807d38c1398a45b3e7ad diff --git a/knockoutwhistweb/app/util/WebsocketEventMapper.scala b/knockoutwhistweb/app/util/WebsocketEventMapper.scala index cb8bb6f..e2c71e5 100644 --- a/knockoutwhistweb/app/util/WebsocketEventMapper.scala +++ b/knockoutwhistweb/app/util/WebsocketEventMapper.scala @@ -6,6 +6,7 @@ import model.sessions.UserSession import play.api.libs.json.{JsValue, Json} import tools.jackson.databind.json.JsonMapper import tools.jackson.module.scala.ScalaModule +import util.mapper.{CardPlayedEventMapper, GameStateEventMapper, KickEventMapper, LeftEventMapper, LobbyUpdateEventMapper, NewRoundEventMapper, NewTrickEventMapper, ReceivedHandEventMapper, RequestCardEventMapper, SessionClosedMapper, SimpleEventMapper, TrickEndEventMapper} import util.mapper.{CardPlayedEventMapper, GameStateEventMapper, KickEventMapper, LeftEventMapper, LobbyUpdateEventMapper, ReceivedHandEventMapper, SessionClosedMapper, SimpleEventMapper, TurnEventMapper} import util.mapper.{GameStateEventMapper, NewRoundEventMapper, NewTrickEventMapper, ReceivedHandEventMapper, RequestCardEventMapper, SimpleEventMapper, TrickEndEventMapper, CardPlayedEventMapper} diff --git a/knockoutwhistweb/app/util/mapper/GameStateChangeEventMapper.scala b/knockoutwhistweb/app/util/mapper/GameStateChangeEventMapper.scala deleted file mode 100644 index e42d4a2..0000000 --- a/knockoutwhistweb/app/util/mapper/GameStateChangeEventMapper.scala +++ /dev/null @@ -1,18 +0,0 @@ -package util.mapper - -import de.knockoutwhist.events.global.GameStateChangeEvent -import logic.game.GameLobby -import play.api.libs.json.{JsObject, Json} - -object GameStateChangeEventMapper extends SimpleEventMapper[GameStateChangeEvent]{ - override def id: String = "GameStateChangeEvent" - - override def toJson(event: GameStateChangeEvent, gameLobby: GameLobby): JsObject = { - println("CALLED toJSON FOR GAMESTATECHANGE") - Json.obj( - "oldState" -> event.oldState.toString, - "newState" -> event.newState.toString, - "gameLobby" -> gameLobby.id - ) - } -}