Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-09-28 22:47:38 +02:00
Code Issues Projects Releases Wiki Activity

Serialize Sessions into json without Gson during shutdown

Browse Source 
Affects issues:
- Fixed #1970
This commit is contained in:
Risto Lahtela 2021-07-02 17:59:25 +03:00
parent b3200d1734
commit 8d445aaccc
6 changed files with 64 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plan/common/src/main/java/com/djrapitops/plan/gathering/domain/Counter.java
View File

@ -57,4 +57,8 @@ public class Counter {
"count=" + count +
'}';
}
public String toJson() {
return "{\"count\": " + count + "}";
}
}

10
Plan/common/src/main/java/com/djrapitops/plan/gathering/domain/FinishedSession.java
View File

@ -191,16 +191,14 @@ public class FinishedSession implements DateHolder {
* @return Serialized format
*/
public String serializeCSV() {
Gson gson = new Gson();
return String.valueOf(playerUUID) + ';' +
serverUUID + ';' +
start + ';' +
end + ';' +
afkTime + ';' +
gson.toJson(getExtraData(WorldTimes.class).orElseGet(WorldTimes::new)) + ';' +
gson.toJson(getExtraData(PlayerKills.class).orElseGet(PlayerKills::new)) + ';' +
gson.toJson(getExtraData(MobKillCounter.class).orElseGet(MobKillCounter::new)) + ';' +
gson.toJson(getExtraData(DeathCounter.class).orElseGet(DeathCounter::new));
getExtraData(WorldTimes.class).orElseGet(WorldTimes::new).toJson() + ';' +
getExtraData(PlayerKills.class).orElseGet(PlayerKills::new).toJson() + ';' +
getExtraData(MobKillCounter.class).orElseGet(MobKillCounter::new).toJson() + ';' +
getExtraData(DeathCounter.class).orElseGet(DeathCounter::new).toJson();
}
}

28
Plan/common/src/main/java/com/djrapitops/plan/gathering/domain/GMTimes.java
View File

@ -16,6 +16,8 @@
*/
package com.djrapitops.plan.gathering.domain;
import org.apache.commons.text.TextStringBuilder;
import java.util.Map;
import java.util.Optional;
@ -57,11 +59,16 @@ public class GMTimes extends TimeKeeper {
public static String magicNumberToGMName(int magicNumber) {
switch (magicNumber) {
case 0: return SURVIVAL;
case 1: return CREATIVE;
case 2: return ADVENTURE;
case 3: return SPECTATOR;
default: return "UNKOWN";
case 0:
return SURVIVAL;
case 1:
return CREATIVE;
case 2:
return ADVENTURE;
case 3:
return SPECTATOR;
default:
return "UNKOWN";
}
}
@ -123,4 +130,15 @@ public class GMTimes extends TimeKeeper {
", lastStateChange=" + lastStateChange +
'}';
}
public String toJson() {
return "{\"times\": {" +
new TextStringBuilder().appendWithSeparators(times.entrySet().stream()
.map(entry -> "\"" + entry.getKey() + "\": " + entry.getValue())
.iterator(), ",").build() +
" }," +
" \"state\": \"" + state + "\"," +
" \"lastStateChange\": " + lastStateChange +
"}";
}
}

10
Plan/common/src/main/java/com/djrapitops/plan/gathering/domain/PlayerKill.java
View File

@ -124,4 +124,14 @@ public class PlayerKill implements DateHolder {
public boolean isNotSelfKill() {
return !isSelfKill();
}
public String toJson() {
return "{\"killer\": \"" + killer + "\"," +
" \"victim\": \"" + victim + "\"," +
" \"weapon\": \"" + weapon + "\"," +
" \"date\": " + date + "," +
" \"victimName\": \"" + victimName + "\"," +
" \"killerName\": \"" + killerName + "\"" +
"}";
}
}

10
Plan/common/src/main/java/com/djrapitops/plan/gathering/domain/PlayerKills.java
View File

@ -17,6 +17,7 @@
package com.djrapitops.plan.gathering.domain;
import com.djrapitops.plan.utilities.comparators.DateHolderRecentComparator;
import org.apache.commons.text.TextStringBuilder;
import java.util.ArrayList;
import java.util.Collection;
@ -73,4 +74,13 @@ public class PlayerKills {
"kills=" + kills +
'}';
}
public String toJson() {
return "{" +
" \"kills\": [" +
new TextStringBuilder().appendWithSeparators(kills
.stream().map(PlayerKill::toJson).iterator(), ",").build() +
" ]" +
"}";
}
}

13
Plan/common/src/main/java/com/djrapitops/plan/gathering/domain/WorldTimes.java
View File

@ -16,6 +16,8 @@
*/
package com.djrapitops.plan.gathering.domain;
import org.apache.commons.text.TextStringBuilder;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
@ -197,4 +199,15 @@ public class WorldTimes {
setGMTimesForWorld(entry.getKey(), entry.getValue());
}
}
public String toJson() {
return "{\"times\": {" +
new TextStringBuilder().appendWithSeparators(times.entrySet().stream()
.map(entry -> "\"" + entry.getKey() + "\": " + entry.getValue().toJson())
.iterator(), ",").build() +
" }," +
" \"currentWorld\": \"" + currentWorld + "\"," +
" \"currentGamemode\": \"" + currentGamemode + "\"" +
"}";
}
}