Sonar: loop counters, record patterns, nested ternary, constants, redundant throws

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

Author: dfa1

cli/src/main/java/io/github/dfa1/typesafe/cli/Main.java

@@ -19,9 +19,11 @@
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 
 /**
  * Command-line entry point, built as an uber-jar. Evaluates a single string {@code --state}
@@ -105,8 +107,7 @@ private static ApiKey loadApiKey(URI endpoint) throws IOException {
 
     /** The evaluate-and-print flow, taking an already-built client so it's testable without a
      *  network call. */
-    static int run(TypeSafeClient client, Codec codec, ParsedArgs parsed, PrintStream out, PrintStream err)
-            throws Exception {
+    static int run(TypeSafeClient client, Codec codec, ParsedArgs parsed, PrintStream out, PrintStream err) {
         EvaluateRequest request = EvaluateRequest.of(Content.text(parsed.state()), parsed.model(), parsed.questions());
 
         if (parsed.verbose()) {
@@ -155,19 +156,20 @@ static ParsedArgs parse(String[] args) {
         URI endpoint = null;
 
         try {
-            for (int i = 0; i < args.length; i++) {
-                String flag = args[i];
+            Iterator<String> it = List.of(args).iterator();
+            while (it.hasNext()) {
+                String flag = it.next();
 
                 switch (flag) {
                     case "--verbose" -> verbose = true;
                     case "--timing" -> timing = true;
-                    case "--state" -> state = args[++i];
-                    case "--model" -> model = new Model(args[++i]);
-                    case "--endpoint" -> endpoint = URI.create(args[++i]);
-                    case "--min" -> minSpecs.add(args[++i]);
-                    case "--print" -> printNames.add(args[++i]);
+                    case "--state" -> state = it.next();
+                    case "--model" -> model = new Model(it.next());
+                    case "--endpoint" -> endpoint = URI.create(it.next());
+                    case "--min" -> minSpecs.add(it.next());
+                    case "--print" -> printNames.add(it.next());
                     case "--noul", "--choice", "--score" -> {
-                        String value = args[++i];
+                        String value = it.next();
                         int eq = value.indexOf('=');
                         String name = eq >= 0 ? value.substring(0, eq) : flag.substring(2);
                         String rest = eq >= 0 ? value.substring(eq + 1) : value;
@@ -176,7 +178,7 @@ static ParsedArgs parse(String[] args) {
                     default -> throw new IllegalArgumentException("Unknown flag: " + flag);
                 }
             }
-        } catch (ArrayIndexOutOfBoundsException e) {
+        } catch (NoSuchElementException e) {
             throw new IllegalArgumentException("Missing value for " + args[args.length - 1]);
         }
 
@@ -192,7 +194,7 @@ static ParsedArgs parse(String[] args) {
 
     static String answerValue(EvaluateResponse response, String name) {
         return switch (response.answers().get(name)) {
-            case Answer.Noul n -> String.valueOf(n.noul());
+            case Answer.Noul(var noul) -> String.valueOf(noul);
             case Answer.Choice c -> c.choice();
             case Answer.Score s -> String.valueOf(s.score());
             case null -> throw new IllegalArgumentException("No such answer: " + name);
@@ -206,7 +208,7 @@ static List<String> minFailures(EvaluateResponse response, List<String> minSpecs
             String name = spec.substring(0, eq);
             double min = Double.parseDouble(spec.substring(eq + 1));
             double value = switch (response.answers().get(name)) {
-                case Answer.Noul n -> n.noul();
+                case Answer.Noul(var noul) -> noul;
                 case Answer.Score s -> s.score();
                 case null -> throw new IllegalArgumentException("No such answer: " + name);
                 default -> throw new IllegalArgumentException(

client-http/src/main/java/io/github/dfa1/typesafe/client/http/HttpTransportResponse.java

@@ -22,8 +22,8 @@ public Optional<String> header(String name) {
     // a record compares and prints an array by identity; compare the body by content instead
     @Override
     public boolean equals(Object o) {
-        return o instanceof HttpTransportResponse r && statusCode == r.statusCode && headers.equals(r.headers)
-                && Arrays.equals(body, r.body);
+        return o instanceof HttpTransportResponse(int s, var h, byte[] b) && statusCode == s && headers.equals(h)
+                && Arrays.equals(body, b);
     }
 
     @Override

client-local/src/main/java/io/github/dfa1/typesafe/client/local/ClefEngine.java

@@ -206,11 +206,9 @@ private static Map<String, String> options(Question question) {
                 options.put("true", c.getOrDefault("true", "The proposition is true or the answer is yes."));
                 options.put("false", c.getOrDefault("false", "The proposition is false or the answer is no."));
             }
-            case Question.Choice(Content ignored, Map<String, String> criteria) -> {
-                criteria.entrySet().stream()
-                        .sorted(Map.Entry.comparingByKey(Comparator.comparing(k -> k.codePoints().toArray(), Arrays::compare)))
-                        .forEach(e -> options.put(e.getKey(), e.getValue()));
-            }
+            case Question.Choice(Content ignored, Map<String, String> criteria) -> criteria.entrySet().stream()
+                    .sorted(Map.Entry.comparingByKey(Comparator.comparing(k -> k.codePoints().toArray(), Arrays::compare)))
+                    .forEach(e -> options.put(e.getKey(), e.getValue()));
             case Question.Score(Content ignored, List<String> criteria) -> {
                 for (int i = 0; i < criteria.size(); i++) {
                     options.put(String.valueOf(i), criteria.get(i));

client-local/src/main/java/io/github/dfa1/typesafe/client/local/LayaEngine.java

@@ -32,6 +32,7 @@
  */
 final class LayaEngine implements Engine {
 
+    private static final String MASK_TOKEN = "[MASK]";
     private static final int CHOICE = 0, SCORE = 1, NOUL = 2; // rl_common.QTYPES
     private static final int OPTION_TOKENS = 48;
 
@@ -43,14 +44,14 @@ final class LayaEngine implements Engine {
     private final double[] temperature;
     private final Map<String, Double> temperatureByOptions;
 
-    private LayaEngine(OrtSession session, BpeTokenizer tokenizer, Map<String, Object> config, Model model) throws OrtException {
+    private LayaEngine(OrtSession session, BpeTokenizer tokenizer, Map<String, Object> config, Model model) {
         this.session = session;
         this.model = model;
         this.tokenizer = tokenizer;
         this.cls = special("[CLS]");
         this.sep = special("[SEP]");
         this.pad = special("[PAD]");
-        this.mask = special("[MASK]");
+        this.mask = special(MASK_TOKEN);
         this.maxLen = ((Number) config.get("max_len")).intValue();
         this.headMaxLen = ((Number) config.get("head_max_len")).intValue();
         @SuppressWarnings("unchecked")
@@ -129,10 +130,10 @@ Sequence sequence(String state, Question question) {
             case Question.Noul ignored -> "noul";
         };
         Content instructions = question.instructions();
-        long[] head = encode(type + " question: " + serialize(instructions).replace("[MASK]", " "));
+        long[] head = encode(type + " question: " + serialize(instructions).replace(MASK_TOKEN, " "));
         List<long[]> opts = new ArrayList<>();
         for (String option : options(question)) {
-            long[] text = encode(" " + option.replace("[MASK]", " "));
+            long[] text = encode(" " + option.replace(MASK_TOKEN, " "));
             long[] withMarker = new long[1 + Math.min(OPTION_TOKENS, text.length)];
             withMarker[0] = mask;
             System.arraycopy(text, 0, withMarker, 1, withMarker.length - 1);
@@ -159,7 +160,7 @@ Sequence sequence(String state, Question question) {
         }
         ids.add(sep);
         int room = Math.max(0, maxLen - ids.size() - 1);
-        long[] st = encode(state.replace("[MASK]", " "));
+        long[] st = encode(state.replace(MASK_TOKEN, " "));
         for (int i = 0; i < Math.min(room, st.length); i++) {
             ids.add(st[i]);
         }
@@ -244,7 +245,16 @@ private static OnnxTensor bools(long[] mask, int n, int k) throws OrtException {
 
     /** rl_agent_api: logits / temperature for this (type, option count) bucket, softmaxed over the real options. */
     private double[] probabilities(float[] logits, int k, int qtype) {
-        String size = k <= 2 ? "2" : k <= 5 ? "3-5" : k <= 10 ? "6-10" : "11+";
+        String size;
+        if (k <= 2) {
+            size = "2";
+        } else if (k <= 5) {
+            size = "3-5";
+        } else if (k <= 10) {
+            size = "6-10";
+        } else {
+            size = "11+";
+        }
         String bucket = List.of("choice", "score", "noul").get(qtype) + ":" + size;
         double t = temperatureByOptions.getOrDefault(bucket, temperature[qtype]);
         float[] z = new float[k];