From 0f1d6c098423223f4a80fc8dc13c77be7e70673f Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Sat, 16 Mar 2024 22:50:08 -0400 Subject: [PATCH] [O] Remove unnecessarily long constructors --- .../controller/general/StaticController.java | 7 +- .../controller/sega/ApiAimeController.java | 6 +- .../v1/ApiChuniV1GameDataController.java | 19 +---- .../v1/ApiChuniV1PlayerDataController.java | 24 +----- .../v2/ApiChuniV2GameDataController.java | 13 +--- .../v2/ApiChuniV2PlayerDataController.java | 29 +------ .../game/diva/ApiDivaGameDataController.java | 8 +- .../diva/ApiDivaPlayerDataController.java | 13 +--- .../ApiMaimai2PlayerDataController.java | 4 +- .../ongeki/ApiOngekiGameDataController.java | 10 +-- .../ongeki/ApiOngekiPlayerDataController.java | 34 +------- .../manage/ApiChuniV1ManageController.java | 8 +- .../sega/manage/ApiDivaManageController.java | 13 +--- .../java/icu/samnyan/aqua/net/games/Chusan.kt | 5 +- .../controller/ChuniServletController.java | 48 +----------- .../impl/UpsertClientBookkeepingHandler.java | 10 --- .../impl/UpsertClientDevelopHandler.java | 10 --- .../impl/UpsertClientErrorHandler.java | 10 --- .../impl/UpsertClientTestmodeHandler.java | 10 --- .../controller/ChusanServletController.java | 77 +------------------ .../controller/MaimaiServletController.java | 28 +------ .../controller/Maimai2ServletController.java | 8 +- .../ongeki/controller/OngekiController.java | 52 +------------ 23 files changed, 39 insertions(+), 407 deletions(-) delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertClientBookkeepingHandler.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertClientDevelopHandler.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertClientErrorHandler.java delete mode 100644 src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertClientTestmodeHandler.java diff --git a/src/main/java/icu/samnyan/aqua/api/controller/general/StaticController.java b/src/main/java/icu/samnyan/aqua/api/controller/general/StaticController.java index 8b420049..2a01f8f8 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/general/StaticController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/general/StaticController.java @@ -2,6 +2,7 @@ package icu.samnyan.aqua.api.controller.general; import icu.samnyan.aqua.sega.diva.dao.userdata.PlayerScreenShotRepository; import icu.samnyan.aqua.sega.diva.model.userdata.PlayerScreenShot; +import lombok.AllArgsConstructor; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; import org.springframework.http.MediaType; @@ -19,14 +20,10 @@ import java.util.Optional; */ @RestController @RequestMapping("api/static") +@AllArgsConstructor public class StaticController { - private final PlayerScreenShotRepository playerScreenShotRepository; - public StaticController(PlayerScreenShotRepository playerScreenShotRepository) { - this.playerScreenShotRepository = playerScreenShotRepository; - } - @GetMapping(value = "screenshot/{filename}", produces = MediaType.IMAGE_JPEG_VALUE) public ResponseEntity getScreenshotFile(@PathVariable String filename) { Optional ss = playerScreenShotRepository.findByFileName(filename); diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/ApiAimeController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/ApiAimeController.java index 28c004e8..98dd6a20 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/ApiAimeController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/ApiAimeController.java @@ -2,6 +2,7 @@ package icu.samnyan.aqua.api.controller.sega; import icu.samnyan.aqua.sega.general.model.Card; import icu.samnyan.aqua.sega.general.service.CardService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,14 +17,11 @@ import java.util.Optional; */ @RestController @RequestMapping("api/sega/aime") +@AllArgsConstructor public class ApiAimeController { private final CardService cardService; - public ApiAimeController(CardService cardService) { - this.cardService = cardService; - } - @PostMapping("getByAccessCode") public Optional getByAccessCode(@RequestBody Map request) { return cardService.getCardByAccessCode(request.get("accessCode").replaceAll("-", "").replaceAll(" ", "")); diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v1/ApiChuniV1GameDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v1/ApiChuniV1GameDataController.java index 150dfdfd..f8dab9c1 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v1/ApiChuniV1GameDataController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v1/ApiChuniV1GameDataController.java @@ -6,6 +6,7 @@ import icu.samnyan.aqua.sega.chunithm.model.gamedata.Character; import icu.samnyan.aqua.sega.chunithm.model.gamedata.CharacterSkill; import icu.samnyan.aqua.sega.chunithm.model.gamedata.Music; import icu.samnyan.aqua.sega.chunithm.service.GameMusicService; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -17,18 +18,13 @@ import java.util.List; */ @RestController @RequestMapping("api/game/chuni/v1/data") +@AllArgsConstructor public class ApiChuniV1GameDataController { private final GameMusicService gameMusicService; private final GameCharacterRepository gameCharacterRepository; private final GameCharacterSkillRepository gameCharacterSkillRepository; - public ApiChuniV1GameDataController(GameMusicService gameMusicService, GameCharacterRepository gameCharacterRepository, GameCharacterSkillRepository gameCharacterSkillRepository) { - this.gameMusicService = gameMusicService; - this.gameCharacterRepository = gameCharacterRepository; - this.gameCharacterSkillRepository = gameCharacterSkillRepository; - } - @GetMapping("music") public List getMusic() { return gameMusicService.getAll(); @@ -43,15 +39,4 @@ public class ApiChuniV1GameDataController { public List getSkill() { return gameCharacterSkillRepository.findAll(); } - -// @PostMapping("character") -// public List importCharacter(@RequestBody List req) { -// return gameCharacterRepository.saveAll(req); -// } -// -// @PostMapping("skill") -// public List importSkill(@RequestBody List req) { -// return gameCharacterSkillRepository.saveAll(req); -// } - } diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v1/ApiChuniV1PlayerDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v1/ApiChuniV1PlayerDataController.java index 9ac6a45c..d2cfb6a6 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v1/ApiChuniV1PlayerDataController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v1/ApiChuniV1PlayerDataController.java @@ -18,6 +18,7 @@ import icu.samnyan.aqua.sega.general.model.Card; import icu.samnyan.aqua.sega.general.service.CardService; import icu.samnyan.aqua.sega.util.VersionInfo; import icu.samnyan.aqua.sega.util.VersionUtil; +import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,6 +40,7 @@ import java.util.stream.Collectors; */ @RestController @RequestMapping("api/game/chuni/v1") +@AllArgsConstructor public class ApiChuniV1PlayerDataController { private static final Logger logger = LoggerFactory.getLogger(ApiChuniV1PlayerDataController.class); @@ -64,28 +66,6 @@ public class ApiChuniV1PlayerDataController { private final GameMusicService gameMusicService; - @Autowired - public ApiChuniV1PlayerDataController(ApiMapper mapper, CardService cardService, UserActivityService userActivityService, UserCharacterService userCharacterService, UserChargeService userChargeService, UserDataService userDataService, UserDataExService userDataExService, UserGameOptionExService userGameOptionExService, UserMapService userMapService, UserPlaylogService userPlaylogService, UserMusicDetailService userMusicDetailService, UserCourseService userCourseService, UserDuelService userDuelService, UserGameOptionService userGameOptionService, UserItemService userItemService, UserGeneralDataService userGeneralDataService, GameMusicService gameMusicService) { - this.mapper = mapper; - this.cardService = cardService; - this.userActivityService = userActivityService; - this.userCharacterService = userCharacterService; - this.userChargeService = userChargeService; - this.userDataService = userDataService; - this.userDataExService = userDataExService; - this.userGameOptionExService = userGameOptionExService; - this.userMapService = userMapService; - this.userPlaylogService = userPlaylogService; - this.userMusicDetailService = userMusicDetailService; - this.userCourseService = userCourseService; - this.userDuelService = userDuelService; - this.userGameOptionService = userGameOptionService; - this.userItemService = userItemService; - this.userGeneralDataService = userGeneralDataService; - this.gameMusicService = gameMusicService; - } - - // Keep it here for legacy @GetMapping("music") public List getMusicList() { diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2GameDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2GameDataController.java index 05155446..ab457212 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2GameDataController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2GameDataController.java @@ -3,6 +3,7 @@ package icu.samnyan.aqua.api.controller.sega.game.chuni.v2; import icu.samnyan.aqua.sega.chusan.model.*; import icu.samnyan.aqua.sega.chusan.model.gamedata.Character; import icu.samnyan.aqua.sega.chusan.model.gamedata.*; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -14,6 +15,7 @@ import java.util.List; */ @RestController @RequestMapping("api/game/chuni/v2/data") +@AllArgsConstructor public class ApiChuniV2GameDataController { private final Chu3GameMusicRepo gameMusicRepository; @@ -25,17 +27,6 @@ public class ApiChuniV2GameDataController { private final Chu3GameFrameRepo gameFrameRepository; private final Chu3GameAvatarAccRepo gameAvatarAccRepository; - public ApiChuniV2GameDataController(Chu3GameMusicRepo gameMusicRepository, Chu3GameCharacterRepo gameCharacterRepository, Chu3GameTrophyRepo gameTrophyRepository, Chu3GameNamePlateRepo gameNamePlateRepository, Chu3GameSystemVoiceRepo gameSystemVoiceRepository, Chu3GameMapIconRepo gameMapIconRepository, Chu3GameFrameRepo gameFrameRepository, Chu3GameAvatarAccRepo gameAvatarAccRepository) { - this.gameMusicRepository = gameMusicRepository; - this.gameCharacterRepository = gameCharacterRepository; - this.gameTrophyRepository = gameTrophyRepository; - this.gameNamePlateRepository = gameNamePlateRepository; - this.gameSystemVoiceRepository = gameSystemVoiceRepository; - this.gameMapIconRepository = gameMapIconRepository; - this.gameFrameRepository = gameFrameRepository; - this.gameAvatarAccRepository = gameAvatarAccRepository; - } - @GetMapping("music") public List getMusic() { return gameMusicRepository.findAll(); diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2PlayerDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2PlayerDataController.java index 5054cff5..b7f2b095 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2PlayerDataController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2PlayerDataController.java @@ -18,6 +18,7 @@ import icu.samnyan.aqua.sega.general.model.Card; import icu.samnyan.aqua.sega.general.service.CardService; import icu.samnyan.aqua.sega.util.VersionInfo; import icu.samnyan.aqua.sega.util.VersionUtil; +import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,6 +40,7 @@ import java.util.stream.Collectors; */ @RestController @RequestMapping("api/game/chuni/v2") +@AllArgsConstructor public class ApiChuniV2PlayerDataController { private static final Logger logger = LoggerFactory.getLogger(ApiChuniV2PlayerDataController.class); @@ -61,33 +63,6 @@ public class ApiChuniV2PlayerDataController { private final UserGeneralDataService userGeneralDataService; private final GameMusicService gameMusicService; - @Autowired - public ApiChuniV2PlayerDataController(ApiMapper mapper, CardService cardService, UserActivityService userActivityService, UserCharacterService userCharacterService, UserChargeService userChargeService, UserDataService userDataService, UserMapAreaService userMapAreaService, UserPlaylogService userPlaylogService, UserMusicDetailService userMusicDetailService, UserCourseService userCourseService, UserDuelService userDuelService, UserGameOptionService userGameOptionService, UserItemService userItemService, UserGeneralDataService userGeneralDataService, GameMusicService gameMusicService) { - this.mapper = mapper; - this.cardService = cardService; - this.userActivityService = userActivityService; - this.userCharacterService = userCharacterService; - this.userChargeService = userChargeService; - this.userDataService = userDataService; - this.userMapAreaService = userMapAreaService; - this.userPlaylogService = userPlaylogService; - this.userMusicDetailService = userMusicDetailService; - this.userCourseService = userCourseService; - this.userDuelService = userDuelService; - this.userGameOptionService = userGameOptionService; - this.userItemService = userItemService; - this.userGeneralDataService = userGeneralDataService; - this.gameMusicService = gameMusicService; - } - - /* - // Keep it here for legacy - @GetMapping("music") - public List getMusicList() { - return gameMusicService.getAll(); - } - */ - /** * Get Basic info * diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/diva/ApiDivaGameDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/diva/ApiDivaGameDataController.java index b1c8f69b..e50279e0 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/diva/ApiDivaGameDataController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/diva/ApiDivaGameDataController.java @@ -6,6 +6,7 @@ import icu.samnyan.aqua.sega.diva.dao.gamedata.DivaPvRepository; import icu.samnyan.aqua.sega.diva.model.gamedata.DivaCustomize; import icu.samnyan.aqua.sega.diva.model.gamedata.DivaModule; import icu.samnyan.aqua.sega.diva.model.gamedata.Pv; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -17,18 +18,13 @@ import java.util.List; */ @RestController @RequestMapping("api/game/diva/data") +@AllArgsConstructor public class ApiDivaGameDataController { private final DivaModuleRepository divaModuleRepository; private final DivaCustomizeRepository divaCustomizeRepository; private final DivaPvRepository divaPvRepository; - public ApiDivaGameDataController(DivaModuleRepository divaModuleRepository, DivaCustomizeRepository divaCustomizeRepository, DivaPvRepository divaPvRepository) { - this.divaModuleRepository = divaModuleRepository; - this.divaCustomizeRepository = divaCustomizeRepository; - this.divaPvRepository = divaPvRepository; - } - @GetMapping(value = "musicList") public List musicList() { return divaPvRepository.findAll(); diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/diva/ApiDivaPlayerDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/diva/ApiDivaPlayerDataController.java index dd1992bd..941372fa 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/diva/ApiDivaPlayerDataController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/diva/ApiDivaPlayerDataController.java @@ -8,6 +8,7 @@ import icu.samnyan.aqua.sega.diva.model.common.Difficulty; import icu.samnyan.aqua.sega.diva.model.common.Edition; import icu.samnyan.aqua.sega.diva.model.userdata.*; import icu.samnyan.aqua.sega.diva.service.PlayerProfileService; +import lombok.AllArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.http.HttpStatus; @@ -21,6 +22,7 @@ import java.util.*; */ @RestController @RequestMapping("api/game/diva") +@AllArgsConstructor public class ApiDivaPlayerDataController { private final PlayerProfileService playerProfileService; @@ -33,17 +35,6 @@ public class ApiDivaPlayerDataController { private final PlayerCustomizeRepository playerCustomizeRepository; private final PlayerScreenShotRepository playerScreenShotRepository; - public ApiDivaPlayerDataController(PlayerProfileService playerProfileService, GameSessionRepository gameSessionRepository, PlayLogRepository playLogRepository, PlayerPvRecordRepository playerPvRecordRepository, PlayerPvCustomizeRepository playerPvCustomizeRepository, PlayerModuleRepository playerModuleRepository, PlayerCustomizeRepository playerCustomizeRepository, PlayerScreenShotRepository playerScreenShotRepository) { - this.playerProfileService = playerProfileService; - this.gameSessionRepository = gameSessionRepository; - this.playLogRepository = playLogRepository; - this.playerPvRecordRepository = playerPvRecordRepository; - this.playerPvCustomizeRepository = playerPvCustomizeRepository; - this.playerModuleRepository = playerModuleRepository; - this.playerCustomizeRepository = playerCustomizeRepository; - this.playerScreenShotRepository = playerScreenShotRepository; - } - @PostMapping("forceUnlock") public ResponseEntity forceUnlock(@RequestParam int pdId) { PlayerProfile profile = playerProfileService.findByPdId(pdId).orElseThrow(); diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/maimai2/ApiMaimai2PlayerDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/maimai2/ApiMaimai2PlayerDataController.java index aaa134d4..6e37b6aa 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/maimai2/ApiMaimai2PlayerDataController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/maimai2/ApiMaimai2PlayerDataController.java @@ -83,10 +83,10 @@ public class ApiMaimai2PlayerDataController { .map(Path::getFileName) .map(Path::toString) .sorted(Comparator.reverseOrder()) - .collect(Collectors.toList()); + .toList(); Photo.setTotalImage(matchedFiles.size()); Photo.setImageIndex(imageIndex); - if(matchedFiles.size() > imageIndex){ + if(matchedFiles.size() > imageIndex) { byte[] targetImageContent = Files.readAllBytes(Paths.get("data/" + matchedFiles.get(imageIndex))); String divData = Base64.getEncoder().encodeToString(targetImageContent); Photo.setDivData(divData); diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/ongeki/ApiOngekiGameDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/ongeki/ApiOngekiGameDataController.java index 8df121e5..26b13c99 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/ongeki/ApiOngekiGameDataController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/ongeki/ApiOngekiGameDataController.java @@ -2,6 +2,7 @@ package icu.samnyan.aqua.api.controller.sega.game.ongeki; import icu.samnyan.aqua.sega.ongeki.dao.gamedata.*; import icu.samnyan.aqua.sega.ongeki.model.gamedata.*; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -11,6 +12,7 @@ import java.util.List; */ @RestController @RequestMapping("api/game/ongeki/data") +@AllArgsConstructor public class ApiOngekiGameDataController { private final GameCardRepository gameCardRepository; @@ -19,14 +21,6 @@ public class ApiOngekiGameDataController { private final GameMusicRepository gameMusicRepository; private final GameSkillRepository gameSkillRepository; - public ApiOngekiGameDataController(GameCardRepository gameCardRepository, GameCharaRepository gameCharaRepository, GameEventRepository gameEventRepository, GameMusicRepository gameMusicRepository, GameSkillRepository gameSkillRepository) { - this.gameCardRepository = gameCardRepository; - this.gameCharaRepository = gameCharaRepository; - this.gameEventRepository = gameEventRepository; - this.gameMusicRepository = gameMusicRepository; - this.gameSkillRepository = gameSkillRepository; - } - @GetMapping("cardList") public List getCardList() { return gameCardRepository.findAll(); diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/ongeki/ApiOngekiPlayerDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/ongeki/ApiOngekiPlayerDataController.java index 5cdd2d0b..8843d4b1 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/ongeki/ApiOngekiPlayerDataController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/ongeki/ApiOngekiPlayerDataController.java @@ -16,6 +16,7 @@ import icu.samnyan.aqua.sega.ongeki.dao.userdata.*; import icu.samnyan.aqua.sega.ongeki.model.gamedata.GameCard; import icu.samnyan.aqua.sega.ongeki.model.response.data.UserRivalData; import icu.samnyan.aqua.sega.ongeki.model.userdata.*; +import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -35,6 +36,7 @@ import java.util.stream.Collectors; */ @RestController @RequestMapping("api/game/ongeki") +@AllArgsConstructor public class ApiOngekiPlayerDataController { private final ApiMapper mapper; @@ -76,38 +78,6 @@ public class ApiOngekiPlayerDataController { private final GameCardRepository gameCardRepository; - public ApiOngekiPlayerDataController(ApiMapper mapper, CardService cardService, UserRivalDataRepository userRivalDataRepository, UserActivityRepository userActivityRepository, UserCardRepository userCardRepository, UserChapterRepository userChapterRepository, UserCharacterRepository userCharacterRepository, UserDataRepository userDataRepository, UserDeckRepository userDeckRepository, UserEventPointRepository userEventPointRepository, UserItemRepository userItemRepository, UserLoginBonusRepository userLoginBonusRepository, UserMissionPointRepository userMissionPointRepository, UserMusicDetailRepository userMusicDetailRepository, UserMusicItemRepository userMusicItemRepository, UserOptionRepository userOptionRepository, UserPlaylogRepository userPlaylogRepository, UserStoryRepository userStoryRepository, UserTrainingRoomRepository userTrainingRoomRepository, UserGeneralDataRepository userGeneralDataRepository, GameCardRepository gameCardRepository, UserTradeItemRepository userTradeItemRepository, UserEventMusicRepository userEventMusicRepository, UserTechEventRepository userTechEventRepository, UserKopRepository userKopRepository, UserMemoryChapterRepository userMemoryChapterRepository, UserScenarioRepository userScenarioRepository, UserBossRepository userBossRepository, UserTechCountRepository userTechCountRepository) { - this.mapper = mapper; - this.cardService = cardService; - this.userActivityRepository = userActivityRepository; - this.userCardRepository = userCardRepository; - this.userChapterRepository = userChapterRepository; - this.userCharacterRepository = userCharacterRepository; - this.userDataRepository = userDataRepository; - this.userDeckRepository = userDeckRepository; - this.userEventPointRepository = userEventPointRepository; - this.userItemRepository = userItemRepository; - this.userLoginBonusRepository = userLoginBonusRepository; - this.userMissionPointRepository = userMissionPointRepository; - this.userMusicDetailRepository = userMusicDetailRepository; - this.userMusicItemRepository = userMusicItemRepository; - this.userOptionRepository = userOptionRepository; - this.userPlaylogRepository = userPlaylogRepository; - this.userStoryRepository = userStoryRepository; - this.userTrainingRoomRepository = userTrainingRoomRepository; - this.userGeneralDataRepository = userGeneralDataRepository; - this.gameCardRepository = gameCardRepository; - this.userTradeItemRepository = userTradeItemRepository; - this.userEventMusicRepository = userEventMusicRepository; - this.userTechEventRepository = userTechEventRepository; - this.userKopRepository = userKopRepository; - this.userMemoryChapterRepository = userMemoryChapterRepository; - this.userScenarioRepository = userScenarioRepository; - this.userBossRepository = userBossRepository; - this.userTechCountRepository = userTechCountRepository; - this.userRivalDataRepository = userRivalDataRepository; - } - @GetMapping("profile") public ProfileResp getProfile(@RequestParam long aimeId) { return mapper.convert(userDataRepository.findByCard_ExtId(aimeId).orElseThrow(), new TypeReference<>() { diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/manage/ApiChuniV1ManageController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/manage/ApiChuniV1ManageController.java index b3f118d8..2136c488 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/manage/ApiChuniV1ManageController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/manage/ApiChuniV1ManageController.java @@ -7,6 +7,7 @@ import icu.samnyan.aqua.sega.chunithm.model.userdata.UserMusicDetail; import icu.samnyan.aqua.sega.chunithm.service.GameMusicService; import icu.samnyan.aqua.sega.chunithm.service.UserDataService; import icu.samnyan.aqua.sega.chunithm.service.UserMusicDetailService; +import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.ResponseEntity; @@ -24,6 +25,7 @@ import java.util.Optional; */ @RestController @RequestMapping("api/manage/chuni/v1") +@AllArgsConstructor public class ApiChuniV1ManageController { private static final Logger logger = LoggerFactory.getLogger(ApiChuniV1ManageController.class); @@ -34,12 +36,6 @@ public class ApiChuniV1ManageController { private final GameMusicService gameMusicService; - public ApiChuniV1ManageController(UserDataService userDataService, UserMusicDetailService userMusicDetailService, GameMusicService gameMusicService) { - this.userDataService = userDataService; - this.userMusicDetailService = userMusicDetailService; - this.gameMusicService = gameMusicService; - } - /** * A request to fill fake score to all chart. only use for testing * @param aimeId The internal id of a card diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/manage/ApiDivaManageController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/manage/ApiDivaManageController.java index f64c54f0..77cb305d 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/manage/ApiDivaManageController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/manage/ApiDivaManageController.java @@ -10,6 +10,7 @@ import icu.samnyan.aqua.sega.diva.model.common.Edition; import icu.samnyan.aqua.sega.diva.model.gamedata.*; import icu.samnyan.aqua.sega.general.dao.PropertyEntryRepository; import icu.samnyan.aqua.sega.general.model.PropertyEntry; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -21,6 +22,7 @@ import java.util.Optional; */ @RestController @RequestMapping("api/manage/diva/") +@AllArgsConstructor public class ApiDivaManageController { private final PvEntryRepository pvEntryRepository; @@ -29,17 +31,6 @@ public class ApiDivaManageController { private final FestaRepository festaRepository; private final ContestRepository contestRepository; private final PropertyEntryRepository propertyEntryRepository; - private final DivaPvRepository divaPvRepository; - - public ApiDivaManageController(PvEntryRepository pvEntryRepository, DivaModuleRepository moduleRepository, DivaCustomizeRepository customizeRepository, FestaRepository festaRepository, ContestRepository contestRepository, PropertyEntryRepository propertyEntryRepository, DivaPvRepository divaPvRepository) { - this.pvEntryRepository = pvEntryRepository; - this.moduleRepository = moduleRepository; - this.customizeRepository = customizeRepository; - this.festaRepository = festaRepository; - this.contestRepository = contestRepository; - this.propertyEntryRepository = propertyEntryRepository; - this.divaPvRepository = divaPvRepository; - } @PostMapping("pvList") public List updatePvList(@RequestBody PvListRequest request) { diff --git a/src/main/java/icu/samnyan/aqua/net/games/Chusan.kt b/src/main/java/icu/samnyan/aqua/net/games/Chusan.kt index d3a9b985..2915b657 100644 --- a/src/main/java/icu/samnyan/aqua/net/games/Chusan.kt +++ b/src/main/java/icu/samnyan/aqua/net/games/Chusan.kt @@ -5,10 +5,7 @@ import ext.RP import ext.Str import icu.samnyan.aqua.net.db.AquaUserServices import icu.samnyan.aqua.net.utils.* -import icu.samnyan.aqua.sega.chusan.dao.userdata.* -import icu.samnyan.aqua.sega.chusan.model.Chu3UserDataRepo -import icu.samnyan.aqua.sega.chusan.model.Chu3UserGeneralDataRepo -import icu.samnyan.aqua.sega.chusan.model.Chu3UserPlaylogRepo +import icu.samnyan.aqua.sega.chusan.model.* import org.springframework.web.bind.annotation.RestController @RestController diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/controller/ChuniServletController.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/controller/ChuniServletController.java index c7748774..17d5c5d7 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/controller/ChuniServletController.java +++ b/src/main/java/icu/samnyan/aqua/sega/chunithm/controller/ChuniServletController.java @@ -3,6 +3,7 @@ package icu.samnyan.aqua.sega.chunithm.controller; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.chunithm.handler.impl.*; +import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -13,6 +14,7 @@ import java.util.Map; */ @RestController @RequestMapping("/g/chu2/{ROM_VERSION}/{CLIENT_ID}/ChuniServlet") +@AllArgsConstructor public class ChuniServletController { private final GameLoginHandler gameLoginHandler; @@ -47,56 +49,10 @@ public class ChuniServletController { private final GetUserRivalDataHandler getUserRivalDataHandler; private final GetUserRivalMusicHandler getUserRivalMusicHandler; private final GetUserTeamHandler getUserTeamHandler; - private final UpsertClientBookkeepingHandler upsertClientBookkeepingHandler; - private final UpsertClientDevelopHandler upsertClientDevelopHandler; - private final UpsertClientErrorHandler upsertClientErrorHandler; private final UpsertClientSettingHandler upsertClientSettingHandler; - private final UpsertClientTestmodeHandler upsertClientTestmodeHandler; private final UpsertUserAllHandler upsertUserAllHandler; private final UpsertUserChargelogHandler upsertUserChargelogHandler; - @Autowired - public ChuniServletController(GameLoginHandler gameLoginHandler, GameLogoutHandler gameLogoutHandler, GetGameChargeHandler getGameChargeHandler, GetGameEventHandler getGameEventHandler, GetGameIdlistHandler getGameIdlistHandler, GetGameMessageHandler getGameMessageHandler, GetGameRankingHandler getGameRankingHandler, GetGameSaleHandler getGameSaleHandler, GetGameSettingHandler getGameSettingHandler,GetTeamCourseRuleHandler getTeamCourseRuleHandler, GetTeamCourseSettingHandler getTeamCourseSettingHandler, GetUserActivityHandler getUserActivityHandler, GetUserCharacterHandler getUserCharacterHandler, GetUserChargeHandler getUserChargeHandler, GetUserCourseHandler getUserCourseHandler, GetUserDataExHandler getUserDataExHandler, GetUserDataHandler getUserDataHandler, GetUserDuelHandler getUserDuelHandler, GetUserFavoriteItemHandler getUserFavoriteItemHandler, GetUserFavoriteMusicHandler getUserFavoriteMusicHandler, GetUserItemHandler getUserItemHandler, GetUserLoginBonusHandler getUserLoginBonusHandler, GetUserMapHandler getUserMapHandler, GetUserMusicHandler getUserMusicHandler, GetUserOptionExHandler getUserOptionExHandler, GetUserOptionHandler getUserOptionHandler, GetUserPreviewHandler getUserPreviewHandler, GetUserRecentRatingHandler getUserRecentRatingHandler, GetUserRegionHandler getUserRegionHandler, GetUserRivalDataHandler getUserRivalDataHandler, GetUserRivalMusicHandler getUserRivalMusicHandler, GetUserTeamHandler getUserTeamHandler, UpsertClientBookkeepingHandler upsertClientBookkeepingHandler, UpsertClientDevelopHandler upsertClientDevelopHandler, UpsertClientErrorHandler upsertClientErrorHandler, UpsertClientSettingHandler upsertClientSettingHandler, UpsertClientTestmodeHandler upsertClientTestmodeHandler, UpsertUserAllHandler upsertUserAllHandler, UpsertUserChargelogHandler upsertUserChargelogHandler) { - this.gameLoginHandler = gameLoginHandler; - this.gameLogoutHandler = gameLogoutHandler; - this.getGameChargeHandler = getGameChargeHandler; - this.getGameEventHandler = getGameEventHandler; - this.getGameIdlistHandler = getGameIdlistHandler; - this.getGameMessageHandler = getGameMessageHandler; - this.getGameRankingHandler = getGameRankingHandler; - this.getGameSaleHandler = getGameSaleHandler; - this.getGameSettingHandler = getGameSettingHandler; - this.getTeamCourseRuleHandler = getTeamCourseRuleHandler; - this.getTeamCourseSettingHandler = getTeamCourseSettingHandler; - this.getUserActivityHandler = getUserActivityHandler; - this.getUserCharacterHandler = getUserCharacterHandler; - this.getUserChargeHandler = getUserChargeHandler; - this.getUserCourseHandler = getUserCourseHandler; - this.getUserDataExHandler = getUserDataExHandler; - this.getUserDataHandler = getUserDataHandler; - this.getUserDuelHandler = getUserDuelHandler; - this.getUserFavoriteItemHandler = getUserFavoriteItemHandler; - this.getUserFavoriteMusicHandler = getUserFavoriteMusicHandler; - this.getUserItemHandler = getUserItemHandler; - this.getUserLoginBonusHandler = getUserLoginBonusHandler; - this.getUserMapHandler = getUserMapHandler; - this.getUserMusicHandler = getUserMusicHandler; - this.getUserOptionExHandler = getUserOptionExHandler; - this.getUserOptionHandler = getUserOptionHandler; - this.getUserPreviewHandler = getUserPreviewHandler; - this.getUserRecentRatingHandler = getUserRecentRatingHandler; - this.getUserRegionHandler = getUserRegionHandler; - this.getUserRivalDataHandler = getUserRivalDataHandler; - this.getUserRivalMusicHandler = getUserRivalMusicHandler; - this.getUserTeamHandler = getUserTeamHandler; - this.upsertClientBookkeepingHandler = upsertClientBookkeepingHandler; - this.upsertClientDevelopHandler = upsertClientDevelopHandler; - this.upsertClientErrorHandler = upsertClientErrorHandler; - this.upsertClientSettingHandler = upsertClientSettingHandler; - this.upsertClientTestmodeHandler = upsertClientTestmodeHandler; - this.upsertUserAllHandler = upsertUserAllHandler; - this.upsertUserChargelogHandler = upsertUserChargelogHandler; - } @PostMapping("GameLoginApi") String gameLogin(@ModelAttribute Map request) throws JsonProcessingException { diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertClientBookkeepingHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertClientBookkeepingHandler.java deleted file mode 100644 index 069d3155..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertClientBookkeepingHandler.java +++ /dev/null @@ -1,10 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import org.springframework.stereotype.Component; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class UpsertClientBookkeepingHandler { -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertClientDevelopHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertClientDevelopHandler.java deleted file mode 100644 index f8772210..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertClientDevelopHandler.java +++ /dev/null @@ -1,10 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import org.springframework.stereotype.Component; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class UpsertClientDevelopHandler { -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertClientErrorHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertClientErrorHandler.java deleted file mode 100644 index 829d3e36..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertClientErrorHandler.java +++ /dev/null @@ -1,10 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import org.springframework.stereotype.Component; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class UpsertClientErrorHandler { -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertClientTestmodeHandler.java b/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertClientTestmodeHandler.java deleted file mode 100644 index 0a033ded..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/chunithm/handler/impl/UpsertClientTestmodeHandler.java +++ /dev/null @@ -1,10 +0,0 @@ -package icu.samnyan.aqua.sega.chunithm.handler.impl; - -import org.springframework.stereotype.Component; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@Component -public class UpsertClientTestmodeHandler { -} diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/controller/ChusanServletController.java b/src/main/java/icu/samnyan/aqua/sega/chusan/controller/ChusanServletController.java index 5990276f..f066ed9e 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/controller/ChusanServletController.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/controller/ChusanServletController.java @@ -3,6 +3,7 @@ package icu.samnyan.aqua.sega.chusan.controller; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.chusan.handler.impl.*; +import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -13,6 +14,7 @@ import java.util.Map; */ @RestController @RequestMapping({"/g/chu3/{version}/ChuniServlet", "/g/chu3/{version}"}) +@AllArgsConstructor public class ChusanServletController { private final GameLoginHandler gameLoginHandler; @@ -64,81 +66,6 @@ public class ChusanServletController { private final GetMatchingStateHandler getMatchingStateHandler; private final RemoveMatchingMemberHandler removeMatchingMemberHandler; - @Autowired - public ChusanServletController(GameLoginHandler gameLoginHandler, GameLogoutHandler gameLogoutHandler, - GetGameChargeHandler getGameChargeHandler, GetGameEventHandler getGameEventHandler, - GetGameIdlistHandler getGameIdlistHandler, GetGameRankingHandler getGameRankingHandler, - GetGameSettingHandler getGameSettingHandler, GetTeamCourseRuleHandler getTeamCourseRuleHandler, - GetTeamCourseSettingHandler getTeamCourseSettingHandler, GetUserActivityHandler getUserActivityHandler, - GetUserCharacterHandler getUserCharacterHandler, GetUserChargeHandler getUserChargeHandler, - GetUserCourseHandler getUserCourseHandler, GetUserDataHandler getUserDataHandler, - GetUserDuelHandler getUserDuelHandler, GetUserFavoriteItemHandler getUserFavoriteItemHandler, - GetUserItemHandler getUserItemHandler, GetUserLoginBonusHandler getUserLoginBonusHandler, - GetUserMapAreaHandler getUserMapAreaHandler, GetUserMusicHandler getUserMusicHandler, - GetUserOptionHandler getUserOptionHandler, GetUserPreviewHandler getUserPreviewHandler, - GetUserRecentRatingHandler getUserRecentRatingHandler, GetUserRegionHandler getUserRegionHandler, - GetUserRivalDataHandler getUserRivalDataHandler, GetUserRivalMusicHandler getUserRivalMusicHandler, - GetUserTeamHandler getUserTeamHandler, UpsertUserAllHandler upsertUserAllHandler, - UpsertUserChargelogHandler upsertUserChargelogHandler, GetUserSymbolChatSettingHandler getUserSymbolChatSettingHandler, - GetUserNetBattleDataHandler getUserNetBattleDataHandler, GetGameGachaHandler getGameGachaHandler, - GetGameGachaCardByIdHandler getGameGachaCardByIdHandler, GetUserCardPrintErrorHandler getUserCardPrintErrorHandler, - CMGetUserPreviewHandler cmGetUserPreviewHandler, CMGetUserDataHandler cmGetUserDataHandler, - CMGetUserCharacterHandler cmGetUserCharacterHandler, GetUserGachaHandler getUserGachaHandler, - GetUserPrintedCardHandler getUserPrintedCardHandler, CMGetUserItemHandler cmGetUserItemHandler, - RollGachaHandler rollGachaHandler, CMUpsertUserGachaHandler cmUpsertUserGachaHandler, - CMUpsertUserPrintSubtractHandler cmUpsertUserPrintSubtractHandler, CMUpsertUserPrintCancelHandler cmUpsertUserPrintCancelHandler, - BeginMatchingHandler beginMatchingHandler, EndMatchingHandler endMatchingHandler, - GetMatchingStateHandler getMatchingStateHandler, RemoveMatchingMemberHandler removeMatchingMemberHandler) { - this.gameLoginHandler = gameLoginHandler; - this.gameLogoutHandler = gameLogoutHandler; - this.getGameChargeHandler = getGameChargeHandler; - this.getGameEventHandler = getGameEventHandler; - this.getGameIdlistHandler = getGameIdlistHandler; - this.getGameRankingHandler = getGameRankingHandler; - this.getGameSettingHandler = getGameSettingHandler; - this.getTeamCourseRuleHandler = getTeamCourseRuleHandler; - this.getTeamCourseSettingHandler = getTeamCourseSettingHandler; - this.getUserActivityHandler = getUserActivityHandler; - this.getUserCharacterHandler = getUserCharacterHandler; - this.getUserChargeHandler = getUserChargeHandler; - this.getUserCourseHandler = getUserCourseHandler; - this.getUserDataHandler = getUserDataHandler; - this.getUserDuelHandler = getUserDuelHandler; - this.getUserFavoriteItemHandler = getUserFavoriteItemHandler; - this.getUserItemHandler = getUserItemHandler; - this.getUserLoginBonusHandler = getUserLoginBonusHandler; - this.getUserMapAreaHandler = getUserMapAreaHandler; - this.getUserMusicHandler = getUserMusicHandler; - this.getUserOptionHandler = getUserOptionHandler; - this.getUserPreviewHandler = getUserPreviewHandler; - this.getUserRecentRatingHandler = getUserRecentRatingHandler; - this.getUserRegionHandler = getUserRegionHandler; - this.getUserRivalDataHandler = getUserRivalDataHandler; - this.getUserRivalMusicHandler = getUserRivalMusicHandler; - this.getUserTeamHandler = getUserTeamHandler; - this.upsertUserAllHandler = upsertUserAllHandler; - this.upsertUserChargelogHandler = upsertUserChargelogHandler; - this.getUserSymbolChatSettingHandler = getUserSymbolChatSettingHandler; - this.getUserNetBattleDataHandler = getUserNetBattleDataHandler; - this.getGameGachaHandler = getGameGachaHandler; - this.getGameGachaCardByIdHandler = getGameGachaCardByIdHandler; - this.getUserCardPrintErrorHandler = getUserCardPrintErrorHandler; - this.cmGetUserPreviewHandler = cmGetUserPreviewHandler; - this.cmGetUserDataHandler = cmGetUserDataHandler; - this.cmGetUserCharacterHandler = cmGetUserCharacterHandler; - this.getUserGachaHandler = getUserGachaHandler; - this.getUserPrintedCardHandler = getUserPrintedCardHandler; - this.cmGetUserItemHandler = cmGetUserItemHandler; - this.rollGachaHandler = rollGachaHandler; - this.cmUpsertUserGachaHandler = cmUpsertUserGachaHandler; - this.cmUpsertUserPrintSubtractHandler = cmUpsertUserPrintSubtractHandler; - this.cmUpsertUserPrintCancelHandler = cmUpsertUserPrintCancelHandler; - this.beginMatchingHandler = beginMatchingHandler; - this.endMatchingHandler = endMatchingHandler; - this.getMatchingStateHandler = getMatchingStateHandler; - this.removeMatchingMemberHandler = removeMatchingMemberHandler; - } - @PostMapping("GameLoginApi") String gameLogin(@ModelAttribute Map request) throws JsonProcessingException { return gameLoginHandler.handle(request); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai/controller/MaimaiServletController.java b/src/main/java/icu/samnyan/aqua/sega/maimai/controller/MaimaiServletController.java index a47de46a..c3d23cef 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai/controller/MaimaiServletController.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai/controller/MaimaiServletController.java @@ -2,6 +2,7 @@ package icu.samnyan.aqua.sega.maimai.controller; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai.handler.impl.*; +import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -15,6 +16,7 @@ import jakarta.servlet.http.HttpServletRequest; */ @RestController @RequestMapping("/g/mai") +@AllArgsConstructor public class MaimaiServletController { private final GetGameEventHandler getGameEventHandler; @@ -41,32 +43,6 @@ public class MaimaiServletController { private final UserLoginHandler userLoginHandler; private final UserLogoutHandler userLogoutHandler; - public MaimaiServletController(GetGameEventHandler getGameEventHandler, GetGameRankingHandler getGameRankingHandler, GetGameSettingHandler getGameSettingHandler, GetTransferFriendHandler getTransferFriendHandler, GetUserActivityHandler getUserActivityHandler, GetUserBossHandler getUserBossHandler, GetUserCharacterHandler getUserCharacterHandler, GetUserCourseHandler getUserCourseHandler, GetUserDataHandler getUserDataHandler, GetUserGradeHandler getUserGradeHandler, GetUserItemHandler getUserItemHandler, GetUserMusicHandler getUserMusicHandler, GetUserOptionHandler getUserOptionHandler, GetUserPresentEventHandler getUserPresentEventHandler, GetUserPresentHandler getUserPresentHandler, GetUserPreviewHandler getUserPreviewHandler, GetUserRecentRatingHandler getUserRecentRatingHandler, GetUserSurvivalHandler getUserSurvivalHandler, GetUserWebOptionHandler getUserWebOptionHandler, UpsertTransferHandler upsertTransferHandler, UpsertUserAllHandler upsertUserAllHandler, UserLoginHandler userLoginHandler, UserLogoutHandler userLogoutHandler) { - this.getGameEventHandler = getGameEventHandler; - this.getGameRankingHandler = getGameRankingHandler; - this.getGameSettingHandler = getGameSettingHandler; - this.getTransferFriendHandler = getTransferFriendHandler; - this.getUserActivityHandler = getUserActivityHandler; - this.getUserBossHandler = getUserBossHandler; - this.getUserCharacterHandler = getUserCharacterHandler; - this.getUserCourseHandler = getUserCourseHandler; - this.getUserDataHandler = getUserDataHandler; - this.getUserGradeHandler = getUserGradeHandler; - this.getUserItemHandler = getUserItemHandler; - this.getUserMusicHandler = getUserMusicHandler; - this.getUserOptionHandler = getUserOptionHandler; - this.getUserPresentEventHandler = getUserPresentEventHandler; - this.getUserPresentHandler = getUserPresentHandler; - this.getUserPreviewHandler = getUserPreviewHandler; - this.getUserRecentRatingHandler = getUserRecentRatingHandler; - this.getUserSurvivalHandler = getUserSurvivalHandler; - this.getUserWebOptionHandler = getUserWebOptionHandler; - this.upsertTransferHandler = upsertTransferHandler; - this.upsertUserAllHandler = upsertUserAllHandler; - this.userLoginHandler = userLoginHandler; - this.userLogoutHandler = userLogoutHandler; - } - @PostMapping("GetGameEventApi") public String getGameEvent(@ModelAttribute Map request) throws JsonProcessingException { return getGameEventHandler.handle(request); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/controller/Maimai2ServletController.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/controller/Maimai2ServletController.java index 7cc97c7e..f4399cab 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/controller/Maimai2ServletController.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/controller/Maimai2ServletController.java @@ -177,24 +177,24 @@ public class Maimai2ServletController { } @PostMapping("UploadUserPhotoApi") - public String uploadUserPhotoHandler(@ModelAttribute Map request) throws JsonProcessingException { + public Object uploadUserPhotoHandler(@ModelAttribute Map request) throws JsonProcessingException { return uploadUserPhotoHandler.handle(request); } @PostMapping("UploadUserPlaylogApi") - public String uploadUserPlaylogHandler(@ModelAttribute Map request) throws JsonProcessingException { + public Object uploadUserPlaylogHandler(@ModelAttribute Map request) throws JsonProcessingException { return uploadUserPlaylogHandler.handle(request); } @CrossOrigin // enable cors because aqua-viewer also use it. @PostMapping("UploadUserPortraitApi") - public String uploadUserPortraitHandler(@ModelAttribute Map request) + public Object uploadUserPortraitHandler(@ModelAttribute Map request) throws JsonProcessingException { return uploadUserPortraitHandler.handle(request); } @PostMapping("UserLoginApi") - public String userLoginHandler(@ModelAttribute Map request) throws JsonProcessingException { + public Object userLoginHandler(@ModelAttribute Map request) throws JsonProcessingException { return userLoginHandler.handle(request); } diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/controller/OngekiController.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/controller/OngekiController.java index 4c088041..fa65e8cc 100644 --- a/src/main/java/icu/samnyan/aqua/sega/ongeki/controller/OngekiController.java +++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/controller/OngekiController.java @@ -3,6 +3,7 @@ package icu.samnyan.aqua.sega.ongeki.controller; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.ongeki.handler.impl.*; +import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; @@ -16,6 +17,7 @@ import java.util.Map; */ @RestController @RequestMapping("/g/ongeki") +@AllArgsConstructor public class OngekiController { private final GetGameEventHandler getGameEventHandler; @@ -65,56 +67,6 @@ public class OngekiController { private final GetClientTestmodeHandler getClientTestmodeHandler; private final GetGameMusicReleaseStateHandler getGameMusicReleaseStateHandler; - @Autowired - public OngekiController(GetGameEventHandler getGameEventHandler, GetGameIdlistHandler getGameIdlistHandler, GetGameMessageHandler getGameMessageHandler, GetGamePointHandler getGamePointHandler, GetGamePresentHandler getGamePresentHandler, GetGameRankingHandler getGameRankingHandler, GetGameRewardHandler getGameRewardHandler, GetGameSettingHandler getGameSettingHandler, GetUserActivityHandler getUserActivityHandler, GetUserBossHandler getUserBossHandler, GetUserBpBaseHandler getUserBpBaseHandler, GetUserCardHandler getUserCardHandler, GetUserChapterHandler getUserChapterHandler, GetUserCharacterHandler getUserCharacterHandler, GetUserDataHandler getUserDataHandler, GetUserDeckByKeyHandler getUserDeckByKeyHandler, GetUserEventPointHandler getUserEventPointHandler, GetUserEventRankingHandler getUserEventRankingHandler, GetUserItemHandler getUserItemHandler, GetUserLoginBonusHandler getUserLoginBonusHandler, GetUserMissionPointHandler getUserMissionPointHandler, GetUserMusicHandler getUserMusicHandler, GetUserMusicItemHandler getUserMusicItemHandler, GetUserOptionHandler getUserOptionHandler, GetUserPreviewHandler getUserPreviewHandler, GetUserRatinglogListHandler getUserRatinglogListHandler, GetUserRecentRatingHandler getUserRecentRatingHandler, GetUserRegionHandler getUserRegionHandler, GetUserRivalHandler getUserRivalHandler, GetUserRivalMusicHandler getUserRivalMusicHandler, GetUserScenarioHandler getUserScenarioHandler, GetUserStoryHandler getUserStoryHandler, GetUserTechCountHandler getUserTechCountHandler, GetUserTrainingRoomByKeyHandler getUserTrainingRoomByKeyHandler, UpsertUserAllHandler upsertUserAllHandler, GetGameTechMusicHandler getGameTechMusicHandler, GetUserTechEventHandler getUserTechEventHandler, GetUserTechEventRankingHandler getUserTechEventRankingHandler, GetUserEventMusicHandler getUserEventMusicHandler, GetUserTradeItemHandler getUserTradeItemHandler, GetUserKopHandler getUserKopHandler, GetClientBookkeepingHandler getClientBookkeepingHandler, GetClientTestmodeHandler getClientTestmodeHandler, GetGameMusicReleaseStateHandler getGameMusicReleaseStateHandler, GetUserMemoryChapterHandler getUserMemoryChapterHandler, GetUserRivalDataHandler getUserRivalDataHandler) { - this.getGameEventHandler = getGameEventHandler; - this.getGameIdlistHandler = getGameIdlistHandler; - this.getGameMessageHandler = getGameMessageHandler; - this.getGamePointHandler = getGamePointHandler; - this.getGamePresentHandler = getGamePresentHandler; - this.getGameRankingHandler = getGameRankingHandler; - this.getGameRewardHandler = getGameRewardHandler; - this.getGameSettingHandler = getGameSettingHandler; - this.getUserActivityHandler = getUserActivityHandler; - this.getUserBossHandler = getUserBossHandler; - this.getUserBpBaseHandler = getUserBpBaseHandler; - this.getUserCardHandler = getUserCardHandler; - this.getUserChapterHandler = getUserChapterHandler; - this.getUserMemoryChapterHandler = getUserMemoryChapterHandler; - this.getUserCharacterHandler = getUserCharacterHandler; - this.getUserDataHandler = getUserDataHandler; - this.getUserDeckByKeyHandler = getUserDeckByKeyHandler; - this.getUserEventPointHandler = getUserEventPointHandler; - this.getUserEventRankingHandler = getUserEventRankingHandler; - this.getUserItemHandler = getUserItemHandler; - this.getUserLoginBonusHandler = getUserLoginBonusHandler; - this.getUserMissionPointHandler = getUserMissionPointHandler; - this.getUserMusicHandler = getUserMusicHandler; - this.getUserMusicItemHandler = getUserMusicItemHandler; - this.getUserOptionHandler = getUserOptionHandler; - this.getUserPreviewHandler = getUserPreviewHandler; - this.getUserRatinglogListHandler = getUserRatinglogListHandler; - this.getUserRecentRatingHandler = getUserRecentRatingHandler; - this.getUserRegionHandler = getUserRegionHandler; - this.getUserRivalHandler = getUserRivalHandler; - this.getUserRivalMusicHandler = getUserRivalMusicHandler; - this.getUserRivalDataHandler = getUserRivalDataHandler; - this.getUserScenarioHandler = getUserScenarioHandler; - this.getUserStoryHandler = getUserStoryHandler; - this.getUserTechCountHandler = getUserTechCountHandler; - this.getUserTrainingRoomByKeyHandler = getUserTrainingRoomByKeyHandler; - this.upsertUserAllHandler = upsertUserAllHandler; - this.getGameTechMusicHandler = getGameTechMusicHandler; - this.getUserTechEventHandler = getUserTechEventHandler; - this.getUserTechEventRankingHandler = getUserTechEventRankingHandler; - this.getUserEventMusicHandler = getUserEventMusicHandler; - this.getUserTradeItemHandler = getUserTradeItemHandler; - this.getUserKopHandler = getUserKopHandler; - this.getClientBookkeepingHandler = getClientBookkeepingHandler; - this.getClientTestmodeHandler = getClientTestmodeHandler; - this.getGameMusicReleaseStateHandler = getGameMusicReleaseStateHandler; - } - @PostMapping("ExtendLockTimeApi") public String extendLockTime(@ModelAttribute Map request) { return "{\"returnCode\":1,\"apiName\":\"extendLockTime\"}";