From 69f4f75347f4d9c9658ff13644422f5183843666 Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Sat, 25 Oct 2025 04:59:24 +0800
Subject: [PATCH] [M] Move files

---
 src/main/java/icu/samnyan/aqua/net/transfer/DataBroker.kt   | 6 +++---
 .../icu/samnyan/aqua/sega/cardmaker/CardMakerController.kt  | 2 +-
 .../java/icu/samnyan/aqua/sega/chusan/ChusanController.kt   | 4 ++--
 .../samnyan/aqua/sega/chusan/model/userdata/Chu3UserData.kt | 2 +-
 .../aqua/sega/chusan/model/userdata/UserMusicDetail.kt      | 2 +-
 .../java/icu/samnyan/aqua/sega/diva/util/DivaMapper.java    | 6 +++---
 .../aqua/sega/maimai2/handler/GetUserRatingHandler.kt       | 2 +-
 .../aqua/sega/maimai2/handler/UploadUserPhotoHandler.kt     | 2 +-
 .../aqua/sega/maimai2/handler/UploadUserPlaylogHandler.kt   | 2 +-
 .../aqua/sega/maimai2/handler/UploadUserPortraitHandler.kt  | 2 +-
 .../aqua/sega/maimai2/handler/UpsertUserAllHandler.kt       | 2 +-
 .../aqua/sega/maimai2/handler/UpsertUserPrintHandler.kt     | 2 +-
 .../aqua/sega/maimai2/model/userdata/Mai2UserDetail.kt      | 2 +-
 .../java/icu/samnyan/aqua/sega/ongeki/OngekiController.kt   | 2 +-
 .../samnyan/aqua/sega/ongeki/model/OngekiUserEntities.kt    | 2 +-
 .../icu/samnyan/aqua/sega/util/{jackson => }/BasicMapper.kt | 2 +-
 .../icu/samnyan/aqua/sega/util/{jackson => }/Serializers.kt | 2 +-
 17 files changed, 22 insertions(+), 22 deletions(-)
 rename src/main/java/icu/samnyan/aqua/sega/util/{jackson => }/BasicMapper.kt (98%)
 rename src/main/java/icu/samnyan/aqua/sega/util/{jackson => }/Serializers.kt (97%)

diff --git a/src/main/java/icu/samnyan/aqua/net/transfer/DataBroker.kt b/src/main/java/icu/samnyan/aqua/net/transfer/DataBroker.kt
index f13c4961..c52d4b2b 100644
--- a/src/main/java/icu/samnyan/aqua/net/transfer/DataBroker.kt
+++ b/src/main/java/icu/samnyan/aqua/net/transfer/DataBroker.kt
@@ -11,9 +11,9 @@ import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserItem
 import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserMusicDetail
 import icu.samnyan.aqua.sega.ongeki.model.OngekiUpsertUserAll
 import icu.samnyan.aqua.sega.ongeki.model.UserItem
