mirror of
https://github.com/plan-player-analytics/Plan.git
synced 2025-02-22 23:31:43 +01:00
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
This commit is contained in:
Fuzzlemann
parent
06bd3518f6
commit
d9730c3c63
@ -90,7 +90,7 @@ public class ManageImportCommand extends SubCommand {
|
||||
|
||||
private void list(Map<String, Importer> 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());
|
||||
}
|
||||
}
|
||||
|
||||
@ -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<AnalysisData> {
|
||||
addValue("version", planVersion);
|
||||
|
||||
final List<RawData> parts = getAllParts();
|
||||
parts.stream().forEach((part) -> {
|
||||
parts.forEach((part) -> {
|
||||
try {
|
||||
Benchmark.start("Analysis Phase: " + part.getClass().getSimpleName());
|
||||
part.analyseData();
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -378,7 +378,7 @@ public class DataCacheHandler extends SessionCache {
|
||||
*/
|
||||
public void saveHandlerDataToCache() {
|
||||
final List<IPlayer> onlinePlayers = plugin.fetch().getOnlinePlayers();
|
||||
onlinePlayers.stream().forEach((p) -> saveHandlerDataToCache(p, false));
|
||||
onlinePlayers.forEach((p) -> saveHandlerDataToCache(p, false));
|
||||
}
|
||||
|
||||
private void saveHandlerDataToCache(IPlayer player, boolean pool) {
|
||||
|
||||
@ -319,7 +319,7 @@ public abstract class SQLDB extends Database {
|
||||
List<SessionData> 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();
|
||||
}
|
||||
|
||||
@ -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<Long> keys = new HashSet<>(starts.keySet());
|
||||
keys.addAll(ends.keySet());
|
||||
Map<Long, Integer> change = new HashMap<>();
|
||||
keys.stream().forEach((key) -> {
|
||||
keys.forEach((key) -> {
|
||||
int value = 0;
|
||||
if (starts.containsKey(key)) {
|
||||
value += starts.get(key);
|
||||
|
||||
@ -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("</div>");
|
||||
return html.toString();
|
||||
}
|
||||
|
||||
@ -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<String, Long> gmTimes = uData.getGmTimes();
|
||||
String[] gms = new String[]{"SURVIVAL", "CREATIVE", "ADVENTURE", "SPECTATOR"};
|
||||
|
||||
@ -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<UUID> uniqueJoins = new HashSet<>();
|
||||
sessions.keySet().stream().forEach((uuid) -> {
|
||||
sessions.keySet().forEach((uuid) -> {
|
||||
List<SessionData> s = sessions.get(uuid);
|
||||
for (SessionData session : s) {
|
||||
if (session.getSessionStart() < nowMinusScale) {
|
||||
@ -238,7 +239,7 @@ public class AnalysisUtils {
|
||||
Map<Integer, Set<UUID>> uniqueJoins = new HashMap<>();
|
||||
long now = MiscUtils.getTime();
|
||||
long nowMinusScale = now - scale;
|
||||
sessions.keySet().stream().forEach((uuid) -> {
|
||||
sessions.keySet().forEach((uuid) -> {
|
||||
List<SessionData> s = sessions.get(uuid);
|
||||
for (SessionData session : s) {
|
||||
if (scale != -1) {
|
||||
|
||||
@ -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));
|
||||
}
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@ public class MapComparator {
|
||||
*/
|
||||
public static List<String[]> sortByValue(Map<String, Integer> hashMap) {
|
||||
List<String[]> 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<String[]> sortByValueLong(Map<String, Long> hashMap) {
|
||||
List<String[]> 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;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user