Refactor dbus client mode to improve maintainability

[signal-cli] / src / main / java / org / asamk / signal / commands / JsonRpcLocalCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
index 06124ffd4ae85561e4d85079a23079d292648d44..24b45ee83f21d68d6e5ad89ecbfeed42df31353d 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
@@ -40,6 +40,7 @@ public interface JsonRpcLocalCommand extends JsonRpcCommand<Map<String, Object>>
             super(attrs);
         }
 
+        @Override
         public <T> T get(String dest) {
             final T value = super.get(dest);
             if (value != null) {
@@ -52,9 +53,13 @@ public interface JsonRpcLocalCommand extends JsonRpcCommand<Map<String, Object>>
 
         @Override
         public <E> List<E> getList(final String dest) {
-            final List<E> value = super.getList(dest);
-            if (value != null) {
-                return value;
+            try {
+                final List<E> value = super.getList(dest);
+                if (value != null) {
+                    return value;
+                }
+            } catch (ClassCastException e) {
+                return List.of(this.<E>get(dest));
             }
 
             return super.getList(dest + "s");