diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/DivaController.kt b/src/main/java/icu/samnyan/aqua/sega/diva/DivaController.kt index efd29756..f6ec55e3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/DivaController.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/DivaController.kt @@ -1,5 +1,6 @@ package icu.samnyan.aqua.sega.diva +import ext.JDict import ext.MutJDict import ext.logger import icu.samnyan.aqua.sega.diva.handler.AttendHandler @@ -84,6 +85,10 @@ class DivaController( val logger = logger() val mapper = DivaMapper() + fun buildResultMap(map: JDict) = + map.filterValues { it != null && !(it is String && it == "") } + .map { (k, v) -> "$k=$v" }.joinToString("&") + @PostMapping(value = ["/"], consumes = [MediaType.APPLICATION_FORM_URLENCODED_VALUE]) fun formRequest(request: HttpServletRequest): String? { val bodyStr = String(request.inputStream.readAllBytes()) diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/BaseHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/BaseHandler.kt deleted file mode 100644 index 0ff9cbab..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/BaseHandler.kt +++ /dev/null @@ -1,20 +0,0 @@ -package icu.samnyan.aqua.sega.diva.handler - -import ext.JDict -import icu.samnyan.aqua.sega.diva.util.DivaMapper -import org.springframework.stereotype.Component - -fun buildResultMap(map: JDict) = - map.filterValues { it != null && !(it is String && it == "") } - .map { (k, v) -> "$k=$v" }.joinToString("&") - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -class BaseHandler { - @JvmField - final var mapper = DivaMapper() - - fun build(map: JDict) = buildResultMap(map) -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/InitHandlers.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/InitHandlers.kt index baf75240..921a4f41 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/InitHandlers.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/InitHandlers.kt @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.handler -import ext.logger import icu.samnyan.aqua.sega.diva.model.common.attend.DispersalParameter import icu.samnyan.aqua.sega.diva.model.common.attend.EtcParameter import icu.samnyan.aqua.sega.diva.model.common.attend.GameBalanceParameter @@ -41,9 +40,7 @@ class AttendHandler { * @author samnyan (privateamusement@protonmail.com) */ @Component -class PingHandler(val rp: PropertyEntryRepository) : BaseHandler() { - val logger = logger() - +class PingHandler(val rp: PropertyEntryRepository) { fun handle(request: BaseRequest): Any { val news: PropertyEntry = rp.findByPropertyKey("diva_news") ?: PropertyEntry("diva_news", "xxx") val warning: PropertyEntry = rp.findByPropertyKey("diva_warning") ?: PropertyEntry("diva_warning", "xxx") diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/BannerDataHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/BannerDataHandler.kt index cbd77b5e..b6d53b1b 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/BannerDataHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/BannerDataHandler.kt @@ -10,7 +10,7 @@ import java.time.LocalDateTime * @author samnyan (privateamusement@protonmail.com) */ @Component -class BannerDataHandler : BaseHandler() { +class BannerDataHandler { fun handle(request: BannerDataRequest) = BannerDataResponse( request.cmd, request.req_id, diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/BannerInfoHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/BannerInfoHandler.kt index c15e341e..6f3cc53b 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/BannerInfoHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/BannerInfoHandler.kt @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component * @author samnyan (privateamusement@protonmail.com) */ @Component -class BannerInfoHandler : BaseHandler() { +class BannerInfoHandler { fun handle(request: BaseRequest) = BannerInfoResponse( request.cmd, request.req_id, diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CmPlyInfoHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CmPlyInfoHandler.kt index 8aa8522f..7e223d23 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CmPlyInfoHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CmPlyInfoHandler.kt @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component * @author samnyan (privateamusement@protonmail.com) */ @Component -class CmPlyInfoHandler : BaseHandler() { +class CmPlyInfoHandler { fun handle(request: BaseRequest) = BaseResponse( request.cmd, request.req_id, diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ContestInfoHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ContestInfoHandler.kt index 6040c15f..6af6f1a5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ContestInfoHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ContestInfoHandler.kt @@ -15,7 +15,7 @@ import kotlin.math.max * @author samnyan (privateamusement@protonmail.com) */ @Component -class ContestInfoHandler(private val contestRepository: ContestRepository) : BaseHandler() { +class ContestInfoHandler(private val contestRepository: ContestRepository) { fun handle(request: BaseRequest): Any { val contestList = contestRepository.findTop8ByEnable(true) var ci_str = "***" diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CstmzItmCtlgHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CstmzItmCtlgHandler.kt index 404700d4..a7015fa0 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CstmzItmCtlgHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CstmzItmCtlgHandler.kt @@ -13,7 +13,7 @@ import java.time.LocalDateTime * @author samnyan (privateamusement@protonmail.com) */ @Component -class CstmzItmCtlgHandler(private val customizeRepository: DivaCustomizeRepository) : BaseHandler() { +class CstmzItmCtlgHandler(private val customizeRepository: DivaCustomizeRepository) { fun handle(request: BaseRequest): Any { val customizeList = customizeRepository.findAll() diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CstmzItmNgMdlListHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CstmzItmNgMdlListHandler.kt index f3b1a174..d3c3cfe8 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CstmzItmNgMdlListHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CstmzItmNgMdlListHandler.kt @@ -11,7 +11,7 @@ import java.time.LocalDateTime * @author samnyan (privateamusement@protonmail.com) */ @Component -class CstmzItmNgMdlListHandler : BaseHandler() { +class CstmzItmNgMdlListHandler { fun handle(request: BaseRequest) = CstmzItmNgMdlListResponse( request.cmd, request.req_id, diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/FestaInfoHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/FestaInfoHandler.kt index 5bfd777c..16c524a6 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/FestaInfoHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/FestaInfoHandler.kt @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component * @author samnyan (privateamusement@protonmail.com) */ @Component -class FestaInfoHandler(private val festaRepository: FestaRepository) : BaseHandler() { +class FestaInfoHandler(private val festaRepository: FestaRepository) { fun handle(request: BaseRequest): Any { val festaList = festaRepository.findTop2ByEnableOrderByCreateDateDesc(true) val collection = FestaCollection(festaList) diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/NgWordHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/NgWordHandler.kt index 892ec9ec..30766ae3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/NgWordHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/NgWordHandler.kt @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component * @author samnyan (privateamusement@protonmail.com) */ @Component -class NgWordHandler : BaseHandler() { +class NgWordHandler { fun handle(request: BaseRequest) = BaseResponse( request.cmd, request.req_id, diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/NvRankingHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/NvRankingHandler.kt index e3068e51..30743e0b 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/NvRankingHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/NvRankingHandler.kt @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component * @author samnyan (privateamusement@protonmail.com) */ @Component -class NvRankingHandler : BaseHandler() { +class NvRankingHandler { fun handle(request: BaseRequest) = NvRankingResponse( request.cmd, request.req_id, diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.kt index 4cb5e282..cb82ffda 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PsRankingHandler.kt @@ -17,7 +17,7 @@ import java.util.stream.Collectors * @author samnyan (privateamusement@protonmail.com) */ @Component -class PsRankingHandler(private val playerPvRecordRepository: PlayerPvRecordRepository) : BaseHandler() { +class PsRankingHandler(private val playerPvRecordRepository: PlayerPvRecordRepository) { fun handle(request: PsRankingRequest): Any { var edition = Edition.ORIGINAL var difficulty = Difficulty.HARD diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PstdHCtrlHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PstdHCtrlHandler.kt index 1ef639eb..21666fc9 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PstdHCtrlHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PstdHCtrlHandler.kt @@ -13,7 +13,7 @@ import java.time.LocalDateTime * @author samnyan (privateamusement@protonmail.com) */ @Component -class PstdHCtrlHandler : BaseHandler() { +class PstdHCtrlHandler { fun handle(request: BaseRequest) = PstdHCtrlResponse( request.cmd, request.req_id, diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PstdItemNgLstHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PstdItemNgLstHandler.kt index 27655a91..03267b11 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PstdItemNgLstHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PstdItemNgLstHandler.kt @@ -11,7 +11,7 @@ import java.time.LocalDateTime * @author samnyan (privateamusement@protonmail.com) */ @Component -class PstdItemNgLstHandler : BaseHandler() { +class PstdItemNgLstHandler { fun handle(request: BaseRequest) = PstdItemNgLstResponse( request.cmd, request.req_id, diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvDefChrLstHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvDefChrLstHandler.kt index 95872f43..a1eb88b3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvDefChrLstHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvDefChrLstHandler.kt @@ -13,7 +13,7 @@ import java.time.LocalDateTime * @author samnyan (privateamusement@protonmail.com) */ @Component -class PvDefChrLstHandler : BaseHandler() { +class PvDefChrLstHandler { fun handle(request: BaseRequest) = PvDefChrLstResponse( request.cmd, request.req_id, diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvListHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvListHandler.kt index c805f1f9..41bf401f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvListHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvListHandler.kt @@ -16,7 +16,7 @@ import java.util.function.Consumer * @author samnyan (privateamusement@protonmail.com) */ @Component -class PvListHandler(private val pvEntryRepository: PvEntryRepository) : BaseHandler() { +class PvListHandler(private val pvEntryRepository: PvEntryRepository) { private val df: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd") fun handle(request: BaseRequest): Any { diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvNgMdlLstHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvNgMdlLstHandler.kt index fcbd76c8..bc783e62 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvNgMdlLstHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvNgMdlLstHandler.kt @@ -11,7 +11,7 @@ import java.time.LocalDateTime * @author samnyan (privateamusement@protonmail.com) */ @Component -class PvNgMdlLstHandler : BaseHandler() { +class PvNgMdlLstHandler { fun handle(request: BaseRequest) = PvNgMdlLstResponse( request.cmd, request.req_id, diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/QstInfHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/QstInfHandler.kt index 1f13b2ad..37af31da 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/QstInfHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/QstInfHandler.kt @@ -11,7 +11,7 @@ import java.time.LocalDateTime * @author samnyan (privateamusement@protonmail.com) */ @Component -class QstInfHandler : BaseHandler() { +class QstInfHandler { fun handle(request: BaseRequest) = QstInfResponse( request.cmd, request.req_id, diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/RmtWpLstHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/RmtWpLstHandler.kt index a7aa2ea5..59c07544 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/RmtWpLstHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/RmtWpLstHandler.kt @@ -11,7 +11,7 @@ import java.time.LocalDateTime * @author samnyan (privateamusement@protonmail.com) */ @Component -class RmtWpLstHandler : BaseHandler() { +class RmtWpLstHandler { fun handle(request: BaseRequest) = RmtWpLstResponse( request.cmd, request.req_id, diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ShopCatalogHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ShopCatalogHandler.kt index 94cfc3a4..dedcb3d1 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ShopCatalogHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/ShopCatalogHandler.kt @@ -12,7 +12,7 @@ import java.time.LocalDateTime * @author samnyan (privateamusement@protonmail.com) */ @Component -class ShopCatalogHandler(private val moduleRepository: DivaModuleRepository) : BaseHandler() { +class ShopCatalogHandler(private val moduleRepository: DivaModuleRepository) { fun handle(request: BaseRequest): Any { val moduleList = moduleRepository.findAll() diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyCstmzItmHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyCstmzItmHandler.kt index bf9716df..ead88833 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyCstmzItmHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyCstmzItmHandler.kt @@ -23,7 +23,7 @@ class BuyCstmzItmHandler( private val playerProfileService: PlayerProfileService, private val playerCustomizeService: PlayerCustomizeService, private val gameSessionRepository: GameSessionRepository -) : BaseHandler() { +) { fun handle(request: BuyCstmzItmRequest): Any { val profile = playerProfileService.findByPdId(request.pd_id).orElseThrow( Supplier { ProfileNotFoundException() }) diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyModuleHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyModuleHandler.kt index db788088..aa260bef 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyModuleHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyModuleHandler.kt @@ -23,7 +23,7 @@ class BuyModuleHandler( private val playerProfileService: PlayerProfileService, private val playerModuleService: PlayerModuleService, private val gameSessionRepository: GameSessionRepository -) : BaseHandler() { +) { fun handle(request: BuyModuleRequest): Any { val profile = playerProfileService.findByPdId(request.pd_id).orElseThrow( Supplier { ProfileNotFoundException() }) diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt index e58e223e..e84c9685 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/GetPvPdHandler.kt @@ -24,7 +24,7 @@ class GetPvPdHandler( private val pvRecordRepository: PlayerPvRecordRepository, private val pvCustomizeRepository: PlayerPvCustomizeRepository, private val playerProfileService: PlayerProfileService -) : BaseHandler() { +) { fun handle(request: GetPvPdRequest): Any { val profileO = playerProfileService.findByPdId(request.pd_id) val pd = StringBuilder() diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.kt index 1332435f..342cde21 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.kt @@ -19,7 +19,7 @@ import java.util.function.Supplier class ShopExitHandler( private val playerProfileService: PlayerProfileService, private val pvCustomizeRepository: PlayerPvCustomizeRepository -) : BaseHandler() { +) { fun handle(request: ShopExitRequest): Any { val profile = playerProfileService.findByPdId(request.pd_id).orElseThrow( Supplier { ProfileNotFoundException() }) diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.kt index 29253ec1..586e6d07 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.kt @@ -44,7 +44,7 @@ class StageResultHandler( private val playerCustomizeRepository: PlayerCustomizeRepository, private val playerInventoryRepository: PlayerInventoryRepository, private val divaCalculator: DivaCalculator -) : BaseHandler() { +) { private var currentProfile: PlayerProfile? = null val logger = logger() diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageStartHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageStartHandler.kt index 44054c1c..a729d5e6 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageStartHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageStartHandler.kt @@ -18,7 +18,7 @@ import java.util.function.Supplier class StageStartHandler( private val gameSessionRepository: GameSessionRepository, private val playerProfileService: PlayerProfileService -) : BaseHandler() { +) { fun handle(request: StageStartRequest): Any { if (request.getPd_id() != -1L) { val profile = playerProfileService.findByPdId(request.getPd_id()).orElseThrow( diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StoreSsHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StoreSsHandler.kt index cebbd06a..1d79d208 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StoreSsHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StoreSsHandler.kt @@ -25,7 +25,7 @@ import java.util.function.Supplier class StoreSsHandler( private val playerProfileService: PlayerProfileService, private val screenShotRepository: PlayerScreenShotRepository -) : BaseHandler() { +) { val logger = logger() fun handle(request: StoreSsRequest, file: MultipartFile): Any { val profile = playerProfileService.findByPdId(request.pd_id).orElseThrow( diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/EndHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/EndHandler.kt index d3dba350..5ab6d4b2 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/EndHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/EndHandler.kt @@ -33,7 +33,7 @@ class EndHandler( private val playerProfileService: PlayerProfileService, private val playerContestRepository: PlayerContestRepository, private val gameSessionRepository: GameSessionRepository -) : BaseHandler() { +) { fun handle(request: StageResultRequest): Any { val profile = playerProfileService.findByPdId(request.getPd_id()).orElseThrow( Supplier { ProfileNotFoundException() }) diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PdUnlockHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PdUnlockHandler.kt index ed358540..a0f1daeb 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PdUnlockHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PdUnlockHandler.kt @@ -17,7 +17,7 @@ import java.util.function.Supplier class PdUnlockHandler( private val playerProfileService: PlayerProfileService, private val gameSessionRepository: GameSessionRepository -) : BaseHandler() { +) { fun handle(request: PdUnlockRequest): Any { val profile = playerProfileService.findByPdId(request.pd_id).orElseThrow( Supplier { ProfileNotFoundException() }) diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PreStartHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PreStartHandler.kt index 69771d6e..5cdebb30 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PreStartHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PreStartHandler.kt @@ -20,7 +20,7 @@ import java.util.concurrent.ThreadLocalRandom class PreStartHandler( private val playerProfileService: PlayerProfileService, private val gameSessionRepository: GameSessionRepository -) : BaseHandler() { +) { var logger = logger() fun handle(request: PreStartRequest): Any { val profileOptional = playerProfileService.findByPdId(request.aime_id) diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/SpendCreditHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/SpendCreditHandler.kt index a18a8592..8b1498ea 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/SpendCreditHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/SpendCreditHandler.kt @@ -12,7 +12,7 @@ import java.util.function.Supplier * @author samnyan (privateamusement@protonmail.com) */ @Component -class SpendCreditHandler(private val playerProfileService: PlayerProfileService) : BaseHandler() { +class SpendCreditHandler(private val playerProfileService: PlayerProfileService) { fun handle(request: SpendCreditRequest): Any { val profile = playerProfileService.findByPdId(request.pd_id).orElseThrow( Supplier { ProfileNotFoundException() }) diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/StartHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/StartHandler.kt index bb552fd5..c032f07f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/StartHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/user/StartHandler.kt @@ -1,7 +1,8 @@ package icu.samnyan.aqua.sega.diva.handler.user -import icu.samnyan.aqua.sega.diva.* -import icu.samnyan.aqua.sega.diva.handler.BaseHandler +import icu.samnyan.aqua.sega.diva.GameSessionRepository +import icu.samnyan.aqua.sega.diva.PlayerContestRepository +import icu.samnyan.aqua.sega.diva.PlayerPvRecordRepository import icu.samnyan.aqua.sega.diva.model.common.* import icu.samnyan.aqua.sega.diva.model.common.collection.ClearSet import icu.samnyan.aqua.sega.diva.model.common.collection.ClearTally @@ -35,7 +36,7 @@ class StartHandler( private val playerModuleService: PlayerModuleService, private val playerPvRecordRepository: PlayerPvRecordRepository, private val playerContestRepository: PlayerContestRepository -) : BaseHandler() { +) { fun handle(request: StartRequest): Any { val profile = playerProfileService.findByPdId(request.getPd_id()).orElseThrow( Supplier { ProfileNotFoundException() })