Reformat files

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

diff --git a/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java b/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
index 40f30681d399b0e14f229d41fec27668580ee10b..e9b03a176ffdc4a089acf0a30f0373cc114f2f2e 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
@@ -3,24 +3,23 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
-import org.asamk.signal.JsonWriter;
-import org.asamk.signal.OutputWriter;
-import org.asamk.signal.PlainTextWriter;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.Device;
+import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;
 import org.asamk.signal.util.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class ListDevicesCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(ListDevicesCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(ListDevicesCommand.class);
 
     @Override
     public String getName() {
@@ -34,52 +33,36 @@ public class ListDevicesCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         List<Device> devices;
         try {
             devices = m.getLinkedDevices();
         } catch (IOException e) {
-            logger.debug("Failed to get linked devices", e);
-            throw new IOErrorException("Failed to get linked devices: " + e.getMessage());
+            throw new IOErrorException("Failed to get linked devices: " + e.getMessage(), e);
         }
 
-        if (outputWriter instanceof PlainTextWriter) {
-            final var writer = (PlainTextWriter) outputWriter;
-            for (var d : devices) {
-                writer.println("- Device {}{}:", d.getId(), (d.getId() == m.getDeviceId() ? " (this device)" : ""));
-                writer.indent(w -> {
-                    w.println("Name: {}", d.getName());
-                    w.println("Created: {}", DateUtils.formatTimestamp(d.getCreated()));
-                    w.println("Last seen: {}", DateUtils.formatTimestamp(d.getLastSeen()));
-                });
+        switch (outputWriter) {
+            case PlainTextWriter writer -> {
+                for (var d : devices) {
+                    writer.println("- Device {}{}:", d.id(), (d.isThisDevice() ? " (this device)" : ""));
+                    writer.indent(w -> {
+                        w.println("Name: {}", d.name());
+                        w.println("Created: {}", DateUtils.formatTimestamp(d.created()));
+                        w.println("Last seen: {}", DateUtils.formatTimestamp(d.lastSeen()));
+                    });
+                }
+            }
+            case JsonWriter writer -> {
+                final var jsonDevices = devices.stream()
+                        .map(d -> new JsonDevice(d.id(), d.name(), d.created(), d.lastSeen()))
+                        .toList();
+                writer.write(jsonDevices);
             }
-        } else {
-            final var writer = (JsonWriter) outputWriter;
-            final var jsonDevices = devices.stream()
-                    .map(d -> new JsonDevice(d.getId(), d.getName(), d.getCreated(), d.getLastSeen()))
-                    .collect(Collectors.toList());
-            writer.write(jsonDevices);
         }
     }
 
-    private static final class JsonDevice {
-
-        public final long id;
-        public final String name;
-        public final long createdTimestamp;
-        public final long lastSeenTimestamp;
-
-        private JsonDevice(
-                final long id,
-                final String name,
-                final long createdTimestamp,
-                final long lastSeenTimestamp
-        ) {
-            this.id = id;
-            this.name = name;
-            this.createdTimestamp = createdTimestamp;
-            this.lastSeenTimestamp = lastSeenTimestamp;
-        }
-    }
+    private record JsonDevice(long id, String name, long createdTimestamp, long lastSeenTimestamp) {}
 }