-import icu.samnyan.aqua.sega.util.jackson.BasicMapper
-import icu.samnyan.aqua.sega.util.jackson.IMapper
-import icu.samnyan.aqua.sega.util.jackson.StringMapper
+import icu.samnyan.aqua.sega.util.BasicMapper
+import icu.samnyan.aqua.sega.util.IMapper
+import icu.samnyan.aqua.sega.util.StringMapper
 
 
 abstract class DataBroker(
diff --git a/src/main/java/icu/samnyan/aqua/sega/cardmaker/CardMakerController.kt b/src/main/java/icu/samnyan/aqua/sega/cardmaker/CardMakerController.kt
index d2f9bb91..a8883501 100644
--- a/src/main/java/icu/samnyan/aqua/sega/cardmaker/CardMakerController.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/cardmaker/CardMakerController.kt
@@ -5,7 +5,7 @@ import ext.logger
 import ext.long
 import ext.parsing
 import icu.samnyan.aqua.sega.allnet.TokenChecker
-import icu.samnyan.aqua.sega.util.jackson.BasicMapper
+import icu.samnyan.aqua.sega.util.BasicMapper
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.web.bind.annotation.ModelAttribute
 import org.springframework.web.bind.annotation.RequestMapping
diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanController.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanController.kt
index 291758b6..b1c51c3f 100644
--- a/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanController.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/chusan/ChusanController.kt
@@ -10,8 +10,8 @@ import icu.samnyan.aqua.sega.chusan.model.Chu3Repos
 import icu.samnyan.aqua.sega.general.GameMusicPopularity
 import icu.samnyan.aqua.sega.general.MeowApi
 import icu.samnyan.aqua.sega.general.RequestContext
-import icu.samnyan.aqua.sega.util.jackson.BasicMapper
-import icu.samnyan.aqua.sega.util.jackson.StringMapper
+import icu.samnyan.aqua.sega.util.BasicMapper
+import icu.samnyan.aqua.sega.util.StringMapper
 import icu.samnyan.aqua.spring.Metrics
 import jakarta.servlet.http.HttpServletRequest
 import org.slf4j.LoggerFactory
diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserData.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserData.kt
index 8ad035c4..dcfc2bf7 100644
--- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserData.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserData.kt
@@ -12,7 +12,7 @@ import icu.samnyan.aqua.net.games.BaseEntity
 import icu.samnyan.aqua.net.games.IUserData
 import icu.samnyan.aqua.sega.chusan.model.request.UserEmoney
 import icu.samnyan.aqua.sega.general.model.Card
-import icu.samnyan.aqua.sega.util.jackson.AccessCodeSerializer
+import icu.samnyan.aqua.sega.util.AccessCodeSerializer
 import jakarta.persistence.*
 import kotlinx.io.IOException
 import lombok.NoArgsConstructor
diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserMusicDetail.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserMusicDetail.kt
index 3bf3933c..edc5e5de 100644
--- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserMusicDetail.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserMusicDetail.kt
@@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.chusan.model.userdata
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import icu.samnyan.aqua.net.games.IGenericUserMusic
-import icu.samnyan.aqua.sega.util.jackson.BooleanToIntegerDeserializer
+import icu.samnyan.aqua.sega.util.BooleanToIntegerDeserializer
 import jakarta.persistence.Entity
 import jakarta.persistence.Table
 import jakarta.persistence.UniqueConstraint
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 29fd5839..755f5bf5 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
@@ -8,9 +8,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import icu.samnyan.aqua.sega.util.jackson.BooleanNumberDeserializer;
-import icu.samnyan.aqua.sega.util.jackson.BooleanNumberSerializer;
-import icu.samnyan.aqua.sega.util.jackson.ZonedDateTimeDeserializer;
+import icu.samnyan.aqua.sega.util.BooleanNumberDeserializer;
+import icu.samnyan.aqua.sega.util.BooleanNumberSerializer;
+import icu.samnyan.aqua.sega.util.ZonedDateTimeDeserializer;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRatingHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRatingHandler.kt
index c9a6813d..0af4c294 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRatingHandler.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/GetUserRatingHandler.kt
@@ -6,7 +6,7 @@ import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos
 import icu.samnyan.aqua.sega.maimai2.model.UserRating
 import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserRate
 import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserUdemae
-import icu.samnyan.aqua.sega.util.jackson.BasicMapper
+import icu.samnyan.aqua.sega.util.BasicMapper
 import org.springframework.stereotype.Component
 
 /**
diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPhotoHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPhotoHandler.kt
index e3942a67..194edb91 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPhotoHandler.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPhotoHandler.kt
@@ -3,7 +3,7 @@ package icu.samnyan.aqua.sega.maimai2.handler
 import ext.*
 import icu.samnyan.aqua.sega.general.BaseHandler
 import icu.samnyan.aqua.sega.maimai2.model.request.Mai2UserPhoto
-import icu.samnyan.aqua.sega.util.jackson.BasicMapper
+import icu.samnyan.aqua.sega.util.BasicMapper
 import org.springframework.stereotype.Component
 import java.io.IOException
 import java.nio.file.Files
diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPlaylogHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPlaylogHandler.kt
index b5824cb5..25f1ff06 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPlaylogHandler.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPlaylogHandler.kt
@@ -9,7 +9,7 @@ import icu.samnyan.aqua.sega.general.BaseHandler
 import icu.samnyan.aqua.sega.maimai2.model.Mai2UserDataRepo
 import icu.samnyan.aqua.sega.maimai2.model.Mai2UserPlaylogRepo
 import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserPlaylog
-import icu.samnyan.aqua.sega.util.jackson.BasicMapper
+import icu.samnyan.aqua.sega.util.BasicMapper
 import icu.samnyan.aqua.spring.Metrics
 import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Component
diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPortraitHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPortraitHandler.kt
index 1301bcb4..2b70a110 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPortraitHandler.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UploadUserPortraitHandler.kt
@@ -7,7 +7,7 @@ import ext.path
 import icu.samnyan.aqua.net.utils.PathProps
 import icu.samnyan.aqua.sega.general.BaseHandler
 import icu.samnyan.aqua.sega.maimai2.model.request.Mai2UserPortrait
-import icu.samnyan.aqua.sega.util.jackson.BasicMapper
+import icu.samnyan.aqua.sega.util.BasicMapper
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Component
 import java.io.IOException
diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt
index e2ec4b99..7b16e8ab 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt
@@ -10,7 +10,7 @@ import icu.samnyan.aqua.sega.maimai2.handler.UploadUserPlaylogHandler.Companion.
 import icu.samnyan.aqua.sega.maimai2.model.*
 import icu.samnyan.aqua.sega.maimai2.model.request.Mai2UpsertUserAll
 import icu.samnyan.aqua.sega.maimai2.model.userdata.*
-import icu.samnyan.aqua.sega.util.jackson.BasicMapper
+import icu.samnyan.aqua.sega.util.BasicMapper
 import lombok.AllArgsConstructor
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Component
diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserPrintHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserPrintHandler.kt
index 6db707aa..ad17f184 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserPrintHandler.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserPrintHandler.kt
@@ -7,7 +7,7 @@ import ext.parsing
 import icu.samnyan.aqua.sega.general.BaseHandler
 import icu.samnyan.aqua.sega.maimai2.model.Mai2Repos
 import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserPrintDetail
-import icu.samnyan.aqua.sega.util.jackson.BasicMapper
+import icu.samnyan.aqua.sega.util.BasicMapper
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Component
 import java.time.LocalDateTime
diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/Mai2UserDetail.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/Mai2UserDetail.kt
index c82efefb..a5903a96 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/Mai2UserDetail.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/Mai2UserDetail.kt
@@ -8,7 +8,7 @@ import icu.samnyan.aqua.net.games.BaseEntity
 import icu.samnyan.aqua.net.games.IUserData
 import icu.samnyan.aqua.sega.general.IntegerListConverter
 import icu.samnyan.aqua.sega.general.model.Card
-import icu.samnyan.aqua.sega.util.jackson.AccessCodeSerializer
+import icu.samnyan.aqua.sega.util.AccessCodeSerializer
 import jakarta.persistence.*
 
 @Entity(name = "Maimai2UserData")
diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiController.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiController.kt
index a03861bc..50996e9a 100644
--- a/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiController.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/OngekiController.kt
@@ -7,7 +7,7 @@ import icu.samnyan.aqua.sega.allnet.TokenChecker
 import icu.samnyan.aqua.sega.general.GameMusicPopularity
 import icu.samnyan.aqua.sega.general.MeowApi
 import icu.samnyan.aqua.sega.general.RequestContext
-import icu.samnyan.aqua.sega.util.jackson.BasicMapper
+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
diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/OngekiUserEntities.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/OngekiUserEntities.kt
index b3b2fce8..47aa146d 100644
--- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/OngekiUserEntities.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/OngekiUserEntities.kt
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.annotation.JsonSerialize
 import icu.samnyan.aqua.net.games.*
 import icu.samnyan.aqua.sega.general.model.Card
-import icu.samnyan.aqua.sega.util.jackson.AccessCodeSerializer
+import icu.samnyan.aqua.sega.util.AccessCodeSerializer
 import jakarta.persistence.*
 import java.time.LocalDate
 import java.time.LocalDateTime
diff --git a/src/main/java/icu/samnyan/aqua/sega/util/jackson/BasicMapper.kt b/src/main/java/icu/samnyan/aqua/sega/util/BasicMapper.kt
similarity index 98%
rename from src/main/java/icu/samnyan/aqua/sega/util/jackson/BasicMapper.kt
rename to src/main/java/icu/samnyan/aqua/sega/util/BasicMapper.kt
index 758e6c03..a5b9eb01 100644
--- a/src/main/java/icu/samnyan/aqua/sega/util/jackson/BasicMapper.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/util/BasicMapper.kt
@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.sega.util.jackson
+package icu.samnyan.aqua.sega.util
 
 import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.core.json.JsonWriteFeature
diff --git a/src/main/java/icu/samnyan/aqua/sega/util/jackson/Serializers.kt b/src/main/java/icu/samnyan/aqua/sega/util/Serializers.kt
similarity index 97%
rename from src/main/java/icu/samnyan/aqua/sega/util/jackson/Serializers.kt
rename to src/main/java/icu/samnyan/aqua/sega/util/Serializers.kt
index 369591a5..05a2ff7a 100644
--- a/src/main/java/icu/samnyan/aqua/sega/util/jackson/Serializers.kt
+++ b/src/main/java/icu/samnyan/aqua/sega/util/Serializers.kt
@@ -1,4 +1,4 @@
-package icu.samnyan.aqua.sega.util.jackson
+package icu.samnyan.aqua.sega.util
 
 import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.core.JsonParser