From: AsamK Date: Tue, 7 Jun 2022 12:25:28 +0000 (+0200) Subject: Rename ThreadInfo to LegacyThreadInfo X-Git-Tag: v0.10.8~14 X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/5afe9c5337e16e89c2ce7bd4aa1781a9ab78704b Rename ThreadInfo to LegacyThreadInfo --- diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java index 81810713..7e5fd242 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java @@ -25,9 +25,9 @@ public class LegacyJsonThreadStore { @JsonProperty("threads") @JsonSerialize(using = MapToListSerializer.class) @JsonDeserialize(using = ThreadsDeserializer.class) - private Map threads = new HashMap<>(); + private Map threads = new HashMap<>(); - public List getThreads() { + public List getThreads() { return new ArrayList<>(threads.values()); } @@ -41,16 +41,16 @@ public class LegacyJsonThreadStore { } } - private static class ThreadsDeserializer extends JsonDeserializer> { + private static class ThreadsDeserializer extends JsonDeserializer> { @Override - public Map deserialize( + public Map deserialize( JsonParser jsonParser, DeserializationContext deserializationContext ) throws IOException { - var threads = new HashMap(); + var threads = new HashMap(); JsonNode node = jsonParser.getCodec().readTree(jsonParser); for (var n : node) { - var t = jsonProcessor.treeToValue(n, ThreadInfo.class); + var t = jsonProcessor.treeToValue(n, LegacyThreadInfo.class); threads.put(t.id, t); } diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/threads/ThreadInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyThreadInfo.java similarity index 86% rename from lib/src/main/java/org/asamk/signal/manager/storage/threads/ThreadInfo.java rename to lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyThreadInfo.java index b81a0051..7a55c665 100644 --- a/lib/src/main/java/org/asamk/signal/manager/storage/threads/ThreadInfo.java +++ b/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyThreadInfo.java @@ -2,7 +2,7 @@ package org.asamk.signal.manager.storage.threads; import com.fasterxml.jackson.annotation.JsonProperty; -public class ThreadInfo { +public class LegacyThreadInfo { @JsonProperty public String id;