From fd1647614345cc577a1ced46612e73ff01ea3bc6 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 8 Apr 2024 19:47:20 +0100 Subject: [PATCH] rename util to common --- src/main/java/cc/fascinated/{util => common}/IPUtils.java | 2 +- src/main/java/cc/fascinated/{util => common}/PlayerUtils.java | 2 +- src/main/java/cc/fascinated/{util => common}/Tuple.java | 2 +- src/main/java/cc/fascinated/{util => common}/UUIDUtils.java | 2 +- src/main/java/cc/fascinated/{util => common}/WebRequest.java | 2 +- src/main/java/cc/fascinated/controller/PlayerController.java | 2 +- src/main/java/cc/fascinated/log/TransactionLogger.java | 2 +- src/main/java/cc/fascinated/model/mojang/MojangProfile.java | 4 ++-- src/main/java/cc/fascinated/model/player/Player.java | 4 ++-- src/main/java/cc/fascinated/model/player/Skin.java | 2 +- src/main/java/cc/fascinated/service/MojangAPIService.java | 2 +- src/main/java/cc/fascinated/service/PlayerService.java | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) rename src/main/java/cc/fascinated/{util => common}/IPUtils.java (97%) rename src/main/java/cc/fascinated/{util => common}/PlayerUtils.java (98%) rename src/main/java/cc/fascinated/{util => common}/Tuple.java (90%) rename src/main/java/cc/fascinated/{util => common}/UUIDUtils.java (94%) rename src/main/java/cc/fascinated/{util => common}/WebRequest.java (97%) diff --git a/src/main/java/cc/fascinated/util/IPUtils.java b/src/main/java/cc/fascinated/common/IPUtils.java similarity index 97% rename from src/main/java/cc/fascinated/util/IPUtils.java rename to src/main/java/cc/fascinated/common/IPUtils.java index 73554d8..eed9631 100644 --- a/src/main/java/cc/fascinated/util/IPUtils.java +++ b/src/main/java/cc/fascinated/common/IPUtils.java @@ -1,4 +1,4 @@ -package cc.fascinated.util; +package cc.fascinated.common; import jakarta.servlet.http.HttpServletRequest; import lombok.experimental.UtilityClass; diff --git a/src/main/java/cc/fascinated/util/PlayerUtils.java b/src/main/java/cc/fascinated/common/PlayerUtils.java similarity index 98% rename from src/main/java/cc/fascinated/util/PlayerUtils.java rename to src/main/java/cc/fascinated/common/PlayerUtils.java index aa127c7..246ed67 100644 --- a/src/main/java/cc/fascinated/util/PlayerUtils.java +++ b/src/main/java/cc/fascinated/common/PlayerUtils.java @@ -1,4 +1,4 @@ -package cc.fascinated.util; +package cc.fascinated.common; import cc.fascinated.Main; import cc.fascinated.model.player.Skin; diff --git a/src/main/java/cc/fascinated/util/Tuple.java b/src/main/java/cc/fascinated/common/Tuple.java similarity index 90% rename from src/main/java/cc/fascinated/util/Tuple.java rename to src/main/java/cc/fascinated/common/Tuple.java index cfdd669..d51de5d 100644 --- a/src/main/java/cc/fascinated/util/Tuple.java +++ b/src/main/java/cc/fascinated/common/Tuple.java @@ -1,4 +1,4 @@ -package cc.fascinated.util; +package cc.fascinated.common; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/cc/fascinated/util/UUIDUtils.java b/src/main/java/cc/fascinated/common/UUIDUtils.java similarity index 94% rename from src/main/java/cc/fascinated/util/UUIDUtils.java rename to src/main/java/cc/fascinated/common/UUIDUtils.java index c20e71c..204f5cd 100644 --- a/src/main/java/cc/fascinated/util/UUIDUtils.java +++ b/src/main/java/cc/fascinated/common/UUIDUtils.java @@ -1,4 +1,4 @@ -package cc.fascinated.util; +package cc.fascinated.common; import lombok.experimental.UtilityClass; diff --git a/src/main/java/cc/fascinated/util/WebRequest.java b/src/main/java/cc/fascinated/common/WebRequest.java similarity index 97% rename from src/main/java/cc/fascinated/util/WebRequest.java rename to src/main/java/cc/fascinated/common/WebRequest.java index 2e71ecc..dc5ef00 100644 --- a/src/main/java/cc/fascinated/util/WebRequest.java +++ b/src/main/java/cc/fascinated/common/WebRequest.java @@ -1,4 +1,4 @@ -package cc.fascinated.util; +package cc.fascinated.common; import lombok.experimental.UtilityClass; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/cc/fascinated/controller/PlayerController.java b/src/main/java/cc/fascinated/controller/PlayerController.java index 50a8ac6..274518f 100644 --- a/src/main/java/cc/fascinated/controller/PlayerController.java +++ b/src/main/java/cc/fascinated/controller/PlayerController.java @@ -5,7 +5,7 @@ import cc.fascinated.model.player.Skin; import cc.fascinated.model.response.impl.InvalidPartResponse; import cc.fascinated.model.response.impl.PlayerNotFoundResponse; import cc.fascinated.service.PlayerService; -import cc.fascinated.util.PlayerUtils; +import cc.fascinated.common.PlayerUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.CacheControl; import org.springframework.http.MediaType; diff --git a/src/main/java/cc/fascinated/log/TransactionLogger.java b/src/main/java/cc/fascinated/log/TransactionLogger.java index b0cabcc..ab9de46 100644 --- a/src/main/java/cc/fascinated/log/TransactionLogger.java +++ b/src/main/java/cc/fascinated/log/TransactionLogger.java @@ -1,6 +1,6 @@ package cc.fascinated.log; -import cc.fascinated.util.IPUtils; +import cc.fascinated.common.IPUtils; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.NonNull; diff --git a/src/main/java/cc/fascinated/model/mojang/MojangProfile.java b/src/main/java/cc/fascinated/model/mojang/MojangProfile.java index 31cb61d..2c487c8 100644 --- a/src/main/java/cc/fascinated/model/mojang/MojangProfile.java +++ b/src/main/java/cc/fascinated/model/mojang/MojangProfile.java @@ -3,8 +3,8 @@ package cc.fascinated.model.mojang; import cc.fascinated.Main; import cc.fascinated.model.player.Cape; import cc.fascinated.model.player.Skin; -import cc.fascinated.util.Tuple; -import cc.fascinated.util.UUIDUtils; +import cc.fascinated.common.Tuple; +import cc.fascinated.common.UUIDUtils; import com.google.gson.JsonObject; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/cc/fascinated/model/player/Player.java b/src/main/java/cc/fascinated/model/player/Player.java index b5b3570..4660ae5 100644 --- a/src/main/java/cc/fascinated/model/player/Player.java +++ b/src/main/java/cc/fascinated/model/player/Player.java @@ -1,8 +1,8 @@ package cc.fascinated.model.player; import cc.fascinated.model.mojang.MojangProfile; -import cc.fascinated.util.Tuple; -import cc.fascinated.util.UUIDUtils; +import cc.fascinated.common.Tuple; +import cc.fascinated.common.UUIDUtils; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; diff --git a/src/main/java/cc/fascinated/model/player/Skin.java b/src/main/java/cc/fascinated/model/player/Skin.java index 91ce88c..65c8eac 100644 --- a/src/main/java/cc/fascinated/model/player/Skin.java +++ b/src/main/java/cc/fascinated/model/player/Skin.java @@ -1,7 +1,7 @@ package cc.fascinated.model.player; import cc.fascinated.config.Config; -import cc.fascinated.util.PlayerUtils; +import cc.fascinated.common.PlayerUtils; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.gson.JsonObject; diff --git a/src/main/java/cc/fascinated/service/MojangAPIService.java b/src/main/java/cc/fascinated/service/MojangAPIService.java index a9a6417..56982c4 100644 --- a/src/main/java/cc/fascinated/service/MojangAPIService.java +++ b/src/main/java/cc/fascinated/service/MojangAPIService.java @@ -2,7 +2,7 @@ package cc.fascinated.service; import cc.fascinated.model.mojang.MojangProfile; import cc.fascinated.model.mojang.MojangUsernameToUuid; -import cc.fascinated.util.WebRequest; +import cc.fascinated.common.WebRequest; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/src/main/java/cc/fascinated/service/PlayerService.java b/src/main/java/cc/fascinated/service/PlayerService.java index 5c550bb..2ec5909 100644 --- a/src/main/java/cc/fascinated/service/PlayerService.java +++ b/src/main/java/cc/fascinated/service/PlayerService.java @@ -3,7 +3,7 @@ package cc.fascinated.service; import cc.fascinated.model.mojang.MojangProfile; import cc.fascinated.model.mojang.MojangUsernameToUuid; import cc.fascinated.model.player.Player; -import cc.fascinated.util.UUIDUtils; +import cc.fascinated.common.UUIDUtils; import lombok.extern.log4j.Log4j2; import net.jodah.expiringmap.ExpirationPolicy; import net.jodah.expiringmap.ExpiringMap;