Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-03-24 04:29:42 +01:00
Code Issues Projects Releases Wiki Activity

Made plugins tabs be transferred over HTTP instead of MySQL #531

Browse Source
This commit is contained in:
Rsl1122 2018-04-02 09:20:19 +03:00
parent 6424fe4a28
commit 0350e603c3
3 changed files with 19 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Plan/src/main/java/com/djrapitops/plan/system/database/databases/operation/TransferOperations.java
View File

@ -21,31 +21,30 @@ public interface TransferOperations {
// Save
@Deprecated
void storePlayerHtml(UUID player, String encodedHtml) throws DBException;
@Deprecated
void storeServerHtml(UUID serverUUID, String encodedHtml) throws DBException;
@Deprecated
void storeNetworkPageContent(UUID serverUUID, String encodedHtml) throws DBException;
void storePlayerPluginsTab(UUID player, String encodedHtml) throws DBException;
void storeConfigSettings(String encodedSettingString) throws DBException;
@Deprecated
void playerOnline(UUID playerUUID) throws DBException;
// Get
@Deprecated
Map<UUID, String> getEncodedPlayerHtml() throws DBException;
@Deprecated
Map<UUID, String> getEncodedNetworkPageContent() throws DBException;
@Deprecated
Map<UUID, String> getEncodedServerHtml() throws DBException;
@Deprecated
Optional<UUID> getServerPlayerIsOnlineOn(UUID playerUUID) throws DBException;
Map<UUID, String> getEncodedPlayerPluginsTabs(UUID playerUUID) throws DBException;
Optional<String> getEncodedConfigSettings() throws DBException;
}

26
Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLTransferOps.java
View File

@ -78,15 +78,6 @@ public class SQLTransferOps extends SQLOps implements TransferOperations {
}
}
@Override
public void storePlayerPluginsTab(UUID player, String encodedHtml) throws DBException {
try {
transferTable.storePlayerPluginsTab(player, encodedHtml);
} catch (SQLException e) {
throw SQLErrorUtil.getExceptionFor(e);
}
}
@Override
public Optional<UUID> getServerPlayerIsOnlineOn(UUID playerUUID) throws DBException {
try {
@ -96,15 +87,6 @@ public class SQLTransferOps extends SQLOps implements TransferOperations {
}
}
@Override
public Map<UUID, String> getEncodedPlayerPluginsTabs(UUID playerUUID) throws DBException {
try {
return transferTable.getPlayerPluginsTabs(playerUUID);
} catch (SQLException e) {
throw SQLErrorUtil.getExceptionFor(e);
}
}
@Override
public void storeConfigSettings(String encodedSettingString) throws DBException {
try {
@ -123,12 +105,4 @@ public class SQLTransferOps extends SQLOps implements TransferOperations {
}
}
@Override
public void playerOnline(UUID playerUUID) throws DBException {
try {
transferTable.storePlayerOnlineOnThisServer(playerUUID);
} catch (SQLException e) {
throw SQLErrorUtil.getExceptionFor(e);
}
}
}

52
Plan/src/main/java/com/djrapitops/plan/system/info/request/CacheInspectPluginsTabRequest.java
View File

@ -5,17 +5,13 @@
package com.djrapitops.plan.system.info.request;
import com.djrapitops.plan.api.exceptions.connection.BadRequestException;
import com.djrapitops.plan.api.exceptions.connection.TransferDatabaseException;
import com.djrapitops.plan.api.exceptions.connection.WebException;
import com.djrapitops.plan.api.exceptions.database.DBException;
import com.djrapitops.plan.system.database.databases.Database;
import com.djrapitops.plan.system.info.server.ServerInfo;
import com.djrapitops.plan.system.webserver.response.DefaultResponses;
import com.djrapitops.plan.system.webserver.response.Response;
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.pages.parts.InspectPagePluginsContent;
import com.djrapitops.plan.utilities.Base64Util;
import com.djrapitops.plugin.utilities.Verify;
import java.util.Map;
@ -28,24 +24,18 @@ import java.util.UUID;
*/
public class CacheInspectPluginsTabRequest extends InfoRequestWithVariables implements CacheRequest {
private static final String SPLIT = "AASPLITAA";
private final UUID player;
private final String nav;
private final String html;
private CacheInspectPluginsTabRequest() {
player = null;
nav = null;
html = null;
}
public CacheInspectPluginsTabRequest(UUID player, String nav, String html) {
Verify.nullCheck(player, nav);
variables.put("player", player.toString());
variables.put("nav", nav);
variables.put("html", html);
this.player = player;
this.nav = nav;
this.html = html;
}
public static CacheInspectPluginsTabRequest createHandler() {
@ -53,43 +43,27 @@ public class CacheInspectPluginsTabRequest extends InfoRequestWithVariables impl
}
@Override
public void placeDataToDatabase() throws WebException {
Verify.nullCheck(player, nav);
String encodedHtml = Base64Util.encode(nav + SPLIT + html);
try {
Database.getActive().transfer().storePlayerPluginsTab(player, encodedHtml);
} catch (DBException e) {
throw new TransferDatabaseException(e);
}
public void placeDataToDatabase() {
/* Transferred over HTTP */
}
@Override
public Response handleRequest(Map<String, String> variables) throws WebException {
// Available variables: sender, player
// Available variables: sender, player, nav, html
String player = variables.get("player");
Verify.nullCheck(player, () -> new BadRequestException("Player UUID 'player' variable not supplied in the request."));
UUID uuid = UUID.fromString(player);
UUID serverUUID = UUID.fromString(variables.get("sender"));
try {
InspectPagePluginsContent pluginsTab = getPluginsTab(uuid);
String nav = variables.get("nav");
String html = variables.get("html");
Verify.nullCheck(nav, () -> new BadRequestException("Nav HTML 'nav' variable not supplied in the request"));
Verify.nullCheck(html, () -> new BadRequestException("HTML 'html' variable not supplied in the request"));
Map<UUID, String> pages = Database.getActive().transfer().getEncodedPlayerPluginsTabs(uuid);
InspectPagePluginsContent pluginsTab = getPluginsTab(uuid);
for (Map.Entry<UUID, String> entry : pages.entrySet()) {
UUID serverUUID = entry.getKey();
String[] navAndHtml = Base64Util.decode(entry.getValue()).split(SPLIT);
if (navAndHtml.length <= 1) {
continue;
}
pluginsTab.addTab(serverUUID, navAndHtml[0], navAndHtml[1]);
}
} catch (DBException e) {
throw new TransferDatabaseException(e);
}
pluginsTab.addTab(serverUUID, nav, html);
return DefaultResponses.SUCCESS.get();
}
@ -99,6 +73,6 @@ public class CacheInspectPluginsTabRequest extends InfoRequestWithVariables impl
@Override
public void runLocally() {
getPluginsTab(player).addTab(ServerInfo.getServerUUID(), nav, html);
getPluginsTab(player).addTab(ServerInfo.getServerUUID(), variables.get("nav"), variables.get("html"));
}
}