[O] Optimize imports

src/main/java/icu/samnyan/aqua/net/Fedy.kt

@@ -2,36 +2,36 @@ package icu.samnyan.aqua.net
 
 import ext.*
 import icu.samnyan.aqua.net.components.EmailProperties
-import org.springframework.boot.context.properties.ConfigurationProperties
-import org.springframework.context.annotation.Configuration
-import org.springframework.web.bind.annotation.RestController
-import java.security.MessageDigest
-import icu.samnyan.aqua.net.utils.SUCCESS
 import icu.samnyan.aqua.net.components.JWT
 import icu.samnyan.aqua.net.db.AquaNetUser
 import icu.samnyan.aqua.net.db.AquaUserServices
-import icu.samnyan.aqua.net.games.mai2.Mai2Import
 import icu.samnyan.aqua.net.games.ExportOptions
-import icu.samnyan.aqua.sega.maimai2.handler.UploadUserPlaylogHandler as Mai2UploadUserPlaylogHandler
-import icu.samnyan.aqua.sega.maimai2.handler.UpsertUserAllHandler as Mai2UpsertUserAllHandler
-import icu.samnyan.aqua.net.utils.ApiException
-import org.springframework.transaction.PlatformTransactionManager
-import org.springframework.transaction.support.TransactionTemplate
-import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo
 import icu.samnyan.aqua.net.games.GenericUserDataRepo
 import icu.samnyan.aqua.net.games.IUserData
+import icu.samnyan.aqua.net.games.mai2.Mai2Import
+import icu.samnyan.aqua.net.utils.ApiException
 import icu.samnyan.aqua.net.utils.PathProps
+import icu.samnyan.aqua.net.utils.SUCCESS
 import icu.samnyan.aqua.sega.chusan.model.Chu3UserDataRepo
 import icu.samnyan.aqua.sega.general.dao.CardRepository
 import icu.samnyan.aqua.sega.general.model.Card
 import icu.samnyan.aqua.sega.general.service.CardService
+import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo
 import icu.samnyan.aqua.sega.ongeki.OgkUserDataRepo
 import icu.samnyan.aqua.sega.wacca.model.db.WcUserRepo
+import org.springframework.boot.context.properties.ConfigurationProperties
+import org.springframework.context.annotation.Configuration
+import org.springframework.transaction.PlatformTransactionManager
+import org.springframework.transaction.support.TransactionTemplate
+import org.springframework.web.bind.annotation.RestController
 import org.springframework.web.multipart.MultipartFile
+import java.security.MessageDigest
 import java.util.concurrent.CompletableFuture
 import kotlin.io.path.getLastModifiedTime
 import kotlin.io.path.isRegularFile
 import kotlin.io.path.writeBytes
+import icu.samnyan.aqua.sega.maimai2.handler.UploadUserPlaylogHandler as Mai2UploadUserPlaylogHandler
+import icu.samnyan.aqua.sega.maimai2.handler.UpsertUserAllHandler as Mai2UpsertUserAllHandler
 
 @Configuration
 @ConfigurationProperties(prefix = "aqua-net.fedy")

src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt

@@ -2,14 +2,14 @@ package icu.samnyan.aqua.net
 
 import ext.*
 import icu.samnyan.aqua.net.components.*
-import icu.samnyan.aqua.net.db.*
+import icu.samnyan.aqua.net.db.AquaNetUserRepo
-import icu.samnyan.aqua.net.db.AquaUserServices.Companion.SETTING_FIELDS
+import icu.samnyan.aqua.net.db.AquaUserServices
+import icu.samnyan.aqua.net.db.EmailConfirmationRepo
+import icu.samnyan.aqua.net.db.ResetPasswordRepo
 import icu.samnyan.aqua.net.utils.PathProps
 import icu.samnyan.aqua.net.utils.SUCCESS
 import icu.samnyan.aqua.sega.general.dao.CardRepository
-import icu.samnyan.aqua.sega.general.model.Card
 import icu.samnyan.aqua.sega.general.model.CardStatus
-import icu.samnyan.aqua.sega.general.service.CardService
 import jakarta.servlet.http.HttpServletRequest
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
@@ -18,7 +18,6 @@ import org.springframework.security.crypto.password.PasswordEncoder
 import org.springframework.web.bind.annotation.RestController
 import org.springframework.web.multipart.MultipartFile
 import java.time.Instant
