From 450397481e1493048b96b285d02e4e6304f6a8b8 Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Wed, 20 Mar 2024 12:24:31 -0400 Subject: [PATCH] [M] Unify BaseHandler --- .../{impl => }/BeginMatchingHandler.java | 4 ++-- .../{impl => }/CMGetUserCharacterHandler.java | 4 ++-- .../{impl => }/CMGetUserDataHandler.java | 4 ++-- .../{impl => }/CMGetUserItemHandler.java | 4 ++-- .../{impl => }/CMGetUserPreviewHandler.java | 4 ++-- .../{impl => }/CMUpsertUserGachaHandler.java | 4 ++-- .../CMUpsertUserPrintCancelHandler.java | 4 ++-- .../CMUpsertUserPrintSubtractHandler.java | 4 ++-- .../handler/{impl => }/EndMatchingHandler.java | 4 ++-- .../handler/{impl => }/GameLoginHandler.java | 4 ++-- .../handler/{impl => }/GameLogoutHandler.java | 4 ++-- .../{impl => }/GetGameChargeHandler.java | 4 ++-- .../handler/{impl => }/GetGameEventHandler.java | 4 ++-- .../{impl => }/GetGameGachaCardByIdHandler.java | 4 ++-- .../handler/{impl => }/GetGameGachaHandler.java | 4 ++-- .../{impl => }/GetGameIdlistHandler.java | 4 ++-- .../{impl => }/GetGameRankingHandler.java | 4 ++-- .../{impl => }/GetGameSettingHandler.java | 4 ++-- .../{impl => }/GetMatchingStateHandler.java | 4 ++-- .../{impl => }/GetTeamCourseRuleHandler.java | 4 ++-- .../{impl => }/GetTeamCourseSettingHandler.java | 4 ++-- .../{impl => }/GetUserActivityHandler.java | 4 ++-- .../GetUserCardPrintErrorHandler.java | 4 ++-- .../{impl => }/GetUserCharacterHandler.java | 4 ++-- .../{impl => }/GetUserChargeHandler.java | 4 ++-- .../{impl => }/GetUserCourseHandler.java | 4 ++-- .../handler/{impl => }/GetUserDataHandler.java | 4 ++-- .../handler/{impl => }/GetUserDuelHandler.java | 4 ++-- .../{impl => }/GetUserFavoriteItemHandler.java | 4 ++-- .../handler/{impl => }/GetUserGachaHandler.java | 4 ++-- .../handler/{impl => }/GetUserItemHandler.java | 4 ++-- .../{impl => }/GetUserLoginBonusHandler.java | 4 ++-- .../{impl => }/GetUserMapAreaHandler.java | 4 ++-- .../handler/{impl => }/GetUserMusicHandler.java | 4 ++-- .../{impl => }/GetUserNetBattleDataHandler.java | 4 ++-- .../{impl => }/GetUserOptionHandler.java | 4 ++-- .../{impl => }/GetUserPreviewHandler.java | 4 ++-- .../{impl => }/GetUserPrintedCardHandler.java | 4 ++-- .../{impl => }/GetUserRecentRatingHandler.java | 4 ++-- .../{impl => }/GetUserRegionHandler.java | 4 ++-- .../{impl => }/GetUserRivalDataHandler.java | 4 ++-- .../{impl => }/GetUserRivalMusicHandler.java | 4 ++-- .../GetUserSymbolChatSettingHandler.java | 4 ++-- .../handler/{impl => }/GetUserTeamHandler.java | 4 ++-- .../{impl => }/RemoveMatchingMemberHandler.java | 4 ++-- .../handler/{impl => }/RollGachaHandler.java | 4 ++-- .../{impl => }/UpsertUserAllHandler.java | 4 ++-- .../{impl => }/UpsertUserChargelogHandler.java | 4 ++-- .../handler => general}/BaseHandler.java | 2 +- .../sega/maimai2/Maimai2ServletController.kt | 5 ++--- .../aqua/sega/maimai2/handler/BaseHandler.java | 17 ----------------- .../{impl => }/CMGetSellingCardHandler.java | 4 ++-- .../{impl => }/CMGetUserCharacterHandler.java | 4 ++-- .../{impl => }/CMGetUserPreviewHandler.java | 4 ++-- .../{impl => }/GetGameChargeHandler.java | 4 ++-- .../handler/{impl => }/GetGameEventHandler.java | 4 ++-- .../{impl => }/GetGameNgMusicIdHandler.java | 4 ++-- .../{impl => }/GetGameRankingHandler.java | 4 ++-- .../{impl => }/GetGameSettingHandler.java | 4 ++-- .../GetGameTournamentInfoHandler.java | 4 ++-- .../{impl => }/GetTransferFriendHandler.java | 4 ++-- .../{impl => }/GetUserActivityHandler.java | 4 ++-- .../handler/{impl => }/GetUserCardHandler.java | 4 ++-- .../GetUserCardPrintErrorHandler.java | 4 ++-- .../{impl => }/GetUserCharacterHandler.java | 4 ++-- .../{impl => }/GetUserChargeHandler.java | 4 ++-- .../{impl => }/GetUserCourseHandler.java | 4 ++-- .../handler/{impl => }/GetUserDataHandler.java | 4 ++-- .../{impl => }/GetUserExtendHandler.java | 4 ++-- .../{impl => }/GetUserFavoriteHandler.java | 4 ++-- .../{impl => }/GetUserFavoriteItemHandler.java | 6 +++--- .../GetUserFriendSeasonRankingHandler.java | 4 ++-- .../handler/{impl => }/GetUserGhostHandler.java | 4 ++-- .../handler/{impl => }/GetUserItemHandler.kt | 4 ++-- .../{impl => }/GetUserLoginBonusHandler.java | 4 ++-- .../handler/{impl => }/GetUserMapHandler.java | 4 ++-- .../handler/{impl => }/GetUserMusicHandler.java | 4 ++-- .../{impl => }/GetUserOptionHandler.java | 4 ++-- .../{impl => }/GetUserPortraitHandler.java | 10 ++-------- .../{impl => }/GetUserPreviewHandler.java | 4 ++-- .../{impl => }/GetUserRatingHandler.java | 4 ++-- .../GetUserRecommendRateMusicHandler.java | 4 ++-- .../GetUserRecommendSelectMusicHandler.java | 4 ++-- .../{impl => }/GetUserRegionHandler.java | 4 ++-- .../{impl => }/GetUserRivalDataHandler.java | 6 +++--- .../{impl => }/GetUserRivalMusicHandler.java | 6 +++--- .../{impl => }/UploadUserPhotoHandler.kt | 7 ++++--- .../{impl => }/UploadUserPlaylogHandler.kt | 4 ++-- .../{impl => }/UploadUserPortraitHandler.kt | 4 ++-- .../{impl => }/UpsertUserAllHandler.java | 4 ++-- .../{impl => }/UpsertUserPrintHandler.java | 4 ++-- .../handler/{impl => }/UserLoginHandler.kt | 4 ++-- .../handler/{impl => }/UserLogoutHandler.java | 4 ++-- 93 files changed, 188 insertions(+), 211 deletions(-) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/BeginMatchingHandler.java (93%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/CMGetUserCharacterHandler.java (95%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/CMGetUserDataHandler.java (94%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/CMGetUserItemHandler.java (95%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/CMGetUserPreviewHandler.java (94%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/CMUpsertUserGachaHandler.java (97%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/CMUpsertUserPrintCancelHandler.java (95%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/CMUpsertUserPrintSubtractHandler.java (97%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/EndMatchingHandler.java (92%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GameLoginHandler.java (98%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GameLogoutHandler.java (89%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetGameChargeHandler.java (93%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetGameEventHandler.java (93%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetGameGachaCardByIdHandler.java (94%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetGameGachaHandler.java (93%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetGameIdlistHandler.java (92%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetGameRankingHandler.java (91%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetGameSettingHandler.java (97%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetMatchingStateHandler.java (93%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetTeamCourseRuleHandler.java (91%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetTeamCourseSettingHandler.java (91%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserActivityHandler.java (94%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserCardPrintErrorHandler.java (94%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserCharacterHandler.java (95%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserChargeHandler.java (93%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserCourseHandler.java (95%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserDataHandler.java (93%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserDuelHandler.java (94%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserFavoriteItemHandler.java (96%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserGachaHandler.java (93%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserItemHandler.java (95%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserLoginBonusHandler.java (96%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserMapAreaHandler.java (93%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserMusicHandler.java (98%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserNetBattleDataHandler.java (92%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserOptionHandler.java (94%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserPreviewHandler.java (97%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserPrintedCardHandler.java (92%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserRecentRatingHandler.java (96%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserRegionHandler.java (92%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserRivalDataHandler.java (91%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserRivalMusicHandler.java (91%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserSymbolChatSettingHandler.java (93%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/GetUserTeamHandler.java (94%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/RemoveMatchingMemberHandler.java (91%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/RollGachaHandler.java (93%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/UpsertUserAllHandler.java (99%) rename src/main/java/icu/samnyan/aqua/sega/chusan/handler/{impl => }/UpsertUserChargelogHandler.java (95%) rename src/main/java/icu/samnyan/aqua/sega/{chusan/handler => general}/BaseHandler.java (84%) delete mode 100644 src/main/java/icu/samnyan/aqua/sega/maimai2/handler/BaseHandler.java rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/CMGetSellingCardHandler.java (93%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/CMGetUserCharacterHandler.java (93%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/CMGetUserPreviewHandler.java (94%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetGameChargeHandler.java (93%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetGameEventHandler.java (93%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetGameNgMusicIdHandler.java (91%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetGameRankingHandler.java (91%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetGameSettingHandler.java (95%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetGameTournamentInfoHandler.java (92%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetTransferFriendHandler.java (91%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserActivityHandler.java (94%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserCardHandler.java (94%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserCardPrintErrorHandler.java (91%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserCharacterHandler.java (93%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserChargeHandler.java (93%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserCourseHandler.java (94%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserDataHandler.java (93%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserExtendHandler.java (93%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserFavoriteHandler.java (93%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserFavoriteItemHandler.java (93%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserFriendSeasonRankingHandler.java (95%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserGhostHandler.java (91%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserItemHandler.kt (96%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserLoginBonusHandler.java (94%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserMapHandler.java (94%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserMusicHandler.java (95%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserOptionHandler.java (93%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserPortraitHandler.java (91%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserPreviewHandler.java (96%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserRatingHandler.java (97%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserRecommendRateMusicHandler.java (92%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserRecommendSelectMusicHandler.java (92%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserRegionHandler.java (91%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserRivalDataHandler.java (89%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/GetUserRivalMusicHandler.java (92%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/UploadUserPhotoHandler.kt (90%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/UploadUserPlaylogHandler.kt (95%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/UploadUserPortraitHandler.kt (96%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/UpsertUserAllHandler.java (99%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/UpsertUserPrintHandler.java (96%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/UserLoginHandler.kt (84%) rename src/main/java/icu/samnyan/aqua/sega/maimai2/handler/{impl => }/UserLogoutHandler.java (89%) diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/BeginMatchingHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/BeginMatchingHandler.java similarity index 93% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/BeginMatchingHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/BeginMatchingHandler.java index f9e96f11..c2d1d5c3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/BeginMatchingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/BeginMatchingHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.response.data.MatchingMemberInfo; import icu.samnyan.aqua.sega.chusan.model.response.data.MatchingWaitState; import icu.samnyan.aqua.sega.util.jackson.StringMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMGetUserCharacterHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMGetUserCharacterHandler.java similarity index 95% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMGetUserCharacterHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMGetUserCharacterHandler.java index d756f8f0..a603fb01 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMGetUserCharacterHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMGetUserCharacterHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserCharacter; import icu.samnyan.aqua.sega.chusan.service.UserCharacterService; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMGetUserDataHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMGetUserDataHandler.java similarity index 94% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMGetUserDataHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMGetUserDataHandler.java index 413d56a0..f744fc2f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMGetUserDataHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMGetUserDataHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.response.data.UserEmoney; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; import icu.samnyan.aqua.sega.chusan.service.UserDataService; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMGetUserItemHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMGetUserItemHandler.java similarity index 95% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMGetUserItemHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMGetUserItemHandler.java index f0a0ba0f..f2612967 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMGetUserItemHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMGetUserItemHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserItem; import icu.samnyan.aqua.sega.chusan.service.UserItemService; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMGetUserPreviewHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMGetUserPreviewHandler.java similarity index 94% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMGetUserPreviewHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMGetUserPreviewHandler.java index 40d71304..44b51609 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMGetUserPreviewHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMGetUserPreviewHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; import icu.samnyan.aqua.sega.chusan.service.UserDataService; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserGachaHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMUpsertUserGachaHandler.java similarity index 97% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserGachaHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMUpsertUserGachaHandler.java index f5a17116..3f747d2d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserGachaHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMUpsertUserGachaHandler.java @@ -1,9 +1,9 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.chusan.model.Chu3UserCardPrintStateRepo; import icu.samnyan.aqua.sega.chusan.model.Chu3UserGachaRepo; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.gamedata.GameGachaCard; import icu.samnyan.aqua.sega.chusan.model.request.UpsertUserGacha; import icu.samnyan.aqua.sega.chusan.model.userdata.UserCardPrintState; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserPrintCancelHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMUpsertUserPrintCancelHandler.java similarity index 95% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserPrintCancelHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMUpsertUserPrintCancelHandler.java index 39cf1a23..343b8774 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserPrintCancelHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMUpsertUserPrintCancelHandler.java @@ -1,9 +1,9 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import icu.samnyan.aqua.sega.chusan.model.Chu3UserCardPrintStateRepo; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserCardPrintState; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserPrintSubtractHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMUpsertUserPrintSubtractHandler.java similarity index 97% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserPrintSubtractHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMUpsertUserPrintSubtractHandler.java index 63806998..9455a053 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserPrintSubtractHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/CMUpsertUserPrintSubtractHandler.java @@ -1,9 +1,9 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import icu.samnyan.aqua.sega.chusan.model.Chu3UserCardPrintStateRepo; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserCardPrintState; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; import icu.samnyan.aqua.sega.chusan.model.userdata.UserItem; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/EndMatchingHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/EndMatchingHandler.java similarity index 92% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/EndMatchingHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/EndMatchingHandler.java index b89be049..80a6da24 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/EndMatchingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/EndMatchingHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GameLoginHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GameLoginHandler.java similarity index 98% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GameLoginHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GameLoginHandler.java index 06df3333..21664fc6 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GameLoginHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GameLoginHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.gamedata.GameLoginBonus; import icu.samnyan.aqua.sega.chusan.model.gamedata.GameLoginBonusPreset; import icu.samnyan.aqua.sega.chusan.model.response.CodeResp; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GameLogoutHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GameLogoutHandler.java similarity index 89% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GameLogoutHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GameLogoutHandler.java index 1d86d42e..83bdc961 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GameLogoutHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GameLogoutHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.response.CodeResp; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameChargeHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameChargeHandler.java similarity index 93% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameChargeHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameChargeHandler.java index 379aa3b1..98b49a87 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameChargeHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameChargeHandler.java @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.chusan.model.Chu3GameChargeRepo; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.gamedata.GameCharge; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameEventHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameEventHandler.java similarity index 93% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameEventHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameEventHandler.java index 303c6e2f..5a54be28 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameEventHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameEventHandler.java @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.chusan.model.Chu3GameEventRepo; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.gamedata.GameEvent; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameGachaCardByIdHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameGachaCardByIdHandler.java similarity index 94% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameGachaCardByIdHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameGachaCardByIdHandler.java index b1e00964..fd6aadca 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameGachaCardByIdHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameGachaCardByIdHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.gamedata.GameGachaCard; import icu.samnyan.aqua.sega.chusan.service.GameGachaCardService; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameGachaHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameGachaHandler.java similarity index 93% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameGachaHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameGachaHandler.java index 9ba4b4ab..a3f90968 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameGachaHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameGachaHandler.java @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.chusan.model.Chu3GameGachaRepo; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.gamedata.GameGacha; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameIdlistHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameIdlistHandler.java similarity index 92% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameIdlistHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameIdlistHandler.java index 03b5a236..ef404f3a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameIdlistHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameIdlistHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameRankingHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameRankingHandler.java similarity index 91% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameRankingHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameRankingHandler.java index c5115fad..f1609bec 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameRankingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameRankingHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameSettingHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameSettingHandler.java similarity index 97% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameSettingHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameSettingHandler.java index 9719560a..4bd0df3f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameSettingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameSettingHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.response.GetGameSettingResp; import icu.samnyan.aqua.sega.chusan.model.response.data.GameSetting; import icu.samnyan.aqua.sega.util.jackson.StringMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetMatchingStateHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetMatchingStateHandler.java similarity index 93% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetMatchingStateHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetMatchingStateHandler.java index 35a6e843..50a6bfa1 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetMatchingStateHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetMatchingStateHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.response.data.MatchingMemberInfo; import icu.samnyan.aqua.sega.chusan.model.response.data.MatchingWaitState; import icu.samnyan.aqua.sega.util.jackson.StringMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetTeamCourseRuleHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetTeamCourseRuleHandler.java similarity index 91% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetTeamCourseRuleHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetTeamCourseRuleHandler.java index 6c3f71e7..c8c230b1 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetTeamCourseRuleHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetTeamCourseRuleHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetTeamCourseSettingHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetTeamCourseSettingHandler.java similarity index 91% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetTeamCourseSettingHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetTeamCourseSettingHandler.java index a6c03fd6..6f8d6265 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetTeamCourseSettingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetTeamCourseSettingHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserActivityHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserActivityHandler.java similarity index 94% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserActivityHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserActivityHandler.java index 134c2e84..6b505848 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserActivityHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserActivityHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserActivity; import icu.samnyan.aqua.sega.chusan.service.UserActivityService; import icu.samnyan.aqua.sega.util.jackson.StringMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserCardPrintErrorHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserCardPrintErrorHandler.java similarity index 94% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserCardPrintErrorHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserCardPrintErrorHandler.java index 7e2f3af4..f961cff9 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserCardPrintErrorHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserCardPrintErrorHandler.java @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.chusan.model.Chu3UserCardPrintStateRepo; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserCardPrintState; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserCharacterHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserCharacterHandler.java similarity index 95% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserCharacterHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserCharacterHandler.java index cd3d3024..39aa93d6 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserCharacterHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserCharacterHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserCharacter; import icu.samnyan.aqua.sega.chusan.service.UserCharacterService; import icu.samnyan.aqua.sega.util.jackson.StringMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserChargeHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserChargeHandler.java similarity index 93% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserChargeHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserChargeHandler.java index d9652cf4..138a5e5c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserChargeHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserChargeHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserCharge; import icu.samnyan.aqua.sega.chusan.service.UserChargeService; import icu.samnyan.aqua.sega.util.jackson.StringMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserCourseHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserCourseHandler.java similarity index 95% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserCourseHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserCourseHandler.java index 3bcbacc3..d3bec274 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserCourseHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserCourseHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserCourse; import icu.samnyan.aqua.sega.chusan.service.UserCourseService; import icu.samnyan.aqua.sega.util.jackson.StringMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserDataHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserDataHandler.java similarity index 93% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserDataHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserDataHandler.java index 2ff6767e..5374cfdb 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserDataHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserDataHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; import icu.samnyan.aqua.sega.chusan.service.UserDataService; import icu.samnyan.aqua.sega.util.jackson.StringMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserDuelHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserDuelHandler.java similarity index 94% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserDuelHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserDuelHandler.java index 946b4690..a4f71749 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserDuelHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserDuelHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserDuel; import icu.samnyan.aqua.sega.chusan.service.UserDuelService; import icu.samnyan.aqua.sega.util.jackson.StringMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserFavoriteItemHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserFavoriteItemHandler.java similarity index 96% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserFavoriteItemHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserFavoriteItemHandler.java index 661ad26c..b28abae2 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserFavoriteItemHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserFavoriteItemHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.response.data.UserFavorite; import icu.samnyan.aqua.sega.chusan.model.userdata.UserGeneralData; import icu.samnyan.aqua.sega.chusan.service.UserGeneralDataService; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserGachaHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserGachaHandler.java similarity index 93% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserGachaHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserGachaHandler.java index 2c37d0b7..ca29d168 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserGachaHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserGachaHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserGacha; import icu.samnyan.aqua.sega.chusan.service.UserGachaService; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserItemHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserItemHandler.java similarity index 95% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserItemHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserItemHandler.java index aa225cd8..2fcb98fa 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserItemHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserItemHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserItem; import icu.samnyan.aqua.sega.chusan.service.UserItemService; import icu.samnyan.aqua.sega.util.jackson.StringMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserLoginBonusHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserLoginBonusHandler.java similarity index 96% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserLoginBonusHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserLoginBonusHandler.java index ae885466..acb949f6 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserLoginBonusHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserLoginBonusHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserLoginBonus; import icu.samnyan.aqua.sega.chusan.service.UserDataService; import icu.samnyan.aqua.sega.chusan.service.UserLoginBonusService; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserMapAreaHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserMapAreaHandler.java similarity index 93% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserMapAreaHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserMapAreaHandler.java index 3f938c72..7d1f995e 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserMapAreaHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserMapAreaHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserMapArea; import icu.samnyan.aqua.sega.chusan.service.UserMapAreaService; import icu.samnyan.aqua.sega.util.jackson.StringMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserMusicHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserMusicHandler.java similarity index 98% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserMusicHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserMusicHandler.java index 21058783..58e4017a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserMusicHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserMusicHandler.java @@ -1,9 +1,9 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.chusan.dto.UserMusicDetailForAncientChusan; import icu.samnyan.aqua.sega.chusan.dto.UserMusicListItemForAncientChusan; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.response.data.UserMusicListItem; import icu.samnyan.aqua.sega.chusan.model.userdata.UserMusicDetail; import icu.samnyan.aqua.sega.chusan.service.UserMusicDetailService; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserNetBattleDataHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserNetBattleDataHandler.java similarity index 92% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserNetBattleDataHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserNetBattleDataHandler.java index 9ae5129b..804a4518 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserNetBattleDataHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserNetBattleDataHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserOptionHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserOptionHandler.java similarity index 94% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserOptionHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserOptionHandler.java index d0b528cc..babf792f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserOptionHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserOptionHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserGameOption; import icu.samnyan.aqua.sega.chusan.service.UserGameOptionService; import icu.samnyan.aqua.sega.util.jackson.StringMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserPreviewHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserPreviewHandler.java similarity index 97% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserPreviewHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserPreviewHandler.java index d20fa38a..b626cfde 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserPreviewHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserPreviewHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.response.GetUserPreviewResp; import icu.samnyan.aqua.sega.chusan.model.userdata.UserCharacter; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserPrintedCardHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserPrintedCardHandler.java similarity index 92% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserPrintedCardHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserPrintedCardHandler.java index d026efe2..761f003d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserPrintedCardHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserPrintedCardHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserRecentRatingHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserRecentRatingHandler.java similarity index 96% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserRecentRatingHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserRecentRatingHandler.java index 33f741f3..7819cff2 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserRecentRatingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserRecentRatingHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserGeneralData; import icu.samnyan.aqua.sega.chusan.model.userdata.UserPlaylog; import icu.samnyan.aqua.sega.chusan.service.UserGeneralDataService; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserRegionHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserRegionHandler.java similarity index 92% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserRegionHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserRegionHandler.java index 8f1eb659..90dc2f4d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserRegionHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserRegionHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserRivalDataHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserRivalDataHandler.java similarity index 91% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserRivalDataHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserRivalDataHandler.java index a8c27365..3a0599a3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserRivalDataHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserRivalDataHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserRivalMusicHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserRivalMusicHandler.java similarity index 91% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserRivalMusicHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserRivalMusicHandler.java index 488c0bf0..1c58a2ad 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserRivalMusicHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserRivalMusicHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserSymbolChatSettingHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserSymbolChatSettingHandler.java similarity index 93% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserSymbolChatSettingHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserSymbolChatSettingHandler.java index b36dcccd..890d0e93 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserSymbolChatSettingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserSymbolChatSettingHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.response.data.SymbolChatInfo; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserTeamHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserTeamHandler.java similarity index 94% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserTeamHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserTeamHandler.java index d2b58f3f..a4146afe 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserTeamHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserTeamHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/RemoveMatchingMemberHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/RemoveMatchingMemberHandler.java similarity index 91% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/RemoveMatchingMemberHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/RemoveMatchingMemberHandler.java index f73fb1a9..16f3c68a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/RemoveMatchingMemberHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/RemoveMatchingMemberHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/RollGachaHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/RollGachaHandler.java similarity index 93% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/RollGachaHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/RollGachaHandler.java index 1da01a84..584eda76 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/RollGachaHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/RollGachaHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.gamedata.GameGachaCard; import icu.samnyan.aqua.sega.chusan.service.GameGachaCardService; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/UpsertUserAllHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/UpsertUserAllHandler.java similarity index 99% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/UpsertUserAllHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/UpsertUserAllHandler.java index 1aae9528..5de686bc 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/UpsertUserAllHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/UpsertUserAllHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.request.UpsertUserAll; import icu.samnyan.aqua.sega.chusan.model.response.CodeResp; import icu.samnyan.aqua.sega.chusan.model.userdata.*; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/UpsertUserChargelogHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/UpsertUserChargelogHandler.java similarity index 95% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/UpsertUserChargelogHandler.java rename to src/main/java/icu/samnyan/aqua/sega/chusan/handler/UpsertUserChargelogHandler.java index 61825c1b..fca81900 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/UpsertUserChargelogHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/UpsertUserChargelogHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.chusan.handler.impl; +package icu.samnyan.aqua.sega.chusan.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.response.CodeResp; import icu.samnyan.aqua.sega.chusan.model.userdata.UserCharge; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/BaseHandler.java b/src/main/java/icu/samnyan/aqua/sega/general/BaseHandler.java similarity index 84% rename from src/main/java/icu/samnyan/aqua/sega/chusan/handler/BaseHandler.java rename to src/main/java/icu/samnyan/aqua/sega/general/BaseHandler.java index 9fa8de2e..ed5a2bc3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/BaseHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/general/BaseHandler.java @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.chusan.handler; +package icu.samnyan.aqua.sega.general; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2ServletController.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2ServletController.kt index 40968267..eec4f245 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2ServletController.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2ServletController.kt @@ -1,9 +1,9 @@ package icu.samnyan.aqua.sega.maimai2 import ext.API -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler +import icu.samnyan.aqua.sega.general.BaseHandler +import icu.samnyan.aqua.sega.maimai2.handler.* import icu.samnyan.aqua.sega.maimai2.handler.impl.* -import lombok.AllArgsConstructor import org.slf4j.LoggerFactory import org.springframework.web.bind.annotation.* import kotlin.reflect.full.declaredMemberProperties @@ -12,7 +12,6 @@ import kotlin.reflect.full.declaredMemberProperties * @author samnyan (privateamusement@protonmail.com) */ @Suppress("unused") -@AllArgsConstructor @RestController @RequestMapping(path = ["/g/mai2/Maimai2Servlet/", "/g/mai2/"]) class Maimai2ServletController( diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/BaseHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/BaseHandler.java deleted file mode 100644 index 4c1c9d28..00000000 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/BaseHandler.java +++ /dev/null @@ -1,17 +0,0 @@ -package icu.samnyan.aqua.sega.maimai2.handler; - -import com.fasterxml.jackson.core.JsonProcessingException; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Map; - -/** - * @author samnyan (privateamusement@protonmail.com) - */ -@RestController -@RequestMapping({"/g/mai2/Maimai2Servlet/", "/g/mai2/"}) -public interface BaseHandler { - - Object handle(Map request) throws JsonProcessingException; -} diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/CMGetSellingCardHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/CMGetSellingCardHandler.java similarity index 93% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/CMGetSellingCardHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/CMGetSellingCardHandler.java index 11ae00cb..690ccfea 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/CMGetSellingCardHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/CMGetSellingCardHandler.java @@ -1,9 +1,9 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.Mai2GameSellingCardRepo; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.gamedata.GameSellingCard; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/CMGetUserCharacterHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/CMGetUserCharacterHandler.java similarity index 93% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/CMGetUserCharacterHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/CMGetUserCharacterHandler.java index 49b279d7..d136c0cf 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/CMGetUserCharacterHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/CMGetUserCharacterHandler.java @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserCharacterRepo; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserCharacter; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/CMGetUserPreviewHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/CMGetUserPreviewHandler.java similarity index 94% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/CMGetUserPreviewHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/CMGetUserPreviewHandler.java index 364cc386..f911c5d2 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/CMGetUserPreviewHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/CMGetUserPreviewHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameChargeHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameChargeHandler.java similarity index 93% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameChargeHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameChargeHandler.java index 29544814..43b7577e 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameChargeHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameChargeHandler.java @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.Mai2GameChargeRepo; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.gamedata.GameCharge; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameEventHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameEventHandler.java similarity index 93% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameEventHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameEventHandler.java index 95eac8cd..3d5c7b58 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameEventHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameEventHandler.java @@ -1,9 +1,9 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.Mai2GameEventRepo; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.gamedata.GameEvent; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameNgMusicIdHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameNgMusicIdHandler.java similarity index 91% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameNgMusicIdHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameNgMusicIdHandler.java index f436e8f2..514661fb 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameNgMusicIdHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameNgMusicIdHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameRankingHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameRankingHandler.java similarity index 91% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameRankingHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameRankingHandler.java index e22c70b5..c443546b 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameRankingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameRankingHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameSettingHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameSettingHandler.java similarity index 95% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameSettingHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameSettingHandler.java index b3f7381e..27fa8472 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameSettingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameSettingHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.response.GetGameSettingResp; import icu.samnyan.aqua.sega.maimai2.model.response.data.GameSetting; import icu.samnyan.aqua.sega.general.dao.PropertyEntryRepository; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameTournamentInfoHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameTournamentInfoHandler.java similarity index 92% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameTournamentInfoHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameTournamentInfoHandler.java index 6367f59d..6556514d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameTournamentInfoHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetGameTournamentInfoHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetTransferFriendHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetTransferFriendHandler.java similarity index 91% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetTransferFriendHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetTransferFriendHandler.java index a96d2d42..4c7856fe 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetTransferFriendHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetTransferFriendHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserActivityHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserActivityHandler.java similarity index 94% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserActivityHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserActivityHandler.java index 67e47bec..f6377f85 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserActivityHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserActivityHandler.java @@ -1,9 +1,9 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserActRepo; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.response.data.UserActivity; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserAct; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserCardHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserCardHandler.java similarity index 94% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserCardHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserCardHandler.java index a60be6b2..5d3a7a3b 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserCardHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserCardHandler.java @@ -1,9 +1,9 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserCardRepo; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserCard; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserCardPrintErrorHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserCardPrintErrorHandler.java similarity index 91% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserCardPrintErrorHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserCardPrintErrorHandler.java index f59c8a7f..6f4a1f3c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserCardPrintErrorHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserCardPrintErrorHandler.java @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserCharacterHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserCharacterHandler.java similarity index 93% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserCharacterHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserCharacterHandler.java index 61520897..2ce123aa 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserCharacterHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserCharacterHandler.java @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserCharacterRepo; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserCharacter; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserChargeHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserChargeHandler.java similarity index 93% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserChargeHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserChargeHandler.java index 78dd095b..4e2ee806 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserChargeHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserChargeHandler.java @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserChargeRepo; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserCharge; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserCourseHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserCourseHandler.java similarity index 94% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserCourseHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserCourseHandler.java index 134f0e60..44c2b967 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserCourseHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserCourseHandler.java @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserCourseRepo; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserCourse; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserDataHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserDataHandler.java similarity index 93% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserDataHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserDataHandler.java index fffae641..2a41ba51 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserDataHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserDataHandler.java @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserExtendHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserExtendHandler.java similarity index 93% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserExtendHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserExtendHandler.java index 7b129463..e784dd1f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserExtendHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserExtendHandler.java @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserExtendRepo; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserExtend; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserFavoriteHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserFavoriteHandler.java similarity index 93% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserFavoriteHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserFavoriteHandler.java index b3abd502..b357db30 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserFavoriteHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserFavoriteHandler.java @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserFavoriteRepo; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserFavorite; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserFavoriteItemHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserFavoriteItemHandler.java similarity index 93% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserFavoriteItemHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserFavoriteItemHandler.java index d2435a01..47fcff60 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserFavoriteItemHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserFavoriteItemHandler.java @@ -1,10 +1,10 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.response.data.UserFavoriteItem; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserGeneralData; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserGeneralDataRepo; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import java.util.LinkedHashMap; import java.util.LinkedList; @@ -20,7 +20,7 @@ import org.springframework.stereotype.Component; @Component("Maimai2GetUserFavoriteItemHandler") public class GetUserFavoriteItemHandler implements BaseHandler { private static final Logger logger = LoggerFactory - .getLogger(icu.samnyan.aqua.sega.maimai2.handler.impl.GetUserFavoriteItemHandler.class); + .getLogger(GetUserFavoriteItemHandler.class); private final StringMapper mapper; private final Mai2UserGeneralDataRepo userGeneralDataRepository; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserFriendSeasonRankingHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserFriendSeasonRankingHandler.java similarity index 95% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserFriendSeasonRankingHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserFriendSeasonRankingHandler.java index b25b300d..b6f99bfc 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserFriendSeasonRankingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserFriendSeasonRankingHandler.java @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserFriendSeasonRankingRepo; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserFriendSeasonRanking; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserGhostHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserGhostHandler.java similarity index 91% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserGhostHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserGhostHandler.java index 2c1a829d..8a998002 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserGhostHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserGhostHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserItemHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserItemHandler.kt similarity index 96% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserItemHandler.kt rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserItemHandler.kt index 8fc957a8..4026327a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserItemHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserItemHandler.kt @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl +package icu.samnyan.aqua.sega.maimai2.handler import icu.samnyan.aqua.net.games.mai2.Maimai2 import icu.samnyan.aqua.sega.general.dao.CardRepository -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler +import icu.samnyan.aqua.sega.general.BaseHandler import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos import icu.samnyan.aqua.sega.maimai2.model.userdata.UserItem.Mai2ItemKind import org.slf4j.Logger diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserLoginBonusHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserLoginBonusHandler.java similarity index 94% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserLoginBonusHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserLoginBonusHandler.java index 934a7489..46f517ea 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserLoginBonusHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserLoginBonusHandler.java @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserLoginBonusRepo; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserLoginBonus; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserMapHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserMapHandler.java similarity index 94% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserMapHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserMapHandler.java index e6e2ac42..267bd1ed 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserMapHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserMapHandler.java @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserMapRepo; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserMap; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserMusicHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserMusicHandler.java similarity index 95% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserMusicHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserMusicHandler.java index a545efa8..3108744d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserMusicHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserMusicHandler.java @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserMusicDetailRepo; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.response.data.UserMusic; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserMusicDetail; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserOptionHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserOptionHandler.java similarity index 93% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserOptionHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserOptionHandler.java index 7061834b..fa966e83 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserOptionHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserOptionHandler.java @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserOptionRepo; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserOption; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserPortraitHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserPortraitHandler.java similarity index 91% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserPortraitHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserPortraitHandler.java index 9f5cbd76..10945576 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserPortraitHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserPortraitHandler.java @@ -1,9 +1,7 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; -import com.fasterxml.jackson.core.JsonEncoding; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; -import icu.samnyan.aqua.sega.maimai2.model.request.UploadUserPortrait; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.request.data.UserPortrait; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; @@ -12,13 +10,9 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.security.crypto.codec.Utf8; import org.springframework.stereotype.Component; -import java.io.File; import java.io.FileInputStream; -import java.io.IOException; import java.nio.file.Files; -import java.nio.file.Path; import java.nio.file.Paths; -import java.nio.file.StandardOpenOption; import java.util.*; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserPreviewHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserPreviewHandler.java similarity index 96% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserPreviewHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserPreviewHandler.java index 77ca8db5..46349eab 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserPreviewHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserPreviewHandler.java @@ -1,9 +1,9 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserOptionRepo; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.response.GetUserPreviewResp; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserOption; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRatingHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRatingHandler.java similarity index 97% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRatingHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRatingHandler.java index 447829b5..669d4f6a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRatingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRatingHandler.java @@ -1,11 +1,11 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserGeneralDataRepo; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserUdemaeRepo; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.response.data.UserRating; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserGeneralData; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRecommendRateMusicHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRecommendRateMusicHandler.java similarity index 92% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRecommendRateMusicHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRecommendRateMusicHandler.java index 4123ca37..3dd61542 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRecommendRateMusicHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRecommendRateMusicHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRecommendSelectMusicHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRecommendSelectMusicHandler.java similarity index 92% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRecommendSelectMusicHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRecommendSelectMusicHandler.java index 227d98ae..36629c33 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRecommendSelectMusicHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRecommendSelectMusicHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRegionHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRegionHandler.java similarity index 91% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRegionHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRegionHandler.java index 84358cb5..f4d9be21 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRegionHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRegionHandler.java @@ -1,7 +1,7 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRivalDataHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRivalDataHandler.java similarity index 89% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRivalDataHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRivalDataHandler.java index 76bfc3e9..fefd8556 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRivalDataHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRivalDataHandler.java @@ -1,10 +1,10 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import java.util.LinkedHashMap; import java.util.Map; import java.util.Optional; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -20,7 +20,7 @@ import icu.samnyan.aqua.sega.util.jackson.StringMapper; @Component("Maimai2GetUserRivalDataHandler") public class GetUserRivalDataHandler implements BaseHandler { private static final Logger logger = LoggerFactory - .getLogger(icu.samnyan.aqua.sega.maimai2.handler.impl.GetUserRivalDataHandler.class); + .getLogger(GetUserRivalDataHandler.class); private final StringMapper mapper; private final Mai2UserDataRepo userDataRepository; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRivalMusicHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRivalMusicHandler.java similarity index 92% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRivalMusicHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRivalMusicHandler.java index ec34316f..da239bbb 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRivalMusicHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRivalMusicHandler.java @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import java.util.HashMap; import java.util.LinkedHashMap; @@ -6,7 +6,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -23,7 +23,7 @@ import icu.samnyan.aqua.sega.util.jackson.StringMapper; @Component("Maimai2GetUserRivalMusicHandler") public class GetUserRivalMusicHandler implements BaseHandler { private static final Logger logger = LoggerFactory - .getLogger(icu.samnyan.aqua.sega.maimai2.handler.impl.GetUserRivalMusicHandler.class); + .getLogger(GetUserRivalMusicHandler.class); private final StringMapper mapper; private final Mai2UserMusicDetailRepo userMusicDetailRepository; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPhotoHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPhotoHandler.kt similarity index 90% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPhotoHandler.kt rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPhotoHandler.kt index 71e3efda..bdcfeb39 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPhotoHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPhotoHandler.kt @@ -1,9 +1,9 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl +package icu.samnyan.aqua.sega.maimai2.handler import ext.div import ext.isoDateTime import ext.path -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler +import icu.samnyan.aqua.sega.general.BaseHandler import icu.samnyan.aqua.sega.maimai2.model.request.UploadUserPhoto import icu.samnyan.aqua.sega.util.jackson.BasicMapper import org.slf4j.Logger @@ -17,7 +17,8 @@ import java.time.LocalDateTime import java.util.* @Component("Maimai2UploadUserPhotoHandler") -class UploadUserPhotoHandler(private val mapper: BasicMapper) : BaseHandler { +class UploadUserPhotoHandler(private val mapper: BasicMapper) : + BaseHandler { val tmpDir = "data/tmp".path().apply { toFile().mkdirs() } val uploadDir = "data/upload/mai2/plays".path().apply { toFile().mkdirs() } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPlaylogHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPlaylogHandler.kt similarity index 95% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPlaylogHandler.kt rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPlaylogHandler.kt index e014fbd2..3f5486e3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPlaylogHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPlaylogHandler.kt @@ -1,9 +1,9 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl +package icu.samnyan.aqua.sega.maimai2.handler import ext.millis import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo import icu.samnyan.aqua.sega.maimai2.model.Mai2UserPlaylogRepo -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler +import icu.samnyan.aqua.sega.general.BaseHandler import icu.samnyan.aqua.sega.maimai2.model.request.UploadUserPlaylog import icu.samnyan.aqua.sega.maimai2.model.userdata.UserPlaylog import icu.samnyan.aqua.sega.util.jackson.BasicMapper diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPortraitHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPortraitHandler.kt similarity index 96% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPortraitHandler.kt rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPortraitHandler.kt index 7c4f5a92..803fe06a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPortraitHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPortraitHandler.kt @@ -1,9 +1,9 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl +package icu.samnyan.aqua.sega.maimai2.handler import ext.div import ext.path import icu.samnyan.aqua.net.utils.PathProps -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler +import icu.samnyan.aqua.sega.general.BaseHandler import icu.samnyan.aqua.sega.maimai2.model.request.UploadUserPortrait import icu.samnyan.aqua.sega.util.jackson.BasicMapper import org.slf4j.Logger diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserAllHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.java similarity index 99% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserAllHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.java index 479dbbd3..45e4a427 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserAllHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.java @@ -1,9 +1,9 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.general.model.Card; import icu.samnyan.aqua.sega.general.service.CardService; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.*; import icu.samnyan.aqua.sega.maimai2.model.request.UpsertUserAll; import icu.samnyan.aqua.sega.maimai2.model.request.data.UserAll; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserPrintHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserPrintHandler.java similarity index 96% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserPrintHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserPrintHandler.java index 816aedd9..4e276061 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UpsertUserPrintHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserPrintHandler.java @@ -1,11 +1,11 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserCardRepo; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo; import icu.samnyan.aqua.sega.maimai2.model.Mai2UserPrintDetailRepo; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.request.UpsertUserPrint; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserCard; import icu.samnyan.aqua.sega.maimai2.model.userdata.UserDetail; diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UserLoginHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UserLoginHandler.kt similarity index 84% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UserLoginHandler.kt rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UserLoginHandler.kt index d4503534..e20f3a51 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UserLoginHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UserLoginHandler.kt @@ -1,6 +1,6 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl +package icu.samnyan.aqua.sega.maimai2.handler -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler +import icu.samnyan.aqua.sega.general.BaseHandler import icu.samnyan.aqua.sega.util.jackson.BasicMapper import org.springframework.stereotype.Component diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UserLogoutHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UserLogoutHandler.java similarity index 89% rename from src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UserLogoutHandler.java rename to src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UserLogoutHandler.java index 7b9cb6f8..ea447e52 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UserLogoutHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UserLogoutHandler.java @@ -1,8 +1,8 @@ -package icu.samnyan.aqua.sega.maimai2.handler.impl; +package icu.samnyan.aqua.sega.maimai2.handler; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.chunithm.model.response.CodeResp; -import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; +import icu.samnyan.aqua.sega.general.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory;