From 61a770a977f0a6052fc64ae21657c2e56e2ebd07 Mon Sep 17 00:00:00 2001 From: samnyan <205-neumphis@users.noreply.dev.s-ul.eu> Date: Fri, 31 Jan 2020 22:56:45 +0800 Subject: [PATCH] [API] Rearrange class --- .../aqua/api/controller/{ => sega}/ApiAimeController.java | 2 +- .../sega/{ => game}/chuni/amazon/ApiAmazonController.java | 7 +------ .../sega/{ => game}/diva/ApiDivaGameDataController.java | 2 +- .../sega/{ => game}/diva/ApiDivaPlayerDataController.java | 3 +-- .../sega/{diva => manage}/ApiDivaManageController.java | 4 ++-- 5 files changed, 6 insertions(+), 12 deletions(-) rename src/main/java/icu/samnyan/aqua/api/controller/{ => sega}/ApiAimeController.java (95%) rename src/main/java/icu/samnyan/aqua/api/controller/sega/{ => game}/chuni/amazon/ApiAmazonController.java (94%) rename src/main/java/icu/samnyan/aqua/api/controller/sega/{ => game}/diva/ApiDivaGameDataController.java (96%) rename src/main/java/icu/samnyan/aqua/api/controller/sega/{ => game}/diva/ApiDivaPlayerDataController.java (99%) rename src/main/java/icu/samnyan/aqua/api/controller/sega/{diva => manage}/ApiDivaManageController.java (98%) diff --git a/src/main/java/icu/samnyan/aqua/api/controller/ApiAimeController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/ApiAimeController.java similarity index 95% rename from src/main/java/icu/samnyan/aqua/api/controller/ApiAimeController.java rename to src/main/java/icu/samnyan/aqua/api/controller/sega/ApiAimeController.java index a654e976..3ed62184 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/ApiAimeController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/ApiAimeController.java @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.api.controller; +package icu.samnyan.aqua.api.controller.sega; import icu.samnyan.aqua.sega.general.dao.CardRepository; import icu.samnyan.aqua.sega.general.model.Card; diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/chuni/amazon/ApiAmazonController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/amazon/ApiAmazonController.java similarity index 94% rename from src/main/java/icu/samnyan/aqua/api/controller/sega/chuni/amazon/ApiAmazonController.java rename to src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/amazon/ApiAmazonController.java index b7f11804..5249ca2f 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/chuni/amazon/ApiAmazonController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/chuni/amazon/ApiAmazonController.java @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.api.controller.sega.chuni.amazon; +package icu.samnyan.aqua.api.controller.sega.game.chuni.amazon; import com.fasterxml.jackson.core.type.TypeReference; import icu.samnyan.aqua.api.model.resp.sega.chuni.amazon.ProfileResp; @@ -132,11 +132,6 @@ public class ApiAmazonController { return gameMusicService.getAll(); } -// @PostMapping("music/import") -// public List addMusic(@RequestBody List musicList) { -// musicList.forEach(music -> music.getLevels().forEach((integer, level) -> level.setMusic(music))); -// return gameMusicService.saveAll(musicList); -// } private int calculateRating(int levelBase, int score) { if (score >= 1007500) return levelBase + 200; diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/diva/ApiDivaGameDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/diva/ApiDivaGameDataController.java similarity index 96% rename from src/main/java/icu/samnyan/aqua/api/controller/sega/diva/ApiDivaGameDataController.java rename to src/main/java/icu/samnyan/aqua/api/controller/sega/game/diva/ApiDivaGameDataController.java index 847cf1a5..723a9867 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/diva/ApiDivaGameDataController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/diva/ApiDivaGameDataController.java @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.api.controller.sega.diva; +package icu.samnyan.aqua.api.controller.sega.game.diva; import icu.samnyan.aqua.sega.diva.dao.gamedata.DivaCustomizeRepository; import icu.samnyan.aqua.sega.diva.dao.gamedata.DivaModuleRepository; diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/diva/ApiDivaPlayerDataController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/diva/ApiDivaPlayerDataController.java similarity index 99% rename from src/main/java/icu/samnyan/aqua/api/controller/sega/diva/ApiDivaPlayerDataController.java rename to src/main/java/icu/samnyan/aqua/api/controller/sega/game/diva/ApiDivaPlayerDataController.java index 3a638f08..dd1992bd 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/diva/ApiDivaPlayerDataController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/game/diva/ApiDivaPlayerDataController.java @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.api.controller.sega.diva; +package icu.samnyan.aqua.api.controller.sega.game.diva; import icu.samnyan.aqua.api.model.MessageResponse; import icu.samnyan.aqua.api.model.ReducedPageResponse; @@ -8,7 +8,6 @@ import icu.samnyan.aqua.sega.diva.model.common.Difficulty; import icu.samnyan.aqua.sega.diva.model.common.Edition; import icu.samnyan.aqua.sega.diva.model.userdata.*; import icu.samnyan.aqua.sega.diva.service.PlayerProfileService; -import icu.samnyan.aqua.sega.general.model.Card; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.http.HttpStatus; diff --git a/src/main/java/icu/samnyan/aqua/api/controller/sega/diva/ApiDivaManageController.java b/src/main/java/icu/samnyan/aqua/api/controller/sega/manage/ApiDivaManageController.java similarity index 98% rename from src/main/java/icu/samnyan/aqua/api/controller/sega/diva/ApiDivaManageController.java rename to src/main/java/icu/samnyan/aqua/api/controller/sega/manage/ApiDivaManageController.java index 6d79cd60..0e19fede 100644 --- a/src/main/java/icu/samnyan/aqua/api/controller/sega/diva/ApiDivaManageController.java +++ b/src/main/java/icu/samnyan/aqua/api/controller/sega/manage/ApiDivaManageController.java @@ -1,4 +1,4 @@ -package icu.samnyan.aqua.api.controller.sega.diva; +package icu.samnyan.aqua.api.controller.sega.manage; import icu.samnyan.aqua.api.model.MessageResponse; import icu.samnyan.aqua.api.model.req.sega.diva.ModuleEntry; @@ -20,7 +20,7 @@ import java.util.Optional; * @author samnyan (privateamusement@protonmail.com) */ @RestController -@RequestMapping("api/game/diva/manage") +@RequestMapping("api/manage/diva/") public class ApiDivaManageController { private final PvEntryRepository pvEntryRepository;