From 7e96237c29c749d753723ade71ac5bb0f0189240 Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 1 Sep 2026 18:46:01 +0000 Subject: [PATCH] style: apply spotless to the enable_thinking and calibrate changes main fails 'mvn verify' at spotless:check. Five files carry violations, from both #199 (the getter rename lengthened lines past the wrap point) and #202 (the new renderers). Same root cause as the SpotBugs failure fixed in java-llama.cpp#409, in the same week: spotless:check binds to a phase that 'mvn test' never reaches, so a change validated with tests -- even with tests plus a full PIT run, as #202 was -- can still be unformatted. Running the goal, not more tests, is what catches this. Formatting only: no logic, no assertion, no test changed. Produced by 'mvn spotless:apply' rather than by hand, after a hand-wrap of the same line was itself rejected by spotless:check -- the tool decides the layout, not me. Verified: 'mvn -f srcmorph/pom.xml spotless:check' exits 0. Co-Authored-By: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01AnNYn8W1xuVxVJtyL34GyH --- .../net/ladenthin/srcmorph/config/AiModelDefinition.java | 3 +-- .../net/ladenthin/srcmorph/engine/CalibrationReport.java | 8 ++++++-- .../ladenthin/srcmorph/provider/LlamaCppJniConfig.java | 3 +-- .../srcmorph/config/AiModelDefinitionSupportTest.java | 3 ++- .../ladenthin/srcmorph/engine/CalibrationReportTest.java | 3 ++- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/srcmorph/src/main/java/net/ladenthin/srcmorph/config/AiModelDefinition.java b/srcmorph/src/main/java/net/ladenthin/srcmorph/config/AiModelDefinition.java index 474008e..599aaee 100644 --- a/srcmorph/src/main/java/net/ladenthin/srcmorph/config/AiModelDefinition.java +++ b/srcmorph/src/main/java/net/ladenthin/srcmorph/config/AiModelDefinition.java @@ -51,8 +51,7 @@ public AiModelDefinition() { private float minP = AiGenerationConfig.DEFAULT_MIN_P; private float topNSigma = AiGenerationConfig.DEFAULT_TOP_N_SIGMA; private float repeatPenalty = AiGenerationConfig.DEFAULT_REPEAT_PENALTY; - private @Nullable Boolean chatTemplateEnableThinking = - AiGenerationConfig.DEFAULT_CHAT_TEMPLATE_ENABLE_THINKING; + private @Nullable Boolean chatTemplateEnableThinking = AiGenerationConfig.DEFAULT_CHAT_TEMPLATE_ENABLE_THINKING; private boolean cachePrompt = AiGenerationConfig.DEFAULT_CACHE_PROMPT; private boolean swaFull = AiGenerationConfig.DEFAULT_SWA_FULL; private int cacheReuse = AiGenerationConfig.DEFAULT_CACHE_REUSE; diff --git a/srcmorph/src/main/java/net/ladenthin/srcmorph/engine/CalibrationReport.java b/srcmorph/src/main/java/net/ladenthin/srcmorph/engine/CalibrationReport.java index 4684721..160f3bc 100644 --- a/srcmorph/src/main/java/net/ladenthin/srcmorph/engine/CalibrationReport.java +++ b/srcmorph/src/main/java/net/ladenthin/srcmorph/engine/CalibrationReport.java @@ -102,7 +102,9 @@ public String renderJson() { appendJsonNumber(out, "decodeTokensPerSecond", FORMAT_TOKENS_PER_SECOND, m.decodeTokensPerSecond()); appendJsonNumber(out, "charsPerToken", FORMAT_CHARS_PER_TOKEN, m.charsPerToken()); appendJsonNumber(out, "midPrefillTokensPerSecond", FORMAT_TOKENS_PER_SECOND, m.midPrefillTokensPerSecond()); - out.append(" \"cachedPromptTokens\": ").append(m.cachedPromptTokens()).append('\n'); + out.append(" \"cachedPromptTokens\": ") + .append(m.cachedPromptTokens()) + .append('\n'); out.append(" }"); out.append(i + 1 < measurements.size() ? ",\n" : "\n"); } @@ -133,7 +135,9 @@ public String renderYaml() { appendYamlNumber(out, "decodeTokensPerSecond", FORMAT_TOKENS_PER_SECOND, m.decodeTokensPerSecond()); appendYamlNumber(out, "charsPerToken", FORMAT_CHARS_PER_TOKEN, m.charsPerToken()); appendYamlNumber(out, "midPrefillTokensPerSecond", FORMAT_TOKENS_PER_SECOND, m.midPrefillTokensPerSecond()); - out.append(" cachedPromptTokens: ").append(m.cachedPromptTokens()).append('\n'); + out.append(" cachedPromptTokens: ") + .append(m.cachedPromptTokens()) + .append('\n'); } return out.toString(); } diff --git a/srcmorph/src/main/java/net/ladenthin/srcmorph/provider/LlamaCppJniConfig.java b/srcmorph/src/main/java/net/ladenthin/srcmorph/provider/LlamaCppJniConfig.java index 858742b..307caec 100644 --- a/srcmorph/src/main/java/net/ladenthin/srcmorph/provider/LlamaCppJniConfig.java +++ b/srcmorph/src/main/java/net/ladenthin/srcmorph/provider/LlamaCppJniConfig.java @@ -493,8 +493,7 @@ public static final class Builder { private float minP = AiGenerationConfig.DEFAULT_MIN_P; private float topNSigma = AiGenerationConfig.DEFAULT_TOP_N_SIGMA; private float repeatPenalty = AiGenerationConfig.DEFAULT_REPEAT_PENALTY; - private @Nullable Boolean chatTemplateEnableThinking = - AiGenerationConfig.DEFAULT_CHAT_TEMPLATE_ENABLE_THINKING; + private @Nullable Boolean chatTemplateEnableThinking = AiGenerationConfig.DEFAULT_CHAT_TEMPLATE_ENABLE_THINKING; private boolean cachePrompt = AiGenerationConfig.DEFAULT_CACHE_PROMPT; private boolean swaFull = AiGenerationConfig.DEFAULT_SWA_FULL; private int cacheReuse = AiGenerationConfig.DEFAULT_CACHE_REUSE; diff --git a/srcmorph/src/test/java/net/ladenthin/srcmorph/config/AiModelDefinitionSupportTest.java b/srcmorph/src/test/java/net/ladenthin/srcmorph/config/AiModelDefinitionSupportTest.java index 949eb57..65cc22d 100644 --- a/srcmorph/src/test/java/net/ladenthin/srcmorph/config/AiModelDefinitionSupportTest.java +++ b/srcmorph/src/test/java/net/ladenthin/srcmorph/config/AiModelDefinitionSupportTest.java @@ -164,7 +164,8 @@ public void getConfig_defaultValues_matchAiGenerationConfigDefaults() { assertThat(config.getCharsPerToken(), is(equalTo(AiGenerationConfig.DEFAULT_CHARS_PER_TOKEN))); assertThat(config.getMaxInputChars(), is(equalTo(AiGenerationConfig.DEFAULT_MAX_INPUT_CHARS))); assertThat(config.isWarnOnTrim(), is(AiGenerationConfig.DEFAULT_WARN_ON_TRIM)); - assertThat(config.getChatTemplateEnableThinking(), is(AiGenerationConfig.DEFAULT_CHAT_TEMPLATE_ENABLE_THINKING)); + assertThat( + config.getChatTemplateEnableThinking(), is(AiGenerationConfig.DEFAULT_CHAT_TEMPLATE_ENABLE_THINKING)); assertThat(config.isCachePrompt(), is(AiGenerationConfig.DEFAULT_CACHE_PROMPT)); assertThat(config.isSwaFull(), is(AiGenerationConfig.DEFAULT_SWA_FULL)); assertThat(config.getCacheReuse(), is(equalTo(AiGenerationConfig.DEFAULT_CACHE_REUSE))); diff --git a/srcmorph/src/test/java/net/ladenthin/srcmorph/engine/CalibrationReportTest.java b/srcmorph/src/test/java/net/ladenthin/srcmorph/engine/CalibrationReportTest.java index 89e3b2a..ef98146 100644 --- a/srcmorph/src/test/java/net/ladenthin/srcmorph/engine/CalibrationReportTest.java +++ b/srcmorph/src/test/java/net/ladenthin/srcmorph/engine/CalibrationReportTest.java @@ -140,7 +140,8 @@ public void renderJson_twoModels_separatesEntriesWithACommaAndNoTrailingComma() /** An empty run must still produce a parseable document, not a dangling array. */ @Test public void renderJson_noModels_isAnEmptyArray() { - assertThat(new CalibrationReport(Collections.emptyList()).renderJson(), is(equalTo("{\n \"models\": []\n}\n"))); + assertThat( + new CalibrationReport(Collections.emptyList()).renderJson(), is(equalTo("{\n \"models\": []\n}\n"))); } @Test