-import java.time.LocalDateTime
 import kotlin.io.path.writeBytes
 
 @RestController

src/main/java/icu/samnyan/aqua/net/components/Email.kt

@@ -3,11 +3,7 @@ package icu.samnyan.aqua.net.components
 import ext.Bool
 import ext.Str
 import ext.logger
-import icu.samnyan.aqua.net.db.AquaNetUser
+import icu.samnyan.aqua.net.db.*
-import icu.samnyan.aqua.net.db.EmailConfirmation
-import icu.samnyan.aqua.net.db.EmailConfirmationRepo
-import icu.samnyan.aqua.net.db.ResetPassword
-import icu.samnyan.aqua.net.db.ResetPasswordRepo
 import org.simplejavamail.api.mailer.Mailer
 import org.simplejavamail.email.EmailBuilder
 import org.simplejavamail.springsupport.SimpleJavaMailSpringSupport

src/main/java/icu/samnyan/aqua/net/components/JWT.kt

@@ -2,11 +2,7 @@ package icu.samnyan.aqua.net.components
 
 import ext.Str
 import ext.minus
-import icu.samnyan.aqua.net.db.AquaNetUser
+import icu.samnyan.aqua.net.db.*
-import icu.samnyan.aqua.net.db.AquaNetUserRepo
-import icu.samnyan.aqua.net.db.SessionToken
-import icu.samnyan.aqua.net.db.SessionTokenRepo
-import icu.samnyan.aqua.net.db.getTokenExpiry
 import io.jsonwebtoken.JwtParser
 import io.jsonwebtoken.Jwts
 import io.jsonwebtoken.security.Keys

src/main/java/icu/samnyan/aqua/net/db/AquaNetSession.kt

@@ -5,7 +5,7 @@ import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
 import java.io.Serializable
 import java.time.Instant
-import java.util.UUID
+import java.util.*
 
 fun getTokenExpiry() = Instant.now().plusSeconds(7 * 86400)
 

src/main/java/icu/samnyan/aqua/net/games/ImportController.kt

@@ -1,13 +1,14 @@
 package icu.samnyan.aqua.net.games
 
 import ext.*
+import icu.samnyan.aqua.net.Fedy
 import icu.samnyan.aqua.net.db.AquaNetUser
 import icu.samnyan.aqua.net.db.AquaUserServices
-import icu.samnyan.aqua.net.Fedy
 import icu.samnyan.aqua.net.utils.AquaNetProps
 import icu.samnyan.aqua.net.utils.SUCCESS
 import icu.samnyan.aqua.sega.general.model.Card
 import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.context.annotation.Lazy
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.repository.NoRepositoryBean
 import org.springframework.transaction.PlatformTransactionManager
@@ -17,7 +18,6 @@ import java.util.*
 import kotlin.io.path.Path
 import kotlin.io.path.writeText
 import kotlin.reflect.KClass
