refactor: Lombok @ToString/@EqualsAndHashCode across jllama production sources

Apply the BAF/plugin Lombok migration pattern to java-llama.cpp. Value-shaped
types get @tostring + @EqualsAndHashCode; mutable lifecycle handles and
operational classes get @tostring only (identity is the correct equals
semantics); classes with semantically-meaningful handwritten toString
implementations keep their custom toString and gain @EqualsAndHashCode only.

Build wiring fixes (mirrors BAF/plugin):
- pom.xml: add Lombok to <annotationProcessorPaths> AND extend the explicit
  -processor argument list to include both Lombok SPI processors
  (AnnotationProcessorHider$AnnotationProcessor and $ClaimingProcessor)
  alongside the existing Checker Framework NullnessChecker.
- lombok.config: switch callSuper default from "call" to "skip" since most
  value classes extend Object directly.

Value types (Lombok @tostring + @EqualsAndHashCode):
- Pair, ChatChoice, ChatResponse, ContentPart, ToolDefinition

Value types with derived/aggregated toString fields:
- Usage (totalTokens via @ToString.Include on the getter)
- TokenLogprob (topLogprobs rendered as size via @ToString.Include)
- Timings (full field dump)

Value types with semantically-meaningful handwritten toString preserved
(@EqualsAndHashCode only, toString documented as intentional):
- ChatMessage ("role: content" conversation-trace format)
- ToolCall ("name(args)[id]" function-call syntax)
- CompletionResult, LlamaOutput (return generated text verbatim — public
  API contract)
- ModelMeta, ServerMetrics (re-serialise to compact JSON for assertEquals)
- JsonParameters (emits actual JSON the native server consumes)
- CliParameters (emits CLI argv-style string for the native binary)

Subclasses of JsonParameters/CliParameters get @EqualsAndHashCode(callSuper=true):
- InferenceParameters, ModelParameters

Operational / lifecycle classes (Lombok @tostring only; identity-equals is
correct; native handles and lambdas excluded from rendered output):
- LlamaModel (parser collaborators rendered, native ctx handle visible)
- LlamaIterator, LlamaIterable, LlamaPublisher (owning model excluded —
  recursive native-state dump)
- Session (model + lambdas + lock excluded)
- CancellationToken, ChatRequest (lambdas excluded)
- LlamaLoader, LlamaSystemProperties, NativeLibraryPermissionSetter,
  ProcessRunner, Java8CompatibilityHelper

Test update:
- PairTest.testHashCodeMatchesObjectsHash renamed and rewritten to
  verify the hashCode contract (non-zero, varies by field) rather than
  pinning to Objects.hash. The PIT-mutation-killing intent is preserved
  but no longer assumes the specific implementation.

Intentionally skipped (rationale documented inline):
- OSInfo — vendored from sqlite-jdbc with explicit "only deviations" policy;
  adding Lombok would diverge further. Spotless line-wrapping is incidental.
- LlamaException, ModelUnavailableException — extend Throwable, which
  already provides toString and identity-equals.
- StopReason, LogLevel — enums, inherit toString from Enum.
- LoadProgressCallback, ToolHandler — interfaces.
- SkipDownloadFailureTranslator, TimingsLogger — non-instantiable utility
  classes (private constructor + all-static methods).

All 888 runnable tests pass; the single RerankingModelTest error is a
pre-existing UnsatisfiedLinkError on this sandbox (no native library
built in restricted-network env, per CLAUDE.md).

https://claude.ai/code/session_01LzoKmqzgtQsELS5tsH4Wog

Author: claude

lombok.config

@@ -10,11 +10,13 @@ config.stopBubbling = true
 # from coverage requirements and bug detectors.
 lombok.addLombokGeneratedAnnotation = true
 
-# Default to "call" on @EqualsAndHashCode / @ToString: when extending a
-# non-Object parent we want the parent's state included; failing loud
-# forces an explicit decision per class.
-lombok.equalsAndHashCode.callSuper = call
-lombok.toString.callSuper = call
+# Default to "skip" on @EqualsAndHashCode / @ToString: we inherit from
+# Object in almost all cases; "skip" is the right default for
+# Object-extending classes. Classes that extend a non-Object base override
+# per-annotation with @EqualsAndHashCode(callSuper = true) /
+# @ToString(callSuper = true).
+lombok.equalsAndHashCode.callSuper = skip
+lombok.toString.callSuper = skip
 
 # Do NOT generate Spring-style @ConstructorProperties; java.beans is not
 # needed by this codebase and pulls in the desktop module on some JDKs.

