diff --git a/src/main/java/ext/Ext.kt b/src/main/java/ext/Ext.kt index 12a1ff73..6a665591 100644 --- a/src/main/java/ext/Ext.kt +++ b/src/main/java/ext/Ext.kt @@ -259,6 +259,7 @@ operator fun List.component13(): E = get(12) inline operator fun List.invoke(i: Int) = get(i) as E val empty = emptyList() +val emptyMap = emptyMap() val Pair.l get() = component1() val Pair<*, S>.r get() = component2() 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 69e350fa..a702f55e 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/DivaController.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/DivaController.kt @@ -2,11 +2,15 @@ package icu.samnyan.aqua.sega.diva import ext.JDict import ext.MutJDict +import ext.emptyMap import ext.logger import icu.samnyan.aqua.sega.diva.handler.AttendHandler import icu.samnyan.aqua.sega.diva.handler.GameInitHandler import icu.samnyan.aqua.sega.diva.handler.PingHandler -import icu.samnyan.aqua.sega.diva.handler.card.* +import icu.samnyan.aqua.sega.diva.handler.card.CardProcedureHandler +import icu.samnyan.aqua.sega.diva.handler.card.ChangeNameHandler +import icu.samnyan.aqua.sega.diva.handler.card.ChangePasswdHandler +import icu.samnyan.aqua.sega.diva.handler.card.RegistrationHandler import icu.samnyan.aqua.sega.diva.handler.databank.* import icu.samnyan.aqua.sega.diva.handler.ingame.* import icu.samnyan.aqua.sega.diva.handler.user.* @@ -35,6 +39,9 @@ import org.springframework.web.multipart.MultipartFile import java.net.URLDecoder import java.nio.charset.StandardCharsets +val DIVA_BAD = mapOf("stat" to "0") +val DIVA_OK = emptyMap + /** * @author samnyan (privateamusement@protonmail.com) */ @@ -47,16 +54,13 @@ class DivaController( val cardProcedureHandler: CardProcedureHandler, val changeNameHandler: ChangeNameHandler, val changePasswdHandler: ChangePasswdHandler, - val initPasswdHandler: InitPasswdHandler, val registrationHandler: RegistrationHandler, val bannerInfoHandler: BannerInfoHandler, val bannerDataHandler: BannerDataHandler, - val cmPlyInfoHandler: CmPlyInfoHandler, val contestInfoHandler: ContestInfoHandler, val cstmzItmCtlgHandler: CstmzItmCtlgHandler, val cstmzItmNgMdlListHandler: CstmzItmNgMdlListHandler, val festaInfoHandler: FestaInfoHandler, - val ngWordHandler: NgWordHandler, val nvRankingHandler: NvRankingHandler, val psRankingHandler: PsRankingHandler, val pstdHCtrlHandler: PstdHCtrlHandler, @@ -104,7 +108,7 @@ class DivaController( "ps_ranking" -> psRankingHandler.handle(mapper.convert(body, PsRankingRequest::class.java)) "pv_list" -> pvListHandler.handle(mapper.convert(body, BaseRequest::class.java)) - "ng_word" -> ngWordHandler.handle(mapper.convert(body, BaseRequest::class.java)) + "ng_word" -> DIVA_OK "rmt_wp_list" -> rmtWpLstHandler.handle(mapper.convert(body, BaseRequest::class.java)) "festa_info" -> festaInfoHandler.handle(mapper.convert(body, BaseRequest::class.java)) "contest_info" -> contestInfoHandler.handle(mapper.convert(body, BaseRequest::class.java)) @@ -115,7 +119,7 @@ class DivaController( "banner_info" -> bannerInfoHandler.handle(mapper.convert(body, BaseRequest::class.java)) "banner_data" -> bannerDataHandler.handle(mapper.convert(body, BannerDataRequest::class.java)) - "cm_ply_info" -> cmPlyInfoHandler.handle(mapper.convert(body, BaseRequest::class.java)) + "cm_ply_info" -> emptyMap "qst_inf" -> qstInfHandler.handle(mapper.convert(body, BaseRequest::class.java)) "pstd_h_ctrl" -> pstdHCtrlHandler.handle(mapper.convert(body, BaseRequest::class.java)) "pstd_item_ng_lst" -> pstdItemNgLstHandler.handle(mapper.convert(body, BaseRequest::class.java)) @@ -126,7 +130,7 @@ class DivaController( "registration" -> registrationHandler.handle(mapper.convert(body, RegistrationRequest::class.java)) - "init_passwd" -> initPasswdHandler.handle(mapper.convert(body, GameInitRequest::class.java)) + "init_passwd" -> DIVA_BAD "change_passwd" -> changePasswdHandler.handle(mapper.convert(body, ChangePasswdRequest::class.java)) @@ -150,9 +154,10 @@ class DivaController( "stage_result" -> stageResultHandler.handle(mapper.convert(body, StageResultRequest::class.java)) "store_ss" -> gameInitHandler.handle(mapper.convert(body, GameInitRequest::class.java)) - else -> "stat=0" + else -> DIVA_BAD } - val resp = respObj as? String ?: buildResultMap(mapper.toMap(respObj)) + val resp = respObj as? String + ?: buildResultMap(mapOf("cmd" to command, "req_id" to body["req_id"], "stat" to "ok") + mapper.toMap(respObj)) logger.info("Response: {}", resp) return resp } 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 a0fa283e..ab673254 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 @@ -15,9 +15,6 @@ import java.time.LocalDateTime @Component class GameInitHandler { fun handle(request: BaseRequest) = GameInitResponse( - request.cmd, - request.req_id, - "ok", "0,0", "FFFF" ) @@ -26,9 +23,6 @@ class GameInitHandler { @Component class AttendHandler { fun handle(request: BaseRequest) = AttendResponse( - request.cmd, - request.req_id, - "ok", EtcParameter().toInternal(), DispersalParameter().toInternal(), GameBalanceParameter().toInternal(), @@ -43,9 +37,6 @@ class PingHandler(val rp: PropertyEntryRepository) { val warning: PropertyEntry = rp.findByPropertyKey("diva_warning") ?: PropertyEntry("diva_warning", "xxx") return PingResponse( - request.cmd, - request.req_id, - "ok", news.propertyValue, warning.propertyValue ) diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/CardProcedureHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/CardProcedureHandler.kt index 30f8ff54..41b64f6d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/CardProcedureHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/CardProcedureHandler.kt @@ -19,9 +19,6 @@ class CardProcedureHandler(val db: DivaRepos) { val profileOptional = db.profile.findByPdId(request.aime_id) if (profileOptional.isEmpty) { return CardProcedureResponse( - request.cmd, - request.req_id, - "ok", Result.FAILED ) } else { @@ -34,9 +31,6 @@ class CardProcedureHandler(val db: DivaRepos) { db.gameSession.delete(session) } return CardProcedureResponse( - request.cmd, - request.req_id, - "ok", Result.FAILED ) } else { @@ -58,9 +52,6 @@ class CardProcedureHandler(val db: DivaRepos) { db.gameSession.save(session) return CardProcedureResponse( - request.cmd, - request.req_id, - "ok", Result.SUCCESS, 100, session.acceptId, diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangeNameHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangeNameHandler.kt index b30e3120..361994e7 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangeNameHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangeNameHandler.kt @@ -19,9 +19,6 @@ class ChangeNameHandler(val db: DivaRepos) { db.gameSession.delete(session) return ChangeNameResponse( - request.cmd, - request.req_id, - "ok", Result.SUCCESS, session.acceptId, profile.pdId, diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangePasswdHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangePasswdHandler.kt index b4ba8232..17112200 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangePasswdHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangePasswdHandler.kt @@ -21,9 +21,6 @@ class ChangePasswdHandler(val db: DivaRepos) { db.gameSession.delete(session) return ChangePasswdResponse( - request.cmd, - request.req_id, - "ok", Result.SUCCESS, session.acceptId, profile.pdId diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/InitPasswdHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/InitPasswdHandler.kt deleted file mode 100644 index c3fedf0d..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/InitPasswdHandler.kt +++ /dev/null @@ -1,17 +0,0 @@ -package icu.samnyan.aqua.sega.diva.handler.card - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse -import org.springframework.stereotype.Component - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -class InitPasswdHandler { - fun handle(request: BaseRequest) = BaseResponse( - request.cmd, - request.req_id, - "0" - ) -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/RegistrationHandler.kt b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/RegistrationHandler.kt index acfb4d92..02df9814 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/RegistrationHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/diva/handler/card/RegistrationHandler.kt @@ -14,18 +14,12 @@ class RegistrationHandler(val service: PlayerProfileService) { fun handle(request: RegistrationRequest) = if (service.findByPdId(request.aime_id).isPresent) { RegistrationResponse( - request.cmd, - request.req_id, - "ok", Result.FAILED, -1 ) } else { val profile = service.register(request) RegistrationResponse( - request.cmd, - request.req_id, - "ok", Result.SUCCESS, profile.pdId ) 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 423eb518..5d05d374 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 @@ -11,9 +11,6 @@ import java.time.LocalDateTime @Component class BannerDataHandler { fun handle(request: BannerDataRequest) = BannerDataResponse( - request.cmd, - request.req_id, - "ok", LocalDateTime.now(), "***", "***", 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 a3a3421a..39c6b492 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 @@ -10,9 +10,6 @@ import org.springframework.stereotype.Component @Component class BannerInfoHandler { fun handle(request: BaseRequest) = BannerInfoResponse( - request.cmd, - request.req_id, - "ok", null, null, null, 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 deleted file mode 100644 index c414cef1..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CmPlyInfoHandler.kt +++ /dev/null @@ -1,17 +0,0 @@ -package icu.samnyan.aqua.sega.diva.handler.databank - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse -import org.springframework.stereotype.Component - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -class CmPlyInfoHandler { - fun handle(request: BaseRequest) = BaseResponse( - request.cmd, - request.req_id, - "ok" - ) -} 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 afa8b8f8..53fe8565 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 @@ -26,9 +26,6 @@ class ContestInfoHandler(val db: DivaRepos) { ci_str = sb.toString() } return ContestInfoResponse( - request.cmd, - request.req_id, - "ok", LocalDateTime.now(), 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 10894e7b..35a8fb91 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 @@ -17,9 +17,6 @@ class CstmzItmCtlgHandler(private val customizeRepository: DivaCustomizeReposito val customizeList = customizeRepository.findAll() return CstmzItmCtlgResponse( - request.cmd, - request.req_id, - "ok", DivaDateTimeUtil.getString(LocalDateTime.now()), encode(customizeList.map { it.toInternal() }.joinToString(",") { encode(it) }) ) 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 e702b92d..24627c7d 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 @@ -12,9 +12,6 @@ import java.time.LocalDateTime @Component class CstmzItmNgMdlListHandler { fun handle(request: BaseRequest) = CstmzItmNgMdlListResponse( - request.cmd, - request.req_id, - "ok", DivaDateTimeUtil.getString(LocalDateTime.now()), "***" ) 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 5e775e7e..cc16037b 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 @@ -16,9 +16,6 @@ class FestaInfoHandler(private val festaRepository: FestaRepository) { val collection = FestaCollection(festaList) return FestaInfoResponse( - request.cmd, - request.req_id, - "ok", collection.ids, collection.names, collection.kinds, 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 deleted file mode 100644 index eb343b9a..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/NgWordHandler.kt +++ /dev/null @@ -1,17 +0,0 @@ -package icu.samnyan.aqua.sega.diva.handler.databank - -import icu.samnyan.aqua.sega.diva.model.request.BaseRequest -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse -import org.springframework.stereotype.Component - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -class NgWordHandler { - fun handle(request: BaseRequest) = BaseResponse( - request.cmd, - request.req_id, - "ok" - ) -} 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 dd157fc1..332bc54c 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 @@ -10,9 +10,6 @@ import org.springframework.stereotype.Component @Component class NvRankingHandler { fun handle(request: BaseRequest) = NvRankingResponse( - request.cmd, - request.req_id, - "ok", null, null, null, 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 9b9dff89..f470b8bf 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 @@ -78,9 +78,6 @@ class PsRankingHandler(val db: DivaRepos) { } return PsRankingResponse( - request.cmd, - request.req_id, - "ok", LocalDateTime.now(), LocalDateTime.now(), request.rnk_ps_idx, 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 420b67ec..62f60f30 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 @@ -12,9 +12,6 @@ import java.time.LocalDateTime @Component class PstdHCtrlHandler { fun handle(request: BaseRequest) = PstdHCtrlResponse( - request.cmd, - request.req_id, - "ok", DivaDateTimeUtil.getString(LocalDateTime.now()), "***,***" ) 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 85f87b57..70961fcc 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 @@ -12,9 +12,6 @@ import java.time.LocalDateTime @Component class PstdItemNgLstHandler { fun handle(request: BaseRequest) = PstdItemNgLstResponse( - request.cmd, - request.req_id, - "ok", DivaDateTimeUtil.getString(LocalDateTime.now()), "***", "***" 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 ee18cce5..8f467198 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 @@ -12,9 +12,6 @@ import java.time.LocalDateTime @Component class PvDefChrLstHandler { fun handle(request: BaseRequest) = PvDefChrLstResponse( - request.cmd, - request.req_id, - "ok", DivaDateTimeUtil.getString(LocalDateTime.now()), "***" ) 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 edd86b00..a60af03c 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 @@ -33,9 +33,6 @@ class PvListHandler(val db: DivaRepos) { sb.append("%2A%2A%2A") return PvListResponse( - request.cmd, - request.req_id, - "ok", LocalDateTime.now(), sb.toString() ) 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 0cfc693f..a6a7c8cf 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 @@ -12,9 +12,6 @@ import java.time.LocalDateTime @Component class PvNgMdlLstHandler { fun handle(request: BaseRequest) = PvNgMdlLstResponse( - request.cmd, - request.req_id, - "ok", DivaDateTimeUtil.getString(LocalDateTime.now()), "***" ) 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 bc87b01d..323baf4e 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 @@ -12,9 +12,6 @@ import java.time.LocalDateTime @Component class QstInfHandler { fun handle(request: BaseRequest) = QstInfResponse( - request.cmd, - request.req_id, - "ok", DivaDateTimeUtil.getString(LocalDateTime.now()), null, null 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 a63fd395..8bf0ccf7 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 @@ -12,9 +12,6 @@ import java.time.LocalDateTime @Component class RmtWpLstHandler { fun handle(request: BaseRequest) = RmtWpLstResponse( - request.cmd, - request.req_id, - "ok", DivaDateTimeUtil.getString(LocalDateTime.now()), "***" ) 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 f2c449a8..698f54a4 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 @@ -16,9 +16,6 @@ class ShopCatalogHandler(private val moduleRepository: DivaModuleRepository) { val moduleList = moduleRepository.findAll() return ShopCatalogResponse( - request.cmd, - request.req_id, - "ok", LocalDateTime.now(), encode(moduleList.map { it.toInternal() }.joinToString(",") { encode(it) }) ) 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 06850ed6..ed93f110 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 @@ -1,5 +1,6 @@ package icu.samnyan.aqua.sega.diva.handler.ingame +import ext.invoke import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.Result import icu.samnyan.aqua.sega.diva.model.request.ingame.BuyCstmzItmRequest @@ -14,32 +15,20 @@ class BuyCstmzItmHandler(val db: DivaRepos) { fun handle(request: BuyCstmzItmRequest): Any { val (profile, session) = db.session(request.pd_id) - val customizeOptional = db.g.customize.findById(request.cstmz_itm_id) + val customize = db.g.customize.findById(request.cstmz_itm_id)() ?: return BuyCstmzItmResponse( + Result.FAILED + ) - if (customizeOptional.isEmpty) { + if (session.vp < customize.price) { return BuyCstmzItmResponse( - request.cmd, - request.req_id, - "ok", - Result.FAILED - ) - } - if (session.vp < customizeOptional.get().price) { - return BuyCstmzItmResponse( - request.cmd, - request.req_id, - "ok", Result.FAILED ) } db.s.customize.buy(profile, request.cstmz_itm_id) - session.vp -= customizeOptional.get().price + session.vp -= customize.price db.gameSession.save(session) return BuyCstmzItmResponse( - request.cmd, - request.req_id, - "ok", Result.SUCCESS, request.cstmz_itm_id, db.s.customize.getModuleHaveString(profile), 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 5ae46290..5c9314ab 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 @@ -17,17 +17,11 @@ class BuyModuleHandler(val db: DivaRepos) { if (moduleOptional.isEmpty) { return BuyModuleResponse( - request.cmd, - request.req_id, - "ok", Result.FAILED ) } if (session.vp < moduleOptional.get().price) { return BuyModuleResponse( - request.cmd, - request.req_id, - "ok", Result.FAILED ) } @@ -36,9 +30,6 @@ class BuyModuleHandler(val db: DivaRepos) { db.gameSession.save(session) return BuyModuleResponse( - request.cmd, - request.req_id, - "ok", Result.SUCCESS, request.mdl_id, db.s.module.getModuleHaveString(profile), 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 7484d1f4..167989fd 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 @@ -91,9 +91,6 @@ class GetPvPdHandler(val db: DivaRepos) { return GetPvPdResponse( - request.cmd, - request.req_id, - "ok", pd.toString(), false, DivaDateTimeUtil.getString(LocalDateTime.now()) 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 1dd22e50..f089ab92 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 @@ -36,9 +36,6 @@ class ShopExitHandler(val db: DivaRepos) { db.profile.save(profile) db.pvCustomize.save(customize) return ShopExitResponse( - request.cmd, - request.req_id, - "ok", Result.SUCCESS ) } 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 884cc3e1..d32b705d 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 @@ -192,9 +192,6 @@ class StageResultHandler(val db: DivaRepos, val calc: DivaCalculator) { return StageResultResponse( - request.cmd, - request.req_id, - "ok", ChallengeKind.UNDEFINED.value, session.oldLevelNumber, session.oldLevelExp, @@ -241,11 +238,7 @@ class StageResultHandler(val db: DivaRepos, val calc: DivaCalculator) { "-1,-1,-1,-1,-1" ) } else { - return StageResultResponse( - request.cmd, - request.req_id, - "ok" - ) + return StageResultResponse() } } 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 3e1f89ba..5521a99b 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 @@ -1,8 +1,8 @@ package icu.samnyan.aqua.sega.diva.handler.ingame +import ext.emptyMap import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.request.ingame.StageStartRequest -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse import org.springframework.stereotype.Component /** @@ -32,10 +32,6 @@ class StageStartHandler(val db: DivaRepos) { db.gameSession.save(session) } - return BaseResponse( - request.cmd, - request.req_id, - "ok" - ) + return emptyMap } } 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 0337fb36..6fe2282d 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 @@ -2,9 +2,10 @@ package icu.samnyan.aqua.sega.diva.handler.ingame import ext.csv import ext.logger +import icu.samnyan.aqua.sega.diva.DIVA_BAD +import icu.samnyan.aqua.sega.diva.DIVA_OK import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.request.ingame.StoreSsRequest -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse import icu.samnyan.aqua.sega.diva.model.userdata.PlayerScreenShot import org.springframework.stereotype.Component import org.springframework.web.multipart.MultipartFile @@ -36,19 +37,10 @@ class StoreSsHandler(val db: DivaRepos) { ) db.screenShot.save(ss) - return BaseResponse( - request.cmd, - request.req_id, - "ok" - ) + return DIVA_OK } catch (e: IOException) { logger.error("Screenshot save failed", e) - - return BaseResponse( - request.cmd, - request.req_id, - "0" - ) + return DIVA_BAD } } } 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 11b6ea68..eb68a189 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 @@ -1,5 +1,6 @@ package icu.samnyan.aqua.sega.diva.handler.user +import icu.samnyan.aqua.sega.diva.DIVA_OK import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.common.ContestBorder import icu.samnyan.aqua.sega.diva.model.common.Difficulty @@ -7,7 +8,6 @@ import icu.samnyan.aqua.sega.diva.model.common.Edition import icu.samnyan.aqua.sega.diva.model.common.SortMode import icu.samnyan.aqua.sega.diva.model.gamedata.Contest import icu.samnyan.aqua.sega.diva.model.request.ingame.StageResultRequest -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse import icu.samnyan.aqua.sega.diva.model.userdata.PlayerContest import icu.samnyan.aqua.sega.diva.util.DivaStringUtils import org.springframework.stereotype.Component @@ -71,11 +71,7 @@ class EndHandler(val db: DivaRepos) { db.profile.save(profile) db.gameSession.delete(session) - return BaseResponse( - request.cmd, - request.req_id, - "ok" - ) + return DIVA_OK } private fun getContestRank(contest: Contest, value: Int): ContestBorder { 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 57ba1cd1..bfa72390 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 @@ -1,8 +1,8 @@ package icu.samnyan.aqua.sega.diva.handler.user +import icu.samnyan.aqua.sega.diva.DIVA_OK import icu.samnyan.aqua.sega.diva.DivaRepos import icu.samnyan.aqua.sega.diva.model.request.user.PdUnlockRequest -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse import org.springframework.stereotype.Component @Component @@ -12,10 +12,6 @@ class PdUnlockHandler(val db: DivaRepos) { db.gameSession.delete(session) - return BaseResponse( - request.cmd, - request.req_id, - "ok" - ) + return DIVA_OK } } 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 c3875263..f7cd3a88 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 @@ -21,9 +21,6 @@ class PreStartHandler(val db: DivaRepos) { val profileOptional = db.profile.findByPdId(request.aime_id) if (profileOptional.isEmpty) { return PreStartResponse( - request.cmd, - request.req_id, - "ok", PreStartResult.NEW_REGISTRATION ) } else { @@ -36,9 +33,6 @@ class PreStartHandler(val db: DivaRepos) { .isBefore(LocalDateTime.now().minusMinutes(5)) && session.startMode == StartMode.START ) { return PreStartResponse( - request.cmd, - request.req_id, - "ok", PreStartResult.ALREADY_PLAYING ) } else { @@ -65,9 +59,6 @@ class PreStartHandler(val db: DivaRepos) { db.gameSession.save(session) return PreStartResponse( - request.cmd, - request.req_id, - "ok", PreStartResult.SUCCESS, session.acceptId, profile.pdId, 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 b932620a..6f31ba7e 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 @@ -14,9 +14,6 @@ class SpendCreditHandler(val db: DivaRepos) { val profile = db.profile(request.pd_id) return SpendCreditResponse( - request.cmd, - request.req_id, - "ok", "-1,-1,x,-1,-1,x,x,-1,x,-1,-1,x,-1,-1,x,x,-1,x,-1,-1,x,-1,-1,x,x,-1,x,-1,-1,x,-1,-1,x,x,-1,x,-1,-1,x,-1,-1,x,x,-1,x,-1,-1,x,-1,-1,x,x,-1,x", 0, profile.vocaloidPoints, 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 3ad2f7a6..dd996498 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 @@ -37,9 +37,6 @@ class StartHandler(val db: DivaRepos) { border = border or ((if (profile.isShowRivalBorder) 1 else 0) shl 2) return StartResponse( - request.cmd, - request.req_id, - "ok", profile.pdId, Result.SUCCESS, session.acceptId, diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/BaseResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/BaseResponse.java deleted file mode 100644 index 4093b3a4..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/BaseResponse.java +++ /dev/null @@ -1,19 +0,0 @@ -package icu.samnyan.aqua.sega.diva.model.response; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -public class BaseResponse { - private String cmd; - private String req_id; - private String stat; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/boot/AttendResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/boot/AttendResponse.java index bad9fd50..f95c2226 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/boot/AttendResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/boot/AttendResponse.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.response.boot; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -11,14 +10,13 @@ import java.time.LocalDateTime; */ @Getter @Setter -public class AttendResponse extends BaseResponse { +public class AttendResponse { private String atnd_prm1; private String atnd_prm2; private String atnd_prm3; private LocalDateTime atnd_lut; - public AttendResponse(String cmd, String req_id, String stat, String atnd_prm1, String atnd_prm2, String atnd_prm3, LocalDateTime atnd_lut) { - super(cmd, req_id, stat); + public AttendResponse(String atnd_prm1, String atnd_prm2, String atnd_prm3, LocalDateTime atnd_lut) { this.atnd_prm1 = atnd_prm1; this.atnd_prm2 = atnd_prm2; this.atnd_prm3 = atnd_prm3; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/boot/GameInitResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/boot/GameInitResponse.java index 56743966..43ef833f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/boot/GameInitResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/boot/GameInitResponse.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.response.boot; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -9,12 +8,11 @@ import lombok.Setter; */ @Getter @Setter -public class GameInitResponse extends BaseResponse { +public class GameInitResponse { private String db_close; private String retry_time; - public GameInitResponse(String cmd, String req_id, String stat, String db_close, String retry_time) { - super(cmd, req_id, stat); + public GameInitResponse(String db_close, String retry_time) { this.db_close = db_close; this.retry_time = retry_time; } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/CardProcedureResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/CardProcedureResponse.java index 966db0f8..787922bd 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/CardProcedureResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/CardProcedureResponse.java @@ -2,7 +2,6 @@ package icu.samnyan.aqua.sega.diva.model.response.card; import icu.samnyan.aqua.sega.diva.model.common.PassStat; import icu.samnyan.aqua.sega.diva.model.common.Result; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -11,7 +10,7 @@ import lombok.Setter; */ @Getter @Setter -public class CardProcedureResponse extends BaseResponse { +public class CardProcedureResponse { private Result cd_adm_result; private int chg_name_price = 100; private int accept_idx; @@ -25,8 +24,7 @@ public class CardProcedureResponse extends BaseResponse { private Integer vcld_pts; private PassStat passwd_stat; - public CardProcedureResponse(String cmd, String req_id, String stat, Result cd_adm_result, int chg_name_price, int accept_idx, long pd_id, String player_name, Integer lv_num, Integer lv_pnt, String lv_str, Integer lv_efct_id, Integer lv_plt_id, Integer vcld_pts, PassStat passwd_stat) { - super(cmd, req_id, stat); + public CardProcedureResponse(Result cd_adm_result, int chg_name_price, int accept_idx, long pd_id, String player_name, Integer lv_num, Integer lv_pnt, String lv_str, Integer lv_efct_id, Integer lv_plt_id, Integer vcld_pts, PassStat passwd_stat) { this.cd_adm_result = cd_adm_result; this.chg_name_price = chg_name_price; this.accept_idx = accept_idx; @@ -41,8 +39,7 @@ public class CardProcedureResponse extends BaseResponse { this.passwd_stat = passwd_stat; } - public CardProcedureResponse(String cmd, String req_id, String stat, Result cd_adm_result) { - super(cmd, req_id, stat); + public CardProcedureResponse(Result cd_adm_result) { this.cd_adm_result = cd_adm_result; } } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/ChangeNameResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/ChangeNameResponse.java index bf4a460f..c7511072 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/ChangeNameResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/ChangeNameResponse.java @@ -1,7 +1,6 @@ package icu.samnyan.aqua.sega.diva.model.response.card; import icu.samnyan.aqua.sega.diva.model.common.Result; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -10,22 +9,20 @@ import lombok.Setter; */ @Getter @Setter -public class ChangeNameResponse extends BaseResponse { +public class ChangeNameResponse { private Result cd_adm_result; private int accept_idx; private long pd_id; private String player_name; - public ChangeNameResponse(String cmd, String req_id, String stat, Result cd_adm_result, int accept_idx, long pd_id, String player_name) { - super(cmd, req_id, stat); + public ChangeNameResponse(Result cd_adm_result, int accept_idx, long pd_id, String player_name) { this.cd_adm_result = cd_adm_result; this.accept_idx = accept_idx; this.pd_id = pd_id; this.player_name = player_name; } - public ChangeNameResponse(String cmd, String req_id, String stat, Result cd_adm_result) { - super(cmd, req_id, stat); + public ChangeNameResponse(Result cd_adm_result) { this.cd_adm_result = cd_adm_result; } } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/ChangePasswdResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/ChangePasswdResponse.java index 6f380265..e0e2abf2 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/ChangePasswdResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/ChangePasswdResponse.java @@ -1,7 +1,6 @@ package icu.samnyan.aqua.sega.diva.model.response.card; import icu.samnyan.aqua.sega.diva.model.common.Result; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -10,20 +9,18 @@ import lombok.Setter; */ @Getter @Setter -public class ChangePasswdResponse extends BaseResponse { +public class ChangePasswdResponse { private Result cd_adm_result; private int accept_idx; private long pd_id; - public ChangePasswdResponse(String cmd, String req_id, String stat, Result cd_adm_result, int accept_idx, long pd_id) { - super(cmd, req_id, stat); + public ChangePasswdResponse(Result cd_adm_result, int accept_idx, long pd_id) { this.cd_adm_result = cd_adm_result; this.accept_idx = accept_idx; this.pd_id = pd_id; } - public ChangePasswdResponse(String cmd, String req_id, String stat, Result cd_adm_result) { - super(cmd, req_id, stat); + public ChangePasswdResponse(Result cd_adm_result) { this.cd_adm_result = cd_adm_result; } } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/RegistrationResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/RegistrationResponse.java index b3559db5..954583a1 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/RegistrationResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/card/RegistrationResponse.java @@ -1,7 +1,6 @@ package icu.samnyan.aqua.sega.diva.model.response.card; import icu.samnyan.aqua.sega.diva.model.common.Result; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -10,12 +9,11 @@ import lombok.Setter; */ @Getter @Setter -public class RegistrationResponse extends BaseResponse { +public class RegistrationResponse { private Result cd_adm_result; private long pd_id; - public RegistrationResponse(String cmd, String req_id, String stat, Result cd_adm_result, long pd_id) { - super(cmd, req_id, stat); + public RegistrationResponse(Result cd_adm_result, long pd_id) { this.cd_adm_result = cd_adm_result; this.pd_id = pd_id; } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/BannerDataResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/BannerDataResponse.java index 103e802f..e9526e5b 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/BannerDataResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/BannerDataResponse.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.response.databank; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -11,14 +10,13 @@ import java.time.LocalDateTime; */ @Getter @Setter -public class BannerDataResponse extends BaseResponse { +public class BannerDataResponse { private LocalDateTime bd_ut; private String bd_ti; private String bd_hs; private int bd_id; - public BannerDataResponse(String cmd, String req_id, String stat, LocalDateTime bd_ut, String bd_ti, String bd_hs, int bd_id) { - super(cmd, req_id, stat); + public BannerDataResponse(LocalDateTime bd_ut, String bd_ti, String bd_hs, int bd_id) { this.bd_ut = bd_ut; this.bd_ti = bd_ti; this.bd_hs = bd_hs; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/BannerInfoResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/BannerInfoResponse.java index 091aa7df..91b45bc7 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/BannerInfoResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/BannerInfoResponse.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.response.databank; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -9,7 +8,7 @@ import lombok.Setter; */ @Getter @Setter -public class BannerInfoResponse extends BaseResponse { +public class BannerInfoResponse { private String bi_lut; // Array of 10 private String bi_id; @@ -17,8 +16,7 @@ public class BannerInfoResponse extends BaseResponse { private String bi_et; private String bi_ut; - public BannerInfoResponse(String cmd, String req_id, String stat, String bi_lut, String bi_id, String bi_st, String bi_et, String bi_ut) { - super(cmd, req_id, stat); + public BannerInfoResponse(String bi_lut, String bi_id, String bi_st, String bi_et, String bi_ut) { this.bi_lut = bi_lut; this.bi_id = bi_id; this.bi_st = bi_st; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/ContestInfoResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/ContestInfoResponse.java index 4c6731fb..04676e72 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/ContestInfoResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/ContestInfoResponse.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.response.databank; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -11,12 +10,11 @@ import java.time.LocalDateTime; */ @Getter @Setter -public class ContestInfoResponse extends BaseResponse { +public class ContestInfoResponse { private LocalDateTime ci_lut; private String ci_str; - public ContestInfoResponse(String cmd, String req_id, String stat, LocalDateTime ci_lut, String ci_str) { - super(cmd, req_id, stat); + public ContestInfoResponse(LocalDateTime ci_lut, String ci_str) { this.ci_lut = ci_lut; this.ci_str = ci_str; } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/CstmzItmCtlgResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/CstmzItmCtlgResponse.java index 36296b8c..1db81c15 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/CstmzItmCtlgResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/CstmzItmCtlgResponse.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.response.databank; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -9,12 +8,11 @@ import lombok.Setter; */ @Getter @Setter -public class CstmzItmCtlgResponse extends BaseResponse { +public class CstmzItmCtlgResponse { private String cstmz_itm_ctlg_lut; private String cstmz_itm_ctlg; - public CstmzItmCtlgResponse(String cmd, String req_id, String stat, String cstmz_itm_ctlg_lut, String cstmz_itm_ctlg) { - super(cmd, req_id, stat); + public CstmzItmCtlgResponse(String cstmz_itm_ctlg_lut, String cstmz_itm_ctlg) { this.cstmz_itm_ctlg_lut = cstmz_itm_ctlg_lut; this.cstmz_itm_ctlg = cstmz_itm_ctlg; } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/CstmzItmNgMdlListResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/CstmzItmNgMdlListResponse.java index 2bd4b5f9..8a693750 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/CstmzItmNgMdlListResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/CstmzItmNgMdlListResponse.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.response.databank; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -9,12 +8,11 @@ import lombok.Setter; */ @Getter @Setter -public class CstmzItmNgMdlListResponse extends BaseResponse { +public class CstmzItmNgMdlListResponse { private String cinml_lut; private String cinm_lst; - public CstmzItmNgMdlListResponse(String cmd, String req_id, String stat, String cinml_lut, String cinm_lst) { - super(cmd, req_id, stat); + public CstmzItmNgMdlListResponse(String cinml_lut, String cinm_lst) { this.cinml_lut = cinml_lut; this.cinm_lst = cinm_lst; } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/FestaInfoResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/FestaInfoResponse.java index 86c29e19..7e9fed61 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/FestaInfoResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/FestaInfoResponse.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.response.databank; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -9,7 +8,7 @@ import lombok.Setter; */ @Getter @Setter -public class FestaInfoResponse extends BaseResponse { +public class FestaInfoResponse { private String fi_id; private String fi_name; private String fi_kind; @@ -22,8 +21,7 @@ public class FestaInfoResponse extends BaseResponse { private String fi_et; private String fi_lut; - public FestaInfoResponse(String cmd, String req_id, String stat, String fi_id, String fi_name, String fi_kind, String fi_difficulty, String fi_pv_id_lst, String fi_attr, String fi_add_vp, String fi_mul_vp, String fi_st, String fi_et, String fi_lut) { - super(cmd, req_id, stat); + public FestaInfoResponse(String fi_id, String fi_name, String fi_kind, String fi_difficulty, String fi_pv_id_lst, String fi_attr, String fi_add_vp, String fi_mul_vp, String fi_st, String fi_et, String fi_lut) { this.fi_id = fi_id; this.fi_name = fi_name; this.fi_kind = fi_kind; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/NvRankingResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/NvRankingResponse.java index fc3d9f84..0ead05c8 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/NvRankingResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/NvRankingResponse.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.response.databank; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -11,14 +10,13 @@ import java.time.LocalDateTime; */ @Getter @Setter -public class NvRankingResponse extends BaseResponse { +public class NvRankingResponse { private String rnk_nv_tag_str; private LocalDateTime rnk_nv_ts; private String rnk_nv_data; private LocalDateTime rnk_nv_lut; - public NvRankingResponse(String cmd, String req_id, String stat, String rnk_nv_tag_str, LocalDateTime rnk_nv_ts, String rnk_nv_data, LocalDateTime rnk_nv_lut) { - super(cmd, req_id, stat); + public NvRankingResponse(String rnk_nv_tag_str, LocalDateTime rnk_nv_ts, String rnk_nv_data, LocalDateTime rnk_nv_lut) { this.rnk_nv_tag_str = rnk_nv_tag_str; this.rnk_nv_ts = rnk_nv_ts; this.rnk_nv_data = rnk_nv_data; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PsRankingResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PsRankingResponse.java index b4784a0f..4b3e5172 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PsRankingResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PsRankingResponse.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.response.databank; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -11,7 +10,7 @@ import java.time.LocalDateTime; */ @Getter @Setter -public class PsRankingResponse extends BaseResponse { +public class PsRankingResponse { private LocalDateTime rnk_ps_lut; private LocalDateTime rnk_ps_ts; private int rnk_ps_dffclty; @@ -26,8 +25,7 @@ public class PsRankingResponse extends BaseResponse { private String rnk_ps_nm2; private String rnk_ps_nm3; - public PsRankingResponse(String cmd, String req_id, String stat, LocalDateTime rnk_ps_lut, LocalDateTime rnk_ps_ts, int rnk_ps_dffclty, String rnk_ps_pv_id, String rnk_ps_edtn1, String rnk_ps_edtn2, String rnk_ps_edtn3, String rnk_ps_scr1, String rnk_ps_scr2, String rnk_ps_scr3, String rnk_ps_nm1, String rnk_ps_nm2, String rnk_ps_nm3) { - super(cmd, req_id, stat); + public PsRankingResponse(LocalDateTime rnk_ps_lut, LocalDateTime rnk_ps_ts, int rnk_ps_dffclty, String rnk_ps_pv_id, String rnk_ps_edtn1, String rnk_ps_edtn2, String rnk_ps_edtn3, String rnk_ps_scr1, String rnk_ps_scr2, String rnk_ps_scr3, String rnk_ps_nm1, String rnk_ps_nm2, String rnk_ps_nm3) { this.rnk_ps_lut = rnk_ps_lut; this.rnk_ps_ts = rnk_ps_ts; this.rnk_ps_dffclty = rnk_ps_dffclty; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PstdHCtrlResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PstdHCtrlResponse.java index 6106f49c..1480e664 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PstdHCtrlResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PstdHCtrlResponse.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.response.databank; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -9,12 +8,11 @@ import lombok.Setter; */ @Getter @Setter -public class PstdHCtrlResponse extends BaseResponse { +public class PstdHCtrlResponse { private String p_std_hc_lut; private String p_std_hc_str; - public PstdHCtrlResponse(String cmd, String req_id, String stat, String p_std_hc_lut, String p_std_hc_str) { - super(cmd, req_id, stat); + public PstdHCtrlResponse(String p_std_hc_lut, String p_std_hc_str) { this.p_std_hc_lut = p_std_hc_lut; this.p_std_hc_str = p_std_hc_str; } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PstdItemNgLstResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PstdItemNgLstResponse.java index b09c5d60..f48dfbfe 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PstdItemNgLstResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PstdItemNgLstResponse.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.response.databank; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -9,13 +8,12 @@ import lombok.Setter; */ @Getter @Setter -public class PstdItemNgLstResponse extends BaseResponse { +public class PstdItemNgLstResponse { private String p_std_i_n_lut; private String p_std_i_ie_n_lst; private String p_std_i_se_n_lst; - public PstdItemNgLstResponse(String cmd, String req_id, String stat, String p_std_i_n_lut, String p_std_i_ie_n_lst, String p_std_i_se_n_lst) { - super(cmd, req_id, stat); + public PstdItemNgLstResponse(String p_std_i_n_lut, String p_std_i_ie_n_lst, String p_std_i_se_n_lst) { this.p_std_i_n_lut = p_std_i_n_lut; this.p_std_i_ie_n_lst = p_std_i_ie_n_lst; this.p_std_i_se_n_lst = p_std_i_se_n_lst; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PvDefChrLstResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PvDefChrLstResponse.java index 212efad0..6f044dd7 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PvDefChrLstResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PvDefChrLstResponse.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.response.databank; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -9,12 +8,11 @@ import lombok.Setter; */ @Getter @Setter -public class PvDefChrLstResponse extends BaseResponse { +public class PvDefChrLstResponse { private String pdcl_lut; private String pdc_lst; - public PvDefChrLstResponse(String cmd, String req_id, String stat, String pdcl_lut, String pdc_lst) { - super(cmd, req_id, stat); + public PvDefChrLstResponse(String pdcl_lut, String pdc_lst) { this.pdcl_lut = pdcl_lut; this.pdc_lst = pdc_lst; } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PvListResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PvListResponse.java index 18f6ca97..1e3746e8 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PvListResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PvListResponse.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.response.databank; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -11,12 +10,11 @@ import java.time.LocalDateTime; */ @Getter @Setter -public class PvListResponse extends BaseResponse { +public class PvListResponse { private LocalDateTime pvl_lut; private String pv_lst; - public PvListResponse(String cmd, String req_id, String stat, LocalDateTime pvl_lut, String pv_lst) { - super(cmd, req_id, stat); + public PvListResponse(LocalDateTime pvl_lut, String pv_lst) { this.pvl_lut = pvl_lut; this.pv_lst = pv_lst; } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PvNgMdlLstResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PvNgMdlLstResponse.java index 23884e56..d79828c0 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PvNgMdlLstResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/PvNgMdlLstResponse.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.response.databank; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -9,12 +8,11 @@ import lombok.Setter; */ @Getter @Setter -public class PvNgMdlLstResponse extends BaseResponse { +public class PvNgMdlLstResponse { private String pnml_lut; private String pnm_lst; - public PvNgMdlLstResponse(String cmd, String req_id, String stat, String pnml_lut, String pnm_lst) { - super(cmd, req_id, stat); + public PvNgMdlLstResponse(String pnml_lut, String pnm_lst) { this.pnml_lut = pnml_lut; this.pnm_lst = pnm_lst; } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/QstInfResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/QstInfResponse.java index 9b86d815..d059c67d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/QstInfResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/QstInfResponse.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.response.databank; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -9,13 +8,12 @@ import lombok.Setter; */ @Getter @Setter -public class QstInfResponse extends BaseResponse { +public class QstInfResponse { private String qi_lut; private String qhi_str; private String qrai_str; - public QstInfResponse(String cmd, String req_id, String stat, String qi_lut, String qhi_str, String qrai_str) { - super(cmd, req_id, stat); + public QstInfResponse(String qi_lut, String qhi_str, String qrai_str) { this.qi_lut = qi_lut; this.qhi_str = qhi_str; this.qrai_str = qrai_str; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/RmtWpLstResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/RmtWpLstResponse.java index ef1c03a2..b9f16cef 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/RmtWpLstResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/RmtWpLstResponse.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.response.databank; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -9,12 +8,11 @@ import lombok.Setter; */ @Getter @Setter -public class RmtWpLstResponse extends BaseResponse { +public class RmtWpLstResponse { private String rwl_lut; private String rw_lst; - public RmtWpLstResponse(String cmd, String req_id, String stat, String rwl_lut, String rw_lst) { - super(cmd, req_id, stat); + public RmtWpLstResponse(String rwl_lut, String rw_lst) { this.rwl_lut = rwl_lut; this.rw_lst = rw_lst; } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/ShopCatalogResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/ShopCatalogResponse.java index 697ea646..a6ecfbeb 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/ShopCatalogResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/databank/ShopCatalogResponse.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.response.databank; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -11,12 +10,11 @@ import java.time.LocalDateTime; */ @Getter @Setter -public class ShopCatalogResponse extends BaseResponse { +public class ShopCatalogResponse { private LocalDateTime shp_ctlg_lut; private String shp_ctlg; - public ShopCatalogResponse(String cmd, String req_id, String stat, LocalDateTime shp_ctlg_lut, String shp_ctlg) { - super(cmd, req_id, stat); + public ShopCatalogResponse(LocalDateTime shp_ctlg_lut, String shp_ctlg) { this.shp_ctlg_lut = shp_ctlg_lut; this.shp_ctlg = shp_ctlg; } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/BuyCstmzItmResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/BuyCstmzItmResponse.java index 4a3784f0..118e08d1 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/BuyCstmzItmResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/BuyCstmzItmResponse.java @@ -1,7 +1,6 @@ package icu.samnyan.aqua.sega.diva.model.response.ingame; import icu.samnyan.aqua.sega.diva.model.common.Result; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -10,22 +9,20 @@ import lombok.Setter; */ @Getter @Setter -public class BuyCstmzItmResponse extends BaseResponse { +public class BuyCstmzItmResponse { private Result shp_rslt; private int cstmz_itm_id; private String cstmz_itm_have; private int vcld_pts; - public BuyCstmzItmResponse(String cmd, String req_id, String stat, Result shp_rslt, int cstmz_itm_id, String cstmz_itm_have, int vcld_pts) { - super(cmd, req_id, stat); + public BuyCstmzItmResponse(Result shp_rslt, int cstmz_itm_id, String cstmz_itm_have, int vcld_pts) { this.shp_rslt = shp_rslt; this.cstmz_itm_id = cstmz_itm_id; this.cstmz_itm_have = cstmz_itm_have; this.vcld_pts = vcld_pts; } - public BuyCstmzItmResponse(String cmd, String req_id, String stat, Result shp_rslt) { - super(cmd, req_id, stat); + public BuyCstmzItmResponse(Result shp_rslt) { this.shp_rslt = shp_rslt; } } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/BuyModuleResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/BuyModuleResponse.java index 19a1907c..29546305 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/BuyModuleResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/BuyModuleResponse.java @@ -1,7 +1,6 @@ package icu.samnyan.aqua.sega.diva.model.response.ingame; import icu.samnyan.aqua.sega.diva.model.common.Result; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -10,22 +9,20 @@ import lombok.Setter; */ @Getter @Setter -public class BuyModuleResponse extends BaseResponse { +public class BuyModuleResponse { private Result shp_rslt; private int mdl_id; private String mdl_have; private int vcld_pts; - public BuyModuleResponse(String cmd, String req_id, String stat, Result shp_rslt, int mdl_id, String mdl_have, int vcld_pts) { - super(cmd, req_id, stat); + public BuyModuleResponse(Result shp_rslt, int mdl_id, String mdl_have, int vcld_pts) { this.shp_rslt = shp_rslt; this.mdl_id = mdl_id; this.mdl_have = mdl_have; this.vcld_pts = vcld_pts; } - public BuyModuleResponse(String cmd, String req_id, String stat, Result shp_rslt) { - super(cmd, req_id, stat); + public BuyModuleResponse(Result shp_rslt) { this.shp_rslt = shp_rslt; } } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/GetPvPdResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/GetPvPdResponse.java index 96f3ae5f..0f2d7134 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/GetPvPdResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/GetPvPdResponse.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.response.ingame; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -9,13 +8,12 @@ import lombok.Setter; */ @Getter @Setter -public class GetPvPdResponse extends BaseResponse { +public class GetPvPdResponse { private String pd_by_pv_id; private Boolean pdddt_flg; private String pdddt_tm; - public GetPvPdResponse(String cmd, String req_id, String stat, String pd_by_pv_id, Boolean pdddt_flg, String pdddt_tm) { - super(cmd, req_id, stat); + public GetPvPdResponse(String pd_by_pv_id, Boolean pdddt_flg, String pdddt_tm) { this.pd_by_pv_id = pd_by_pv_id; this.pdddt_flg = pdddt_flg; this.pdddt_tm = pdddt_tm; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/ShopExitResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/ShopExitResponse.java index 5ffa93f1..75116650 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/ShopExitResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/ShopExitResponse.java @@ -1,7 +1,6 @@ package icu.samnyan.aqua.sega.diva.model.response.ingame; import icu.samnyan.aqua.sega.diva.model.common.Result; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -10,11 +9,10 @@ import lombok.Setter; */ @Getter @Setter -public class ShopExitResponse extends BaseResponse { +public class ShopExitResponse { private Result shp_rslt; - public ShopExitResponse(String cmd, String req_id, String stat, Result shp_rslt) { - super(cmd, req_id, stat); + public ShopExitResponse(Result shp_rslt) { this.shp_rslt = shp_rslt; } } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/StageResultResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/StageResultResponse.java index 813907fd..d37ccae5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/StageResultResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/ingame/StageResultResponse.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.response.ingame; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -11,7 +10,7 @@ import java.time.LocalDateTime; */ @Getter @Setter -public class StageResultResponse extends BaseResponse { +public class StageResultResponse { private int chllng_kind; private int lv_num_old; @@ -58,12 +57,9 @@ public class StageResultResponse extends BaseResponse { private String my_ccd_r_hnd; private String my_ccd_r_vp; - public StageResultResponse(String cmd, String req_id, String stat) { - super(cmd, req_id, stat); - } + public StageResultResponse() {} - public StageResultResponse(String cmd, String req_id, String stat, int chllng_kind, int lv_num_old, int lv_pnt_old, int lv_num, int lv_pnt, String lv_str, int lv_efct_id, int lv_plt_id, int vcld_pts, int prsnt_vcld_pts, int cnp_cid, int cnp_val, String cnp_sp, String crwd_kind, String crwd_value, String crwd_str_0, String crwd_str_1, int cerwd_kind, int cerwd_value, String cerwd_str_0, String cerwd_str_1, String ttl_str_ary, String ttl_plt_id_ary, String ttl_desc_ary, String skin_id_ary, String skin_name_ary, String skin_illust_ary, String skin_desc_ary, int pdddt_flg, LocalDateTime pdddt_tm, int nblss_ltt_stts, int nblss_ltt_tckt, int nblss_ltt_is_opn, int nblss_ltt_prz, int nblss_ltt_nxt_stts, int nblss_ltt_nxt_tckt, String my_qst_id, String my_qst_r_qid, String my_qst_r_knd, String my_qst_r_vl, String my_qst_r_nflg, String my_ccd_r_qid, String my_ccd_r_hnd, String my_ccd_r_vp) { - super(cmd, req_id, stat); + public StageResultResponse(int chllng_kind, int lv_num_old, int lv_pnt_old, int lv_num, int lv_pnt, String lv_str, int lv_efct_id, int lv_plt_id, int vcld_pts, int prsnt_vcld_pts, int cnp_cid, int cnp_val, String cnp_sp, String crwd_kind, String crwd_value, String crwd_str_0, String crwd_str_1, int cerwd_kind, int cerwd_value, String cerwd_str_0, String cerwd_str_1, String ttl_str_ary, String ttl_plt_id_ary, String ttl_desc_ary, String skin_id_ary, String skin_name_ary, String skin_illust_ary, String skin_desc_ary, int pdddt_flg, LocalDateTime pdddt_tm, int nblss_ltt_stts, int nblss_ltt_tckt, int nblss_ltt_is_opn, int nblss_ltt_prz, int nblss_ltt_nxt_stts, int nblss_ltt_nxt_tckt, String my_qst_id, String my_qst_r_qid, String my_qst_r_knd, String my_qst_r_vl, String my_qst_r_nflg, String my_ccd_r_qid, String my_ccd_r_hnd, String my_ccd_r_vp) { this.chllng_kind = chllng_kind; this.lv_num_old = lv_num_old; this.lv_pnt_old = lv_pnt_old; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/operation/PingResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/operation/PingResponse.java index 5f39f8e9..e253c3b8 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/operation/PingResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/operation/PingResponse.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.response.operation; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import icu.samnyan.aqua.sega.diva.util.URIEncoder; import lombok.Getter; import lombok.Setter; @@ -10,7 +9,7 @@ import lombok.Setter; */ @Getter @Setter -public class PingResponse extends BaseResponse { +public class PingResponse { private String ping_b_msg = URIEncoder.encode("Server Running No other news"); private String ping_m_msg = URIEncoder.encode("Network Service Running"); private String atnd_lut; @@ -50,12 +49,9 @@ public class PingResponse extends BaseResponse { private String nblss_ltt_st_tm; private String nblss_ltt_ed_tm; - public PingResponse(String cmd, String req_id, String stat) { - super(cmd, req_id, stat); - } + - public PingResponse(String cmd, String req_id, String stat, String ping_b_msg, String ping_m_msg) { - super(cmd, req_id, stat); + public PingResponse(String ping_b_msg, String ping_m_msg) { this.ping_b_msg = ping_b_msg; this.ping_m_msg = ping_m_msg; } diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/user/PreStartResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/user/PreStartResponse.java index 86011ec4..1d5466ba 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/user/PreStartResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/user/PreStartResponse.java @@ -3,7 +3,6 @@ package icu.samnyan.aqua.sega.diva.model.response.user; import icu.samnyan.aqua.sega.diva.model.common.PassStat; import icu.samnyan.aqua.sega.diva.model.common.PreStartResult; import icu.samnyan.aqua.sega.diva.model.common.SortMode; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -14,7 +13,7 @@ import java.time.LocalDateTime; */ @Getter @Setter -public class PreStartResponse extends BaseResponse { +public class PreStartResponse { private PreStartResult ps_result; private Integer accept_idx; @@ -40,13 +39,11 @@ public class PreStartResponse extends BaseResponse { private Integer vcld_pts; private PassStat passwd_stat; - public PreStartResponse(String cmd, String req_id, String stat, PreStartResult ps_result) { - super(cmd, req_id, stat); + public PreStartResponse(PreStartResult ps_result) { this.ps_result = ps_result; } - public PreStartResponse(String cmd, String req_id, String stat, PreStartResult ps_result, Integer accept_idx, long pd_id, String player_name, SortMode sort_kind, Integer lv_num, Integer lv_pnt, String lv_str, Integer lv_efct_id, Integer lv_plt_id, String mdl_eqp_ary, LocalDateTime mdl_eqp_tm, Integer skn_eqp, Integer btn_se_eqp, Integer sld_se_eqp, Integer chn_sld_se_eqp, Integer sldr_tch_se_eqp, Integer vcld_pts, PassStat passwd_stat) { - super(cmd, req_id, stat); + public PreStartResponse(PreStartResult ps_result, Integer accept_idx, long pd_id, String player_name, SortMode sort_kind, Integer lv_num, Integer lv_pnt, String lv_str, Integer lv_efct_id, Integer lv_plt_id, String mdl_eqp_ary, LocalDateTime mdl_eqp_tm, Integer skn_eqp, Integer btn_se_eqp, Integer sld_se_eqp, Integer chn_sld_se_eqp, Integer sldr_tch_se_eqp, Integer vcld_pts, PassStat passwd_stat) { this.ps_result = ps_result; this.accept_idx = accept_idx; this.nblss_ltt_stts = -1; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/user/SpendCreditResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/user/SpendCreditResponse.java index 5bc3b041..ada13a4e 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/user/SpendCreditResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/user/SpendCreditResponse.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.model.response.user; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -9,7 +8,7 @@ import lombok.Setter; */ @Getter @Setter -public class SpendCreditResponse extends BaseResponse { +public class SpendCreditResponse { private String cmpgn_rslt; private int cmpgn_rslt_num; private int vcld_pts; @@ -17,8 +16,7 @@ public class SpendCreditResponse extends BaseResponse { private int lv_efct_id; private int lv_plt_id; - public SpendCreditResponse(String cmd, String req_id, String stat, String cmpgn_rslt, int cmpgn_rslt_num, int vcld_pts, String lv_str, int lv_efct_id, int lv_plt_id) { - super(cmd, req_id, stat); + public SpendCreditResponse(String cmpgn_rslt, int cmpgn_rslt_num, int vcld_pts, String lv_str, int lv_efct_id, int lv_plt_id) { this.cmpgn_rslt = cmpgn_rslt; this.cmpgn_rslt_num = cmpgn_rslt_num; this.vcld_pts = vcld_pts; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/user/StartResponse.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/user/StartResponse.java index 1b132520..f4e242ec 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/response/user/StartResponse.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/response/user/StartResponse.java @@ -1,7 +1,6 @@ package icu.samnyan.aqua.sega.diva.model.response.user; import icu.samnyan.aqua.sega.diva.model.common.*; -import icu.samnyan.aqua.sega.diva.model.response.BaseResponse; import lombok.Getter; import lombok.Setter; @@ -15,7 +14,7 @@ import static icu.samnyan.aqua.sega.diva.model.common.Const.ALL_NOT_HAVE; */ @Getter @Setter -public class StartResponse extends BaseResponse { +public class StartResponse { private long pd_id; private Result start_result = Result.SUCCESS; @@ -85,8 +84,7 @@ public class StartResponse extends BaseResponse { private String p_std_ie_have = ALL_NOT_HAVE; private String p_std_se_have = ALL_NOT_HAVE; - public StartResponse(String cmd, String req_id, String stat, long pd_id, Result start_result, int accept_idx, int start_idx, String player_name, int hp_vol, boolean btn_se_vol, int btn_se_vol2, int sldr_se_vol2, SortMode sort_kind, int lv_num, int lv_pnt, String lv_str, int lv_efct_id, int lv_plt_id, String mdl_eqp_ary, String c_itm_eqp_ary, String ms_itm_flg_ary, LocalDateTime mdl_eqp_tm, String mdl_have, String cstmz_itm_have, boolean use_pv_mdl_eqp, boolean use_mdl_pri, boolean use_pv_skn_eqp, boolean use_pv_btn_se_eqp, boolean use_pv_sld_se_eqp, boolean use_pv_chn_sld_se_eqp, boolean use_pv_sldr_tch_se_eqp, int vcld_pts, int nxt_pv_id, Difficulty nxt_dffclty, Edition nxt_edtn, String cv_cid, String cv_sc, String cv_rr, String cv_bv, String cv_bf, int cnp_cid, int cnp_val, ContestBorder cnp_rr, String cnp_sp, String my_lst_0, String my_lst_1, String my_lst_2, String my_lst_3, String my_lst_4, String dsp_clr_brdr, boolean dsp_intrm_rnk, boolean dsp_clr_sts, String clr_sts, boolean rgo_sts, String my_qst_id, String my_qst_sts, String my_qst_prgrs, String my_qst_et, String p_std_ie_have, String p_std_se_have) { - super(cmd, req_id, stat); + public StartResponse(long pd_id, Result start_result, int accept_idx, int start_idx, String player_name, int hp_vol, boolean btn_se_vol, int btn_se_vol2, int sldr_se_vol2, SortMode sort_kind, int lv_num, int lv_pnt, String lv_str, int lv_efct_id, int lv_plt_id, String mdl_eqp_ary, String c_itm_eqp_ary, String ms_itm_flg_ary, LocalDateTime mdl_eqp_tm, String mdl_have, String cstmz_itm_have, boolean use_pv_mdl_eqp, boolean use_mdl_pri, boolean use_pv_skn_eqp, boolean use_pv_btn_se_eqp, boolean use_pv_sld_se_eqp, boolean use_pv_chn_sld_se_eqp, boolean use_pv_sldr_tch_se_eqp, int vcld_pts, int nxt_pv_id, Difficulty nxt_dffclty, Edition nxt_edtn, String cv_cid, String cv_sc, String cv_rr, String cv_bv, String cv_bf, int cnp_cid, int cnp_val, ContestBorder cnp_rr, String cnp_sp, String my_lst_0, String my_lst_1, String my_lst_2, String my_lst_3, String my_lst_4, String dsp_clr_brdr, boolean dsp_intrm_rnk, boolean dsp_clr_sts, String clr_sts, boolean rgo_sts, String my_qst_id, String my_qst_sts, String my_qst_prgrs, String my_qst_et, String p_std_ie_have, String p_std_se_have) { this.pd_id = pd_id; this.start_result = start_result; this.accept_idx = accept_idx;