Issue #0 address jdt2jar review feedback

Agent-Logs-Url: https://github.com/simbo1905/java.util.json.Java21/sessions/46541410-0395-47ca-bf41-41ba6d0a8dc6

Co-authored-by: simbo1905 <322608+simbo1905@users.noreply.github.com>

Author: Copilot

jdt2jar/pom.xml

@@ -63,7 +63,6 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.13.0</version>
                 <configuration>
-                    <release>24</release>
                     <compilerArgs>
                         <arg>-Xlint:all</arg>
                         <arg>-Xdiags:verbose</arg>

jdt2jar/src/main/java/json/java21/jdt2jar/Jdt2Jar.java

@@ -9,6 +9,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayDeque;
 import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
@@ -254,16 +255,17 @@ private static Options parseOptions(String[] args) {
     var includeSources = false;
     var help = false;
 
-    for (var i = 0; i < args.length; i++) {
-      final var arg = args[i];
+    final var remaining = new ArrayDeque<>(java.util.List.of(args));
+    while (!remaining.isEmpty()) {
+      final var arg = remaining.removeFirst();
       switch (arg) {
         case "--help" -> help = true;
         case "--main" -> main = true;
         case "--include-sources" -> includeSources = true;
-        case "--output" -> output = Path.of(requireValue(args, ++i, "--output"));
-        case "--package" -> packageName = requireValue(args, ++i, "--package");
-        case "--class" -> className = requireValue(args, ++i, "--class");
-        case "--runtime" -> runtime = Integer.parseInt(requireValue(args, ++i, "--runtime"));
+        case "--output" -> output = Path.of(requireValue(remaining, "--output"));
+        case "--package" -> packageName = requireValue(remaining, "--package");
+        case "--class" -> className = requireValue(remaining, "--class");
+        case "--runtime" -> runtime = Integer.parseInt(requireValue(remaining, "--runtime"));
         default -> {
           if (arg.startsWith("--")) {
             throw new UsageException("Unknown option: " + arg);
@@ -288,11 +290,11 @@ private static Options parseOptions(String[] args) {
     return new Options(schema, output, packageName, className, main, runtime, includeSources, false);
   }
 
-  private static String requireValue(String[] args, int index, String option) {
-    if (index >= args.length) {
+  private static String requireValue(ArrayDeque<String> args, String option) {
+    if (args.isEmpty()) {
       throw new UsageException("Missing value for " + option);
     }
-    return args[index];
+    return args.removeFirst();
   }
 
   private static String toInternalName(String packageName, String className) {

jdt2jar/src/main/java/json/java21/jdt2jar/runtime/ValidatorMain.java

@@ -12,6 +12,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayDeque;
 import java.util.Properties;
 
 /// Runtime launcher for compiled validator JARs.
@@ -133,13 +134,14 @@ private static CliOptions parseArgs(String[] args) {
     boolean json = false;
     boolean help = false;
 
-    for (int i = 0; i < args.length; i++) {
-      final var arg = args[i];
+    final var remaining = new ArrayDeque<>(java.util.List.of(args));
+    while (!remaining.isEmpty()) {
+      final var arg = remaining.removeFirst();
       switch (arg) {
         case "--help" -> help = true;
-        case "--validate" -> input = Path.of(requireValue(args, ++i, "--validate"));
+        case "--validate" -> input = Path.of(requireValue(remaining, "--validate"));
         case "--format" -> {
-          final var value = requireValue(args, ++i, "--format");
+          final var value = requireValue(remaining, "--format");
           if ("json".equalsIgnoreCase(value)) {
             json = true;
           } else {
@@ -153,11 +155,11 @@ private static CliOptions parseArgs(String[] args) {
     return new CliOptions(input, json, help);
   }
 
-  private static String requireValue(String[] args, int index, String option) {
-    if (index >= args.length) {
+  private static String requireValue(ArrayDeque<String> args, String option) {
+    if (args.isEmpty()) {
       throw new IllegalArgumentException("Missing value for " + option);
     }
-    return args[index];
+    return args.removeFirst();
   }
 
   private static void printUsage() {

json-java21-jtd-codegen/src/main/java/json/java21/jtd/codegen/JtdCodegen.java

@@ -27,7 +27,7 @@ public final class JtdCodegen {
   private JtdCodegen() {}
 
   /// Result of compilation including the validator and generated class statistics.
-  public record CompileResult(JtdValidator validator, int classfileBytes, byte[] classBytes) {}
+  public record CompileResult(JtdValidator validator, int classfileBytes) {}
 
   /// Public factory invoked by [JtdValidator.compileGenerated] via reflection.
   public static JtdValidator compile(JsonValue schema) {
@@ -49,7 +49,7 @@ public static CompileResult compileWithStats(JsonValue schema) {
   /// @param className Generated validator class name
   /// @return the generated class bytes
   public static byte[] compileBytes(JsonValue schema, String packageName, String className) {
-    return buildBytes(schema, packageName, className).clone();
+    return buildBytes(schema, packageName, className);
   }
 
   private static CompileResult instantiate(JsonValue schema, byte[] bytes, String packageName, String className) {
@@ -60,7 +60,7 @@ private static CompileResult instantiate(JsonValue schema, byte[] bytes, String
       final var clazz = lookup.defineClass(bytes);
       final var ctor = clazz.getConstructor(String.class);
       final var validator = (JtdValidator) ctor.newInstance(schemaJson);
-      return new CompileResult(validator, bytes.length, bytes.clone());
+      return new CompileResult(validator, bytes.length);
     } catch (Exception e) {
       throw new RuntimeException("Failed to load generated validator: " + internalName, e);
     }