pom.xml

@@ -377,14 +377,23 @@ SPDX-License-Identifier: MIT
 						  so it acts as a second-opinion verifier on the same JSpecify
 						  annotations.
 						-->
+						<!-- Explicit processor list: Lombok (two SPI classes) + Checker Framework's
+							 Nullness Checker as a 2nd nullness pass alongside NullAway. The explicit
+							 -processor argument overrides SPI discovery, so every processor we want
+							 to run must be listed here. -->
 						<arg>-processor</arg>
-						<arg>org.checkerframework.checker.nullness.NullnessChecker</arg>
+						<arg>lombok.launch.AnnotationProcessorHider$AnnotationProcessor,lombok.launch.AnnotationProcessorHider$ClaimingProcessor,org.checkerframework.checker.nullness.NullnessChecker</arg>
 						<arg>-XDaddTypeAnnotationsToSymbol=true</arg>
 						<arg>-XDcompilePolicy=simple</arg>
 						<arg>--should-stop=ifError=FLOW</arg>
 						<arg>-Xplugin:ErrorProne -Xep:NullAway:ERROR -XepOpt:NullAway:OnlyNullMarked=true -XepOpt:NullAway:JSpecifyMode=true -XepOpt:NullAway:CheckOptionalEmptiness=true -XepOpt:NullAway:AcknowledgeRestrictiveAnnotations=true -XepOpt:NullAway:AcknowledgeAndroidRecent=true -XepOpt:NullAway:AssertsEnabled=true -Xep:BoxedPrimitiveEquality:ERROR -Xep:EqualsHashCode:ERROR -Xep:EqualsIncompatibleType:ERROR -Xep:IdentityBinaryExpression:ERROR -Xep:SelfAssignment:ERROR -Xep:SelfComparison:ERROR -Xep:SelfEquals:ERROR -Xep:DeadException:ERROR -Xep:FormatString:ERROR -Xep:InvalidPatternSyntax:ERROR -Xep:OptionalEquality:ERROR -Xep:ImpossibleNullComparison:ERROR</arg>
 					</compilerArgs>
 					<annotationProcessorPaths>
+						<path>
+							<groupId>org.projectlombok</groupId>
+							<artifactId>lombok</artifactId>
+							<version>${lombok.version}</version>
+						</path>
 						<path>
 							<groupId>com.google.errorprone</groupId>
 							<artifactId>error_prone_core</artifactId>

src/main/java/net/ladenthin/llama/CancellationToken.java

@@ -4,6 +4,8 @@
 
 package net.ladenthin.llama;
 
+import lombok.ToString;
+
 /**
  * Cancellation handle for a blocking {@link LlamaModel} call. Pass an instance to
  * {@link LlamaModel#complete(InferenceParameters, CancellationToken)} and invoke
@@ -31,7 +33,13 @@
  * A token may be reused across calls. {@link #cancel()} and {@link #isCancelled()} are
  * safe to invoke concurrently with the inference loop.
  * </p>
+ *
+ * <p>{@code toString} is generated by Lombok over the {@code cancelled} flag.
+ * {@code equals}/{@code hashCode} are intentionally NOT generated: a token is a
+ * lifecycle handle managed by identity (the calling thread keeps a reference and
+ * the inference loop observes that same instance), not a value object.</p>
  */
