From 6d966fe416c9ca49ef2bb0ad1f61cbb5566b1ecd Mon Sep 17 00:00:00 2001 From: joffrey-bion Date: Sat, 31 Oct 2020 13:48:49 +0100 Subject: Remove unnecessary Livedoc (Kotlin MPP makes it redundant) --- sw-server/build.gradle.kts | 4 ---- .../src/main/kotlin/org/luxons/sevenwonders/server/SevenWonders.kt | 2 -- .../luxons/sevenwonders/server/controllers/GameBrowserController.kt | 2 -- .../org/luxons/sevenwonders/server/controllers/GameController.kt | 2 -- .../org/luxons/sevenwonders/server/controllers/HomeController.kt | 2 -- .../org/luxons/sevenwonders/server/controllers/LobbyController.kt | 2 -- sw-server/src/main/resources/application.properties | 2 -- 7 files changed, 16 deletions(-) diff --git a/sw-server/build.gradle.kts b/sw-server/build.gradle.kts index accab588..a30a7e6d 100644 --- a/sw-server/build.gradle.kts +++ b/sw-server/build.gradle.kts @@ -21,10 +21,6 @@ dependencies { implementation("com.fasterxml.jackson.module:jackson-module-kotlin") implementation("ch.qos.logback:logback-classic:1.1.8") - implementation("org.hildan.livedoc:livedoc-springboot:4.3.2") - implementation("org.hildan.livedoc:livedoc-ui-webjar:4.3.2") - - annotationProcessor("org.hildan.livedoc:livedoc-javadoc-processor:4.3.2") testImplementation(kotlin("test")) testImplementation(kotlin("test-junit")) diff --git a/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/SevenWonders.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/SevenWonders.kt index 51710115..8496fafd 100644 --- a/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/SevenWonders.kt +++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/SevenWonders.kt @@ -1,11 +1,9 @@ package org.luxons.sevenwonders.server -import org.hildan.livedoc.spring.boot.starter.EnableJSONDoc import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.runApplication @SpringBootApplication -@EnableJSONDoc class SevenWonders fun main(args: Array) { diff --git a/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/controllers/GameBrowserController.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/controllers/GameBrowserController.kt index 3236a6c9..b63f6756 100644 --- a/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/controllers/GameBrowserController.kt +++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/controllers/GameBrowserController.kt @@ -1,6 +1,5 @@ package org.luxons.sevenwonders.server.controllers -import org.hildan.livedoc.core.annotations.Api import org.luxons.sevenwonders.model.api.LobbyDTO import org.luxons.sevenwonders.model.api.actions.CreateGameAction import org.luxons.sevenwonders.model.api.actions.JoinGameAction @@ -21,7 +20,6 @@ import java.security.Principal /** * This is the place where the player looks for a game. */ -@Api(name = "GameBrowser") @Controller class GameBrowserController( private val lobbyController: LobbyController, diff --git a/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/controllers/GameController.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/controllers/GameController.kt index f3d8aaef..0309cb27 100644 --- a/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/controllers/GameController.kt +++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/controllers/GameController.kt @@ -1,6 +1,5 @@ package org.luxons.sevenwonders.server.controllers -import org.hildan.livedoc.core.annotations.Api import org.luxons.sevenwonders.engine.Game import org.luxons.sevenwonders.model.api.actions.PrepareMoveAction import org.luxons.sevenwonders.model.cards.PreparedCard @@ -16,7 +15,6 @@ import java.security.Principal /** * This API is for in-game events management. */ -@Api(name = "Game") @Controller class GameController( private val template: SimpMessagingTemplate, diff --git a/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/controllers/HomeController.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/controllers/HomeController.kt index c34756a8..5cfedb17 100644 --- a/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/controllers/HomeController.kt +++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/controllers/HomeController.kt @@ -1,6 +1,5 @@ package org.luxons.sevenwonders.server.controllers -import org.hildan.livedoc.core.annotations.Api import org.luxons.sevenwonders.model.api.ConnectedPlayer import org.luxons.sevenwonders.model.api.PlayerDTO import org.luxons.sevenwonders.model.api.actions.ChooseNameAction @@ -15,7 +14,6 @@ import java.security.Principal /** * Handles actions in the homepage of the game. */ -@Api(name = "Home") @Controller class HomeController( private val playerRepository: PlayerRepository, diff --git a/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/controllers/LobbyController.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/controllers/LobbyController.kt index 64e75a8f..fccb9b5b 100644 --- a/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/controllers/LobbyController.kt +++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/controllers/LobbyController.kt @@ -2,7 +2,6 @@ package org.luxons.sevenwonders.server.controllers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch -import org.hildan.livedoc.core.annotations.Api import org.luxons.sevenwonders.bot.SevenWondersBot import org.luxons.sevenwonders.model.api.actions.AddBotAction import org.luxons.sevenwonders.model.api.actions.ReassignWondersAction @@ -25,7 +24,6 @@ import java.security.Principal /** * Handles actions in the game's lobby. The lobby is the place where players gather before a game. */ -@Api(name = "Lobby") @Controller class LobbyController( private val lobbyRepository: LobbyRepository, diff --git a/sw-server/src/main/resources/application.properties b/sw-server/src/main/resources/application.properties index 438ad03f..5ee314c7 100644 --- a/sw-server/src/main/resources/application.properties +++ b/sw-server/src/main/resources/application.properties @@ -1,3 +1 @@ -livedoc.version=1.0 -livedoc.packages[0]=org.luxons.sevenwonders server.port=8000 -- cgit