From d9730c3c6357e7ff1007367518834632d7916f30 Mon Sep 17 00:00:00 2001 From: Fuzzlemann Date: Sun, 23 Jul 2017 18:35:13 +0200 Subject: [PATCH] Remove unnecessary .stream() call if only .forEach() can be used Remove .exists() call at deletion because .delete() doesn't throw a FileNotFoundException when the file isn't present, it just returns false --- .../commands/manage/ManageImportCommand.java | 2 +- .../djrapitops/plan/data/AnalysisData.java | 20 +++---- .../com/djrapitops/plan/data/UserData.java | 52 ++++++------------- .../plan/data/cache/DataCacheHandler.java | 2 +- .../plan/database/databases/SQLDB.java | 2 +- .../graphs/PlayerActivityGraphCreator.java | 17 +++--- .../djrapitops/plan/utilities/HtmlUtils.java | 2 +- .../plan/utilities/analysis/Analysis.java | 28 +++------- .../utilities/analysis/AnalysisUtils.java | 13 ++--- .../utilities/analysis/ExportUtility.java | 11 ++-- .../utilities/comparators/MapComparator.java | 4 +- 11 files changed, 51 insertions(+), 102 deletions(-) diff --git a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageImportCommand.java b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageImportCommand.java index effe6802f..b3c1a7e5b 100644 --- a/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageImportCommand.java +++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageImportCommand.java @@ -90,7 +90,7 @@ public class ManageImportCommand extends SubCommand { private void list(Map importers, ISender sender) { sender.sendMessage(Phrase.CMD_FOOTER.parse()); - importers.entrySet().stream().forEach(e -> sender.sendMessage(Phrase.CMD_BALL + " " + e.getKey() + ": " + e.getValue().getInfo())); + importers.forEach((string, importer) -> sender.sendMessage(Phrase.CMD_BALL + " " + string + ": " + importer.getInfo())); sender.sendMessage(Phrase.CMD_FOOTER.parse()); } } diff --git a/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java b/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java index 711140772..dd4d46c34 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java @@ -1,24 +1,16 @@ package main.java.com.djrapitops.plan.data; import com.djrapitops.plugin.utilities.Verify; -import java.util.Arrays; -import java.util.List; -import java.util.Map; import main.java.com.djrapitops.plan.Log; -import main.java.com.djrapitops.plan.data.analysis.ActivityPart; -import main.java.com.djrapitops.plan.data.analysis.CommandUsagePart; -import main.java.com.djrapitops.plan.data.analysis.GamemodePart; -import main.java.com.djrapitops.plan.data.analysis.GeolocationPart; -import main.java.com.djrapitops.plan.data.analysis.JoinInfoPart; -import main.java.com.djrapitops.plan.data.analysis.KillPart; -import main.java.com.djrapitops.plan.data.analysis.PlayerCountPart; -import main.java.com.djrapitops.plan.data.analysis.PlaytimePart; -import main.java.com.djrapitops.plan.data.analysis.RawData; -import main.java.com.djrapitops.plan.data.analysis.TPSPart; +import main.java.com.djrapitops.plan.data.analysis.*; import main.java.com.djrapitops.plan.utilities.Benchmark; import main.java.com.djrapitops.plan.utilities.HtmlUtils; import main.java.com.djrapitops.plan.utilities.MiscUtils; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + /** * Big container object for Data. * @@ -151,7 +143,7 @@ public class AnalysisData extends RawData { addValue("version", planVersion); final List parts = getAllParts(); - parts.stream().forEach((part) -> { + parts.forEach((part) -> { try { Benchmark.start("Analysis Phase: " + part.getClass().getSimpleName()); part.analyseData(); diff --git a/Plan/src/main/java/com/djrapitops/plan/data/UserData.java b/Plan/src/main/java/com/djrapitops/plan/data/UserData.java index 4219a4f9c..2c87e2ca0 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/UserData.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/UserData.java @@ -753,47 +753,25 @@ public class UserData { if (getClass() != obj.getClass()) { return false; } + final UserData other = (UserData) obj; - if (this.registered != other.registered) { - return false; - } // if (this.lastPlayed != other.lastPlayed) { // return false; // } - if (this.playTime != other.playTime) { - return false; - } - if (this.loginTimes != other.loginTimes) { - return false; - } - if (this.timesKicked != other.timesKicked) { - return false; - } - if (this.lastGmSwapTime != other.lastGmSwapTime) { - return false; - } - if (this.mobKills != other.mobKills) { - return false; - } - if (this.deaths != other.deaths) { - return false; - } - if (!Objects.equals(this.lastNick, other.lastNick)) { - return false; - } - if (!Objects.equals(this.name, other.name)) { - return false; - } - if (!Objects.equals(this.uuid, other.uuid)) { - return false; - } - if (!Objects.equals(this.ips, other.ips)) { - return false; - } - if (!Objects.equals(this.nicknames, other.nicknames)) { - return false; - } - return Objects.equals(this.lastGamemode, other.lastGamemode) + + return this.registered == other.registered + && this.playTime == other.playTime + && this.loginTimes == other.loginTimes + && this.timesKicked == other.timesKicked + && this.lastGmSwapTime == other.lastGmSwapTime + && this.mobKills == other.mobKills + && this.deaths == other.deaths + && Objects.equals(this.lastNick, other.lastNick) + && Objects.equals(this.name, other.name) + && Objects.equals(this.uuid, other.uuid) + && Objects.equals(this.ips, other.ips) + && Objects.equals(this.nicknames, other.nicknames) + && Objects.equals(this.lastGamemode, other.lastGamemode) && Objects.equals(this.gmTimes, other.gmTimes) && Objects.equals(this.playerKills, other.playerKills) && Objects.equals(this.sessions, other.sessions); diff --git a/Plan/src/main/java/com/djrapitops/plan/data/cache/DataCacheHandler.java b/Plan/src/main/java/com/djrapitops/plan/data/cache/DataCacheHandler.java index 953e4d944..708e6f9ab 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/cache/DataCacheHandler.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/cache/DataCacheHandler.java @@ -378,7 +378,7 @@ public class DataCacheHandler extends SessionCache { */ public void saveHandlerDataToCache() { final List onlinePlayers = plugin.fetch().getOnlinePlayers(); - onlinePlayers.stream().forEach((p) -> saveHandlerDataToCache(p, false)); + onlinePlayers.forEach((p) -> saveHandlerDataToCache(p, false)); } private void saveHandlerDataToCache(IPlayer player, boolean pool) { diff --git a/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java b/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java index 4b4ae1eb7..3076f03fd 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java @@ -319,7 +319,7 @@ public abstract class SQLDB extends Database { List sessions = sessionsTable.getSessionData(userId); data.addSessions(sessions); data.setPlayerKills(killsTable.getPlayerKills(userId)); - processors.stream().forEach((processor) -> processor.process(data)); + processors.forEach((processor) -> processor.process(data)); Benchmark.stop("Database: Give userdata to processors"); setAvailable(); } diff --git a/Plan/src/main/java/com/djrapitops/plan/ui/html/graphs/PlayerActivityGraphCreator.java b/Plan/src/main/java/com/djrapitops/plan/ui/html/graphs/PlayerActivityGraphCreator.java index 26b529153..21fdabb9e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/ui/html/graphs/PlayerActivityGraphCreator.java +++ b/Plan/src/main/java/com/djrapitops/plan/ui/html/graphs/PlayerActivityGraphCreator.java @@ -1,15 +1,5 @@ package main.java.com.djrapitops.plan.ui.html.graphs; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collectors; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.Settings; import main.java.com.djrapitops.plan.data.SessionData; @@ -19,6 +9,11 @@ import main.java.com.djrapitops.plan.utilities.MiscUtils; import main.java.com.djrapitops.plan.utilities.analysis.MathUtils; import main.java.com.djrapitops.plan.utilities.analysis.Point; +import java.io.Serializable; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; + /** * * @author Rsl1122 @@ -112,7 +107,7 @@ public class PlayerActivityGraphCreator { Set keys = new HashSet<>(starts.keySet()); keys.addAll(ends.keySet()); Map change = new HashMap<>(); - keys.stream().forEach((key) -> { + keys.forEach((key) -> { int value = 0; if (starts.containsKey(key)) { value += starts.get(key); diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/HtmlUtils.java b/Plan/src/main/java/com/djrapitops/plan/utilities/HtmlUtils.java index 075807e99..fcbf0e681 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/HtmlUtils.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/HtmlUtils.java @@ -163,7 +163,7 @@ public class HtmlUtils { StringBuilder html = new StringBuilder(); html.append(Html.HEADER.parse(name)); html.append(Html.PLUGIN_CONTAINER_START.parse()); - placeholders.stream().forEach(html::append); + placeholders.forEach(html::append); html.append(""); return html.toString(); } 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 cda24af58..f67c894e3 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 @@ -1,33 +1,16 @@ package main.java.com.djrapitops.plan.utilities.analysis; import com.djrapitops.plugin.task.AbsRunnable; -import com.djrapitops.plugin.task.ITask; import com.djrapitops.plugin.utilities.Verify; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.stream.Collectors; import main.java.com.djrapitops.plan.Log; import main.java.com.djrapitops.plan.Phrase; import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.Settings; -import main.java.com.djrapitops.plan.data.AnalysisData; -import main.java.com.djrapitops.plan.data.KillData; -import main.java.com.djrapitops.plan.data.SessionData; -import main.java.com.djrapitops.plan.data.TPS; -import main.java.com.djrapitops.plan.data.UserData; +import main.java.com.djrapitops.plan.data.*; import main.java.com.djrapitops.plan.data.additional.AnalysisType; import main.java.com.djrapitops.plan.data.additional.HookHandler; import main.java.com.djrapitops.plan.data.additional.PluginData; -import main.java.com.djrapitops.plan.data.analysis.ActivityPart; -import main.java.com.djrapitops.plan.data.analysis.GamemodePart; -import main.java.com.djrapitops.plan.data.analysis.GeolocationPart; -import main.java.com.djrapitops.plan.data.analysis.JoinInfoPart; -import main.java.com.djrapitops.plan.data.analysis.KillPart; -import main.java.com.djrapitops.plan.data.analysis.PlayerCountPart; -import main.java.com.djrapitops.plan.data.analysis.PlaytimePart; +import main.java.com.djrapitops.plan.data.analysis.*; import main.java.com.djrapitops.plan.data.cache.AnalysisCacheHandler; import main.java.com.djrapitops.plan.data.cache.DataCacheHandler; import main.java.com.djrapitops.plan.data.cache.InspectCacheHandler; @@ -38,6 +21,9 @@ import main.java.com.djrapitops.plan.utilities.HtmlUtils; import main.java.com.djrapitops.plan.utilities.MiscUtils; import main.java.com.djrapitops.plan.utilities.comparators.UserDataLastPlayedComparator; +import java.util.*; +import java.util.stream.Collectors; + /** * * @author Rsl1122 @@ -74,7 +60,7 @@ public class Analysis { plugin.processStatus().startExecution("Analysis"); log(Phrase.ANALYSIS_START + ""); // Async task for Analysis - ITask asyncAnalysisTask = plugin.getRunnableFactory().createNew(new AbsRunnable("AnalysisTask") { + plugin.getRunnableFactory().createNew(new AbsRunnable("AnalysisTask") { @Override public void run() { taskId = this.getTaskId(); @@ -264,7 +250,7 @@ public class Analysis { long now = MiscUtils.getTime(); Benchmark.start("Analysis: Fill Dataset"); - rawData.stream().forEach((uData) -> { + rawData.forEach((uData) -> { uData.access(); Map gmTimes = uData.getGmTimes(); String[] gms = new String[]{"SURVIVAL", "CREATIVE", "ADVENTURE", "SPECTATOR"}; diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtils.java b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtils.java index 5190ce915..ff26d3894 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtils.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/AnalysisUtils.java @@ -1,9 +1,5 @@ package main.java.com.djrapitops.plan.utilities.analysis; -import java.io.Serializable; -import java.util.*; -import java.util.stream.Collectors; -import java.util.stream.Stream; import main.java.com.djrapitops.plan.Log; import main.java.com.djrapitops.plan.Settings; import main.java.com.djrapitops.plan.data.SessionData; @@ -12,6 +8,11 @@ import main.java.com.djrapitops.plan.data.additional.PluginData; import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.MiscUtils; +import java.io.Serializable; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; + /** * * @author Rsl1122 @@ -216,7 +217,7 @@ public class AnalysisUtils { long now = MiscUtils.getTime(); long nowMinusScale = now - scale; Set uniqueJoins = new HashSet<>(); - sessions.keySet().stream().forEach((uuid) -> { + sessions.keySet().forEach((uuid) -> { List s = sessions.get(uuid); for (SessionData session : s) { if (session.getSessionStart() < nowMinusScale) { @@ -238,7 +239,7 @@ public class AnalysisUtils { Map> uniqueJoins = new HashMap<>(); long now = MiscUtils.getTime(); long nowMinusScale = now - scale; - sessions.keySet().stream().forEach((uuid) -> { + sessions.keySet().forEach((uuid) -> { List s = sessions.get(uuid); for (SessionData session : s) { if (scale != -1) { diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/ExportUtility.java b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/ExportUtility.java index bc349be72..04e993cff 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/ExportUtility.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/analysis/ExportUtility.java @@ -100,9 +100,7 @@ public class ExportUtility { File playerFolder = new File(playersFolder, userData.getName()); playerFolder.mkdir(); File inspectHtmlFile = new File(playerFolder, "index.html"); - if (inspectHtmlFile.exists()) { - inspectHtmlFile.delete(); - } + inspectHtmlFile.delete(); Files.write(inspectHtmlFile.toPath(), Collections.singletonList(inspectHtml)); } @@ -113,7 +111,7 @@ public class ExportUtility { * @throws FileNotFoundException * @throws IOException */ - public static void writeAnalysisHtml(AnalysisData analysisData, File serverFolder) throws FileNotFoundException, IOException { + public static void writeAnalysisHtml(AnalysisData analysisData, File serverFolder) throws IOException { if (!Settings.ANALYSIS_EXPORT.isTrue()) { return; } @@ -121,9 +119,8 @@ public class ExportUtility { PlaceholderUtils.getAnalysisReplaceRules(analysisData)) .replace(HtmlUtils.getInspectUrl(""), "../player/"); File analysisHtmlFile = new File(serverFolder, "index.html"); - if (analysisHtmlFile.exists()) { - analysisHtmlFile.delete(); - } + analysisHtmlFile.delete(); + Files.write(analysisHtmlFile.toPath(), Collections.singletonList(analysisHtml)); } diff --git a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/MapComparator.java b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/MapComparator.java index 01ea5e929..69b3d3db5 100644 --- a/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/MapComparator.java +++ b/Plan/src/main/java/com/djrapitops/plan/utilities/comparators/MapComparator.java @@ -20,7 +20,7 @@ public class MapComparator { */ public static List sortByValue(Map hashMap) { List sortedList = new ArrayList<>(); - hashMap.keySet().stream().forEach((key) -> sortedList.add(new String[]{"" + hashMap.get(key), key})); + hashMap.keySet().forEach((key) -> sortedList.add(new String[]{"" + hashMap.get(key), key})); sortedList.sort(Comparator.comparingInt(strings -> Integer.parseInt(strings[0]))); return sortedList; } @@ -32,7 +32,7 @@ public class MapComparator { */ public static List sortByValueLong(Map hashMap) { List sortedList = new ArrayList<>(); - hashMap.keySet().stream().forEach((key) -> sortedList.add(new String[]{"" + hashMap.get(key), key})); + hashMap.keySet().forEach((key) -> sortedList.add(new String[]{"" + hashMap.get(key), key})); sortedList.sort(Comparator.comparing(strings -> Long.valueOf(strings[0]))); return sortedList; }