Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-10-28 14:30:49 +01:00
Code Issues Projects Releases Wiki Activity

Split NetworkPage into it's own response

Browse Source
This commit is contained in:
Rsl1122 2018-08-12 09:53:56 +03:00
parent 8fbb5a7c9e
commit cab63df82f
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Plan/src/main/java/com/djrapitops/plan/system/info/BungeeInfoSystem.java
View File

@ -7,9 +7,6 @@ package com.djrapitops.plan.system.info;
import com.djrapitops.plan.api.exceptions.ParseException; import com.djrapitops.plan.api.exceptions.ParseException;
import com.djrapitops.plan.api.exceptions.connection.NoServersException; import com.djrapitops.plan.api.exceptions.connection.NoServersException;
import com.djrapitops.plan.api.exceptions.connection.WebException; import com.djrapitops.plan.api.exceptions.connection.WebException;
import com.djrapitops.plan.api.exceptions.connection.WebFailException;
import com.djrapitops.plan.data.store.containers.NetworkContainer;
import com.djrapitops.plan.system.cache.CacheSystem;
import com.djrapitops.plan.system.info.connection.BungeeConnectionSystem; import com.djrapitops.plan.system.info.connection.BungeeConnectionSystem;
import com.djrapitops.plan.system.info.request.CacheRequest; import com.djrapitops.plan.system.info.request.CacheRequest;
import com.djrapitops.plan.system.info.request.GenerateInspectPageRequest; import com.djrapitops.plan.system.info.request.GenerateInspectPageRequest;
@ -17,8 +14,8 @@ import com.djrapitops.plan.system.info.request.InfoRequest;
import com.djrapitops.plan.system.info.server.ServerInfo; import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.webserver.response.cache.PageId; import com.djrapitops.plan.system.webserver.response.cache.PageId;
import com.djrapitops.plan.system.webserver.response.cache.ResponseCache; import com.djrapitops.plan.system.webserver.response.cache.ResponseCache;
import com.djrapitops.plan.system.webserver.response.pages.AnalysisPageResponse; import com.djrapitops.plan.system.webserver.response.errors.InternalErrorResponse;
import com.djrapitops.plan.utilities.html.pages.NetworkPage; import com.djrapitops.plan.system.webserver.response.pages.NetworkPageResponse;
/** /**
* InfoSystem for Bungee. * InfoSystem for Bungee.
@ -43,13 +40,13 @@ public class BungeeInfoSystem extends InfoSystem {
} }
@Override @Override
public void updateNetworkPage() throws WebException { public void updateNetworkPage() {
try { ResponseCache.cacheResponse(PageId.SERVER.of(ServerInfo.getServerUUID()), () -> {
NetworkContainer networkContainer = CacheSystem.getInstance().getDataContainerCache().getNetworkContainer(); try {
String html = new NetworkPage(networkContainer).toHtml(); return new NetworkPageResponse();
ResponseCache.cacheResponse(PageId.SERVER.of(ServerInfo.getServerUUID()), () -> new AnalysisPageResponse(html)); } catch (ParseException e) {
} catch (ParseException e) { return new InternalErrorResponse("Network page parsing failed.", e);
throw new WebFailException("Exception during Network Page Parsing", e); }
} });
} }
} }

20
Plan/src/main/java/com/djrapitops/plan/system/webserver/response/pages/NetworkPageResponse.java Normal file
View File

@ -0,0 +1,20 @@
package com.djrapitops.plan.system.webserver.response.pages;
import com.djrapitops.plan.api.exceptions.ParseException;
import com.djrapitops.plan.data.store.containers.NetworkContainer;
import com.djrapitops.plan.system.cache.CacheSystem;
import com.djrapitops.plan.system.webserver.response.Response;
import com.djrapitops.plan.utilities.html.pages.NetworkPage;
/**
* Response for /network page.
*
* @author Rsl1122
*/
public class NetworkPageResponse extends Response {
public NetworkPageResponse() throws ParseException {
NetworkContainer networkContainer = CacheSystem.getInstance().getDataContainerCache().getNetworkContainer();
setContent(new NetworkPage(networkContainer).toHtml());
}
}