From 563d91d438387a1c3df622c5195d3fdf31de2c09 Mon Sep 17 00:00:00 2001 From: Dom Eori <4j6dq2zi8@relay.firefox.com> Date: Thu, 4 Aug 2022 04:06:55 +0900 Subject: [PATCH] [maimai2] Use BasicMapper instead of StringMapper --- .../sega/maimai2/handler/impl/GetGameChargeHandler.java | 6 +++--- .../sega/maimai2/handler/impl/GetGameEventHandler.java | 6 +++--- .../maimai2/handler/impl/GetGameNgMusicIdHandler.java | 6 +++--- .../sega/maimai2/handler/impl/GetGameRankingHandler.java | 6 +++--- .../sega/maimai2/handler/impl/GetGameSettingHandler.java | 6 +++--- .../handler/impl/GetGameTournamentInfoHandler.java | 6 +++--- .../maimai2/handler/impl/GetTransferFriendHandler.java | 8 ++++---- 7 files changed, 22 insertions(+), 22 deletions(-) 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 1c86ff5e..ab00d78f 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 @@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.dao.gamedata.GameChargeRepository; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.gamedata.GameCharge; -import icu.samnyan.aqua.sega.util.jackson.StringMapper; +import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -22,10 +22,10 @@ public class GetGameChargeHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(GetGameChargeHandler.class); private final GameChargeRepository gameChargeRepository; - private final StringMapper mapper; + private final BasicMapper mapper; @Autowired - public GetGameChargeHandler(GameChargeRepository gameChargeRepository, StringMapper mapper) { + public GetGameChargeHandler(GameChargeRepository gameChargeRepository, BasicMapper mapper) { this.gameChargeRepository = gameChargeRepository; this.mapper = mapper; } 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 e0e448bb..78478053 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 @@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.dao.gamedata.GameEventRepository; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; import icu.samnyan.aqua.sega.maimai2.model.gamedata.GameEvent; -import icu.samnyan.aqua.sega.util.jackson.StringMapper; +import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -24,9 +24,9 @@ public class GetGameEventHandler implements BaseHandler { private final GameEventRepository gameEventRepository; - private final StringMapper mapper; + private final BasicMapper mapper; - public GetGameEventHandler(GameEventRepository gameEventRepository, StringMapper mapper) { + public GetGameEventHandler(GameEventRepository gameEventRepository, BasicMapper mapper) { this.gameEventRepository = gameEventRepository; this.mapper = mapper; } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameNgMusicIdHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameNgMusicIdHandler.java index 6d28ea7e..f436e8f2 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameNgMusicIdHandler.java +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameNgMusicIdHandler.java @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; -import icu.samnyan.aqua.sega.util.jackson.StringMapper; +import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -20,9 +20,9 @@ public class GetGameNgMusicIdHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(GetGameNgMusicIdHandler.class); - private final StringMapper mapper; + private final BasicMapper mapper; - public GetGameNgMusicIdHandler(StringMapper mapper) { + public GetGameNgMusicIdHandler(BasicMapper mapper) { this.mapper = mapper; } 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 83c948e3..e22c70b5 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 @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; -import icu.samnyan.aqua.sega.util.jackson.StringMapper; +import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -20,9 +20,9 @@ public class GetGameRankingHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(GetGameRankingHandler.class); - private final StringMapper mapper; + private final BasicMapper mapper; - public GetGameRankingHandler(StringMapper mapper) { + public GetGameRankingHandler(BasicMapper mapper) { this.mapper = mapper; } 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 7cb2be9b..b3f7381e 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 @@ -6,7 +6,7 @@ import icu.samnyan.aqua.sega.maimai2.model.response.GetGameSettingResp; import icu.samnyan.aqua.sega.maimai2.model.response.data.GameSetting; import icu.samnyan.aqua.sega.general.dao.PropertyEntryRepository; import icu.samnyan.aqua.sega.general.model.PropertyEntry; -import icu.samnyan.aqua.sega.util.jackson.StringMapper; +import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -22,12 +22,12 @@ public class GetGameSettingHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(GetGameSettingHandler.class); - private final StringMapper mapper; + private final BasicMapper mapper; private final PropertyEntryRepository propertyEntryRepository; @Autowired - public GetGameSettingHandler(StringMapper mapper, PropertyEntryRepository propertyEntryRepository) { + public GetGameSettingHandler(BasicMapper mapper, PropertyEntryRepository propertyEntryRepository) { this.mapper = mapper; this.propertyEntryRepository = propertyEntryRepository; } diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameTournamentInfoHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetGameTournamentInfoHandler.java index 69afeba3..6367f59d 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 @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; -import icu.samnyan.aqua.sega.util.jackson.StringMapper; +import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -22,9 +22,9 @@ public class GetGameTournamentInfoHandler implements BaseHandler { //private final GameEventRepository gameEventRepository; - private final StringMapper mapper; + private final BasicMapper mapper; - public GetGameTournamentInfoHandler(StringMapper mapper) { + public GetGameTournamentInfoHandler(BasicMapper mapper) { this.mapper = mapper; } 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 d30fbb7b..a96d2d42 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 @@ -2,7 +2,7 @@ package icu.samnyan.aqua.sega.maimai2.handler.impl; import com.fasterxml.jackson.core.JsonProcessingException; import icu.samnyan.aqua.sega.maimai2.handler.BaseHandler; -import icu.samnyan.aqua.sega.util.jackson.StringMapper; +import icu.samnyan.aqua.sega.util.jackson.BasicMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -20,15 +20,15 @@ public class GetTransferFriendHandler implements BaseHandler { private static final Logger logger = LoggerFactory.getLogger(GetTransferFriendHandler.class); - private final StringMapper mapper; + private final BasicMapper mapper; - public GetTransferFriendHandler(StringMapper mapper) { + public GetTransferFriendHandler(BasicMapper mapper) { this.mapper = mapper; } @Override public String handle(Map request) throws JsonProcessingException { - int userId = (int) request.get("userId"); + long userId = ((Number) request.get("userId")).longValue(); List transferFriendList = new ArrayList<>();