From d66b6fa471d71b5b39bbf3d6cdbe0bb7bca71933 Mon Sep 17 00:00:00 2001 From: Janis Date: Tue, 9 Jun 2026 21:49:05 +0200 Subject: [PATCH] chore(account): remove dead CoreGameClient REST trait (#65) Move CoreCreateGameRequest, CorePlayerInfo, CoreTimeControl to CoreGameDtos. Delete CoreGameClient trait (replaced by GameCreationStreamClient) and CoreGameResponse (unused after stream migration). Remove from reflection config. Closes NCS-105 https://knockoutwhist.youtrack.cloud/issue/NCS-105 Reviewed-on: https://git.janis-eccarius.de/NowChess/NowChessSystems/pulls/65 --- .../account/client/CoreGameClient.scala | 28 ------------------- .../account/client/CoreGameDtos.scala | 10 +++++++ .../config/NativeReflectionConfig.scala | 3 +- 3 files changed, 11 insertions(+), 30 deletions(-) delete mode 100644 modules/account/src/main/scala/de/nowchess/account/client/CoreGameClient.scala create mode 100644 modules/account/src/main/scala/de/nowchess/account/client/CoreGameDtos.scala diff --git a/modules/account/src/main/scala/de/nowchess/account/client/CoreGameClient.scala b/modules/account/src/main/scala/de/nowchess/account/client/CoreGameClient.scala deleted file mode 100644 index e75a5bd..0000000 --- a/modules/account/src/main/scala/de/nowchess/account/client/CoreGameClient.scala +++ /dev/null @@ -1,28 +0,0 @@ -package de.nowchess.account.client - -import de.nowchess.security.{InternalClientHeadersFactory, InternalSecretClientFilter} -import jakarta.ws.rs.* -import jakarta.ws.rs.core.MediaType -import org.eclipse.microprofile.rest.client.annotation.{RegisterClientHeaders, RegisterProvider} -import org.eclipse.microprofile.rest.client.inject.RegisterRestClient - -case class CorePlayerInfo(id: String, displayName: String) -case class CoreTimeControl(limitSeconds: Option[Int], incrementSeconds: Option[Int], daysPerMove: Option[Int]) -case class CoreCreateGameRequest( - white: Option[CorePlayerInfo], - black: Option[CorePlayerInfo], - timeControl: Option[CoreTimeControl], - mode: Option[String], -) -case class CoreGameResponse(gameId: String) - -@Path("/api/board/game") -@RegisterRestClient(configKey = "core-service") -@RegisterProvider(classOf[InternalSecretClientFilter]) -@RegisterClientHeaders(classOf[InternalClientHeadersFactory]) -trait CoreGameClient: - - @POST - @Consumes(Array(MediaType.APPLICATION_JSON)) - @Produces(Array(MediaType.APPLICATION_JSON)) - def createGame(req: CoreCreateGameRequest): CoreGameResponse diff --git a/modules/account/src/main/scala/de/nowchess/account/client/CoreGameDtos.scala b/modules/account/src/main/scala/de/nowchess/account/client/CoreGameDtos.scala new file mode 100644 index 0000000..c3b48c1 --- /dev/null +++ b/modules/account/src/main/scala/de/nowchess/account/client/CoreGameDtos.scala @@ -0,0 +1,10 @@ +package de.nowchess.account.client + +case class CorePlayerInfo(id: String, displayName: String) +case class CoreTimeControl(limitSeconds: Option[Int], incrementSeconds: Option[Int], daysPerMove: Option[Int]) +case class CoreCreateGameRequest( + white: Option[CorePlayerInfo], + black: Option[CorePlayerInfo], + timeControl: Option[CoreTimeControl], + mode: Option[String], +) diff --git a/modules/account/src/main/scala/de/nowchess/account/config/NativeReflectionConfig.scala b/modules/account/src/main/scala/de/nowchess/account/config/NativeReflectionConfig.scala index ca76bcb..8b72c7e 100644 --- a/modules/account/src/main/scala/de/nowchess/account/config/NativeReflectionConfig.scala +++ b/modules/account/src/main/scala/de/nowchess/account/config/NativeReflectionConfig.scala @@ -1,6 +1,6 @@ package de.nowchess.account.config -import de.nowchess.account.client.{CoreCreateGameRequest, CoreGameResponse, CorePlayerInfo, CoreTimeControl} +import de.nowchess.account.client.{CoreCreateGameRequest, CorePlayerInfo, CoreTimeControl} import de.nowchess.account.domain.{ BotAccount, Challenge, @@ -53,7 +53,6 @@ import io.quarkus.runtime.annotations.RegisterForReflection classOf[CorePlayerInfo], classOf[CoreTimeControl], classOf[CoreCreateGameRequest], - classOf[CoreGameResponse], classOf[OfficialChallengeResponse], classOf[GameCreationRequestDto], classOf[GameCreationResponseDto],