From 14297986f28ea09166c33b167a98042ab5e90716 Mon Sep 17 00:00:00 2001 From: AsamK Date: Sat, 24 Jan 2026 14:58:15 +0100 Subject: [PATCH] Use SequencedCollection instead of List --- src/main/java/org/asamk/signal/commands/Command.java | 3 ++- src/main/java/org/asamk/signal/commands/DaemonCommand.java | 3 ++- .../asamk/signal/commands/DeleteLocalAccountDataCommand.java | 3 ++- src/main/java/org/asamk/signal/commands/JsonRpcCommand.java | 3 ++- .../org/asamk/signal/commands/JsonRpcDispatcherCommand.java | 3 ++- .../java/org/asamk/signal/commands/JsonRpcLocalCommand.java | 3 ++- .../org/asamk/signal/commands/JsonRpcMultiLocalCommand.java | 3 ++- src/main/java/org/asamk/signal/commands/ReceiveCommand.java | 3 ++- src/main/java/org/asamk/signal/commands/RegisterCommand.java | 3 ++- src/main/java/org/asamk/signal/commands/VerifyCommand.java | 3 ++- src/main/java/org/asamk/signal/commands/VersionCommand.java | 3 ++- 11 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/asamk/signal/commands/Command.java b/src/main/java/org/asamk/signal/commands/Command.java index 2e4c761d..509c3e2e 100644 --- a/src/main/java/org/asamk/signal/commands/Command.java +++ b/src/main/java/org/asamk/signal/commands/Command.java @@ -3,12 +3,13 @@ package org.asamk.signal.commands; import org.asamk.signal.OutputType; import java.util.List; +import java.util.SequencedCollection; public interface Command { String getName(); - default List getSupportedOutputTypes() { + default SequencedCollection getSupportedOutputTypes() { return List.of(OutputType.PLAIN_TEXT); } } diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java index fae370a5..734f92c8 100644 --- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java +++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java @@ -32,6 +32,7 @@ import java.nio.channels.Channel; import java.nio.channels.ServerSocketChannel; import java.util.ArrayList; import java.util.List; +import java.util.SequencedCollection; import static org.asamk.signal.util.CommandUtil.getReceiveConfig; @@ -87,7 +88,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand { } @Override - public List getSupportedOutputTypes() { + public SequencedCollection getSupportedOutputTypes() { return List.of(OutputType.PLAIN_TEXT, OutputType.JSON); } diff --git a/src/main/java/org/asamk/signal/commands/DeleteLocalAccountDataCommand.java b/src/main/java/org/asamk/signal/commands/DeleteLocalAccountDataCommand.java index 71f8867c..6cca915c 100644 --- a/src/main/java/org/asamk/signal/commands/DeleteLocalAccountDataCommand.java +++ b/src/main/java/org/asamk/signal/commands/DeleteLocalAccountDataCommand.java @@ -16,6 +16,7 @@ import org.asamk.signal.output.JsonWriter; import java.io.IOException; import java.util.List; import java.util.Map; +import java.util.SequencedCollection; public class DeleteLocalAccountDataCommand implements RegistrationCommand, JsonRpcRegistrationCommand> { @@ -54,7 +55,7 @@ public class DeleteLocalAccountDataCommand implements RegistrationCommand, JsonR } @Override - public List getSupportedOutputTypes() { + public SequencedCollection getSupportedOutputTypes() { return List.of(OutputType.PLAIN_TEXT, OutputType.JSON); } diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcCommand.java index 5a7a3738..c70b3a92 100644 --- a/src/main/java/org/asamk/signal/commands/JsonRpcCommand.java +++ b/src/main/java/org/asamk/signal/commands/JsonRpcCommand.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import org.asamk.signal.OutputType; import java.util.List; +import java.util.SequencedCollection; public interface JsonRpcCommand extends Command { @@ -12,7 +13,7 @@ public interface JsonRpcCommand extends Command { return null; } - default List getSupportedOutputTypes() { + default SequencedCollection getSupportedOutputTypes() { return List.of(OutputType.JSON); } } diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java index 5ce9daf4..4221fa4d 100644 --- a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java +++ b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java @@ -21,6 +21,7 @@ import java.io.FileInputStream; import java.io.InputStreamReader; import java.nio.channels.Channels; import java.util.List; +import java.util.SequencedCollection; import java.util.function.Supplier; import static org.asamk.signal.util.CommandUtil.getReceiveConfig; @@ -53,7 +54,7 @@ public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand } @Override - public List getSupportedOutputTypes() { + public SequencedCollection getSupportedOutputTypes() { return List.of(OutputType.JSON); } diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java index 212c3e87..6c98ea20 100644 --- a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java +++ b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java @@ -11,6 +11,7 @@ import org.asamk.signal.output.JsonWriter; import java.util.List; import java.util.Map; +import java.util.SequencedCollection; public interface JsonRpcLocalCommand extends JsonRpcSingleCommand>, LocalCommand { @@ -23,7 +24,7 @@ public interface JsonRpcLocalCommand extends JsonRpcSingleCommand getSupportedOutputTypes() { + default SequencedCollection getSupportedOutputTypes() { return List.of(OutputType.PLAIN_TEXT, OutputType.JSON); } } diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcMultiLocalCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcMultiLocalCommand.java index f14edeff..96c5448a 100644 --- a/src/main/java/org/asamk/signal/commands/JsonRpcMultiLocalCommand.java +++ b/src/main/java/org/asamk/signal/commands/JsonRpcMultiLocalCommand.java @@ -11,6 +11,7 @@ import org.asamk.signal.output.JsonWriter; import java.util.List; import java.util.Map; +import java.util.SequencedCollection; public interface JsonRpcMultiLocalCommand extends JsonRpcMultiCommand>, MultiLocalCommand { @@ -27,7 +28,7 @@ public interface JsonRpcMultiLocalCommand extends JsonRpcMultiCommand getSupportedOutputTypes() { + default SequencedCollection getSupportedOutputTypes() { return List.of(OutputType.PLAIN_TEXT, OutputType.JSON); } } diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java index 37da35e1..8c3ad80c 100644 --- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java +++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java @@ -27,6 +27,7 @@ import java.time.Duration; import java.util.ArrayList; import java.util.List; import java.util.Optional; +import java.util.SequencedCollection; public class ReceiveCommand implements LocalCommand, JsonRpcSingleCommand { @@ -60,7 +61,7 @@ public class ReceiveCommand implements LocalCommand, JsonRpcSingleCommand getSupportedOutputTypes() { + public SequencedCollection getSupportedOutputTypes() { return List.of(OutputType.PLAIN_TEXT, OutputType.JSON); } diff --git a/src/main/java/org/asamk/signal/commands/RegisterCommand.java b/src/main/java/org/asamk/signal/commands/RegisterCommand.java index e51129b6..1cacc5f5 100644 --- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java +++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java @@ -21,6 +21,7 @@ import org.asamk.signal.util.CommandUtil; import java.io.IOException; import java.util.List; +import java.util.SequencedCollection; public class RegisterCommand implements RegistrationCommand, JsonRpcRegistrationCommand { @@ -57,7 +58,7 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration } @Override - public List getSupportedOutputTypes() { + public SequencedCollection getSupportedOutputTypes() { return List.of(OutputType.PLAIN_TEXT, OutputType.JSON); } diff --git a/src/main/java/org/asamk/signal/commands/VerifyCommand.java b/src/main/java/org/asamk/signal/commands/VerifyCommand.java index 6a5046bc..5548dd45 100644 --- a/src/main/java/org/asamk/signal/commands/VerifyCommand.java +++ b/src/main/java/org/asamk/signal/commands/VerifyCommand.java @@ -19,6 +19,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.List; +import java.util.SequencedCollection; public class VerifyCommand implements RegistrationCommand, JsonRpcRegistrationCommand { @@ -50,7 +51,7 @@ public class VerifyCommand implements RegistrationCommand, JsonRpcRegistrationCo } @Override - public List getSupportedOutputTypes() { + public SequencedCollection getSupportedOutputTypes() { return List.of(OutputType.PLAIN_TEXT, OutputType.JSON); } diff --git a/src/main/java/org/asamk/signal/commands/VersionCommand.java b/src/main/java/org/asamk/signal/commands/VersionCommand.java index 498e5e71..accbd1f9 100644 --- a/src/main/java/org/asamk/signal/commands/VersionCommand.java +++ b/src/main/java/org/asamk/signal/commands/VersionCommand.java @@ -16,6 +16,7 @@ import org.asamk.signal.output.PlainTextWriter; import java.util.List; import java.util.Map; +import java.util.SequencedCollection; public class VersionCommand implements JsonRpcLocalCommand, JsonRpcMultiLocalCommand { @@ -25,7 +26,7 @@ public class VersionCommand implements JsonRpcLocalCommand, JsonRpcMultiLocalCom } @Override - public List getSupportedOutputTypes() { + public SequencedCollection getSupportedOutputTypes() { return List.of(OutputType.PLAIN_TEXT, OutputType.JSON); }