diff --git a/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionIn.java b/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionIn.java index cb1753a92..ee38bfcb7 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionIn.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionIn.java @@ -68,9 +68,9 @@ public class ConnectionIn { private Map readVariables(Request request) throws WebException { String requestBody = readRequestBody(request.getRequestBody()); - String[] variables = requestBody.split(";&variable;"); + String[] bodyVariables = requestBody.split(";&variable;"); - return Arrays.stream(variables) + return Arrays.stream(bodyVariables) .map(variable -> variable.split("=", 2)) .filter(splitVariables -> splitVariables.length == 2) .collect(Collectors.toMap(splitVariables -> splitVariables[0], splitVariables -> splitVariables[1], (a, b) -> b)); diff --git a/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionLog.java b/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionLog.java index ad149e3d4..db16a8369 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionLog.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionLog.java @@ -11,6 +11,7 @@ import com.djrapitops.plugin.api.utility.log.Log; import java.util.HashMap; import java.util.Map; +import java.util.Objects; /** * Class responsible for logging what ConnectionOut objects get in return. @@ -90,6 +91,20 @@ public class ConnectionLog { public int compareTo(Entry o) { return Long.compare(o.date, this.date); } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof Entry)) return false; + Entry entry = (Entry) o; + return responseCode == entry.responseCode && + date == entry.date; + } + + @Override + public int hashCode() { + return Objects.hash(responseCode, date); + } } } diff --git a/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ServerConnectionSystem.java b/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ServerConnectionSystem.java index af0aad656..c4c7870b3 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ServerConnectionSystem.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ServerConnectionSystem.java @@ -116,9 +116,4 @@ public class ServerConnectionSystem extends ConnectionSystem { Log.info(locale.get().getString(PluginLang.ENABLE_NOTIFY_ADDRESS_CONFIRMATION, webServerAddress)); } } - - @Override - public void disable() { - - } } diff --git a/Plan/src/main/java/com/djrapitops/plan/system/info/connection/WebExceptionLogger.java b/Plan/src/main/java/com/djrapitops/plan/system/info/connection/WebExceptionLogger.java index 49e14bad7..73bac53ff 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/info/connection/WebExceptionLogger.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/info/connection/WebExceptionLogger.java @@ -63,4 +63,7 @@ public class WebExceptionLogger { return null; } + private WebExceptionLogger() { + // Static method class. + } } diff --git a/Plan/src/main/java/com/djrapitops/plan/system/info/request/CacheAnalysisPageRequest.java b/Plan/src/main/java/com/djrapitops/plan/system/info/request/CacheAnalysisPageRequest.java index f15f33d0f..251c165f3 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/CacheAnalysisPageRequest.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/CacheAnalysisPageRequest.java @@ -50,13 +50,13 @@ public class CacheAnalysisPageRequest extends InfoRequestWithVariables implement public Response handleRequest(Map variables) throws WebException { // Available variables: sender, html (Base64) - UUID serverUUID = UUID.fromString(variables.get("sender")); + UUID sender = UUID.fromString(variables.get("sender")); - String html = variables.get("html"); - Verify.nullCheck(html, () -> new BadRequestException("HTML 'html' variable not supplied in the request")); + String sentHtml = variables.get("html"); + Verify.nullCheck(sentHtml, () -> new BadRequestException("HTML 'html' variable not supplied in the request")); boolean export = Settings.ANALYSIS_EXPORT.isTrue(); - cache(export, serverUUID, Base64Util.decode(html)); + cache(export, sender, Base64Util.decode(sentHtml)); return DefaultResponses.SUCCESS.get(); } diff --git a/Plan/src/main/java/com/djrapitops/plan/system/settings/PlanErrorManager.java b/Plan/src/main/java/com/djrapitops/plan/system/settings/PlanErrorManager.java index 826e6e582..aa7d14141 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/settings/PlanErrorManager.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/settings/PlanErrorManager.java @@ -32,13 +32,7 @@ public class PlanErrorManager implements ErrorManager { } else { Log.warn("It has been logged to ErrorLog.txt"); } - try { - if ((Check.isBukkitAvailable() && Check.isBungeeAvailable()) || Settings.DEV_MODE.isTrue()) { - Logger.getGlobal().log(Level.WARNING, source, e); - } - } catch (IllegalStateException ignored) { - /* Config system not initialized */ - } + logGlobally(source, e); ErrorLogger.logThrowable(e, logsFolder); } catch (Exception exception) { System.out.println("Failed to log error to file because of " + exception); @@ -48,4 +42,14 @@ public class PlanErrorManager implements ErrorManager { Logger.getGlobal().log(Level.WARNING, source, e); } } + + private void logGlobally(String source, Throwable e) { + try { + if ((Check.isBukkitAvailable() && Check.isBungeeAvailable()) || Settings.DEV_MODE.isTrue()) { + Logger.getGlobal().log(Level.WARNING, source, e); + } + } catch (IllegalStateException ignored) { + /* Config system not initialized */ + } + } }