refactor: simplify core models and session utilities

Author: 0WhiteDev

src/main/java/dev/whitedev/jpi/agent/AgentOptions.java

@@ -25,13 +25,14 @@ public static AgentOptions parse(String value) {
             String host = required(values, "host");
             String token = required(values, "token");
             int port = Integer.parseInt(required(values, "port"));
-            if (!InetAddress.getByName(host).isLoopbackAddress()) {
+            InetAddress address = InetAddress.getByName(host);
+            if (!address.isLoopbackAddress()) {
                 throw new IllegalArgumentException("Agent only accepts a loopback host");
             }
             if (port < 1 || port > 65535 || token.length() < 16) {
                 throw new IllegalArgumentException("Invalid agent port or token");
             }
-            return new AgentOptions(InetAddress.getByName(host), port, token);
+            return new AgentOptions(address, port, token);
         } catch (Exception exception) {
             if (exception instanceof IllegalArgumentException) throw (IllegalArgumentException) exception;
             throw new IllegalArgumentException("Invalid agent options", exception);

src/main/java/dev/whitedev/jpi/attach/CommandLineTokenizer.java

@@ -21,18 +21,18 @@ public static List<String> parse(String commandLine) {
             } else if (value == '"') {
                 quoted = !quoted;
             } else if (Character.isWhitespace(value) && !quoted) {
-                add(result, current);
+                flush(result, current);
             } else {
                 current.append(value);
             }
         }
         if (escaping) current.append('\\');
         if (quoted) throw new IllegalArgumentException("Unclosed quote in arguments");
-        add(result, current);
+        flush(result, current);
         return result;
     }
 
-    private static void add(List<String> result, StringBuilder value) {
+    private static void flush(List<String> result, StringBuilder value) {
         if (value.length() == 0) return;
         result.add(value.toString());
         value.setLength(0);

src/main/java/dev/whitedev/jpi/attach/InspectorSession.java

@@ -25,13 +25,17 @@ public final class InspectorSession implements Closeable {
     public JvmDescriptor target() { return target; }
 
     public synchronized byte[] request(Operation operation, String payload) throws IOException {
-        if (closed) throw new IOException("Inspector session is closed");
+        ensureOpen();
         WireProtocol.writeRequest(output, operation, WireProtocol.utf8(payload == null ? "" : payload));
         WireProtocol.Response response = WireProtocol.readResponse(input);
         if (!response.success()) throw new IOException(response.text());
         return response.payload();
     }
 
+    private void ensureOpen() throws IOException {
+        if (closed) throw new IOException("Inspector session is closed");
+    }
+
     public String requestText(Operation operation, String payload) throws IOException {
         return WireProtocol.text(request(operation, payload));
     }

src/main/java/dev/whitedev/jpi/attach/JvmDescriptor.java

@@ -1,15 +1,9 @@
 package dev.whitedev.jpi.attach;
 
-public final class JvmDescriptor {
-    private final String id;
-    private final String displayName;
-
-    public JvmDescriptor(String id, String displayName) {
-        this.id = id;
-        this.displayName = displayName == null || displayName.trim().isEmpty() ? "<unknown>" : displayName;
+public record JvmDescriptor(String id, String displayName) {
+    public JvmDescriptor {
+        displayName = displayName == null || displayName.isBlank() ? "<unknown>" : displayName;
     }
 
-    public String id() { return id; }
-    public String displayName() { return displayName; }
     @Override public String toString() { return id + "  -  " + displayName; }
 }

src/main/java/dev/whitedev/jpi/attach/JvmDiscovery.java

@@ -2,14 +2,14 @@
 
 import com.sun.tools.attach.VirtualMachine;
 import com.sun.tools.attach.VirtualMachineDescriptor;
-import java.lang.management.ManagementFactory;
+
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 
 public final class JvmDiscovery {
     public List<JvmDescriptor> discover() {
-        String ownPid = ManagementFactory.getRuntimeMXBean().getName().split("@", 2)[0];
+        String ownPid = Long.toString(ProcessHandle.current().pid());
         List<JvmDescriptor> result = new ArrayList<>();
         for (VirtualMachineDescriptor descriptor : VirtualMachine.list()) {
             if (!descriptor.id().equals(ownPid)) result.add(new JvmDescriptor(descriptor.id(), descriptor.displayName()));

src/main/java/dev/whitedev/jpi/decompile/DecompilerEngine.java

@@ -10,7 +10,7 @@ public enum DecompilerEngine {
 
     DecompilerEngine(String displayName, String... resources) {
         this.displayName = displayName;
-        this.resources = resources;
+        this.resources = resources.clone();
     }
 
     String[] resources() {

src/main/java/dev/whitedev/jpi/export/SessionSnapshotExporter.java

@@ -35,11 +35,15 @@ public static Path export(InspectorSession session, Path output) throws IOExcept
 
         try (ZipOutputStream zip = new ZipOutputStream(Files.newOutputStream(destination), StandardCharsets.UTF_8)) {
             for (Map.Entry<String, String> report : reports.entrySet()) {
-                zip.putNextEntry(new ZipEntry(report.getKey()));
-                zip.write(report.getValue().getBytes(StandardCharsets.UTF_8));
-                zip.closeEntry();
+                writeEntry(zip, report);
             }
         }
         return destination;
     }
+
+    private static void writeEntry(ZipOutputStream zip, Map.Entry<String, String> report) throws IOException {
+        zip.putNextEntry(new ZipEntry(report.getKey()));
+        zip.write(report.getValue().getBytes(StandardCharsets.UTF_8));
+        zip.closeEntry();
+    }
 }

src/main/java/dev/whitedev/jpi/nativeaccess/MemoryMatch.java

@@ -1,11 +1,4 @@
 package dev.whitedev.jpi.nativeaccess;
 
-public final class MemoryMatch {
-    private final long address;
-    private final String value;
-    private final int byteSize;
-    public MemoryMatch(long address, String value, int byteSize) { this.address = address; this.value = value; this.byteSize = byteSize; }
-    public long address() { return address; }
-    public String value() { return value; }
-    public int byteSize() { return byteSize; }
+public record MemoryMatch(long address, String value, int byteSize) {
 }