diff --git a/Plan/src/main/java/com/djrapitops/plan/Plan.java b/Plan/src/main/java/com/djrapitops/plan/Plan.java index b0d311b8b..a66d7aa30 100644 --- a/Plan/src/main/java/com/djrapitops/plan/Plan.java +++ b/Plan/src/main/java/com/djrapitops/plan/Plan.java @@ -24,16 +24,21 @@ import com.djrapitops.plan.api.exceptions.EnableException; import com.djrapitops.plan.command.PlanCommand; import com.djrapitops.plan.data.plugin.HookHandler; import com.djrapitops.plan.database.Database; -import com.djrapitops.plan.system.settings.Settings; import com.djrapitops.plan.settings.locale.Locale; import com.djrapitops.plan.settings.locale.Msg; import com.djrapitops.plan.settings.theme.PlanColorScheme; import com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.system.file.FileSystem; +import com.djrapitops.plan.system.processing.ProcessingQueue; +import com.djrapitops.plan.system.settings.Settings; +import com.djrapitops.plan.system.settings.config.ConfigSystem; +import com.djrapitops.plan.system.update.VersionCheckSystem; +import com.djrapitops.plan.system.webserver.WebServer; +import com.djrapitops.plan.system.webserver.WebServerSystem; +import com.djrapitops.plan.system.webserver.pagecache.PageCache; import com.djrapitops.plan.systems.Systems; import com.djrapitops.plan.systems.cache.DataCache; import com.djrapitops.plan.systems.cache.GeolocationCache; -import com.djrapitops.plan.system.file.FileSystem; -import com.djrapitops.plan.system.settings.config.ConfigSystem; import com.djrapitops.plan.systems.file.database.DBSystem; import com.djrapitops.plan.systems.info.BukkitInformationManager; import com.djrapitops.plan.systems.info.ImporterManager; @@ -42,12 +47,7 @@ import com.djrapitops.plan.systems.info.server.BukkitServerInfoManager; import com.djrapitops.plan.systems.listeners.*; import com.djrapitops.plan.systems.processing.Processor; import com.djrapitops.plan.systems.processing.importing.importers.OfflinePlayerImporter; -import com.djrapitops.plan.system.processing.ProcessingQueue; import com.djrapitops.plan.systems.tasks.TaskSystem; -import com.djrapitops.plan.system.update.VersionCheckSystem; -import com.djrapitops.plan.systems.webserver.WebServer; -import com.djrapitops.plan.systems.webserver.WebServerSystem; -import com.djrapitops.plan.systems.webserver.pagecache.PageCache; import com.djrapitops.plan.utilities.file.export.HtmlExport; import com.djrapitops.plan.utilities.metrics.BStats; import com.djrapitops.plugin.BukkitPlugin; diff --git a/Plan/src/main/java/com/djrapitops/plan/PlanBungee.java b/Plan/src/main/java/com/djrapitops/plan/PlanBungee.java index a521c7d9e..23010b290 100644 --- a/Plan/src/main/java/com/djrapitops/plan/PlanBungee.java +++ b/Plan/src/main/java/com/djrapitops/plan/PlanBungee.java @@ -6,25 +6,25 @@ package com.djrapitops.plan; import com.djrapitops.plan.command.PlanBungeeCommand; import com.djrapitops.plan.database.Database; -import com.djrapitops.plan.system.settings.Settings; import com.djrapitops.plan.settings.locale.Locale; import com.djrapitops.plan.settings.locale.Msg; import com.djrapitops.plan.settings.theme.PlanColorScheme; import com.djrapitops.plan.settings.theme.Theme; -import com.djrapitops.plan.systems.Systems; import com.djrapitops.plan.system.file.FileSystem; +import com.djrapitops.plan.system.processing.ProcessingQueue; +import com.djrapitops.plan.system.settings.Settings; import com.djrapitops.plan.system.settings.config.ConfigSystem; +import com.djrapitops.plan.system.update.VersionCheckSystem; +import com.djrapitops.plan.system.webserver.WebServer; +import com.djrapitops.plan.system.webserver.WebServerSystem; +import com.djrapitops.plan.systems.Systems; import com.djrapitops.plan.systems.file.database.DBSystem; import com.djrapitops.plan.systems.info.BungeeInformationManager; import com.djrapitops.plan.systems.info.InformationManager; import com.djrapitops.plan.systems.info.server.BungeeServerInfoManager; import com.djrapitops.plan.systems.listeners.BungeePlayerListener; import com.djrapitops.plan.systems.processing.Processor; -import com.djrapitops.plan.system.processing.ProcessingQueue; import com.djrapitops.plan.systems.tasks.TaskSystem; -import com.djrapitops.plan.system.update.VersionCheckSystem; -import com.djrapitops.plan.systems.webserver.WebServer; -import com.djrapitops.plan.systems.webserver.WebServerSystem; import com.djrapitops.plan.utilities.file.export.HtmlExport; import com.djrapitops.plugin.BungeePlugin; import com.djrapitops.plugin.StaticHolder; diff --git a/Plan/src/main/java/com/djrapitops/plan/PlanPlugin.java b/Plan/src/main/java/com/djrapitops/plan/PlanPlugin.java index efc80648f..ab4e7b514 100644 --- a/Plan/src/main/java/com/djrapitops/plan/PlanPlugin.java +++ b/Plan/src/main/java/com/djrapitops/plan/PlanPlugin.java @@ -6,10 +6,10 @@ package com.djrapitops.plan; import com.djrapitops.plan.database.Database; import com.djrapitops.plan.system.processing.ProcessingQueue; +import com.djrapitops.plan.system.webserver.WebServer; import com.djrapitops.plan.systems.Systems; import com.djrapitops.plan.systems.info.InformationManager; import com.djrapitops.plan.systems.processing.Processor; -import com.djrapitops.plan.systems.webserver.WebServer; import com.djrapitops.plugin.IPlugin; import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.api.config.Config; @@ -25,6 +25,7 @@ import java.util.UUID; * @author Rsl1122 */ public interface PlanPlugin extends IPlugin { + @Deprecated Database getDB(); ServerVariableHolder getVariable(); diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/DevCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/DevCommand.java index a56ae6a5b..ec5a068d1 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/DevCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/DevCommand.java @@ -8,8 +8,8 @@ import com.djrapitops.plan.Plan; import com.djrapitops.plan.api.exceptions.WebAPIException; import com.djrapitops.plan.settings.locale.Locale; import com.djrapitops.plan.settings.locale.Msg; -import com.djrapitops.plan.systems.webserver.webapi.WebAPI; -import com.djrapitops.plan.systems.webserver.webapi.bukkit.InspectWebAPI; +import com.djrapitops.plan.system.webserver.webapi.WebAPI; +import com.djrapitops.plan.system.webserver.webapi.bukkit.InspectWebAPI; import com.djrapitops.plan.utilities.Condition; import com.djrapitops.plugin.command.CommandType; import com.djrapitops.plugin.command.ISender; diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageSetupCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageSetupCommand.java index f31722cd7..5f3b0bcff 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageSetupCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageSetupCommand.java @@ -3,11 +3,11 @@ package com.djrapitops.plan.command.commands.manage; import com.djrapitops.plan.Plan; import com.djrapitops.plan.api.exceptions.WebAPIException; import com.djrapitops.plan.api.exceptions.WebAPIForbiddenException; -import com.djrapitops.plan.system.settings.Permissions; -import com.djrapitops.plan.system.settings.Settings; import com.djrapitops.plan.settings.locale.Locale; import com.djrapitops.plan.settings.locale.Msg; -import com.djrapitops.plan.systems.webserver.webapi.bungee.RequestSetupWebAPI; +import com.djrapitops.plan.system.settings.Permissions; +import com.djrapitops.plan.system.settings.Settings; +import com.djrapitops.plan.system.webserver.webapi.bungee.RequestSetupWebAPI; import com.djrapitops.plan.utilities.Condition; import com.djrapitops.plugin.api.config.Config; import com.djrapitops.plugin.api.utility.log.Log; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/APIRequestHandler.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/APIRequestHandler.java similarity index 90% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/APIRequestHandler.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/APIRequestHandler.java index c4d5032ac..a5c515bc3 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/APIRequestHandler.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/APIRequestHandler.java @@ -2,11 +2,11 @@ * 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 com.djrapitops.plan.systems.webserver; +package com.djrapitops.plan.system.webserver; import com.djrapitops.plan.system.settings.Settings; -import com.djrapitops.plan.systems.webserver.response.Response; -import com.djrapitops.plan.systems.webserver.webapi.WebAPIManager; +import com.djrapitops.plan.system.webserver.response.Response; +import com.djrapitops.plan.system.webserver.webapi.WebAPIManager; import com.djrapitops.plugin.api.Benchmark; import com.djrapitops.plugin.api.utility.log.Log; import com.sun.net.httpserver.Headers; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/APIResponseHandler.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/APIResponseHandler.java similarity index 92% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/APIResponseHandler.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/APIResponseHandler.java index 325d2dab5..3369474df 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/APIResponseHandler.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/APIResponseHandler.java @@ -2,15 +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 com.djrapitops.plan.systems.webserver; +package com.djrapitops.plan.system.webserver; -import com.djrapitops.plan.systems.webserver.pagecache.PageCache; -import com.djrapitops.plan.systems.webserver.pagecache.PageId; -import com.djrapitops.plan.systems.webserver.response.*; -import com.djrapitops.plan.systems.webserver.response.api.BadRequestResponse; -import com.djrapitops.plan.systems.webserver.webapi.WebAPI; -import com.djrapitops.plan.systems.webserver.webapi.WebAPIManager; -import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.system.webserver.pagecache.PageCache; +import com.djrapitops.plan.system.webserver.pagecache.PageId; +import com.djrapitops.plan.system.webserver.response.*; +import com.djrapitops.plan.system.webserver.response.api.BadRequestResponse; +import com.djrapitops.plan.system.webserver.webapi.WebAPI; +import com.djrapitops.plan.system.webserver.webapi.WebAPIManager; import com.djrapitops.plan.utilities.html.Html; import com.djrapitops.plugin.api.utility.log.Log; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/Request.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/Request.java similarity index 97% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/Request.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/Request.java index 4057f70c2..6b344f02b 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/Request.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/Request.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 com.djrapitops.plan.systems.webserver; +package com.djrapitops.plan.system.webserver; import com.djrapitops.plugin.utilities.Verify; import com.sun.net.httpserver.Headers; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/RequestHandler.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/RequestHandler.java similarity index 82% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/RequestHandler.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/RequestHandler.java index 94fb92858..6bf5bba0d 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/RequestHandler.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/RequestHandler.java @@ -2,12 +2,11 @@ * 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 com.djrapitops.plan.systems.webserver; +package com.djrapitops.plan.system.webserver; -import com.djrapitops.plan.PlanPlugin; import com.djrapitops.plan.system.settings.Settings; -import com.djrapitops.plan.systems.webserver.response.PromptAuthorizationResponse; -import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.system.webserver.response.PromptAuthorizationResponse; +import com.djrapitops.plan.system.webserver.response.Response; import com.djrapitops.plugin.api.Benchmark; import com.djrapitops.plugin.api.utility.log.Log; import com.sun.net.httpserver.Headers; @@ -25,8 +24,8 @@ public class RequestHandler implements HttpHandler { private final ResponseHandler responseHandler; - RequestHandler(PlanPlugin plugin, WebServer webServer) { - responseHandler = new ResponseHandler(plugin, webServer); + RequestHandler(WebServer webServer) { + responseHandler = new ResponseHandler(webServer); } @Override diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/ResponseHandler.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/ResponseHandler.java similarity index 93% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/ResponseHandler.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/ResponseHandler.java index 5ce3ef38c..15dbe26f6 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/ResponseHandler.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/ResponseHandler.java @@ -2,17 +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 com.djrapitops.plan.systems.webserver; +package com.djrapitops.plan.system.webserver; import com.djrapitops.plan.PlanPlugin; import com.djrapitops.plan.api.exceptions.ParseException; import com.djrapitops.plan.api.exceptions.WebUserAuthException; import com.djrapitops.plan.data.WebUser; import com.djrapitops.plan.database.tables.SecurityTable; -import com.djrapitops.plan.systems.webserver.pagecache.PageCache; -import com.djrapitops.plan.systems.webserver.pagecache.PageId; -import com.djrapitops.plan.systems.webserver.response.*; -import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.system.webserver.pagecache.PageCache; +import com.djrapitops.plan.system.webserver.pagecache.PageId; +import com.djrapitops.plan.system.webserver.response.*; import com.djrapitops.plan.utilities.PassEncryptUtil; import com.djrapitops.plan.utilities.uuid.UUIDUtility; import com.djrapitops.plugin.api.utility.log.Log; @@ -29,13 +28,10 @@ import java.util.UUID; */ public class ResponseHandler extends APIResponseHandler { - private final PlanPlugin plugin; - private final boolean usingHttps; - public ResponseHandler(PlanPlugin plugin, WebServer webServer) { - super(webServer.getWebAPI()); - this.plugin = plugin; + public ResponseHandler(WebServer webServer) { + super(); this.usingHttps = webServer.isUsingHTTPS(); } @@ -90,7 +86,7 @@ public class ResponseHandler extends APIResponseHandler { case "server": if (args.length > 2) { try { - Optional serverUUIDOptional = plugin.getDB().getServerTable().getServerUUID(args[2].replace("%20", " ")); + Optional serverUUIDOptional = PlanPlugin.getInstance().getDB().getServerTable().getServerUUID(args[2].replace("%20", " ")); if (serverUUIDOptional.isPresent()) { serverUUID = serverUUIDOptional.get(); } @@ -134,7 +130,7 @@ public class ResponseHandler extends APIResponseHandler { String user = userInfo[0]; String passwordRaw = userInfo[1]; - SecurityTable securityTable = plugin.getDB().getSecurityTable(); + SecurityTable securityTable = PlanPlugin.getInstance().getDB().getSecurityTable(); if (!securityTable.userExists(user)) { throw new WebUserAuthException("User Doesn't exist"); } diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/WebServer.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/WebServer.java similarity index 78% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/WebServer.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/WebServer.java index d516b58a9..4a18fc6b5 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/WebServer.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/WebServer.java @@ -1,13 +1,11 @@ -package com.djrapitops.plan.systems.webserver; +package com.djrapitops.plan.system.webserver; import com.djrapitops.plan.PlanPlugin; -import com.djrapitops.plan.system.settings.Settings; import com.djrapitops.plan.settings.locale.Locale; import com.djrapitops.plan.settings.locale.Msg; -import com.djrapitops.plan.systems.webserver.webapi.WebAPIManager; -import com.djrapitops.plan.systems.webserver.webapi.bukkit.*; -import com.djrapitops.plan.systems.webserver.webapi.bungee.*; -import com.djrapitops.plan.systems.webserver.webapi.universal.PingWebAPI; +import com.djrapitops.plan.system.SubSystem; +import com.djrapitops.plan.system.file.FileSystem; +import com.djrapitops.plan.system.settings.Settings; import com.djrapitops.plan.utilities.html.HtmlUtils; import com.djrapitops.plugin.StaticHolder; import com.djrapitops.plugin.api.Check; @@ -34,51 +32,56 @@ import java.util.concurrent.TimeUnit; /** * @author Rsl1122 */ -public class WebServer { +public class WebServer implements SubSystem { - private final PlanPlugin plugin; - private final WebAPIManager webAPI; - - private final int port; + private int port; private boolean enabled = false; private HttpServer server; private boolean usingHttps = false; - public WebServer(PlanPlugin plugin) { - this.plugin = plugin; + @Override + public void enable() { this.port = Settings.WEBSERVER_PORT.getNumber(); - webAPI = new WebAPIManager(); - registerWebAPIs(); + PlanPlugin plugin = PlanPlugin.getInstance(); StaticHolder.saveInstance(APIRequestHandler.class, plugin.getClass()); StaticHolder.saveInstance(RequestHandler.class, plugin.getClass()); StaticHolder.saveInstance(ResponseHandler.class, plugin.getClass()); StaticHolder.saveInstance(APIResponseHandler.class, plugin.getClass()); + + initServer(); } - private void registerWebAPIs() { - webAPI.registerNewAPI( - new AnalysisReadyWebAPI(), - new AnalyzeWebAPI(), - new ConfigurationWebAPI(), - new InspectWebAPI(), - new IsOnlineWebAPI(), - new RequestInspectPluginsTabBukkitWebAPI(), - new PingWebAPI() - ); - - webAPI.registerNewAPI( - new IsCachedWebAPI(), - new PostHtmlWebAPI(), - new PostInspectPluginsTabWebAPI(), - new PostNetworkPageContentWebAPI(), - new PostOriginalBukkitSettingsWebAPI(), - new RequestPluginsTabWebAPI(), - new RequestSetupWebAPI() - ); + @Override + public void disable() { + stop(); } + // TODO WebAPIPageHandler +// private void registerWebAPIs() { +// webAPI.registerNewAPI( +// new AnalysisReadyWebAPI(), +// new AnalyzeWebAPI(), +// new ConfigurationWebAPI(), +// new InspectWebAPI(), +// new IsOnlineWebAPI(), +// new RequestInspectPluginsTabBukkitWebAPI(), +// new PingWebAPI() +// ); +// +// webAPI.registerNewAPI( +// new IsCachedWebAPI(), +// new PostHtmlWebAPI(), +// new PostInspectPluginsTabWebAPI(), +// new PostNetworkPageContentWebAPI(), +// new PostOriginalBukkitSettingsWebAPI(), +// new RequestPluginsTabWebAPI(), +// new RequestSetupWebAPI() +// ); +// } + //Log.infoColor("§aWebServer Running in WebAPI-only Mode"); + /** * Starts up the WebServer in a new Thread Pool. */ @@ -103,12 +106,8 @@ public class WebServer { Log.infoColor("§eUser Authorization Disabled! (Not possible over http)"); server = HttpServer.create(new InetSocketAddress(Settings.WEBSERVER_IP.toString(), port), 10); } - if (plugin.getInfoManager().isUsingAnotherWebServer()) { - server.createContext("/", new APIRequestHandler(getWebAPI())); - Log.infoColor("§aWebServer Running in WebAPI-only Mode"); - } else { - server.createContext("/", new RequestHandler(plugin, this)); - } + + server.createContext("/", new RequestHandler(this)); server.setExecutor(new ThreadPoolExecutor(4, 8, 30, TimeUnit.SECONDS, new ArrayBlockingQueue<>(100))); server.start(); @@ -125,7 +124,7 @@ public class WebServer { private boolean startHttpsServer() { String keyStorePath = Settings.WEBSERVER_CERTIFICATE_PATH.toString(); if (!Paths.get(keyStorePath).isAbsolute()) { - keyStorePath = plugin.getDataFolder() + File.separator + keyStorePath; + keyStorePath = FileSystem.getDataFolder() + File.separator + keyStorePath; } char[] storepass = Settings.WEBSERVER_CERTIFICATE_STOREPASS.toString().toCharArray(); @@ -214,8 +213,4 @@ public class WebServer { public String getAccessAddress() { return isEnabled() ? getProtocol() + "://" + HtmlUtils.getIP() : Settings.EXTERNAL_WEBSERVER_LINK.toString(); } - - public WebAPIManager getWebAPI() { - return webAPI; - } } diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/WebServerSystem.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/WebServerSystem.java similarity index 93% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/WebServerSystem.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/WebServerSystem.java index 9bb59907a..b581b5fde 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/WebServerSystem.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/WebServerSystem.java @@ -2,12 +2,11 @@ * 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 com.djrapitops.plan.systems.webserver; +package com.djrapitops.plan.system.webserver; import com.djrapitops.plan.api.exceptions.EnableException; import com.djrapitops.plan.system.SubSystem; import com.djrapitops.plan.systems.Systems; -import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.Check; /** diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/pagecache/PageCache.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/pagecache/PageCache.java similarity index 94% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/pagecache/PageCache.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/pagecache/PageCache.java index 3f29bffba..d9adebf4d 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/pagecache/PageCache.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/pagecache/PageCache.java @@ -1,7 +1,7 @@ -package com.djrapitops.plan.systems.webserver.pagecache; +package com.djrapitops.plan.system.webserver.pagecache; -import com.djrapitops.plan.systems.webserver.response.InspectPageResponse; -import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.system.webserver.response.InspectPageResponse; +import com.djrapitops.plan.system.webserver.response.Response; import java.util.HashMap; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/pagecache/PageId.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/pagecache/PageId.java similarity index 94% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/pagecache/PageId.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/pagecache/PageId.java index 51d12471c..35d5fefeb 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/pagecache/PageId.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/pagecache/PageId.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 com.djrapitops.plan.systems.webserver.pagecache; +package com.djrapitops.plan.system.webserver.pagecache; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/pagecache/PageLoader.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/pagecache/PageLoader.java similarity index 60% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/pagecache/PageLoader.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/pagecache/PageLoader.java index dff2a8e92..4c60ce917 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/pagecache/PageLoader.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/pagecache/PageLoader.java @@ -1,6 +1,6 @@ -package com.djrapitops.plan.systems.webserver.pagecache; +package com.djrapitops.plan.system.webserver.pagecache; -import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.system.webserver.response.Response; /** * This interface is used for providing the method to load the page. diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/AnalysisPageResponse.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/AnalysisPageResponse.java similarity index 97% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/AnalysisPageResponse.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/response/AnalysisPageResponse.java index 9af6991c2..df7e21c40 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/AnalysisPageResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/AnalysisPageResponse.java @@ -1,4 +1,4 @@ -package com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.system.webserver.response; import com.djrapitops.plan.Plan; import com.djrapitops.plan.data.AnalysisData; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/CSSResponse.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/CSSResponse.java similarity index 85% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/CSSResponse.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/response/CSSResponse.java index 247ff3ef4..a58e24e9f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/CSSResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/CSSResponse.java @@ -1,4 +1,4 @@ -package com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.system.webserver.response; import com.djrapitops.plan.settings.theme.Theme; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/DebugPageResponse.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/DebugPageResponse.java similarity index 98% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/DebugPageResponse.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/response/DebugPageResponse.java index 77d77563d..20e32ffc7 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/DebugPageResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/DebugPageResponse.java @@ -2,14 +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 com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.system.webserver.response; import com.djrapitops.plan.PlanBungee; -import com.djrapitops.plan.ServerVariableHolder; import com.djrapitops.plan.PlanPlugin; +import com.djrapitops.plan.ServerVariableHolder; import com.djrapitops.plan.systems.info.server.BungeeServerInfoManager; import com.djrapitops.plan.systems.info.server.ServerInfo; -import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plan.utilities.file.FileUtil; import com.djrapitops.plan.utilities.html.Html; import com.djrapitops.plugin.api.Benchmark; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/ErrorResponse.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/ErrorResponse.java similarity index 96% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/ErrorResponse.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/response/ErrorResponse.java index a3ec460f0..8924eed88 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/ErrorResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/ErrorResponse.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 com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.system.webserver.response; import com.djrapitops.plan.settings.theme.Theme; import com.djrapitops.plan.utilities.MiscUtils; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/FileResponse.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/FileResponse.java similarity index 96% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/FileResponse.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/response/FileResponse.java index 6d6dd0414..5b3cadd23 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/FileResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/FileResponse.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 com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.system.webserver.response; import com.djrapitops.plan.utilities.file.FileUtil; import com.djrapitops.plugin.utilities.Verify; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/ForbiddenResponse.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/ForbiddenResponse.java similarity index 91% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/ForbiddenResponse.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/response/ForbiddenResponse.java index ebf1a42dd..739dda270 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/ForbiddenResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/ForbiddenResponse.java @@ -1,4 +1,4 @@ -package com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.system.webserver.response; import com.djrapitops.plan.utilities.html.Html; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/InspectPageResponse.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/InspectPageResponse.java similarity index 96% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/InspectPageResponse.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/response/InspectPageResponse.java index 1a12057db..36cfa3582 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/InspectPageResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/InspectPageResponse.java @@ -1,4 +1,4 @@ -package com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.system.webserver.response; import com.djrapitops.plan.api.exceptions.ParseException; import com.djrapitops.plan.settings.theme.Theme; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/InternalErrorResponse.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/InternalErrorResponse.java similarity index 96% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/InternalErrorResponse.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/response/InternalErrorResponse.java index 2531158ce..f9496b88f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/InternalErrorResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/InternalErrorResponse.java @@ -1,4 +1,4 @@ -package com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.system.webserver.response; import com.djrapitops.plan.utilities.html.Html; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/JavaScriptResponse.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/JavaScriptResponse.java similarity index 92% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/JavaScriptResponse.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/response/JavaScriptResponse.java index 04cfef747..e9e15ad0d 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/JavaScriptResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/JavaScriptResponse.java @@ -1,4 +1,4 @@ -package com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.system.webserver.response; import com.djrapitops.plan.settings.theme.Theme; import com.djrapitops.plan.settings.theme.ThemeVal; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/NotFoundResponse.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/NotFoundResponse.java similarity index 91% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/NotFoundResponse.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/response/NotFoundResponse.java index e32dd3d6a..f083edec7 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/NotFoundResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/NotFoundResponse.java @@ -1,4 +1,4 @@ -package com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.system.webserver.response; import com.djrapitops.plan.utilities.html.Html; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/PlayersPageResponse.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/PlayersPageResponse.java similarity index 98% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/PlayersPageResponse.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/response/PlayersPageResponse.java index 02db10151..71819569f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/PlayersPageResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/PlayersPageResponse.java @@ -1,4 +1,4 @@ -package com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.system.webserver.response; import com.djrapitops.plan.PlanPlugin; import com.djrapitops.plan.data.container.GeoInfo; @@ -6,10 +6,9 @@ import com.djrapitops.plan.data.container.Session; import com.djrapitops.plan.data.container.UserInfo; import com.djrapitops.plan.data.element.TableContainer; import com.djrapitops.plan.database.Database; -import com.djrapitops.plan.system.settings.Settings; import com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.system.settings.Settings; import com.djrapitops.plan.utilities.FormatUtils; -import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plan.utilities.analysis.AnalysisUtils; import com.djrapitops.plan.utilities.comparators.GeoInfoComparator; import com.djrapitops.plan.utilities.comparators.UserInfoLastPlayedComparator; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/PromptAuthorizationResponse.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/PromptAuthorizationResponse.java similarity index 93% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/PromptAuthorizationResponse.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/response/PromptAuthorizationResponse.java index ae1de29f7..f15892e74 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/PromptAuthorizationResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/PromptAuthorizationResponse.java @@ -1,4 +1,4 @@ -package com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.system.webserver.response; import com.djrapitops.plan.utilities.html.Html; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/RedirectResponse.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/RedirectResponse.java similarity index 81% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/RedirectResponse.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/response/RedirectResponse.java index 1b72a2621..e29e566a0 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/RedirectResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/RedirectResponse.java @@ -1,4 +1,4 @@ -package com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.system.webserver.response; /** * @author Rsl1122 diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/Response.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/Response.java similarity index 97% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/Response.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/response/Response.java index b5e07411b..5c00e6438 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/Response.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/Response.java @@ -1,4 +1,4 @@ -package com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.system.webserver.response; import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpExchange; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/ResponseType.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/ResponseType.java similarity index 90% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/ResponseType.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/response/ResponseType.java index 78bc83585..4cbb01aab 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/ResponseType.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/ResponseType.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 com.djrapitops.plan.systems.webserver.response; +package com.djrapitops.plan.system.webserver.response; /** * //TODO Class Javadoc Comment diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/api/BadRequestResponse.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/api/BadRequestResponse.java similarity index 75% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/api/BadRequestResponse.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/response/api/BadRequestResponse.java index 18c96c563..fd29437d3 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/api/BadRequestResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/api/BadRequestResponse.java @@ -2,9 +2,9 @@ * 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 com.djrapitops.plan.systems.webserver.response.api; +package com.djrapitops.plan.system.webserver.response.api; -import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.system.webserver.response.Response; /** * @author Fuzzlemann diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/api/JsonResponse.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/api/JsonResponse.java similarity index 71% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/api/JsonResponse.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/response/api/JsonResponse.java index fd4694a1c..396f09c0a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/api/JsonResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/api/JsonResponse.java @@ -2,10 +2,10 @@ * 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 com.djrapitops.plan.systems.webserver.response.api; +package com.djrapitops.plan.system.webserver.response.api; -import com.djrapitops.plan.systems.webserver.response.Response; -import com.djrapitops.plan.systems.webserver.response.ResponseType; +import com.djrapitops.plan.system.webserver.response.Response; +import com.djrapitops.plan.system.webserver.response.ResponseType; import com.google.gson.Gson; /** diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/api/SuccessResponse.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/api/SuccessResponse.java similarity index 74% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/api/SuccessResponse.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/response/api/SuccessResponse.java index c69435c30..97c9c209e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/response/api/SuccessResponse.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/response/api/SuccessResponse.java @@ -2,9 +2,9 @@ * 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 com.djrapitops.plan.systems.webserver.response.api; +package com.djrapitops.plan.system.webserver.response.api; -import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.system.webserver.response.Response; /** * @author Fuzzlemann diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPI.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/WebAPI.java similarity index 93% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPI.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/WebAPI.java index de07ebcc4..a17d1a798 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/WebAPI.java @@ -2,18 +2,17 @@ * 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 com.djrapitops.plan.systems.webserver.webapi; +package com.djrapitops.plan.system.webserver.webapi; import com.djrapitops.plan.PlanPlugin; import com.djrapitops.plan.api.exceptions.*; import com.djrapitops.plan.system.settings.Settings; -import com.djrapitops.plan.systems.webserver.pagecache.PageCache; -import com.djrapitops.plan.systems.webserver.pagecache.PageId; -import com.djrapitops.plan.systems.webserver.response.NotFoundResponse; -import com.djrapitops.plan.systems.webserver.response.Response; -import com.djrapitops.plan.systems.webserver.response.api.BadRequestResponse; -import com.djrapitops.plan.systems.webserver.response.api.SuccessResponse; -import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.system.webserver.pagecache.PageCache; +import com.djrapitops.plan.system.webserver.pagecache.PageId; +import com.djrapitops.plan.system.webserver.response.NotFoundResponse; +import com.djrapitops.plan.system.webserver.response.Response; +import com.djrapitops.plan.system.webserver.response.api.BadRequestResponse; +import com.djrapitops.plan.system.webserver.response.api.SuccessResponse; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.utilities.Verify; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPIManager.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/WebAPIManager.java similarity index 96% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPIManager.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/WebAPIManager.java index 2048afac5..2887562ac 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPIManager.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/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 com.djrapitops.plan.systems.webserver.webapi; +package com.djrapitops.plan.system.webserver.webapi; import com.djrapitops.plan.utilities.PassEncryptUtil; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/AnalysisReadyWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/AnalysisReadyWebAPI.java similarity index 86% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/AnalysisReadyWebAPI.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/AnalysisReadyWebAPI.java index cd156f4d8..eff3e7889 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/AnalysisReadyWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/AnalysisReadyWebAPI.java @@ -2,12 +2,12 @@ * 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 com.djrapitops.plan.systems.webserver.webapi.bukkit; +package com.djrapitops.plan.system.webserver.webapi.bukkit; import com.djrapitops.plan.PlanPlugin; import com.djrapitops.plan.api.exceptions.WebAPIException; -import com.djrapitops.plan.systems.webserver.response.Response; -import com.djrapitops.plan.systems.webserver.webapi.WebAPI; +import com.djrapitops.plan.system.webserver.response.Response; +import com.djrapitops.plan.system.webserver.webapi.WebAPI; import java.util.Map; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/AnalyzeWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/AnalyzeWebAPI.java similarity index 86% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/AnalyzeWebAPI.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/AnalyzeWebAPI.java index cc2033a69..b5047045a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/AnalyzeWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/AnalyzeWebAPI.java @@ -2,12 +2,12 @@ * 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 com.djrapitops.plan.systems.webserver.webapi.bukkit; +package com.djrapitops.plan.system.webserver.webapi.bukkit; import com.djrapitops.plan.PlanPlugin; import com.djrapitops.plan.api.exceptions.WebAPIException; -import com.djrapitops.plan.systems.webserver.response.Response; -import com.djrapitops.plan.systems.webserver.webapi.WebAPI; +import com.djrapitops.plan.system.webserver.response.Response; +import com.djrapitops.plan.system.webserver.webapi.WebAPI; import java.util.Map; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/ConfigurationWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/ConfigurationWebAPI.java similarity index 96% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/ConfigurationWebAPI.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/ConfigurationWebAPI.java index 1228dfd8b..1b2bf7ab2 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/ConfigurationWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/ConfigurationWebAPI.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 com.djrapitops.plan.systems.webserver.webapi.bukkit; +package com.djrapitops.plan.system.webserver.webapi.bukkit; import com.djrapitops.plan.Plan; import com.djrapitops.plan.PlanBungee; @@ -10,8 +10,8 @@ import com.djrapitops.plan.PlanPlugin; import com.djrapitops.plan.api.exceptions.WebAPIException; import com.djrapitops.plan.settings.ServerSpecificSettings; import com.djrapitops.plan.system.settings.Settings; -import com.djrapitops.plan.systems.webserver.response.Response; -import com.djrapitops.plan.systems.webserver.webapi.WebAPI; +import com.djrapitops.plan.system.webserver.response.Response; +import com.djrapitops.plan.system.webserver.webapi.WebAPI; import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.utilities.Verify; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/InspectWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/InspectWebAPI.java similarity index 85% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/InspectWebAPI.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/InspectWebAPI.java index e335d5a8d..7985c5a1d 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/InspectWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/InspectWebAPI.java @@ -2,12 +2,12 @@ * 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 com.djrapitops.plan.systems.webserver.webapi.bukkit; +package com.djrapitops.plan.system.webserver.webapi.bukkit; import com.djrapitops.plan.PlanPlugin; import com.djrapitops.plan.api.exceptions.WebAPIException; -import com.djrapitops.plan.systems.webserver.response.Response; -import com.djrapitops.plan.systems.webserver.webapi.WebAPI; +import com.djrapitops.plan.system.webserver.response.Response; +import com.djrapitops.plan.system.webserver.webapi.WebAPI; import java.util.Map; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/IsOnlineWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/IsOnlineWebAPI.java similarity index 87% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/IsOnlineWebAPI.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/IsOnlineWebAPI.java index 10aa37e81..6aa8c7041 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/IsOnlineWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/IsOnlineWebAPI.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 com.djrapitops.plan.systems.webserver.webapi.bukkit; +package com.djrapitops.plan.system.webserver.webapi.bukkit; import com.djrapitops.plan.Plan; import com.djrapitops.plan.PlanPlugin; import com.djrapitops.plan.api.exceptions.WebAPIException; -import com.djrapitops.plan.systems.webserver.response.Response; -import com.djrapitops.plan.systems.webserver.webapi.WebAPI; +import com.djrapitops.plan.system.webserver.response.Response; +import com.djrapitops.plan.system.webserver.webapi.WebAPI; import org.bukkit.entity.Player; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/RequestInspectPluginsTabBukkitWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/RequestInspectPluginsTabBukkitWebAPI.java similarity index 89% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/RequestInspectPluginsTabBukkitWebAPI.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/RequestInspectPluginsTabBukkitWebAPI.java index 7fe7034c9..5fa25b950 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/RequestInspectPluginsTabBukkitWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bukkit/RequestInspectPluginsTabBukkitWebAPI.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 com.djrapitops.plan.systems.webserver.webapi.bukkit; +package com.djrapitops.plan.system.webserver.webapi.bukkit; import com.djrapitops.plan.PlanPlugin; import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.system.webserver.response.Response; +import com.djrapitops.plan.system.webserver.webapi.WebAPI; import com.djrapitops.plan.systems.info.BukkitInformationManager; -import com.djrapitops.plan.systems.webserver.response.Response; -import com.djrapitops.plan.systems.webserver.webapi.WebAPI; import com.djrapitops.plugin.api.Check; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/IsCachedWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/IsCachedWebAPI.java similarity index 93% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/IsCachedWebAPI.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/IsCachedWebAPI.java index 2f94b412f..a5b558646 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/IsCachedWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/IsCachedWebAPI.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 com.djrapitops.plan.systems.webserver.webapi.bungee; +package com.djrapitops.plan.system.webserver.webapi.bungee; import com.djrapitops.plan.PlanPlugin; import com.djrapitops.plan.api.exceptions.WebAPIException; import com.djrapitops.plan.api.exceptions.WebAPINotFoundException; +import com.djrapitops.plan.system.webserver.response.Response; +import com.djrapitops.plan.system.webserver.webapi.WebAPI; import com.djrapitops.plan.systems.info.InformationManager; -import com.djrapitops.plan.systems.webserver.response.Response; -import com.djrapitops.plan.systems.webserver.webapi.WebAPI; import java.util.Map; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostHtmlWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/PostHtmlWebAPI.java similarity index 88% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostHtmlWebAPI.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/PostHtmlWebAPI.java index 4c473f681..c257d0b08 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostHtmlWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/PostHtmlWebAPI.java @@ -2,18 +2,18 @@ * 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 com.djrapitops.plan.systems.webserver.webapi.bungee; +package com.djrapitops.plan.system.webserver.webapi.bungee; import com.djrapitops.plan.PlanPlugin; import com.djrapitops.plan.api.exceptions.WebAPIException; import com.djrapitops.plan.system.settings.Settings; +import com.djrapitops.plan.system.webserver.pagecache.PageCache; +import com.djrapitops.plan.system.webserver.pagecache.PageId; +import com.djrapitops.plan.system.webserver.response.AnalysisPageResponse; +import com.djrapitops.plan.system.webserver.response.InspectPageResponse; +import com.djrapitops.plan.system.webserver.response.Response; +import com.djrapitops.plan.system.webserver.webapi.WebAPI; import com.djrapitops.plan.systems.info.InformationManager; -import com.djrapitops.plan.systems.webserver.pagecache.PageCache; -import com.djrapitops.plan.systems.webserver.pagecache.PageId; -import com.djrapitops.plan.systems.webserver.response.AnalysisPageResponse; -import com.djrapitops.plan.systems.webserver.response.InspectPageResponse; -import com.djrapitops.plan.systems.webserver.response.Response; -import com.djrapitops.plan.systems.webserver.webapi.WebAPI; import com.djrapitops.plan.utilities.file.export.HtmlExport; import com.djrapitops.plugin.api.utility.log.Log; import org.apache.commons.lang3.text.StrSubstitutor; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostInspectPluginsTabWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/PostInspectPluginsTabWebAPI.java similarity index 91% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostInspectPluginsTabWebAPI.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/PostInspectPluginsTabWebAPI.java index b82d80d92..1d89cf878 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostInspectPluginsTabWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/PostInspectPluginsTabWebAPI.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 com.djrapitops.plan.systems.webserver.webapi.bungee; +package com.djrapitops.plan.system.webserver.webapi.bungee; import com.djrapitops.plan.PlanPlugin; import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.system.webserver.response.Response; +import com.djrapitops.plan.system.webserver.webapi.WebAPI; import com.djrapitops.plan.systems.info.BungeeInformationManager; -import com.djrapitops.plan.systems.webserver.response.Response; -import com.djrapitops.plan.systems.webserver.webapi.WebAPI; import java.util.Map; import java.util.UUID; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostNetworkPageContentWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/PostNetworkPageContentWebAPI.java similarity index 88% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostNetworkPageContentWebAPI.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/PostNetworkPageContentWebAPI.java index 5bc53cd01..f874266a7 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostNetworkPageContentWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/PostNetworkPageContentWebAPI.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 com.djrapitops.plan.systems.webserver.webapi.bungee; +package com.djrapitops.plan.system.webserver.webapi.bungee; import com.djrapitops.plan.PlanPlugin; import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.system.webserver.response.Response; +import com.djrapitops.plan.system.webserver.webapi.WebAPI; import com.djrapitops.plan.systems.info.BungeeInformationManager; -import com.djrapitops.plan.systems.webserver.response.Response; -import com.djrapitops.plan.systems.webserver.webapi.WebAPI; import com.djrapitops.plugin.api.Check; import java.util.Map; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostOriginalBukkitSettingsWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/PostOriginalBukkitSettingsWebAPI.java similarity index 91% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostOriginalBukkitSettingsWebAPI.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/PostOriginalBukkitSettingsWebAPI.java index fe6299d79..3300ad586 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/PostOriginalBukkitSettingsWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/PostOriginalBukkitSettingsWebAPI.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 com.djrapitops.plan.systems.webserver.webapi.bungee; +package com.djrapitops.plan.system.webserver.webapi.bungee; import com.djrapitops.plan.PlanBungee; import com.djrapitops.plan.PlanPlugin; import com.djrapitops.plan.api.exceptions.WebAPIException; import com.djrapitops.plan.system.settings.Settings; -import com.djrapitops.plan.systems.webserver.response.Response; -import com.djrapitops.plan.systems.webserver.webapi.WebAPI; +import com.djrapitops.plan.system.webserver.response.Response; +import com.djrapitops.plan.system.webserver.webapi.WebAPI; import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.utilities.Verify; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/RequestPluginsTabWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/RequestPluginsTabWebAPI.java similarity index 90% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/RequestPluginsTabWebAPI.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/RequestPluginsTabWebAPI.java index b6ef7c6b9..465029b0c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/RequestPluginsTabWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/RequestPluginsTabWebAPI.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 com.djrapitops.plan.systems.webserver.webapi.bungee; +package com.djrapitops.plan.system.webserver.webapi.bungee; import com.djrapitops.plan.PlanPlugin; import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.system.webserver.response.Response; +import com.djrapitops.plan.system.webserver.webapi.WebAPI; +import com.djrapitops.plan.system.webserver.webapi.bukkit.RequestInspectPluginsTabBukkitWebAPI; import com.djrapitops.plan.systems.info.server.ServerInfo; import com.djrapitops.plan.systems.processing.Processor; -import com.djrapitops.plan.systems.webserver.response.Response; -import com.djrapitops.plan.systems.webserver.webapi.WebAPI; -import com.djrapitops.plan.systems.webserver.webapi.bukkit.RequestInspectPluginsTabBukkitWebAPI; import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.api.utility.log.Log; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/RequestSetupWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/RequestSetupWebAPI.java similarity index 89% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/RequestSetupWebAPI.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/RequestSetupWebAPI.java index 6f8f88b1d..35326754d 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/RequestSetupWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/bungee/RequestSetupWebAPI.java @@ -2,17 +2,17 @@ * 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 com.djrapitops.plan.systems.webserver.webapi.bungee; +package com.djrapitops.plan.system.webserver.webapi.bungee; import com.djrapitops.plan.Plan; import com.djrapitops.plan.PlanBungee; import com.djrapitops.plan.PlanPlugin; import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.system.webserver.response.ForbiddenResponse; +import com.djrapitops.plan.system.webserver.response.Response; +import com.djrapitops.plan.system.webserver.webapi.WebAPI; import com.djrapitops.plan.systems.info.server.ServerInfo; -import com.djrapitops.plan.systems.webserver.response.ForbiddenResponse; -import com.djrapitops.plan.systems.webserver.response.Response; -import com.djrapitops.plan.systems.webserver.webapi.WebAPI; import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.utilities.Verify; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/universal/PingWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/universal/PingWebAPI.java similarity index 89% rename from Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/universal/PingWebAPI.java rename to Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/universal/PingWebAPI.java index 8412914e9..c3afc031f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/universal/PingWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/webserver/webapi/universal/PingWebAPI.java @@ -2,17 +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 com.djrapitops.plan.systems.webserver.webapi.universal; +package com.djrapitops.plan.system.webserver.webapi.universal; import com.djrapitops.plan.Plan; import com.djrapitops.plan.PlanBungee; import com.djrapitops.plan.PlanPlugin; import com.djrapitops.plan.api.exceptions.WebAPIException; +import com.djrapitops.plan.system.webserver.response.Response; +import com.djrapitops.plan.system.webserver.webapi.WebAPI; import com.djrapitops.plan.systems.info.BukkitInformationManager; -import com.djrapitops.plan.systems.webserver.response.Response; -import com.djrapitops.plan.systems.webserver.webapi.WebAPI; -import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.api.utility.log.Log; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/Systems.java b/Plan/src/main/java/com/djrapitops/plan/systems/Systems.java index 2cd84c358..a2b4b41a9 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/Systems.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/Systems.java @@ -9,18 +9,17 @@ import com.djrapitops.plan.PlanBungee; import com.djrapitops.plan.settings.theme.Theme; import com.djrapitops.plan.system.SubSystem; import com.djrapitops.plan.system.file.FileSystem; -import com.djrapitops.plan.system.settings.config.ConfigSystem; -import com.djrapitops.plan.system.settings.config.BungeeConfigSystem; import com.djrapitops.plan.system.settings.config.BukkitConfigSystem; +import com.djrapitops.plan.system.settings.config.BungeeConfigSystem; +import com.djrapitops.plan.system.settings.config.ConfigSystem; +import com.djrapitops.plan.system.update.VersionCheckSystem; +import com.djrapitops.plan.system.webserver.WebServerSystem; import com.djrapitops.plan.systems.file.database.DBSystem; import com.djrapitops.plan.systems.file.database.PlanBungeeDBSystem; import com.djrapitops.plan.systems.file.database.PlanDBSystem; import com.djrapitops.plan.systems.tasks.PlanBungeeTaskSystem; import com.djrapitops.plan.systems.tasks.PlanTaskSystem; import com.djrapitops.plan.systems.tasks.TaskSystem; -import com.djrapitops.plan.system.update.VersionCheckSystem; -import com.djrapitops.plan.systems.webserver.WebServerSystem; -import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.utility.log.Log; import org.apache.commons.lang3.ArrayUtils; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/BukkitInformationManager.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/BukkitInformationManager.java index 914c62ec3..f6492a00c 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/BukkitInformationManager.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/BukkitInformationManager.java @@ -11,23 +11,23 @@ import com.djrapitops.plan.data.AnalysisData; import com.djrapitops.plan.data.element.InspectContainer; import com.djrapitops.plan.data.plugin.HookHandler; import com.djrapitops.plan.data.plugin.PluginData; -import com.djrapitops.plan.system.settings.Settings; import com.djrapitops.plan.settings.theme.Theme; +import com.djrapitops.plan.system.settings.Settings; +import com.djrapitops.plan.system.webserver.WebServer; +import com.djrapitops.plan.system.webserver.WebServerSystem; +import com.djrapitops.plan.system.webserver.pagecache.PageCache; +import com.djrapitops.plan.system.webserver.pagecache.PageId; +import com.djrapitops.plan.system.webserver.response.*; +import com.djrapitops.plan.system.webserver.webapi.WebAPIManager; +import com.djrapitops.plan.system.webserver.webapi.bukkit.AnalysisReadyWebAPI; +import com.djrapitops.plan.system.webserver.webapi.bukkit.AnalyzeWebAPI; +import com.djrapitops.plan.system.webserver.webapi.bukkit.RequestInspectPluginsTabBukkitWebAPI; +import com.djrapitops.plan.system.webserver.webapi.bungee.*; +import com.djrapitops.plan.system.webserver.webapi.universal.PingWebAPI; import com.djrapitops.plan.systems.cache.DataCache; import com.djrapitops.plan.systems.info.parsing.AnalysisPageParser; import com.djrapitops.plan.systems.info.parsing.InspectPageParser; import com.djrapitops.plan.systems.processing.Processor; -import com.djrapitops.plan.systems.webserver.WebServer; -import com.djrapitops.plan.systems.webserver.WebServerSystem; -import com.djrapitops.plan.systems.webserver.pagecache.PageCache; -import com.djrapitops.plan.systems.webserver.pagecache.PageId; -import com.djrapitops.plan.systems.webserver.response.*; -import com.djrapitops.plan.systems.webserver.webapi.WebAPIManager; -import com.djrapitops.plan.systems.webserver.webapi.bukkit.AnalysisReadyWebAPI; -import com.djrapitops.plan.systems.webserver.webapi.bukkit.AnalyzeWebAPI; -import com.djrapitops.plan.systems.webserver.webapi.bukkit.RequestInspectPluginsTabBukkitWebAPI; -import com.djrapitops.plan.systems.webserver.webapi.bungee.*; -import com.djrapitops.plan.systems.webserver.webapi.universal.PingWebAPI; import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plan.utilities.analysis.Analysis; import com.djrapitops.plan.utilities.file.export.HtmlExport; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/BungeeInformationManager.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/BungeeInformationManager.java index 14054cc07..e28a1e1a0 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/BungeeInformationManager.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/BungeeInformationManager.java @@ -10,20 +10,19 @@ import com.djrapitops.plan.api.exceptions.WebAPIConnectionFailException; import com.djrapitops.plan.api.exceptions.WebAPIException; import com.djrapitops.plan.api.exceptions.WebAPINotFoundException; import com.djrapitops.plan.system.settings.Settings; +import com.djrapitops.plan.system.webserver.pagecache.PageCache; +import com.djrapitops.plan.system.webserver.pagecache.PageId; +import com.djrapitops.plan.system.webserver.response.*; +import com.djrapitops.plan.system.webserver.webapi.WebAPIManager; +import com.djrapitops.plan.system.webserver.webapi.bukkit.AnalysisReadyWebAPI; +import com.djrapitops.plan.system.webserver.webapi.bukkit.AnalyzeWebAPI; +import com.djrapitops.plan.system.webserver.webapi.bukkit.InspectWebAPI; +import com.djrapitops.plan.system.webserver.webapi.bukkit.IsOnlineWebAPI; +import com.djrapitops.plan.system.webserver.webapi.bungee.RequestPluginsTabWebAPI; import com.djrapitops.plan.systems.cache.DataCache; import com.djrapitops.plan.systems.info.parsing.NetworkPageParser; import com.djrapitops.plan.systems.info.server.BungeeServerInfoManager; import com.djrapitops.plan.systems.info.server.ServerInfo; -import com.djrapitops.plan.systems.webserver.pagecache.PageCache; -import com.djrapitops.plan.systems.webserver.pagecache.PageId; -import com.djrapitops.plan.systems.webserver.response.*; -import com.djrapitops.plan.systems.webserver.webapi.WebAPIManager; -import com.djrapitops.plan.systems.webserver.webapi.bukkit.AnalysisReadyWebAPI; -import com.djrapitops.plan.systems.webserver.webapi.bukkit.AnalyzeWebAPI; -import com.djrapitops.plan.systems.webserver.webapi.bukkit.InspectWebAPI; -import com.djrapitops.plan.systems.webserver.webapi.bukkit.IsOnlineWebAPI; -import com.djrapitops.plan.systems.webserver.webapi.bungee.RequestPluginsTabWebAPI; -import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plan.utilities.file.export.HtmlExport; import com.djrapitops.plan.utilities.html.HtmlStructure; import com.djrapitops.plugin.api.utility.log.ErrorLogger; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/InformationManager.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/InformationManager.java index bfd2d64f1..8c6991a1a 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/InformationManager.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/InformationManager.java @@ -5,10 +5,10 @@ package com.djrapitops.plan.systems.info; import com.djrapitops.plan.api.exceptions.ParseException; +import com.djrapitops.plan.system.webserver.pagecache.PageCache; +import com.djrapitops.plan.system.webserver.pagecache.PageId; import com.djrapitops.plan.systems.cache.DataCache; import com.djrapitops.plan.systems.cache.SessionCache; -import com.djrapitops.plan.systems.webserver.pagecache.PageCache; -import com.djrapitops.plan.systems.webserver.pagecache.PageId; import com.djrapitops.plugin.command.ISender; import java.io.IOException; diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BungeeServerInfoManager.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BungeeServerInfoManager.java index 971e05026..b44f56101 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BungeeServerInfoManager.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/server/BungeeServerInfoManager.java @@ -10,8 +10,8 @@ import com.djrapitops.plan.api.exceptions.EnableException; import com.djrapitops.plan.api.exceptions.WebAPIException; import com.djrapitops.plan.database.Database; import com.djrapitops.plan.database.tables.ServerTable; -import com.djrapitops.plan.systems.webserver.webapi.bukkit.ConfigurationWebAPI; -import com.djrapitops.plan.systems.webserver.webapi.universal.PingWebAPI; +import com.djrapitops.plan.system.webserver.webapi.bukkit.ConfigurationWebAPI; +import com.djrapitops.plan.system.webserver.webapi.universal.PingWebAPI; import com.djrapitops.plugin.api.TimeAmount; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.task.AbsRunnable; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java index 83b6b6c72..d121b5c87 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/Analysis.java @@ -8,17 +8,17 @@ import com.djrapitops.plan.data.element.AnalysisContainer; import com.djrapitops.plan.data.plugin.BanData; import com.djrapitops.plan.data.plugin.PluginData; import com.djrapitops.plan.database.Database; -import com.djrapitops.plan.system.settings.Settings; import com.djrapitops.plan.settings.locale.Locale; import com.djrapitops.plan.settings.locale.Msg; +import com.djrapitops.plan.system.settings.Settings; +import com.djrapitops.plan.system.webserver.response.ErrorResponse; +import com.djrapitops.plan.system.webserver.response.InternalErrorResponse; import com.djrapitops.plan.systems.cache.DataCache; import com.djrapitops.plan.systems.cache.SessionCache; import com.djrapitops.plan.systems.info.BukkitInformationManager; import com.djrapitops.plan.systems.info.InformationManager; import com.djrapitops.plan.systems.tasks.PlanTaskSystem; import com.djrapitops.plan.systems.tasks.TaskSystem; -import com.djrapitops.plan.systems.webserver.response.ErrorResponse; -import com.djrapitops.plan.systems.webserver.response.InternalErrorResponse; import com.djrapitops.plugin.StaticHolder; import com.djrapitops.plugin.api.Benchmark; import com.djrapitops.plugin.api.utility.log.Log; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/HtmlExport.java b/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/HtmlExport.java index 2c3b9f394..f7088db5b 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/HtmlExport.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/HtmlExport.java @@ -8,8 +8,8 @@ import com.djrapitops.plan.PlanPlugin; import com.djrapitops.plan.data.container.UserInfo; import com.djrapitops.plan.settings.theme.Theme; import com.djrapitops.plan.settings.theme.ThemeVal; -import com.djrapitops.plan.systems.webserver.response.PlayersPageResponse; -import com.djrapitops.plan.systems.webserver.webapi.bungee.PostHtmlWebAPI; +import com.djrapitops.plan.system.webserver.response.PlayersPageResponse; +import com.djrapitops.plan.system.webserver.webapi.bungee.PostHtmlWebAPI; import com.djrapitops.plan.utilities.file.FileUtil; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.task.RunnableFactory; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/SpecificExport.java b/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/SpecificExport.java index ff3ef68bc..f51cf8fc9 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/SpecificExport.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/file/export/SpecificExport.java @@ -5,10 +5,9 @@ package com.djrapitops.plan.utilities.file.export; import com.djrapitops.plan.system.settings.Settings; -import com.djrapitops.plan.systems.webserver.pagecache.PageCache; -import com.djrapitops.plan.systems.webserver.pagecache.PageId; -import com.djrapitops.plan.systems.webserver.response.Response; -import com.djrapitops.plan.utilities.MiscUtils; +import com.djrapitops.plan.system.webserver.pagecache.PageCache; +import com.djrapitops.plan.system.webserver.pagecache.PageId; +import com.djrapitops.plan.system.webserver.response.Response; import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.task.AbsRunnable; diff --git a/Plan/test/main/java/com/djrapitops/plan/data/cache/PageCacheTest.java b/Plan/test/main/java/com/djrapitops/plan/data/cache/PageCacheTest.java index 1efd781d8..5918c4059 100644 --- a/Plan/test/main/java/com/djrapitops/plan/data/cache/PageCacheTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/data/cache/PageCacheTest.java @@ -1,8 +1,8 @@ package com.djrapitops.plan.data.cache; -import com.djrapitops.plan.systems.webserver.pagecache.PageCache; -import com.djrapitops.plan.systems.webserver.pagecache.PageLoader; -import com.djrapitops.plan.systems.webserver.response.Response; +import com.djrapitops.plan.system.webserver.pagecache.PageCache; +import com.djrapitops.plan.system.webserver.pagecache.PageLoader; +import com.djrapitops.plan.system.webserver.response.Response; import org.junit.Test; import test.utilities.RandomData; diff --git a/Plan/test/main/java/com/djrapitops/plan/systems/webserver/WebServerTest.java b/Plan/test/main/java/com/djrapitops/plan/system/webserver/WebServerTest.java similarity index 96% rename from Plan/test/main/java/com/djrapitops/plan/systems/webserver/WebServerTest.java rename to Plan/test/main/java/com/djrapitops/plan/system/webserver/WebServerTest.java index 08b657f65..7887e2c15 100644 --- a/Plan/test/main/java/com/djrapitops/plan/systems/webserver/WebServerTest.java +++ b/Plan/test/main/java/com/djrapitops/plan/system/webserver/WebServerTest.java @@ -1,4 +1,4 @@ -package com.djrapitops.plan.systems.webserver; +package com.djrapitops.plan.system.webserver; import com.djrapitops.plan.Plan; import com.sun.net.httpserver.HttpExchange;