+@ToString
 public final class CancellationToken {
 
     private volatile boolean cancelled;

src/main/java/net/ladenthin/llama/ChatChoice.java

@@ -4,10 +4,15 @@
 
 package net.ladenthin.llama;
 
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
 /**
  * One choice in a chat completion response: the assistant message and the finish reason.
  * Mirrors the OpenAI {@code choices[i]} object.
  */
+@ToString
+@EqualsAndHashCode
 public final class ChatChoice {
 
     private final int index;

src/main/java/net/ladenthin/llama/ChatMessage.java

@@ -8,6 +8,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import lombok.EqualsAndHashCode;
 import org.jspecify.annotations.Nullable;
 
 /**
@@ -27,7 +28,13 @@
  * (see {@link InferenceParameters#setMessages(java.util.List)}) emits an array-form
  * {@code content} field that the compiled-in {@code mtmd} pipeline understands.
  * </p>
+ *
+ * <p>{@code equals}/{@code hashCode} are generated by Lombok over all fields.
+ * {@code toString} is intentionally handwritten (not Lombok-generated) so that
+ * conversation traces in logs render as "{@code role: content}" or
+ * "{@code role (tool_calls=N): content}" instead of a verbose field dump.</p>
  */
+@EqualsAndHashCode
 public final class ChatMessage {
 
     private final String role;

src/main/java/net/ladenthin/llama/ChatRequest.java

@@ -12,6 +12,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
+import lombok.ToString;
 import org.jspecify.annotations.Nullable;
 
 /**
@@ -23,7 +24,15 @@
  * setters; consumed by {@link LlamaModel#chat(ChatRequest)} and
  * {@link LlamaModel#chatWithTools(ChatRequest, java.util.Map)}.
  * </p>
+ *
+ * <p>{@code toString} is generated by Lombok over the request state fields. The
+ * {@code paramsCustomizer} {@link Consumer} is excluded because lambda equality is
+ * implementation-defined (compiler-synthesized class identity), not value-shaped,
+ * and the rendered identity hash is noise in a request dump. {@code equals}/
+ * {@code hashCode} are intentionally NOT generated: this is a mutable builder, not
+ * a value object.
  */
+@ToString
 public final class ChatRequest {
 
     private static final ObjectMapper MAPPER = new ObjectMapper();
@@ -32,6 +41,10 @@ public final class ChatRequest {
     private final List<ToolDefinition> tools = new ArrayList<ToolDefinition>();
     private @Nullable String toolChoice;
     private int maxToolRounds = 8;
+
+    // Lambda Consumer — toString is the implementation hash, not useful in logs;
+    // equality is compiler-synthesized class identity, not value-shaped.
+    @ToString.Exclude
     private @Nullable Consumer<InferenceParameters> paramsCustomizer;
 
     /** Construct an empty request; populate via the setters. */

src/main/java/net/ladenthin/llama/ChatResponse.java

@@ -7,6 +7,8 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 /**
  * Typed result of {@link LlamaModel#chat(ChatRequest)} and
@@ -17,6 +19,8 @@
  * raw OAI JSON for fields not yet typed.
  * </p>
  */
+@ToString
+@EqualsAndHashCode
 public final class ChatResponse {
 
     private final String id;

src/main/java/net/ladenthin/llama/CliParameters.java

@@ -9,9 +9,20 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import lombok.EqualsAndHashCode;
 import net.ladenthin.llama.args.CliArg;
 import org.jspecify.annotations.Nullable;
 
+/**
+ * Base class for CLI-style parameter builders.
+ *
+ * <p>{@code equals}/{@code hashCode} are generated by Lombok over the parameters map.
+ * {@code toString} is intentionally handwritten (not Lombok-generated): it emits the
+ * accumulated parameters as a space-separated CLI argv-style string that callers can
+ * forward to the native CLI. Replacing it with a Lombok field dump would break that
+ * consumer contract.
+ */
+@EqualsAndHashCode
 abstract class CliParameters {
 
     final Map<String, @Nullable String> parameters = new HashMap<>();

src/main/java/net/ladenthin/llama/CompletionResult.java

@@ -6,6 +6,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import lombok.EqualsAndHashCode;
 
 /**
  * Typed result of {@link LlamaModel#completeWithStats(InferenceParameters)}.
@@ -15,7 +16,15 @@
  * {@link InferenceParameters#setNProbs(int)} > 0), and the {@link StopReason}.
  * The raw native JSON is exposed via {@link #getRawJson()} as an escape hatch.
  * </p>
+ *
+ * <p>{@code equals}/{@code hashCode} are generated by Lombok over all fields.
+ * {@code toString} is intentionally handwritten (not Lombok-generated): it
+ * returns the generated text verbatim so that {@code result + ""} or
+ * {@code String.valueOf(result)} produce the completion text rather than a
+ * verbose field dump. This is a public-API contract preserved from the
+ * pre-Lombok shape.</p>
  */
+@EqualsAndHashCode
 public final class CompletionResult {
 
     private final String text;

src/main/java/net/ladenthin/llama/ContentPart.java

@@ -10,6 +10,8 @@
 import java.util.Base64;
 import java.util.Locale;
 import java.util.Objects;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.jspecify.annotations.Nullable;
 
 /**
@@ -32,6 +34,8 @@
  * factories — the constructor is private.
  * </p>
  */
+@ToString
+@EqualsAndHashCode
 public final class ContentPart {
 
     /** Discriminator for the two part kinds the OAI multipart schema supports. */