-import org.springframework.context.annotation.Lazy
 
 data class ExportOptions(
     val playlogAfter: String? = null

src/main/java/icu/samnyan/aqua/net/games/chu3/Chusan.kt

@@ -3,8 +3,11 @@ package icu.samnyan.aqua.net.games.chu3
 import ext.*
 import icu.samnyan.aqua.net.db.AquaUserServices
 import icu.samnyan.aqua.net.games.*
-import icu.samnyan.aqua.net.utils.*
+import icu.samnyan.aqua.net.utils.chu3Scores
-import icu.samnyan.aqua.sega.chusan.model.*
+import icu.samnyan.aqua.sega.chusan.model.Chu3Repos
+import icu.samnyan.aqua.sega.chusan.model.Chu3UserDataRepo
+import icu.samnyan.aqua.sega.chusan.model.Chu3UserMusicDetailRepo
+import icu.samnyan.aqua.sega.chusan.model.Chu3UserPlaylogRepo
 import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserData
 import org.springframework.web.bind.annotation.RestController
 

src/main/java/icu/samnyan/aqua/net/games/mai2/Mai2MusicDetailImport.kt

@@ -1,6 +1,9 @@
 package icu.samnyan.aqua.net.games.mai2
 
-import ext.*
+import ext.API
+import ext.RB
+import ext.RP
+import ext.minus
 import icu.samnyan.aqua.net.db.AquaUserServices
 import icu.samnyan.aqua.net.utils.SUCCESS
 import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos

src/main/java/icu/samnyan/aqua/net/games/mai2/Maimai2.kt

@@ -3,14 +3,19 @@ package icu.samnyan.aqua.net.games.mai2
 import ext.*
 import icu.samnyan.aqua.net.db.AquaUserServices
 import icu.samnyan.aqua.net.games.*
-import icu.samnyan.aqua.net.utils.*
+import icu.samnyan.aqua.net.utils.SUCCESS
+import icu.samnyan.aqua.net.utils.mai2Scores
 import icu.samnyan.aqua.sega.maimai2.handler.UploadUserPhotoHandler
-import icu.samnyan.aqua.sega.maimai2.model.*
+import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos
-import icu.samnyan.aqua.sega.maimai2.model.userdata.*
+import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo
+import icu.samnyan.aqua.sega.maimai2.model.Mai2UserMusicDetailRepo
+import icu.samnyan.aqua.sega.maimai2.model.Mai2UserPlaylogRepo
+import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserDetail
+import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserGeneralData
+import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserLoginBonus
 import org.springframework.http.MediaType
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RestController
-import java.util.*
 
 @RestController
 @API("api/v2/game/mai2")

src/main/java/icu/samnyan/aqua/net/games/ongeki/Ongeki.kt

@@ -3,7 +3,7 @@ package icu.samnyan.aqua.net.games.ongeki
 import ext.API
 import icu.samnyan.aqua.net.db.AquaUserServices
 import icu.samnyan.aqua.net.games.*
-import icu.samnyan.aqua.net.utils.*
+import icu.samnyan.aqua.net.utils.ongekiScores
 import icu.samnyan.aqua.sega.ongeki.OgkUserDataRepo
 import icu.samnyan.aqua.sega.ongeki.OgkUserGeneralDataRepo
 import icu.samnyan.aqua.sega.ongeki.OgkUserMusicDetailRepo

src/main/java/icu/samnyan/aqua/net/games/wacca/Wacca.kt

@@ -1,6 +1,9 @@
 package icu.samnyan.aqua.net.games.wacca
 
-import ext.*
+import ext.API
+import ext.RP
+import ext.isoDate
+import ext.utc
 import icu.samnyan.aqua.net.db.AquaUserServices
 import icu.samnyan.aqua.net.games.*
 import icu.samnyan.aqua.net.utils.waccaScores

src/main/java/icu/samnyan/aqua/net/transfer/AllNetClient.kt

@@ -3,10 +3,10 @@ package icu.samnyan.aqua.net.transfer
 import ext.header
 import ext.post
 import ext.request
-import java.net.URI
 import icu.samnyan.aqua.sega.aimedb.AimeDbClient
 import icu.samnyan.aqua.sega.allnet.AllNetBillingDecoder
 import icu.samnyan.aqua.sega.allnet.AllNetBillingDecoder.decodeAllNetResp
+import java.net.URI
 
 val keychipPattern = Regex("([A-Z\\d]{4}-[A-Z\\d]{11}|[A-Z\\d]{11})")
 

src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDB.kt

@@ -1,6 +1,8 @@
 package icu.samnyan.aqua.sega.aimedb
 
-import ext.*
+import ext.invoke
+import ext.logger
+import ext.toHex
 import icu.samnyan.aqua.net.Fedy
 import icu.samnyan.aqua.net.db.AquaUserServices
 import icu.samnyan.aqua.sega.allnet.AllNetProps

src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbServer.kt

@@ -9,8 +9,6 @@ import io.netty.channel.socket.SocketChannel
 import io.netty.channel.socket.nio.NioServerSocketChannel
 import io.netty.handler.logging.LogLevel
 import io.netty.handler.logging.LoggingHandler
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.context.annotation.Configuration
 import org.springframework.stereotype.Component

src/main/java/icu/samnyan/aqua/sega/chusan/ChusanController.kt

@@ -16,7 +16,6 @@ import icu.samnyan.aqua.spring.Metrics
 import jakarta.servlet.http.HttpServletRequest
 import org.slf4j.LoggerFactory
 import org.springframework.web.bind.annotation.RestController
-import kotlin.collections.set
 
 /**
  * @author samnyan (privateamusement@protonmail.com)

src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanCMApis.kt

@@ -4,8 +4,8 @@ import ext.*
 import icu.samnyan.aqua.sega.chusan.ChusanController
 import icu.samnyan.aqua.sega.chusan.model.request.UpsertUserGacha
 import icu.samnyan.aqua.sega.chusan.model.request.UserEmoney
-import icu.samnyan.aqua.sega.chusan.model.userdata.UserCardPrintState
 import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserItem
+import icu.samnyan.aqua.sega.chusan.model.userdata.UserCardPrintState
 import java.time.LocalDateTime
 
 fun ChusanController.cmApiInit() {

src/main/java/icu/samnyan/aqua/sega/chusan/handler/ChusanMatchingApis.kt

@@ -9,15 +9,6 @@ import ext.parsing
 import icu.samnyan.aqua.sega.chusan.ChusanController
 import icu.samnyan.aqua.sega.chusan.model.request.MatchingWaitState
 import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3MatchingMemberReq
-import kotlin.collections.MutableList
-import kotlin.collections.find
-import kotlin.collections.indices
-import kotlin.collections.listOf
-import kotlin.collections.map
-import kotlin.collections.mapOf
-import kotlin.collections.mutableListOf
-import kotlin.collections.mutableMapOf
-import kotlin.collections.set
 
 
 fun ChusanController.matchingApiInit() {

src/main/java/icu/samnyan/aqua/sega/chusan/model/request/UpsertUserGacha.kt

@@ -3,8 +3,8 @@ package icu.samnyan.aqua.sega.chusan.model.request
 import com.fasterxml.jackson.annotation.JsonProperty
 import icu.samnyan.aqua.sega.chusan.model.GameGachaCard
 import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserData
-import icu.samnyan.aqua.sega.chusan.model.userdata.UserGacha
 import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3UserItem
+import icu.samnyan.aqua.sega.chusan.model.userdata.UserGacha
 import java.io.Serializable
 
 class UpsertUserGacha : Serializable {

src/main/java/icu/samnyan/aqua/sega/diva/handler/BaseHandler.java

@@ -1,7 +1,6 @@
 package icu.samnyan.aqua.sega.diva.handler;
 
 import icu.samnyan.aqua.sega.diva.util.DivaMapper;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;

src/main/java/icu/samnyan/aqua/sega/diva/handler/boot/AttendHandler.java

@@ -6,7 +6,6 @@ import icu.samnyan.aqua.sega.diva.model.common.attend.EtcParameter;
 import icu.samnyan.aqua.sega.diva.model.common.attend.GameBalanceParameter;
 import icu.samnyan.aqua.sega.diva.model.request.BaseRequest;
 import icu.samnyan.aqua.sega.diva.model.response.boot.AttendResponse;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

src/main/java/icu/samnyan/aqua/sega/diva/handler/boot/GameInitHandler.java

@@ -3,7 +3,6 @@ package icu.samnyan.aqua.sega.diva.handler.boot;
 import icu.samnyan.aqua.sega.diva.handler.BaseHandler;
 import icu.samnyan.aqua.sega.diva.model.request.BaseRequest;
 import icu.samnyan.aqua.sega.diva.model.response.boot.GameInitResponse;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

src/main/java/icu/samnyan/aqua/sega/diva/handler/card/CardProcedureHandler.java

@@ -9,7 +9,6 @@ import icu.samnyan.aqua.sega.diva.model.response.card.CardProcedureResponse;
 import icu.samnyan.aqua.sega.diva.model.userdata.GameSession;
 import icu.samnyan.aqua.sega.diva.model.userdata.PlayerProfile;
 import icu.samnyan.aqua.sega.diva.service.PlayerProfileService;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangeNameHandler.java

@@ -10,7 +10,6 @@ import icu.samnyan.aqua.sega.diva.model.response.card.ChangeNameResponse;
 import icu.samnyan.aqua.sega.diva.model.userdata.GameSession;
 import icu.samnyan.aqua.sega.diva.model.userdata.PlayerProfile;
 import icu.samnyan.aqua.sega.diva.service.PlayerProfileService;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/icu/samnyan/aqua/sega/diva/handler/card/ChangePasswdHandler.java

@@ -11,7 +11,6 @@ import icu.samnyan.aqua.sega.diva.model.response.card.ChangePasswdResponse;
 import icu.samnyan.aqua.sega.diva.model.userdata.GameSession;
 import icu.samnyan.aqua.sega.diva.model.userdata.PlayerProfile;
 import icu.samnyan.aqua.sega.diva.service.PlayerProfileService;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/icu/samnyan/aqua/sega/diva/handler/card/InitPasswdHandler.java

@@ -5,7 +5,6 @@ import icu.samnyan.aqua.sega.diva.handler.BaseHandler;
 import icu.samnyan.aqua.sega.diva.model.request.BaseRequest;
 import icu.samnyan.aqua.sega.diva.model.response.BaseResponse;
 import icu.samnyan.aqua.sega.diva.service.PlayerProfileService;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/icu/samnyan/aqua/sega/diva/handler/card/RegistrationHandler.java

@@ -6,7 +6,6 @@ import icu.samnyan.aqua.sega.diva.model.request.card.RegistrationRequest;
 import icu.samnyan.aqua.sega.diva.model.response.card.RegistrationResponse;
 import icu.samnyan.aqua.sega.diva.model.userdata.PlayerProfile;
 import icu.samnyan.aqua.sega.diva.service.PlayerProfileService;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/BannerDataHandler.java

@@ -3,7 +3,6 @@ package icu.samnyan.aqua.sega.diva.handler.databank;
 import icu.samnyan.aqua.sega.diva.handler.BaseHandler;
 import icu.samnyan.aqua.sega.diva.model.request.databank.BannerDataRequest;
 import icu.samnyan.aqua.sega.diva.model.response.databank.BannerDataResponse;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/BannerInfoHandler.java

@@ -3,7 +3,6 @@ package icu.samnyan.aqua.sega.diva.handler.databank;
 import icu.samnyan.aqua.sega.diva.handler.BaseHandler;
 import icu.samnyan.aqua.sega.diva.model.request.BaseRequest;
 import icu.samnyan.aqua.sega.diva.model.response.databank.BannerInfoResponse;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CmPlyInfoHandler.java

@@ -3,7 +3,6 @@ package icu.samnyan.aqua.sega.diva.handler.databank;
 import icu.samnyan.aqua.sega.diva.handler.BaseHandler;
 import icu.samnyan.aqua.sega.diva.model.request.BaseRequest;
 import icu.samnyan.aqua.sega.diva.model.response.BaseResponse;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/CstmzItmNgMdlListHandler.java

@@ -4,7 +4,6 @@ import icu.samnyan.aqua.sega.diva.handler.BaseHandler;
 import icu.samnyan.aqua.sega.diva.model.request.BaseRequest;
 import icu.samnyan.aqua.sega.diva.model.response.databank.CstmzItmNgMdlListResponse;
 import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/FestaInfoHandler.java

@@ -6,7 +6,6 @@ import icu.samnyan.aqua.sega.diva.model.common.collection.FestaCollection;
 import icu.samnyan.aqua.sega.diva.model.gamedata.Festa;
 import icu.samnyan.aqua.sega.diva.model.request.BaseRequest;
 import icu.samnyan.aqua.sega.diva.model.response.databank.FestaInfoResponse;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/NgWordHandler.java

@@ -3,7 +3,6 @@ package icu.samnyan.aqua.sega.diva.handler.databank;
 import icu.samnyan.aqua.sega.diva.handler.BaseHandler;
 import icu.samnyan.aqua.sega.diva.model.request.BaseRequest;
 import icu.samnyan.aqua.sega.diva.model.response.BaseResponse;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/NvRankingHandler.java

@@ -3,7 +3,6 @@ package icu.samnyan.aqua.sega.diva.handler.databank;
 import icu.samnyan.aqua.sega.diva.handler.BaseHandler;
 import icu.samnyan.aqua.sega.diva.model.request.BaseRequest;
 import icu.samnyan.aqua.sega.diva.model.response.databank.NvRankingResponse;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PstdHCtrlHandler.java

@@ -4,7 +4,6 @@ import icu.samnyan.aqua.sega.diva.handler.BaseHandler;
 import icu.samnyan.aqua.sega.diva.model.request.BaseRequest;
 import icu.samnyan.aqua.sega.diva.model.response.databank.PstdHCtrlResponse;
 import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PstdItemNgLstHandler.java

@@ -4,7 +4,6 @@ import icu.samnyan.aqua.sega.diva.handler.BaseHandler;
 import icu.samnyan.aqua.sega.diva.model.request.BaseRequest;
 import icu.samnyan.aqua.sega.diva.model.response.databank.PstdItemNgLstResponse;
 import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvDefChrLstHandler.java

@@ -4,7 +4,6 @@ import icu.samnyan.aqua.sega.diva.handler.BaseHandler;
 import icu.samnyan.aqua.sega.diva.model.request.BaseRequest;
 import icu.samnyan.aqua.sega.diva.model.response.databank.PvDefChrLstResponse;
 import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/PvNgMdlLstHandler.java

@@ -4,7 +4,6 @@ import icu.samnyan.aqua.sega.diva.handler.BaseHandler;
 import icu.samnyan.aqua.sega.diva.model.request.BaseRequest;
 import icu.samnyan.aqua.sega.diva.model.response.databank.PvNgMdlLstResponse;
 import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/QstInfHandler.java

@@ -4,7 +4,6 @@ import icu.samnyan.aqua.sega.diva.handler.BaseHandler;
 import icu.samnyan.aqua.sega.diva.model.request.BaseRequest;
 import icu.samnyan.aqua.sega.diva.model.response.databank.QstInfResponse;
 import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

src/main/java/icu/samnyan/aqua/sega/diva/handler/databank/RmtWpLstHandler.java

@@ -4,7 +4,6 @@ import icu.samnyan.aqua.sega.diva.handler.BaseHandler;
 import icu.samnyan.aqua.sega.diva.model.request.BaseRequest;
 import icu.samnyan.aqua.sega.diva.model.response.databank.RmtWpLstResponse;
 import icu.samnyan.aqua.sega.diva.util.DivaDateTimeUtil;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyCstmzItmHandler.java

@@ -13,7 +13,6 @@ import icu.samnyan.aqua.sega.diva.model.userdata.GameSession;
 import icu.samnyan.aqua.sega.diva.model.userdata.PlayerProfile;
 import icu.samnyan.aqua.sega.diva.service.PlayerCustomizeService;
 import icu.samnyan.aqua.sega.diva.service.PlayerProfileService;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/BuyModuleHandler.java

@@ -13,7 +13,6 @@ import icu.samnyan.aqua.sega.diva.model.userdata.GameSession;
 import icu.samnyan.aqua.sega.diva.model.userdata.PlayerProfile;
 import icu.samnyan.aqua.sega.diva.service.PlayerModuleService;
 import icu.samnyan.aqua.sega.diva.service.PlayerProfileService;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/ShopExitHandler.java

@@ -9,7 +9,6 @@ import icu.samnyan.aqua.sega.diva.model.response.ingame.ShopExitResponse;
 import icu.samnyan.aqua.sega.diva.model.userdata.PlayerProfile;
 import icu.samnyan.aqua.sega.diva.model.userdata.PlayerPvCustomize;
 import icu.samnyan.aqua.sega.diva.service.PlayerProfileService;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageResultHandler.java

@@ -12,8 +12,6 @@ import icu.samnyan.aqua.sega.diva.model.response.ingame.StageResultResponse;
 import icu.samnyan.aqua.sega.diva.model.userdata.*;
 import icu.samnyan.aqua.sega.diva.service.PlayerProfileService;
 import icu.samnyan.aqua.sega.diva.util.DivaCalculator;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
-import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StageStartHandler.java

@@ -9,7 +9,6 @@ import icu.samnyan.aqua.sega.diva.model.response.BaseResponse;
 import icu.samnyan.aqua.sega.diva.model.userdata.GameSession;
 import icu.samnyan.aqua.sega.diva.model.userdata.PlayerProfile;
 import icu.samnyan.aqua.sega.diva.service.PlayerProfileService;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/icu/samnyan/aqua/sega/diva/handler/ingame/StoreSsHandler.java

@@ -8,7 +8,6 @@ import icu.samnyan.aqua.sega.diva.model.response.BaseResponse;
 import icu.samnyan.aqua.sega.diva.model.userdata.PlayerProfile;
 import icu.samnyan.aqua.sega.diva.model.userdata.PlayerScreenShot;
 import icu.samnyan.aqua.sega.diva.service.PlayerProfileService;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/icu/samnyan/aqua/sega/diva/handler/operation/PingHandler.java

@@ -3,7 +3,6 @@ package icu.samnyan.aqua.sega.diva.handler.operation;
 import icu.samnyan.aqua.sega.diva.handler.BaseHandler;
 import icu.samnyan.aqua.sega.diva.model.request.BaseRequest;
 import icu.samnyan.aqua.sega.diva.model.response.operation.PingResponse;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import icu.samnyan.aqua.sega.general.dao.PropertyEntryRepository;
 import icu.samnyan.aqua.sega.general.model.PropertyEntry;
 import lombok.AllArgsConstructor;

src/main/java/icu/samnyan/aqua/sega/diva/handler/user/EndHandler.java

@@ -17,7 +17,6 @@ import icu.samnyan.aqua.sega.diva.model.userdata.GameSession;
 import icu.samnyan.aqua.sega.diva.model.userdata.PlayerContest;
 import icu.samnyan.aqua.sega.diva.model.userdata.PlayerProfile;
 import icu.samnyan.aqua.sega.diva.service.PlayerProfileService;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PdUnlockHandler.java

@@ -9,7 +9,6 @@ import icu.samnyan.aqua.sega.diva.model.response.BaseResponse;
 import icu.samnyan.aqua.sega.diva.model.userdata.GameSession;
 import icu.samnyan.aqua.sega.diva.model.userdata.PlayerProfile;
 import icu.samnyan.aqua.sega.diva.service.PlayerProfileService;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/icu/samnyan/aqua/sega/diva/handler/user/PreStartHandler.java

@@ -9,7 +9,6 @@ import icu.samnyan.aqua.sega.diva.model.response.user.PreStartResponse;
 import icu.samnyan.aqua.sega.diva.model.userdata.GameSession;
 import icu.samnyan.aqua.sega.diva.model.userdata.PlayerProfile;
 import icu.samnyan.aqua.sega.diva.service.PlayerProfileService;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/icu/samnyan/aqua/sega/diva/handler/user/SpendCreditHandler.java

@@ -6,7 +6,6 @@ import icu.samnyan.aqua.sega.diva.model.request.user.SpendCreditRequest;
 import icu.samnyan.aqua.sega.diva.model.response.user.SpendCreditResponse;
 import icu.samnyan.aqua.sega.diva.model.userdata.PlayerProfile;
 import icu.samnyan.aqua.sega.diva.service.PlayerProfileService;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/icu/samnyan/aqua/sega/diva/handler/user/StartHandler.java

@@ -20,7 +20,6 @@ import icu.samnyan.aqua.sega.diva.model.userdata.PlayerPvRecord;
 import icu.samnyan.aqua.sega.diva.service.PlayerCustomizeService;
 import icu.samnyan.aqua.sega.diva.service.PlayerModuleService;
 import icu.samnyan.aqua.sega.diva.service.PlayerProfileService;
-import icu.samnyan.aqua.sega.diva.util.DivaMapper;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/icu/samnyan/aqua/sega/general/GameMusicPopularity.kt

@@ -1,7 +1,6 @@
 package icu.samnyan.aqua.sega.general
 
 import ext.*
-import icu.samnyan.aqua.net.db.AquaUserServices
 import jakarta.persistence.EntityManager
 import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Component

src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2ServletController.kt

@@ -1,6 +1,7 @@
 package icu.samnyan.aqua.sega.maimai2
 
 import ext.*
+import icu.samnyan.aqua.net.Fedy
 import icu.samnyan.aqua.net.games.mai2.Maimai2
 import icu.samnyan.aqua.net.utils.ApiException
 import icu.samnyan.aqua.net.utils.simpleDescribe
@@ -9,15 +10,15 @@ import icu.samnyan.aqua.sega.general.*
 import icu.samnyan.aqua.sega.maimai2.handler.*
 import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos
 import icu.samnyan.aqua.spring.Metrics
-import io.ktor.client.request.*
 import jakarta.servlet.http.HttpServletRequest
-import org.springframework.web.bind.annotation.*
-import java.time.format.DateTimeFormatter
-import kotlin.reflect.full.declaredMemberProperties
-import icu.samnyan.aqua.net.Fedy
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Lazy
-import org.springframework.beans.factory.ObjectProvider
+import org.springframework.web.bind.annotation.PathVariable
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+import java.time.format.DateTimeFormatter
+import kotlin.reflect.full.declaredMemberProperties
 
 /**
  * @author samnyan (privateamusement@protonmail.com)

src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt

@@ -7,9 +7,11 @@ import ext.unique
 import icu.samnyan.aqua.sega.general.BaseHandler
 import icu.samnyan.aqua.sega.general.service.CardService
 import icu.samnyan.aqua.sega.maimai2.handler.UploadUserPlaylogHandler.Companion.playBacklog
-import icu.samnyan.aqua.sega.maimai2.model.*
+import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos
 import icu.samnyan.aqua.sega.maimai2.model.request.Mai2UpsertUserAll
-import icu.samnyan.aqua.sega.maimai2.model.userdata.*
+import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserDetail
+import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserGeneralData
+import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserRate
 import icu.samnyan.aqua.sega.util.BasicMapper
 import lombok.AllArgsConstructor
 import org.slf4j.LoggerFactory

src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserEntities.kt

@@ -5,6 +5,10 @@ package icu.samnyan.aqua.sega.maimai2.model.userdata
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.core.JsonGenerator
+import com.fasterxml.jackson.databind.JsonSerializer
+import com.fasterxml.jackson.databind.SerializerProvider
+import com.fasterxml.jackson.databind.annotation.JsonSerialize
 import ext.toJson
 import icu.samnyan.aqua.net.games.BaseEntity
 import icu.samnyan.aqua.net.games.IGenericGamePlaylog
@@ -15,13 +19,9 @@ import jakarta.persistence.*
 import lombok.AllArgsConstructor
 import lombok.Data
 import lombok.NoArgsConstructor
-import java.time.LocalDateTime
-import com.fasterxml.jackson.databind.annotation.JsonSerialize
-import java.time.format.DateTimeFormatter
-import com.fasterxml.jackson.databind.JsonSerializer
-import com.fasterxml.jackson.databind.SerializerProvider
-import com.fasterxml.jackson.core.JsonGenerator
 import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
 
 @MappedSuperclass
 open class Mai2UserEntity : BaseEntity(), IUserEntity<Mai2UserDetail> {

src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiCMApis.kt

@@ -1,13 +1,6 @@
 package icu.samnyan.aqua.sega.ongeki
 
-import ext.asDateTime
+import ext.*
-import ext.empty
-import ext.int
-import ext.invoke
-import ext.long
-import ext.mapApply
-import ext.minus
-import ext.parsing
 import icu.samnyan.aqua.sega.ongeki.model.*
 import java.time.LocalDateTime
 

src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiController.kt

@@ -11,7 +11,6 @@ import icu.samnyan.aqua.sega.util.BasicMapper
 import icu.samnyan.aqua.spring.Metrics
 import jakarta.servlet.http.HttpServletRequest
 import org.springframework.web.bind.annotation.RestController
-import kotlin.collections.set
 
 @Suppress("unused")
 @RestController

src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiRepos.kt

@@ -6,8 +6,6 @@ import icu.samnyan.aqua.net.games.GenericUserDataRepo
 import icu.samnyan.aqua.net.games.GenericUserMusicRepo
 import icu.samnyan.aqua.net.games.IUserRepo
 import icu.samnyan.aqua.sega.ongeki.model.*
-import icu.samnyan.aqua.sega.ongeki.model.UserEventMap
-import icu.samnyan.aqua.sega.ongeki.model.UserSkin
 import org.springframework.data.domain.Page
 import org.springframework.data.domain.Pageable
 import org.springframework.data.jpa.repository.JpaRepository

src/main/java/icu/samnyan/aqua/spring/SecurityConfig.kt

@@ -6,7 +6,6 @@ import org.springframework.security.config.Customizer
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder
-import org.springframework.security.crypto.password.PasswordEncoder
 import org.springframework.security.web.SecurityFilterChain
 import org.springframework.web.cors.CorsConfiguration
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource