From 4a9b9d57e4c88083850d680515350af1852eab4b Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Fri, 16 Feb 2024 17:51:36 -0500 Subject: [PATCH] [O] Optimize imports --- .../samnyan/aqua/api/config/WebConfig.java | 4 ++-- .../v1/ApiChuniV1GameDataController.java | 4 +++- .../v2/ApiChuniV2GameDataController.java | 23 +++++-------------- .../v2/ApiChuniV2PlayerDataController.java | 1 - .../game/diva/ApiDivaGameDataController.java | 5 ---- .../ApiMaimai2PlayerDataController.java | 8 +++---- .../sega/game/maimai2/Maimai2New.kt | 4 ++-- .../aqua/api/model/ObjectMessageResponse.java | 2 -- .../model/resp/sega/maimai2/ProfileResp.java | 4 ++-- .../ongeki/external/ExternalUserData.java | 6 ----- .../ongeki/external/OngekiDataExport.java | 1 - .../ongeki/external/OngekiDataImport.java | 1 - .../aqua/sega/allnet/AllNetController.java | 7 +++--- .../aqua/sega/allnet/model/Keychip.java | 5 ++-- .../ChusanServletControllerAdvice.java | 2 +- .../dao/gamedata/GameAvatarAccRepository.java | 1 - .../dao/gamedata/GameFrameRepository.java | 1 - .../dao/gamedata/GameGachaCardRepository.java | 5 ++-- .../dao/gamedata/GameGachaRepository.java | 1 - .../gamedata/GameLoginBonusRepository.java | 1 - .../dao/gamedata/GameMapIconRepository.java | 1 - .../dao/gamedata/GameNamePlateRepository.java | 1 - .../gamedata/GameSystemVoiceRepository.java | 1 - .../dao/gamedata/GameTrophyRepository.java | 1 - .../UserCardPrintStateRepository.java | 1 - .../dao/userdata/UserGachaRepository.java | 1 - .../UserMusicListItemForAncientChusan.java | 1 - .../impl/CMUpsertUserGachaHandler.java | 7 +----- .../impl/CMUpsertUserPrintCancelHandler.java | 1 - .../CMUpsertUserPrintSubtractHandler.java | 7 +----- .../handler/impl/EndMatchingHandler.java | 1 - .../chusan/handler/impl/GameLoginHandler.java | 6 +---- .../impl/GetGameGachaCardByIdHandler.java | 2 -- .../handler/impl/GetGameRankingHandler.java | 1 - .../handler/impl/GetGameSettingHandler.java | 1 - .../impl/GetTeamCourseRuleHandler.java | 4 +++- .../impl/GetUserCardPrintErrorHandler.java | 1 - .../handler/impl/GetUserDataHandler.java | 2 -- .../impl/GetUserFavoriteItemHandler.java | 7 +----- .../impl/GetUserLoginBonusHandler.java | 8 +------ .../handler/impl/GetUserMusicHandler.java | 5 +++- .../impl/GetUserRecentRatingHandler.java | 4 ++-- .../chusan/handler/impl/RollGachaHandler.java | 2 -- .../sega/chusan/model/gamedata/AvatarAcc.java | 4 +++- .../sega/chusan/model/gamedata/Character.java | 8 +++---- .../sega/chusan/model/gamedata/Frame.java | 4 +++- .../chusan/model/gamedata/GameCharge.java | 4 +--- .../sega/chusan/model/gamedata/GameEvent.java | 6 ++--- .../sega/chusan/model/gamedata/GameGacha.java | 7 +----- .../chusan/model/gamedata/GameGachaCard.java | 7 +----- .../chusan/model/gamedata/GameLoginBonus.java | 2 +- .../model/gamedata/GameLoginBonusPreset.java | 2 +- .../sega/chusan/model/gamedata/Level.java | 2 +- .../sega/chusan/model/gamedata/MapIcon.java | 4 +++- .../sega/chusan/model/gamedata/Music.java | 2 +- .../sega/chusan/model/gamedata/NamePlate.java | 4 +++- .../chusan/model/gamedata/SystemVoice.java | 4 +++- .../sega/chusan/model/gamedata/Trophy.java | 4 +++- .../chusan/model/request/UpsertUserGacha.java | 5 ++-- .../response/data/MatchingMemberInfo.java | 6 ++--- .../response/data/MatchingWaitState.java | 7 +++--- .../chusan/model/userdata/UserActivity.java | 2 +- .../model/userdata/UserCardPrintState.java | 3 +-- .../chusan/model/userdata/UserCharacter.java | 2 +- .../chusan/model/userdata/UserCharge.java | 2 +- .../chusan/model/userdata/UserCourse.java | 2 +- .../sega/chusan/model/userdata/UserData.java | 3 +-- .../sega/chusan/model/userdata/UserDuel.java | 2 +- .../sega/chusan/model/userdata/UserGacha.java | 2 +- .../chusan/model/userdata/UserGameOption.java | 2 +- .../model/userdata/UserGeneralData.java | 2 +- .../sega/chusan/model/userdata/UserItem.java | 2 +- .../chusan/model/userdata/UserLoginBonus.java | 2 +- .../chusan/model/userdata/UserMapArea.java | 2 +- .../model/userdata/UserMusicDetail.java | 2 +- .../chusan/model/userdata/UserPlaylog.java | 2 +- .../service/GameLoginBonusPresetService.java | 1 - .../sega/chusan/service/UserGachaService.java | 1 - .../sega/chusan/service/UserItemService.java | 1 - .../sega/diva/controller/DivaController.java | 3 +-- .../diva/filter/DivaCompressionFilter.java | 8 +++---- .../sega/diva/model/gamedata/Contest.java | 2 +- .../sega/diva/model/gamedata/Difficulty.java | 3 +-- .../diva/model/gamedata/DivaCustomize.java | 6 ++--- .../sega/diva/model/gamedata/DivaModule.java | 6 ++--- .../aqua/sega/diva/model/gamedata/Festa.java | 2 +- .../sega/diva/model/gamedata/NgWords.java | 2 +- .../aqua/sega/diva/model/gamedata/Pv.java | 2 +- .../sega/diva/model/gamedata/PvEntry.java | 2 +- .../sega/diva/model/userdata/GameSession.java | 2 +- .../sega/diva/model/userdata/PlayLog.java | 2 +- .../diva/model/userdata/PlayerContest.java | 2 +- .../diva/model/userdata/PlayerCustomize.java | 2 +- .../diva/model/userdata/PlayerInventory.java | 2 +- .../diva/model/userdata/PlayerModule.java | 2 +- .../diva/model/userdata/PlayerProfile.java | 2 +- .../model/userdata/PlayerPvCustomize.java | 2 +- .../diva/model/userdata/PlayerPvRecord.java | 2 +- .../diva/model/userdata/PlayerScreenShot.java | 3 +-- .../aqua/sega/diva/util/DivaMapper.java | 1 - .../aqua/sega/util/jackson/StringMapper.java | 2 -- 101 files changed, 123 insertions(+), 206 deletions(-) diff --git a/src/main/java/icu/samnyan/aqua/api/config/WebConfig.java b/src/main/java/icu/samnyan/aqua/api/config/WebConfig.java index 0159bfcf..3f5cc7c3 100644 --- a/src/main/java/icu/samnyan/aqua/api/config/WebConfig.java +++ b/src/main/java/icu/samnyan/aqua/api/config/WebConfig.java @@ -1,7 +1,5 @@ package icu.samnyan.aqua.api.config; -import java.io.IOException; - import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.core.io.FileSystemResource; @@ -10,6 +8,8 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.resource.PathResourceResolver; +import java.io.IOException; + @Configuration public class WebConfig implements WebMvcConfigurer { diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v1/ApiChuniV1GameDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v1/ApiChuniV1GameDataController.java index 81a23ff0..150dfdfd 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v1/ApiChuniV1GameDataController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v1/ApiChuniV1GameDataController.java @@ -6,7 +6,9 @@ import icu.samnyan.aqua.sega.chunithm.model.gamedata.Character; import icu.samnyan.aqua.sega.chunithm.model.gamedata.CharacterSkill; import icu.samnyan.aqua.sega.chunithm.model.gamedata.Music; import icu.samnyan.aqua.sega.chunithm.service.GameMusicService; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2GameDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2GameDataController.java index 7501edc7..f23663e3 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2GameDataController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2GameDataController.java @@ -1,22 +1,11 @@ package icu.samnyan.aqua.api.controller.sega.game.chuni.v2; -import icu.samnyan.aqua.sega.chusan.dao.gamedata.GameAvatarAccRepository; -import icu.samnyan.aqua.sega.chusan.dao.gamedata.GameCharacterRepository; -import icu.samnyan.aqua.sega.chusan.dao.gamedata.GameFrameRepository; -import icu.samnyan.aqua.sega.chusan.dao.gamedata.GameMapIconRepository; -import icu.samnyan.aqua.sega.chusan.dao.gamedata.GameMusicRepository; -import icu.samnyan.aqua.sega.chusan.dao.gamedata.GameTrophyRepository; -import icu.samnyan.aqua.sega.chusan.dao.gamedata.GameNamePlateRepository; -import icu.samnyan.aqua.sega.chusan.dao.gamedata.GameSystemVoiceRepository; -import icu.samnyan.aqua.sega.chusan.model.gamedata.AvatarAcc; -import icu.samnyan.aqua.sega.chusan.model.gamedata.Character; -import icu.samnyan.aqua.sega.chusan.model.gamedata.Frame; -import icu.samnyan.aqua.sega.chusan.model.gamedata.MapIcon; -import icu.samnyan.aqua.sega.chusan.model.gamedata.Music; -import icu.samnyan.aqua.sega.chusan.model.gamedata.NamePlate; -import icu.samnyan.aqua.sega.chusan.model.gamedata.SystemVoice; -import icu.samnyan.aqua.sega.chusan.model.gamedata.Trophy; -import org.springframework.web.bind.annotation.*; +import icu.samnyan.aqua.sega.chusan.dao.gamedata.*; +import icu.samnyan.aqua.sega.chusan.model.gamedata.Character; +import icu.samnyan.aqua.sega.chusan.model.gamedata.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2PlayerDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2PlayerDataController.java index 5853e681..5054cff5 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2PlayerDataController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/v2/ApiChuniV2PlayerDataController.java @@ -10,7 +10,6 @@ import icu.samnyan.aqua.api.model.resp.sega.chuni.v2.external.ChuniDataExport; import icu.samnyan.aqua.api.model.resp.sega.chuni.v2.external.ChuniDataImport; import icu.samnyan.aqua.api.model.resp.sega.chuni.v2.external.ExternalUserData; import icu.samnyan.aqua.api.util.ApiMapper; -import icu.samnyan.aqua.sega.chunithm.handler.impl.GetUserFavoriteMusicHandler; import icu.samnyan.aqua.sega.chusan.model.gamedata.Level; import icu.samnyan.aqua.sega.chusan.model.gamedata.Music; import icu.samnyan.aqua.sega.chusan.model.userdata.*; diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/diva/ApiDivaGameDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/diva/ApiDivaGameDataController.java index aca2599a..b1c8f69b 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/diva/ApiDivaGameDataController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/diva/ApiDivaGameDataController.java @@ -6,15 +6,10 @@ import icu.samnyan.aqua.sega.diva.dao.gamedata.DivaPvRepository; import icu.samnyan.aqua.sega.diva.model.gamedata.DivaCustomize; import icu.samnyan.aqua.sega.diva.model.gamedata.DivaModule; import icu.samnyan.aqua.sega.diva.model.gamedata.Pv; -import org.springframework.core.io.FileSystemResource; -import org.springframework.core.io.Resource; -import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.io.IOException; -import java.nio.file.Paths; import java.util.List; /** diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/maimai2/ApiMaimai2PlayerDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/maimai2/ApiMaimai2PlayerDataController.java index cc4a393e..9f5f7e90 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/maimai2/ApiMaimai2PlayerDataController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/maimai2/ApiMaimai2PlayerDataController.java @@ -2,11 +2,10 @@ package icu.samnyan.aqua.api.controller.sega.game.maimai2; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; - import icu.samnyan.aqua.api.model.MessageResponse; import icu.samnyan.aqua.api.model.ReducedPageResponse; -import icu.samnyan.aqua.api.model.resp.sega.maimai2.ProfileResp; import icu.samnyan.aqua.api.model.resp.sega.maimai2.PhotoResp; +import icu.samnyan.aqua.api.model.resp.sega.maimai2.ProfileResp; import icu.samnyan.aqua.api.model.resp.sega.maimai2.external.ExternalUserData; import icu.samnyan.aqua.api.model.resp.sega.maimai2.external.Maimai2DataExport; import icu.samnyan.aqua.api.model.resp.sega.maimai2.external.Maimai2DataImport; @@ -24,8 +23,9 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import java.io.IOException; -import java.nio.file.*; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/maimai2/Maimai2New.kt b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/maimai2/Maimai2New.kt index 8407e911..c2023aee 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/game/maimai2/Maimai2New.kt +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/maimai2/Maimai2New.kt @@ -1,10 +1,10 @@ package icu.samnyan.aqua.api.controller.sega.game.maimai2 -import ext.* +import ext.invoke import icu.samnyan.aqua.sega.maimai2.dao.userdata.UserDataRepository import icu.samnyan.aqua.sega.maimai2.dao.userdata.UserGeneralDataRepository import icu.samnyan.aqua.sega.maimai2.dao.userdata.UserPlaylogRepository -import org.springframework.http.HttpStatus.* +import org.springframework.http.HttpStatus.NOT_FOUND import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RequestParam diff --git a/src/main/java/icu/samnyan/aqua/api/model/ObjectMessageResponse.java b/src/main/java/icu/samnyan/aqua/api/model/ObjectMessageResponse.java index 888fba48..b669131d 100644 --- a/src/main/java/icu/samnyan/aqua/api/model/ObjectMessageResponse.java +++ b/src/main/java/icu/samnyan/aqua/api/model/ObjectMessageResponse.java @@ -1,7 +1,5 @@ package icu.samnyan.aqua.api.model; -import icu.samnyan.aqua.api.model.MessageResponse; - public class ObjectMessageResponse extends MessageResponse { private T data; diff --git a/src/main/java/icu/samnyan/aqua/api/model/resp/sega/maimai2/ProfileResp.java b/src/main/java/icu/samnyan/aqua/api/model/resp/sega/maimai2/ProfileResp.java index 92d500a7..d4386c9a 100644 --- a/src/main/java/icu/samnyan/aqua/api/model/resp/sega/maimai2/ProfileResp.java +++ b/src/main/java/icu/samnyan/aqua/api/model/resp/sega/maimai2/ProfileResp.java @@ -1,11 +1,11 @@ package icu.samnyan.aqua.api.model.resp.sega.maimai2; -import java.util.List; - import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + /** * @author samnyan (privateamusement@protonmail.com) */ diff --git a/src/main/java/icu/samnyan/aqua/api/model/resp/sega/ongeki/external/ExternalUserData.java b/src/main/java/icu/samnyan/aqua/api/model/resp/sega/ongeki/external/ExternalUserData.java index 1b144523..f6703432 100644 --- a/src/main/java/icu/samnyan/aqua/api/model/resp/sega/ongeki/external/ExternalUserData.java +++ b/src/main/java/icu/samnyan/aqua/api/model/resp/sega/ongeki/external/ExternalUserData.java @@ -1,15 +1,9 @@ package icu.samnyan.aqua.api.model.resp.sega.ongeki.external; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import icu.samnyan.aqua.sega.general.model.Card; -import icu.samnyan.aqua.sega.util.jackson.AccessCodeSerializer; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/api/model/resp/sega/ongeki/external/OngekiDataExport.java b/src/main/java/icu/samnyan/aqua/api/model/resp/sega/ongeki/external/OngekiDataExport.java index a83516cb..c37d90d7 100644 --- a/src/main/java/icu/samnyan/aqua/api/model/resp/sega/ongeki/external/OngekiDataExport.java +++ b/src/main/java/icu/samnyan/aqua/api/model/resp/sega/ongeki/external/OngekiDataExport.java @@ -6,7 +6,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.List; -import java.util.Map; /** * @author samnyan (privateamusement@protonmail.com) diff --git a/src/main/java/icu/samnyan/aqua/api/model/resp/sega/ongeki/external/OngekiDataImport.java b/src/main/java/icu/samnyan/aqua/api/model/resp/sega/ongeki/external/OngekiDataImport.java index 0e1ffc39..1b2b241d 100644 --- a/src/main/java/icu/samnyan/aqua/api/model/resp/sega/ongeki/external/OngekiDataImport.java +++ b/src/main/java/icu/samnyan/aqua/api/model/resp/sega/ongeki/external/OngekiDataImport.java @@ -6,7 +6,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.List; -import java.util.Map; /** * @author samnyan (privateamusement@protonmail.com) diff --git a/src/main/java/icu/samnyan/aqua/sega/allnet/AllNetController.java b/src/main/java/icu/samnyan/aqua/sega/allnet/AllNetController.java index 2d88ca56..cc0f6e6a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/allnet/AllNetController.java +++ b/src/main/java/icu/samnyan/aqua/sega/allnet/AllNetController.java @@ -1,14 +1,15 @@ package icu.samnyan.aqua.sega.allnet; import com.fasterxml.jackson.databind.ObjectMapper; - +import icu.samnyan.aqua.sega.allnet.dao.keychip.KeyChipRepository; import icu.samnyan.aqua.sega.allnet.model.response.DownloadOrderResponse; import icu.samnyan.aqua.sega.allnet.model.response.PowerOnResponse; import icu.samnyan.aqua.sega.allnet.model.response.PowerOnResponseV2; import icu.samnyan.aqua.sega.allnet.model.response.PowerOnResponseV3; import icu.samnyan.aqua.sega.allnet.util.Decoder; import icu.samnyan.aqua.sega.allnet.util.KeychipChecker; -import icu.samnyan.aqua.sega.allnet.dao.keychip.KeyChipRepository; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -23,8 +24,6 @@ import java.time.Instant; import java.time.LocalDateTime; import java.util.Map; import java.util.UUID; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import static icu.samnyan.aqua.sega.util.AquaConst.DEFAULT_KEYCHIP_ID; diff --git a/src/main/java/icu/samnyan/aqua/sega/allnet/model/Keychip.java b/src/main/java/icu/samnyan/aqua/sega/allnet/model/Keychip.java index 261ae90d..19a7be20 100644 --- a/src/main/java/icu/samnyan/aqua/sega/allnet/model/Keychip.java +++ b/src/main/java/icu/samnyan/aqua/sega/allnet/model/Keychip.java @@ -1,16 +1,15 @@ package icu.samnyan.aqua.sega.allnet.model; -import java.io.Serializable; - import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; import jakarta.persistence.UniqueConstraint; - import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; + @Entity(name = "Keychip") @Table(name = "allnet_keychips", uniqueConstraints = {@UniqueConstraint(columnNames = {"keychip_id"})}) @Data diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/controller/ChusanServletControllerAdvice.java b/src/main/java/icu/samnyan/aqua/sega/chusan/controller/ChusanServletControllerAdvice.java index 84980747..42463b3f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/controller/ChusanServletControllerAdvice.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/controller/ChusanServletControllerAdvice.java @@ -2,12 +2,12 @@ package icu.samnyan.aqua.sega.chusan.controller; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RestControllerAdvice; -import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Map; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameAvatarAccRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameAvatarAccRepository.java index 207f993a..e965c6ea 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameAvatarAccRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameAvatarAccRepository.java @@ -1,7 +1,6 @@ package icu.samnyan.aqua.sega.chusan.dao.gamedata; import icu.samnyan.aqua.sega.chusan.model.gamedata.AvatarAcc; - import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameFrameRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameFrameRepository.java index eee779f8..7a09a9c1 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameFrameRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameFrameRepository.java @@ -1,7 +1,6 @@ package icu.samnyan.aqua.sega.chusan.dao.gamedata; import icu.samnyan.aqua.sega.chusan.model.gamedata.Frame; - import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameGachaCardRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameGachaCardRepository.java index 49e7b321..1a1ef6c2 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameGachaCardRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameGachaCardRepository.java @@ -1,12 +1,11 @@ package icu.samnyan.aqua.sega.chusan.dao.gamedata; import icu.samnyan.aqua.sega.chusan.model.gamedata.GameGachaCard; - -import java.util.List; - import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; +import java.util.List; + /** * @author samnyan (privateamusement@protonmail.com) */ diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameGachaRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameGachaRepository.java index dd1f065e..378d7f87 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameGachaRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameGachaRepository.java @@ -1,7 +1,6 @@ package icu.samnyan.aqua.sega.chusan.dao.gamedata; import icu.samnyan.aqua.sega.chusan.model.gamedata.GameGacha; - import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameLoginBonusRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameLoginBonusRepository.java index 7dadde65..7c388d38 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameLoginBonusRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameLoginBonusRepository.java @@ -1,7 +1,6 @@ package icu.samnyan.aqua.sega.chusan.dao.gamedata; import icu.samnyan.aqua.sega.chusan.model.gamedata.GameLoginBonus; -import icu.samnyan.aqua.sega.chusan.model.gamedata.GameLoginBonusPreset; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameMapIconRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameMapIconRepository.java index 2f8f7ace..74ecf1b5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameMapIconRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameMapIconRepository.java @@ -1,7 +1,6 @@ package icu.samnyan.aqua.sega.chusan.dao.gamedata; import icu.samnyan.aqua.sega.chusan.model.gamedata.MapIcon; - import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameNamePlateRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameNamePlateRepository.java index 40c375d5..122a633c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameNamePlateRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameNamePlateRepository.java @@ -1,7 +1,6 @@ package icu.samnyan.aqua.sega.chusan.dao.gamedata; import icu.samnyan.aqua.sega.chusan.model.gamedata.NamePlate; - import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameSystemVoiceRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameSystemVoiceRepository.java index 97c1b111..a82c62e6 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameSystemVoiceRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameSystemVoiceRepository.java @@ -1,7 +1,6 @@ package icu.samnyan.aqua.sega.chusan.dao.gamedata; import icu.samnyan.aqua.sega.chusan.model.gamedata.SystemVoice; - import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameTrophyRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameTrophyRepository.java index b8dda928..76aef8af 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameTrophyRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/gamedata/GameTrophyRepository.java @@ -1,7 +1,6 @@ package icu.samnyan.aqua.sega.chusan.dao.gamedata; import icu.samnyan.aqua.sega.chusan.model.gamedata.Trophy; - import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserCardPrintStateRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserCardPrintStateRepository.java index 72e7b8b2..a5e9ab5f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserCardPrintStateRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserCardPrintStateRepository.java @@ -2,7 +2,6 @@ package icu.samnyan.aqua.sega.chusan.dao.userdata; import icu.samnyan.aqua.sega.chusan.model.userdata.UserCardPrintState; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; - import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserGachaRepository.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserGachaRepository.java index 19319386..d7673fcc 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserGachaRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/dao/userdata/UserGachaRepository.java @@ -2,7 +2,6 @@ package icu.samnyan.aqua.sega.chusan.dao.userdata; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; import icu.samnyan.aqua.sega.chusan.model.userdata.UserGacha; - import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/dto/UserMusicListItemForAncientChusan.java b/src/main/java/icu/samnyan/aqua/sega/chusan/dto/UserMusicListItemForAncientChusan.java index 23974297..c1ad2a73 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/dto/UserMusicListItemForAncientChusan.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/dto/UserMusicListItemForAncientChusan.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.chusan.dto; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserMusicDetail; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; 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/impl/CMUpsertUserGachaHandler.java index 28262541..fe47d02a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserGachaHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserGachaHandler.java @@ -1,7 +1,6 @@ package icu.samnyan.aqua.sega.chusan.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; - import icu.samnyan.aqua.sega.chusan.dao.userdata.UserCardPrintStateRepository; import icu.samnyan.aqua.sega.chusan.dao.userdata.UserGachaRepository; import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; @@ -20,11 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; /** * @author samnyan (privateamusement@protonmail.com) 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/impl/CMUpsertUserPrintCancelHandler.java index 2f933455..1b08db5d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserPrintCancelHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserPrintCancelHandler.java @@ -2,7 +2,6 @@ package icu.samnyan.aqua.sega.chusan.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; - import icu.samnyan.aqua.sega.chusan.dao.userdata.UserCardPrintStateRepository; import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserCardPrintState; 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/impl/CMUpsertUserPrintSubtractHandler.java index 5574626d..55cb30f7 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserPrintSubtractHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/CMUpsertUserPrintSubtractHandler.java @@ -2,7 +2,6 @@ package icu.samnyan.aqua.sega.chusan.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; - import icu.samnyan.aqua.sega.chusan.dao.userdata.UserCardPrintStateRepository; import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserCardPrintState; @@ -16,11 +15,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; /** * @author samnyan (privateamusement@protonmail.com) 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/impl/EndMatchingHandler.java index 1370be0e..b89be049 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/EndMatchingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/EndMatchingHandler.java @@ -3,7 +3,6 @@ package icu.samnyan.aqua.sega.chusan.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; import icu.samnyan.aqua.sega.util.jackson.StringMapper; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; 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/impl/GameLoginHandler.java index 62c3d588..06df3333 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GameLoginHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GameLoginHandler.java @@ -8,11 +8,7 @@ import icu.samnyan.aqua.sega.chusan.model.response.CodeResp; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; import icu.samnyan.aqua.sega.chusan.model.userdata.UserItem; import icu.samnyan.aqua.sega.chusan.model.userdata.UserLoginBonus; -import icu.samnyan.aqua.sega.chusan.service.GameLoginBonusPresetService; -import icu.samnyan.aqua.sega.chusan.service.GameLoginBonusService; -import icu.samnyan.aqua.sega.chusan.service.UserDataService; -import icu.samnyan.aqua.sega.chusan.service.UserItemService; -import icu.samnyan.aqua.sega.chusan.service.UserLoginBonusService; +import icu.samnyan.aqua.sega.chusan.service.*; 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/GetGameGachaCardByIdHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameGachaCardByIdHandler.java index 3c318640..b1e00964 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameGachaCardByIdHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameGachaCardByIdHandler.java @@ -1,8 +1,6 @@ package icu.samnyan.aqua.sega.chusan.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; - -import icu.samnyan.aqua.sega.chusan.dao.gamedata.GameGachaCardRepository; import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.gamedata.GameGachaCard; import icu.samnyan.aqua.sega.chusan.service.GameGachaCardService; 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/impl/GetGameRankingHandler.java index d14808de..c5115fad 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameRankingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameRankingHandler.java @@ -1,7 +1,6 @@ package icu.samnyan.aqua.sega.chusan.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; - import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; 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/GetGameSettingHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameSettingHandler.java index 66225222..9719560a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameSettingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetGameSettingHandler.java @@ -13,7 +13,6 @@ import org.springframework.stereotype.Component; import java.net.InetAddress; import java.net.UnknownHostException; -import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.Map; 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/impl/GetTeamCourseRuleHandler.java index b9a3c83d..6c3f71e7 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetTeamCourseRuleHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetTeamCourseRuleHandler.java @@ -7,7 +7,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import java.util.*; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; @Component("ChusanGetTeamCourseRuleHandler") public class GetTeamCourseRuleHandler implements BaseHandler { 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/impl/GetUserCardPrintErrorHandler.java index 158eb3af..69b7ac9d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserCardPrintErrorHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserCardPrintErrorHandler.java @@ -1,7 +1,6 @@ package icu.samnyan.aqua.sega.chusan.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; - import icu.samnyan.aqua.sega.chusan.dao.userdata.UserCardPrintStateRepository; import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserCardPrintState; 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/impl/GetUserDataHandler.java index 0d2b5893..2ff6767e 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserDataHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserDataHandler.java @@ -4,8 +4,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; import icu.samnyan.aqua.sega.chusan.service.UserDataService; -import icu.samnyan.aqua.sega.general.service.ClientSettingService; -import icu.samnyan.aqua.sega.util.VersionUtil; 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/GetUserFavoriteItemHandler.java b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserFavoriteItemHandler.java index cd667239..661ad26c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserFavoriteItemHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserFavoriteItemHandler.java @@ -6,18 +6,13 @@ 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; import icu.samnyan.aqua.sega.util.jackson.StringMapper; - import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; @Component("ChusanGetUserFavoriteItemHandler") public class GetUserFavoriteItemHandler implements BaseHandler { 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/impl/GetUserLoginBonusHandler.java index 2be60c55..ae885466 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserLoginBonusHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserLoginBonusHandler.java @@ -3,7 +3,6 @@ package icu.samnyan.aqua.sega.chusan.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserLoginBonus; -import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; import icu.samnyan.aqua.sega.chusan.service.UserDataService; import icu.samnyan.aqua.sega.chusan.service.UserLoginBonusService; import icu.samnyan.aqua.sega.util.jackson.StringMapper; @@ -13,12 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import java.time.LocalDateTime; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.ArrayList; -import java.util.HashMap; +import java.util.*; @Component("ChusanGetUserLoginBonusHandler") public class GetUserLoginBonusHandler implements BaseHandler { 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/impl/GetUserMusicHandler.java index cdd0c425..21058783 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserMusicHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserMusicHandler.java @@ -16,7 +16,10 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; -import java.util.*; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; /** * Response: 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/impl/GetUserRecentRatingHandler.java index 6113a7f7..33f741f3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserRecentRatingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/GetUserRecentRatingHandler.java @@ -3,10 +3,10 @@ package icu.samnyan.aqua.sega.chusan.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.userdata.UserGeneralData; -import icu.samnyan.aqua.sega.chusan.service.UserGeneralDataService; -import icu.samnyan.aqua.sega.general.model.response.UserRecentRating; import icu.samnyan.aqua.sega.chusan.model.userdata.UserPlaylog; +import icu.samnyan.aqua.sega.chusan.service.UserGeneralDataService; import icu.samnyan.aqua.sega.chusan.service.UserPlaylogService; +import icu.samnyan.aqua.sega.general.model.response.UserRecentRating; import icu.samnyan.aqua.sega.util.jackson.StringMapper; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; 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/impl/RollGachaHandler.java index 694d7df9..1da01a84 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/RollGachaHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/handler/impl/RollGachaHandler.java @@ -1,8 +1,6 @@ package icu.samnyan.aqua.sega.chusan.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; - -import icu.samnyan.aqua.sega.chusan.dao.gamedata.GameGachaCardRepository; import icu.samnyan.aqua.sega.chusan.handler.BaseHandler; import icu.samnyan.aqua.sega.chusan.model.gamedata.GameGachaCard; import icu.samnyan.aqua.sega.chusan.service.GameGachaCardService; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/AvatarAcc.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/AvatarAcc.java index 2ca8e9e9..aac2b1cf 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/AvatarAcc.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/AvatarAcc.java @@ -1,10 +1,12 @@ package icu.samnyan.aqua.sega.chusan.model.gamedata; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/Character.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/Character.java index 447ec12b..9d21930e 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/Character.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/Character.java @@ -1,12 +1,12 @@ package icu.samnyan.aqua.sega.chusan.model.gamedata; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/Frame.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/Frame.java index f17f6915..1926f7db 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/Frame.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/Frame.java @@ -1,10 +1,12 @@ package icu.samnyan.aqua.sega.chusan.model.gamedata; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameCharge.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameCharge.java index b87913ec..07c630a1 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameCharge.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameCharge.java @@ -1,13 +1,11 @@ package icu.samnyan.aqua.sega.chusan.model.gamedata; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; - +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameEvent.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameEvent.java index 30fbe788..1d4c38bd 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameEvent.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameEvent.java @@ -1,13 +1,13 @@ package icu.samnyan.aqua.sega.chusan.model.gamedata; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.Table; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameGacha.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameGacha.java index 17f01ac6..62aefdef 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameGacha.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameGacha.java @@ -2,16 +2,11 @@ package icu.samnyan.aqua.sega.chusan.model.gamedata; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; - +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameGachaCard.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameGachaCard.java index 4d66ccbd..50104f82 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameGachaCard.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameGachaCard.java @@ -2,16 +2,11 @@ package icu.samnyan.aqua.sega.chusan.model.gamedata; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; - +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameLoginBonus.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameLoginBonus.java index d62f4300..764e4836 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameLoginBonus.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameLoginBonus.java @@ -1,11 +1,11 @@ package icu.samnyan.aqua.sega.chusan.model.gamedata; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; @Entity(name = "ChusanGameLoginBonus") diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameLoginBonusPreset.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameLoginBonusPreset.java index fb1ad70a..8e9754b5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameLoginBonusPreset.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/GameLoginBonusPreset.java @@ -1,11 +1,11 @@ package icu.samnyan.aqua.sega.chusan.model.gamedata; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; @Entity(name = "ChusanGameLoginBonusPreset") diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/Level.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/Level.java index ae5b733d..fc4b7722 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/Level.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/Level.java @@ -1,11 +1,11 @@ package icu.samnyan.aqua.sega.chusan.model.gamedata; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/MapIcon.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/MapIcon.java index 187d5f39..5ae64743 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/MapIcon.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/MapIcon.java @@ -1,10 +1,12 @@ package icu.samnyan.aqua.sega.chusan.model.gamedata; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/Music.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/Music.java index 76852bdd..ba17ce4f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/Music.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/Music.java @@ -1,10 +1,10 @@ package icu.samnyan.aqua.sega.chusan.model.gamedata; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; import java.util.Map; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/NamePlate.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/NamePlate.java index 0056ec3a..0874e20a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/NamePlate.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/NamePlate.java @@ -1,10 +1,12 @@ package icu.samnyan.aqua.sega.chusan.model.gamedata; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/SystemVoice.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/SystemVoice.java index a799a237..7032c927 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/SystemVoice.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/SystemVoice.java @@ -1,10 +1,12 @@ package icu.samnyan.aqua.sega.chusan.model.gamedata; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/Trophy.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/Trophy.java index 55fba867..078af200 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/Trophy.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/gamedata/Trophy.java @@ -1,10 +1,12 @@ package icu.samnyan.aqua.sega.chusan.model.gamedata; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/request/UpsertUserGacha.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/request/UpsertUserGacha.java index 015b9cdd..8824e546 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/request/UpsertUserGacha.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/request/UpsertUserGacha.java @@ -1,9 +1,10 @@ package icu.samnyan.aqua.sega.chusan.model.request; import com.fasterxml.jackson.annotation.JsonProperty; - import icu.samnyan.aqua.sega.chusan.model.gamedata.GameGachaCard; -import icu.samnyan.aqua.sega.chusan.model.userdata.*; +import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; +import icu.samnyan.aqua.sega.chusan.model.userdata.UserGacha; +import icu.samnyan.aqua.sega.chusan.model.userdata.UserItem; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/MatchingMemberInfo.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/MatchingMemberInfo.java index 4db1a7a2..d30abd1f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/MatchingMemberInfo.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/MatchingMemberInfo.java @@ -1,14 +1,12 @@ package icu.samnyan.aqua.sega.chusan.model.response.data; -import java.time.LocalDateTime; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; - import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + /** * @author samnyan (privateamusement@protonmail.com) */ diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/MatchingWaitState.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/MatchingWaitState.java index aec36d25..e58dd812 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/MatchingWaitState.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/MatchingWaitState.java @@ -1,14 +1,13 @@ package icu.samnyan.aqua.sega.chusan.model.response.data; -import java.util.ArrayList; -import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; - import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.ArrayList; +import java.util.List; + /** * @author samnyan (privateamusement@protonmail.com) */ diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserActivity.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserActivity.java index 37565716..4bf3de56 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserActivity.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserActivity.java @@ -3,11 +3,11 @@ package icu.samnyan.aqua.sega.chusan.model.userdata; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCardPrintState.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCardPrintState.java index 15e065de..92912cb9 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCardPrintState.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCardPrintState.java @@ -2,12 +2,11 @@ package icu.samnyan.aqua.sega.chusan.model.userdata; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; - +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCharacter.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCharacter.java index 67cf4a1b..2be68083 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCharacter.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCharacter.java @@ -3,11 +3,11 @@ package icu.samnyan.aqua.sega.chusan.model.userdata; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCharge.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCharge.java index 4a278b9a..6797e7f3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCharge.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCharge.java @@ -2,11 +2,11 @@ package icu.samnyan.aqua.sega.chusan.model.userdata; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCourse.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCourse.java index ded50e28..3845ab71 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCourse.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCourse.java @@ -2,11 +2,11 @@ package icu.samnyan.aqua.sega.chusan.model.userdata; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.time.LocalDateTime; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserData.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserData.java index 4bd01721..0bb947c3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserData.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserData.java @@ -5,15 +5,14 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.databind.annotation.JsonSerialize; - import icu.samnyan.aqua.sega.chusan.model.response.data.UserEmoney; import icu.samnyan.aqua.sega.general.model.Card; import icu.samnyan.aqua.sega.util.jackson.AccessCodeSerializer; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; import java.time.LocalDateTime; import java.util.List; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserDuel.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserDuel.java index a530ef00..34e3a139 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserDuel.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserDuel.java @@ -2,11 +2,11 @@ package icu.samnyan.aqua.sega.chusan.model.userdata; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.time.LocalDateTime; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserGacha.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserGacha.java index 4a53249c..e297a04e 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserGacha.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserGacha.java @@ -1,11 +1,11 @@ package icu.samnyan.aqua.sega.chusan.model.userdata; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserGameOption.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserGameOption.java index 907e3cb3..db0e90cd 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserGameOption.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserGameOption.java @@ -2,11 +2,11 @@ package icu.samnyan.aqua.sega.chusan.model.userdata; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserGeneralData.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserGeneralData.java index 6ab4564c..76ddd30a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserGeneralData.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserGeneralData.java @@ -1,11 +1,11 @@ package icu.samnyan.aqua.sega.chusan.model.userdata; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserItem.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserItem.java index ef388f25..2e477785 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserItem.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserItem.java @@ -3,11 +3,11 @@ package icu.samnyan.aqua.sega.chusan.model.userdata; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserLoginBonus.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserLoginBonus.java index bb7fba58..93fba549 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserLoginBonus.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserLoginBonus.java @@ -1,11 +1,11 @@ package icu.samnyan.aqua.sega.chusan.model.userdata; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserMapArea.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserMapArea.java index c8af6f5a..edd33fe2 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserMapArea.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserMapArea.java @@ -3,11 +3,11 @@ package icu.samnyan.aqua.sega.chusan.model.userdata; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserMusicDetail.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserMusicDetail.java index a50ab0c6..45536812 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserMusicDetail.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserMusicDetail.java @@ -5,11 +5,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import icu.samnyan.aqua.sega.chusan.util.BooleanToIntegerDeserializer; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserPlaylog.java b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserPlaylog.java index 918f6c4b..2aaa1ee9 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserPlaylog.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserPlaylog.java @@ -2,11 +2,11 @@ package icu.samnyan.aqua.sega.chusan.model.userdata; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/service/GameLoginBonusPresetService.java b/src/main/java/icu/samnyan/aqua/sega/chusan/service/GameLoginBonusPresetService.java index 93fccac4..8db158bd 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/GameLoginBonusPresetService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/service/GameLoginBonusPresetService.java @@ -1,7 +1,6 @@ package icu.samnyan.aqua.sega.chusan.service; import icu.samnyan.aqua.sega.chusan.dao.gamedata.GameLoginBonusPresetsRepository; -import icu.samnyan.aqua.sega.chusan.dao.gamedata.GameLoginBonusRepository; import icu.samnyan.aqua.sega.chusan.model.gamedata.GameLoginBonusPreset; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserGachaService.java b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserGachaService.java index a4f998aa..05efd73a 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserGachaService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserGachaService.java @@ -3,7 +3,6 @@ package icu.samnyan.aqua.sega.chusan.service; import icu.samnyan.aqua.sega.chusan.dao.userdata.UserGachaRepository; import icu.samnyan.aqua.sega.chusan.model.userdata.UserData; import icu.samnyan.aqua.sega.chusan.model.userdata.UserGacha; - import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserItemService.java b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserItemService.java index ea189c5b..cdc5c7f3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserItemService.java +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/service/UserItemService.java @@ -9,7 +9,6 @@ import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Optional; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/controller/DivaController.java b/src/main/java/icu/samnyan/aqua/sega/diva/controller/DivaController.java index bfe72a1b..0bb8e646 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/controller/DivaController.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/controller/DivaController.java @@ -21,6 +21,7 @@ import icu.samnyan.aqua.sega.diva.model.request.user.PreStartRequest; import icu.samnyan.aqua.sega.diva.model.request.user.SpendCreditRequest; import icu.samnyan.aqua.sega.diva.model.request.user.StartRequest; import icu.samnyan.aqua.sega.diva.util.DivaMapper; +import jakarta.servlet.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.MediaType; @@ -30,8 +31,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; import java.io.IOException; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/filter/DivaCompressionFilter.java b/src/main/java/icu/samnyan/aqua/sega/diva/filter/DivaCompressionFilter.java index f9d6cebc..0b209093 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/filter/DivaCompressionFilter.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/filter/DivaCompressionFilter.java @@ -3,15 +3,15 @@ package icu.samnyan.aqua.sega.diva.filter; import icu.samnyan.aqua.sega.general.filter.CompressRequestWrapper; import icu.samnyan.aqua.sega.general.filter.CompressResponseWrapper; import icu.samnyan.aqua.sega.util.Compression; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; -import jakarta.servlet.FilterChain; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Base64; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Contest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Contest.java index a0a21ce4..9605925c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Contest.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Contest.java @@ -4,12 +4,12 @@ import icu.samnyan.aqua.sega.diva.model.common.ContestLeague; import icu.samnyan.aqua.sega.diva.model.common.ContestNormaType; import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil; import icu.samnyan.aqua.sega.util.URIEncoder; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import org.apache.commons.lang3.StringUtils; -import jakarta.persistence.*; import java.io.Serializable; import java.time.LocalDateTime; import java.util.LinkedList; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Difficulty.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Difficulty.java index 58c4b6e2..379d0240 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Difficulty.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Difficulty.java @@ -1,12 +1,11 @@ package icu.samnyan.aqua.sega.diva.model.gamedata; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; - /** * @author samnyan (privateamusement@protonmail.com) */ diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaCustomize.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaCustomize.java index 50b0c8c6..5f3e113c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaCustomize.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaCustomize.java @@ -3,13 +3,13 @@ package icu.samnyan.aqua.sega.diva.model.gamedata; import icu.samnyan.aqua.sega.diva.model.Internalizable; import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil; import icu.samnyan.aqua.sega.util.URIEncoder; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.Table; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaModule.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaModule.java index 07580885..92b4d684 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaModule.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/DivaModule.java @@ -3,13 +3,13 @@ package icu.samnyan.aqua.sega.diva.model.gamedata; import icu.samnyan.aqua.sega.diva.model.Internalizable; import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil; import icu.samnyan.aqua.sega.util.URIEncoder; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.Table; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Festa.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Festa.java index f55cb75e..5971e0c5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Festa.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Festa.java @@ -2,11 +2,11 @@ package icu.samnyan.aqua.sega.diva.model.gamedata; import icu.samnyan.aqua.sega.diva.model.common.Difficulty; import icu.samnyan.aqua.sega.diva.model.common.FestaKind; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/NgWords.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/NgWords.java index c85f66a9..c8be4f17 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/NgWords.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/NgWords.java @@ -1,11 +1,11 @@ package icu.samnyan.aqua.sega.diva.model.gamedata; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Pv.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Pv.java index a56c0d84..191f0049 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Pv.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/Pv.java @@ -1,10 +1,10 @@ package icu.samnyan.aqua.sega.diva.model.gamedata; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; import java.util.Map; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/PvEntry.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/PvEntry.java index a222c325..d1ce14cd 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/PvEntry.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/gamedata/PvEntry.java @@ -2,11 +2,11 @@ package icu.samnyan.aqua.sega.diva.model.gamedata; import icu.samnyan.aqua.sega.diva.model.common.Difficulty; import icu.samnyan.aqua.sega.diva.model.common.Edition; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/GameSession.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/GameSession.java index 291c6a79..9cbaa209 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/GameSession.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/GameSession.java @@ -1,11 +1,11 @@ package icu.samnyan.aqua.sega.diva.model.userdata; import icu.samnyan.aqua.sega.diva.model.common.StartMode; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayLog.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayLog.java index c3676026..a85665cb 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayLog.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayLog.java @@ -5,11 +5,11 @@ import icu.samnyan.aqua.sega.diva.model.common.ChallengeKind; import icu.samnyan.aqua.sega.diva.model.common.ClearResult; import icu.samnyan.aqua.sega.diva.model.common.Difficulty; import icu.samnyan.aqua.sega.diva.model.common.Edition; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerContest.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerContest.java index a5ffbefd..d0d6cbde 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerContest.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerContest.java @@ -1,11 +1,11 @@ package icu.samnyan.aqua.sega.diva.model.userdata; import icu.samnyan.aqua.sega.diva.model.common.ContestBorder; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerCustomize.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerCustomize.java index 3a79c8a1..d7a38491 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerCustomize.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerCustomize.java @@ -1,10 +1,10 @@ package icu.samnyan.aqua.sega.diva.model.userdata; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerInventory.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerInventory.java index 05007508..0c130992 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerInventory.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerInventory.java @@ -1,11 +1,11 @@ package icu.samnyan.aqua.sega.diva.model.userdata; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerModule.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerModule.java index 78e90d3b..54639e51 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerModule.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerModule.java @@ -1,10 +1,10 @@ package icu.samnyan.aqua.sega.diva.model.userdata; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerProfile.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerProfile.java index e15d960a..e6eb8063 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerProfile.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerProfile.java @@ -2,11 +2,11 @@ package icu.samnyan.aqua.sega.diva.model.userdata; import com.fasterxml.jackson.annotation.JsonIgnore; import icu.samnyan.aqua.sega.diva.model.common.*; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; import java.time.LocalDateTime; diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerPvCustomize.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerPvCustomize.java index a78d35f4..368a840c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerPvCustomize.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerPvCustomize.java @@ -1,11 +1,11 @@ package icu.samnyan.aqua.sega.diva.model.userdata; import com.fasterxml.jackson.annotation.JsonIgnore; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerPvRecord.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerPvRecord.java index 409094a9..d2035059 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerPvRecord.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerPvRecord.java @@ -5,11 +5,11 @@ import icu.samnyan.aqua.sega.diva.model.common.ChallengeKind; import icu.samnyan.aqua.sega.diva.model.common.ClearResult; import icu.samnyan.aqua.sega.diva.model.common.Difficulty; import icu.samnyan.aqua.sega.diva.model.common.Edition; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; import java.io.Serializable; /** diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerScreenShot.java b/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerScreenShot.java index 8ad6a67f..a78be363 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerScreenShot.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/model/userdata/PlayerScreenShot.java @@ -1,11 +1,10 @@ package icu.samnyan.aqua.sega.diva.model.userdata; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import jakarta.persistence.*; - /** * @author samnyan (privateamusement@protonmail.com) */ diff --git a/src/main/java/icu/samnyan/aqua/sega/diva/util/DivaMapper.java b/src/main/java/icu/samnyan/aqua/sega/diva/util/DivaMapper.java index e3c397bb..29fd5839 100644 --- a/src/main/java/icu/samnyan/aqua/sega/diva/util/DivaMapper.java +++ b/src/main/java/icu/samnyan/aqua/sega/diva/util/DivaMapper.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.diva.util; -import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.json.JsonWriteFeature; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/src/main/java/icu/samnyan/aqua/sega/util/jackson/StringMapper.java b/src/main/java/icu/samnyan/aqua/sega/util/jackson/StringMapper.java index e8287bef..b955b8c7 100644 --- a/src/main/java/icu/samnyan/aqua/sega/util/jackson/StringMapper.java +++ b/src/main/java/icu/samnyan/aqua/sega/util/jackson/StringMapper.java @@ -1,6 +1,5 @@ package icu.samnyan.aqua.sega.util.jackson; -import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.json.JsonWriteFeature; import com.fasterxml.jackson.core.type.TypeReference; @@ -16,7 +15,6 @@ import org.springframework.stereotype.Component; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.LinkedHashMap; -import java.util.Map; /** * @author samnyan (privateamusement@protonmail.com)