From cf2b1499252a39aa952b84bfde1d45c76f437f99 Mon Sep 17 00:00:00 2001 From: Dom Eori <4j6dq2zi8@relay.firefox.com> Date: Sun, 26 Dec 2021 23:52:12 +0900 Subject: [PATCH] [general & maimai2] Use fixed bean naming --- src/main/java/icu/samnyan/aqua/AquaServerApplication.java | 8 ++------ .../sega/maimai2/dao/userdata/UserChargeRepository.java | 2 +- .../sega/maimai2/dao/userdata/UserPlaylogRepository.java | 2 +- .../sega/maimai2/handler/impl/GetGameChargeHandler.java | 2 +- .../sega/maimai2/handler/impl/GetGameEventHandler.java | 2 +- .../sega/maimai2/handler/impl/GetGameRankingHandler.java | 2 +- .../sega/maimai2/handler/impl/GetGameSettingHandler.java | 2 +- .../handler/impl/GetGameTournamentInfoHandler.java | 3 +-- .../maimai2/handler/impl/GetTransferFriendHandler.java | 2 +- .../sega/maimai2/handler/impl/GetUserCardHandler.java | 2 +- .../sega/maimai2/handler/impl/GetUserDataHandler.java | 2 +- .../sega/maimai2/handler/impl/GetUserExtendHandler.java | 2 +- .../sega/maimai2/handler/impl/GetUserGhostHandler.java | 2 +- .../sega/maimai2/handler/impl/GetUserRatingHandler.java | 2 +- .../sega/maimai2/handler/impl/GetUserRegionHandler.java | 2 +- .../sega/maimai2/handler/impl/UploadUserPhotoHandler.java | 2 +- .../maimai2/handler/impl/UploadUserPlaylogHandler.java | 2 +- .../aqua/sega/maimai2/handler/impl/UserLoginHandler.java | 2 +- .../aqua/sega/maimai2/handler/impl/UserLogoutHandler.java | 2 +- 19 files changed, 20 insertions(+), 25 deletions(-) diff --git a/src/main/java/icu/samnyan/aqua/AquaServerApplication.java b/src/main/java/icu/samnyan/aqua/AquaServerApplication.java index edee56db..804cf45e 100644 --- a/src/main/java/icu/samnyan/aqua/AquaServerApplication.java +++ b/src/main/java/icu/samnyan/aqua/AquaServerApplication.java @@ -4,17 +4,13 @@ import icu.samnyan.aqua.sega.aimedb.AimeDbServer; import icu.samnyan.aqua.spring.util.AutoChecker; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.context.ConfigurableApplicationContext; -@SpringBootApplication() +@SpringBootApplication public class AquaServerApplication { public static void main(String[] args) throws Exception { - final SpringApplicationBuilder builder = new SpringApplicationBuilder(AquaServerApplication.class); - builder.beanNameGenerator(new AquaBeanNameGenerator()); - - ConfigurableApplicationContext ctx = builder.run(args); + ConfigurableApplicationContext ctx = SpringApplication.run(AquaServerApplication.class, args); final AimeDbServer aimeDbServer = ctx.getBean(AimeDbServer.class); aimeDbServer.start(); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserChargeRepository.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserChargeRepository.java index 84a07056..fd091f63 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserChargeRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserChargeRepository.java @@ -11,7 +11,7 @@ import java.util.Optional; /** * @author samnyan (privateamusement@protonmail.com) */ -@Repository +@Repository("Maimai2UserChargeRepository") public interface UserChargeRepository extends JpaRepository { List findByUser_Card_ExtId(Long extId); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserPlaylogRepository.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserPlaylogRepository.java index 9390ec83..3f9d4b45 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserPlaylogRepository.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/dao/userdata/UserPlaylogRepository.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository; /** * @author samnyan (privateamusement@protonmail.com) */ -@Repository +@Repository("Maimai2UserPlaylogRepository") public interface UserPlaylogRepository extends JpaRepository { } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameChargeHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameChargeHandler.java index 05bcbdb0..1c86ff5e 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameChargeHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameChargeHandler.java @@ -17,7 +17,7 @@ import java.util.Map; /** * @author samnyan (privateamusement@protonmail.com) */ -@Component +@Component("Maimai2GetGameChargeHandler") public class GetGameChargeHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(GetGameChargeHandler.class); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameEventHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameEventHandler.java index 6c7eabd3..e0e448bb 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameEventHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameEventHandler.java @@ -17,7 +17,7 @@ import java.util.Map; /** * @author samnyan (privateamusement@protonmail.com) */ -@Component +@Component("Maimai2GetGameEventHandler") public class GetGameEventHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(GetGameEventHandler.class); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameRankingHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameRankingHandler.java index 548111b3..83c948e3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameRankingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameRankingHandler.java @@ -15,7 +15,7 @@ import java.util.Map; /** * @author samnyan (privateamusement@protonmail.com) */ -@Component +@Component("Maimai2GetGameRankingHandler") public class GetGameRankingHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(GetGameRankingHandler.class); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameSettingHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameSettingHandler.java index 12b50650..7cb2be9b 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameSettingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameSettingHandler.java @@ -17,7 +17,7 @@ import java.util.Map; /** * @author samnyan (privateamusement@protonmail.com) */ -@Component +@Component("Maimai2GetGameSettingHandler") public class GetGameSettingHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(GetGameSettingHandler.class); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameTournamentInfoHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameTournamentInfoHandler.java index 47af6a66..69afeba3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameTournamentInfoHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameTournamentInfoHandler.java @@ -5,7 +5,6 @@ import icu.samnyan.aqua.sega.maimai2.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; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -16,7 +15,7 @@ import java.util.Map; /** * @author samnyan (privateamusement@protonmail.com) */ -@Component +@Component("Maimai2GetGameTournamentInfoHandler") public class GetGameTournamentInfoHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(GetGameTournamentInfoHandler.class); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetTransferFriendHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetTransferFriendHandler.java index 86270fa5..d30fbb7b 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetTransferFriendHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetTransferFriendHandler.java @@ -15,7 +15,7 @@ import java.util.Map; /** * @author samnyan (privateamusement@protonmail.com) */ -@Component +@Component("Maimai2GetTransferFriendHandler") public class GetTransferFriendHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(GetTransferFriendHandler.class); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserCardHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserCardHandler.java index f0b1d8c4..481416ca 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserCardHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserCardHandler.java @@ -15,7 +15,7 @@ import java.util.Map; /** * @author samnyan (privateamusement@protonmail.com) */ -@Component +@Component("Maimai2GetUserCardHandler") public class GetUserCardHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(GetUserDataHandler.class); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserDataHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserDataHandler.java index eaba78b7..bf4aa1ca 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserDataHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserDataHandler.java @@ -15,7 +15,7 @@ import java.util.Map; /** * @author samnyan (privateamusement@protonmail.com) */ -@Component +@Component("Maimai2GetUserDataHandler") public class GetUserDataHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(GetUserDataHandler.class); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserExtendHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserExtendHandler.java index 1b25cf7b..52e8e72d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserExtendHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserExtendHandler.java @@ -15,7 +15,7 @@ import java.util.Map; /** * @author samnyan (privateamusement@protonmail.com) */ -@Component +@Component("Maimai2GetUserExtendHandler") public class GetUserExtendHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(GetUserExtendHandler.class); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserGhostHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserGhostHandler.java index 8018602b..2c1a829d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserGhostHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserGhostHandler.java @@ -15,7 +15,7 @@ import java.util.Map; /** * @author samnyan (privateamusement@protonmail.com) */ -@Component +@Component("Maimai2GetUserGhostHandler") public class GetUserGhostHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(GetUserDataHandler.class); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRatingHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRatingHandler.java index cc4d41f1..f620e671 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRatingHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRatingHandler.java @@ -22,7 +22,7 @@ import java.util.*; /** * @author samnyan (privateamusement@protonmail.com) */ -@Component +@Component("Maimai2GetUserRatingHandler") public class GetUserRatingHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(GetUserRatingHandler.class); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRegionHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRegionHandler.java index 973217b4..84358cb5 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRegionHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserRegionHandler.java @@ -15,7 +15,7 @@ import java.util.Map; /** * @author samnyan (privateamusement@protonmail.com) */ -@Component +@Component("Maimai2GetUserRegionHandler") public class GetUserRegionHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(GetUserDataHandler.class); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPhotoHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPhotoHandler.java index 67a6db10..b961d7b3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPhotoHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPhotoHandler.java @@ -21,7 +21,7 @@ import java.util.Map; /** * @author samnyan (privateamusement@protonmail.com) */ -@Component +@Component("Maimai2UploadUserPhotoHandler") public class UploadUserPhotoHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(UploadUserPhotoHandler.class); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPlaylogHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPlaylogHandler.java index 728904bf..9c64db9f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPlaylogHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPlaylogHandler.java @@ -19,7 +19,7 @@ import java.util.Optional; /** * @author samnyan (privateamusement@protonmail.com) */ -@Component +@Component("Maimai2UploadUserPlaylogHandler") public class UploadUserPlaylogHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(UploadUserPlaylogHandler.class); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UserLoginHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UserLoginHandler.java index 494721aa..102226be 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UserLoginHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UserLoginHandler.java @@ -13,7 +13,7 @@ import java.util.Map; /** * @author samnyan (privateamusement@protonmail.com) */ -@Component +@Component("Maimai2UserLoginHandler") public class UserLoginHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(UserLoginHandler.class); diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UserLogoutHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UserLogoutHandler.java index db84d49d..7b9cb6f8 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UserLogoutHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UserLogoutHandler.java @@ -13,7 +13,7 @@ import java.util.Map; /** * @author samnyan (privateamusement@protonmail.com) */ -@Component +@Component("Maimai2UserLogoutHandler") public class UserLogoutHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(UserLogoutHandler.class);