Use record classes

[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..ccf327715d67966ce89f55115b1184b7b29f918e 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
@@ -16,8 +16,7 @@ import java.util.Map;
 public interface JsonRpcLocalCommand extends JsonRpcCommand<Map<String, Object>>, LocalCommand {
 
     default TypeReference<Map<String, Object>> getRequestType() {
-        return new TypeReference<>() {
-        };
+        return new TypeReference<>() {};
     }
 
     default void handleCommand(
@@ -32,7 +31,7 @@ public interface JsonRpcLocalCommand extends JsonRpcCommand<Map<String, Object>>
     }
 
     /**
-     * Namepace implementation, that defaults booleans to false and converts camel case keys to dashed strings
+     * Namespace implementation, that has plural handling for list arguments and converts camel case keys to dashed strings
      */
     final class JsonRpcNamespace extends Namespace {
 
@@ -40,6 +39,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,21 +52,16 @@ 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");
         }
-
-        @Override
-        public Boolean getBoolean(String dest) {
-            Boolean maybeGotten = this.get(dest);
-            if (maybeGotten == null) {
-                maybeGotten = false;
-            }
-            return maybeGotten;
-        }
     }
 }