From 8ffcd302dff3aed42a6bb81d9d658abe38b28325 Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Sat, 16 Sep 2017 19:03:33 +0300 Subject: [PATCH] Some parts to BungeeInformationManager --- .../info/BungeeInformationManager.java | 13 +++++++--- .../bungee/RequestPluginsTabWebAPI.java | 26 +++++++++++-------- 2 files changed, 25 insertions(+), 14 deletions(-) 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 78c0e59a3..91a1f21d0 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 @@ -11,8 +11,9 @@ import main.java.com.djrapitops.plan.bungee.PlanBungee; import main.java.com.djrapitops.plan.systems.cache.DataCache; import main.java.com.djrapitops.plan.systems.info.server.ServerInfo; import main.java.com.djrapitops.plan.systems.webserver.PageCache; -import main.java.com.djrapitops.plan.systems.webserver.response.InspectPageResponse; +import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPIManager; import main.java.com.djrapitops.plan.systems.webserver.webapi.bukkit.AnalyzeWebAPI; +import main.java.com.djrapitops.plan.systems.webserver.webapi.bungee.RequestPluginsTabWebAPI; import java.sql.SQLException; import java.util.HashMap; @@ -75,8 +76,9 @@ public class BungeeInformationManager extends InformationManager { @Override public void cachePlayer(UUID uuid) { - PageCache.loadPage("inspectPage: " + uuid, () -> new InspectPageResponse(this, uuid)); - // TODO Player page plugin tab request + // TODO Request Inspect from server where the player is online or any if offline +// PageCache.loadPage("inspectPage: " + uuid, () -> new InspectPageResponse(this, uuid)); + getWebAPI().getAPI(RequestPluginsTabWebAPI.class).sendRequestsToBukkitServers(plugin, uuid); } @Override @@ -114,4 +116,9 @@ public class BungeeInformationManager extends InformationManager { perServerPluginsTab.put(serverUUID, html); pluginsTabContent.put(uuid, perServerPluginsTab); } + + private WebAPIManager getWebAPI() { + return plugin.getWebServer().getWebAPI(); + } + } \ No newline at end of file diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/RequestPluginsTabWebAPI.java b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/RequestPluginsTabWebAPI.java index 8d15f33e0..76c4c3659 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/RequestPluginsTabWebAPI.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bungee/RequestPluginsTabWebAPI.java @@ -42,6 +42,21 @@ public class RequestPluginsTabWebAPI extends WebAPI { } UUID uuid = UUID.fromString(uuidS); + sendRequestsToBukkitServers(plugin, uuid); + return PageCache.loadPage("success", SuccessResponse::new); + } + + @Override + public void sendRequest(String address) throws WebAPIException { + throw new IllegalStateException("Wrong method call for this WebAPI, call sendRequest(String, UUID, UUID) instead."); + } + + public void sendRequest(String address, UUID uuid) throws WebAPIException { + addVariable("uuid", uuid.toString()); + super.sendRequest(address); + } + + public void sendRequestsToBukkitServers(IPlan plugin, UUID uuid) { plugin.addToProcessQueue(new Processor(uuid) { @Override public void process() { @@ -60,16 +75,5 @@ public class RequestPluginsTabWebAPI extends WebAPI { } } }); - return PageCache.loadPage("success", SuccessResponse::new); - } - - @Override - public void sendRequest(String address) throws WebAPIException { - throw new IllegalStateException("Wrong method call for this WebAPI, call sendRequest(String, UUID, UUID) instead."); - } - - public void sendRequest(String address, UUID uuid) throws WebAPIException { - addVariable("uuid", uuid.toString()); - super.sendRequest(address); } } \ No newline at end of file