From 5a359c3e75eaf935e6751cfd1b5b1c4a81cc3874 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Thu, 14 Sep 2017 20:27:11 +0300 Subject: [PATCH] Moved WebAPI to different package --- .../plan/systems/webserver/APIResponseHandler.java | 4 ++-- .../com/djrapitops/plan/systems/webserver/WebServer.java | 6 +++--- .../plan/systems/{ => webserver}/webapi/WebAPI.java | 2 +- .../plan/systems/{ => webserver}/webapi/WebAPIManager.java | 2 +- .../{ => webserver}/webapi/bukkit/AnalyticsWebAPI.java | 4 ++-- .../{ => webserver}/webapi/bukkit/AnalyzeWebAPI.java | 4 ++-- .../{ => webserver}/webapi/bukkit/ConfigureWebAPI.java | 4 ++-- .../{ => webserver}/webapi/bukkit/InspectWebAPI.java | 4 ++-- .../{ => webserver}/webapi/bukkit/OnlinePlayersWebAPI.java | 4 ++-- .../{ => webserver}/webapi/universal/PingWebAPI.java | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) rename Plan/src/main/java/com/djrapitops/plan/systems/{ => webserver}/webapi/WebAPI.java (87%) rename Plan/src/main/java/com/djrapitops/plan/systems/{ => webserver}/webapi/WebAPIManager.java (91%) rename Plan/src/main/java/com/djrapitops/plan/systems/{ => webserver}/webapi/bukkit/AnalyticsWebAPI.java (88%) rename Plan/src/main/java/com/djrapitops/plan/systems/{ => webserver}/webapi/bukkit/AnalyzeWebAPI.java (84%) rename Plan/src/main/java/com/djrapitops/plan/systems/{ => webserver}/webapi/bukkit/ConfigureWebAPI.java (92%) rename Plan/src/main/java/com/djrapitops/plan/systems/{ => webserver}/webapi/bukkit/InspectWebAPI.java (90%) rename Plan/src/main/java/com/djrapitops/plan/systems/{ => webserver}/webapi/bukkit/OnlinePlayersWebAPI.java (84%) rename Plan/src/main/java/com/djrapitops/plan/systems/{ => webserver}/webapi/universal/PingWebAPI.java (83%) diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/APIResponseHandler.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/APIResponseHandler.java index 01b0a010c..fd8d845ae 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/APIResponseHandler.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/APIResponseHandler.java @@ -5,11 +5,11 @@ package main.java.com.djrapitops.plan.systems.webserver; import main.java.com.djrapitops.plan.Plan; -import main.java.com.djrapitops.plan.systems.webapi.WebAPI; -import main.java.com.djrapitops.plan.systems.webapi.WebAPIManager; import main.java.com.djrapitops.plan.systems.webserver.response.ForbiddenResponse; import main.java.com.djrapitops.plan.systems.webserver.response.Response; import main.java.com.djrapitops.plan.systems.webserver.response.api.BadRequestResponse; +import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; +import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPIManager; import main.java.com.djrapitops.plan.utilities.MiscUtils; import java.io.ByteArrayOutputStream; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/WebServer.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/WebServer.java index 463d0ec4b..c75568e49 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/WebServer.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/WebServer.java @@ -10,9 +10,9 @@ import main.java.com.djrapitops.plan.api.IPlan; import main.java.com.djrapitops.plan.locale.Locale; import main.java.com.djrapitops.plan.locale.Msg; import main.java.com.djrapitops.plan.systems.info.InformationManager; -import main.java.com.djrapitops.plan.systems.webapi.WebAPIManager; -import main.java.com.djrapitops.plan.systems.webapi.bukkit.*; -import main.java.com.djrapitops.plan.systems.webapi.universal.PingWebAPI; +import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPIManager; +import main.java.com.djrapitops.plan.systems.webserver.webapi.bukkit.*; +import main.java.com.djrapitops.plan.systems.webserver.webapi.universal.PingWebAPI; import main.java.com.djrapitops.plan.utilities.html.HtmlUtils; import javax.net.ssl.*; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webapi/WebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPI.java similarity index 87% rename from Plan/src/main/java/com/djrapitops/plan/systems/webapi/WebAPI.java rename to Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPI.java index 892f1a265..50c40402a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webapi/WebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPI.java @@ -2,7 +2,7 @@ * Licence is provided in the jar as license.yml also here: * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml */ -package main.java.com.djrapitops.plan.systems.webapi; +package main.java.com.djrapitops.plan.systems.webserver.webapi; import main.java.com.djrapitops.plan.api.IPlan; import main.java.com.djrapitops.plan.systems.webserver.response.Response; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webapi/WebAPIManager.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPIManager.java similarity index 91% rename from Plan/src/main/java/com/djrapitops/plan/systems/webapi/WebAPIManager.java rename to Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPIManager.java index 79928c6c0..2322d10bd 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webapi/WebAPIManager.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPIManager.java @@ -2,7 +2,7 @@ * Licence is provided in the jar as license.yml also here: * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml */ -package main.java.com.djrapitops.plan.systems.webapi; +package main.java.com.djrapitops.plan.systems.webserver.webapi; import java.util.HashMap; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webapi/bukkit/AnalyticsWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/AnalyticsWebAPI.java similarity index 88% rename from Plan/src/main/java/com/djrapitops/plan/systems/webapi/bukkit/AnalyticsWebAPI.java rename to Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/AnalyticsWebAPI.java index a3e0fce01..67e1d07ca 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webapi/bukkit/AnalyticsWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/AnalyticsWebAPI.java @@ -2,15 +2,15 @@ * Licence is provided in the jar as license.yml also here: * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml */ -package main.java.com.djrapitops.plan.systems.webapi.bukkit; +package main.java.com.djrapitops.plan.systems.webserver.webapi.bukkit; import main.java.com.djrapitops.plan.api.IPlan; import main.java.com.djrapitops.plan.systems.info.InformationManager; -import main.java.com.djrapitops.plan.systems.webapi.WebAPI; import main.java.com.djrapitops.plan.systems.webserver.PageCache; import main.java.com.djrapitops.plan.systems.webserver.response.Response; import main.java.com.djrapitops.plan.systems.webserver.response.api.BadRequestResponse; import main.java.com.djrapitops.plan.systems.webserver.response.api.JsonResponse; +import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webapi/bukkit/AnalyzeWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/AnalyzeWebAPI.java similarity index 84% rename from Plan/src/main/java/com/djrapitops/plan/systems/webapi/bukkit/AnalyzeWebAPI.java rename to Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/AnalyzeWebAPI.java index 61236a328..d0f406051 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webapi/bukkit/AnalyzeWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/AnalyzeWebAPI.java @@ -2,13 +2,13 @@ * Licence is provided in the jar as license.yml also here: * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml */ -package main.java.com.djrapitops.plan.systems.webapi.bukkit; +package main.java.com.djrapitops.plan.systems.webserver.webapi.bukkit; import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.systems.webapi.WebAPI; import main.java.com.djrapitops.plan.systems.webserver.PageCache; import main.java.com.djrapitops.plan.systems.webserver.response.Response; import main.java.com.djrapitops.plan.systems.webserver.response.api.SuccessResponse; +import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webapi/bukkit/ConfigureWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/ConfigureWebAPI.java similarity index 92% rename from Plan/src/main/java/com/djrapitops/plan/systems/webapi/bukkit/ConfigureWebAPI.java rename to Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/ConfigureWebAPI.java index 95641f4c3..6352b66a4 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webapi/bukkit/ConfigureWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/ConfigureWebAPI.java @@ -2,16 +2,16 @@ * Licence is provided in the jar as license.yml also here: * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml */ -package main.java.com.djrapitops.plan.systems.webapi.bukkit; +package main.java.com.djrapitops.plan.systems.webserver.webapi.bukkit; import com.djrapitops.plugin.config.fileconfig.IFileConfig; import main.java.com.djrapitops.plan.Log; import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.systems.webapi.WebAPI; import main.java.com.djrapitops.plan.systems.webserver.PageCache; import main.java.com.djrapitops.plan.systems.webserver.response.Response; import main.java.com.djrapitops.plan.systems.webserver.response.api.BadRequestResponse; import main.java.com.djrapitops.plan.systems.webserver.response.api.SuccessResponse; +import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; import java.io.IOException; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webapi/bukkit/InspectWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/InspectWebAPI.java similarity index 90% rename from Plan/src/main/java/com/djrapitops/plan/systems/webapi/bukkit/InspectWebAPI.java rename to Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/InspectWebAPI.java index f26982a27..c9b2d8e0b 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webapi/bukkit/InspectWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/InspectWebAPI.java @@ -2,14 +2,14 @@ * Licence is provided in the jar as license.yml also here: * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml */ -package main.java.com.djrapitops.plan.systems.webapi.bukkit; +package main.java.com.djrapitops.plan.systems.webserver.webapi.bukkit; import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.systems.webapi.WebAPI; import main.java.com.djrapitops.plan.systems.webserver.PageCache; import main.java.com.djrapitops.plan.systems.webserver.response.Response; import main.java.com.djrapitops.plan.systems.webserver.response.api.BadRequestResponse; import main.java.com.djrapitops.plan.systems.webserver.response.api.SuccessResponse; +import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; import main.java.com.djrapitops.plan.utilities.uuid.UUIDUtility; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webapi/bukkit/OnlinePlayersWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/OnlinePlayersWebAPI.java similarity index 84% rename from Plan/src/main/java/com/djrapitops/plan/systems/webapi/bukkit/OnlinePlayersWebAPI.java rename to Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/OnlinePlayersWebAPI.java index edda558af..7241eba63 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webapi/bukkit/OnlinePlayersWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/OnlinePlayersWebAPI.java @@ -2,13 +2,13 @@ * Licence is provided in the jar as license.yml also here: * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml */ -package main.java.com.djrapitops.plan.systems.webapi.bukkit; +package main.java.com.djrapitops.plan.systems.webserver.webapi.bukkit; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.systems.webapi.WebAPI; import main.java.com.djrapitops.plan.systems.webserver.response.Response; import main.java.com.djrapitops.plan.systems.webserver.response.api.JsonResponse; +import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; import org.bukkit.Server; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webapi/universal/PingWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/universal/PingWebAPI.java similarity index 83% rename from Plan/src/main/java/com/djrapitops/plan/systems/webapi/universal/PingWebAPI.java rename to Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/universal/PingWebAPI.java index 95192807d..33e07f3b6 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webapi/universal/PingWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/universal/PingWebAPI.java @@ -2,13 +2,13 @@ * Licence is provided in the jar as license.yml also here: * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml */ -package main.java.com.djrapitops.plan.systems.webapi.universal; +package main.java.com.djrapitops.plan.systems.webserver.webapi.universal; import main.java.com.djrapitops.plan.api.IPlan; -import main.java.com.djrapitops.plan.systems.webapi.WebAPI; import main.java.com.djrapitops.plan.systems.webserver.PageCache; import main.java.com.djrapitops.plan.systems.webserver.response.Response; import main.java.com.djrapitops.plan.systems.webserver.response.api.SuccessResponse; +import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI; import java.util.Map;