Apply code formatting and upgrade spotless tooling

- Upgrade spotless-maven-plugin from 2.44.5 to 3.0.0
- Upgrade palantir-java-format from 2.56.0 to 2.81.0 for Java 25 support
- Run mvn spotless:apply to format code

Addresses review feedback on PR #394.

Author: cowwoc

pom.xml

@@ -64,6 +64,7 @@ under the License.
     <minimalMavenBuildVersion>3.9.0</minimalMavenBuildVersion>
     <minimalJavaBuildVersion>11</minimalJavaBuildVersion>
     <classWorldsVersion>2.6.0</classWorldsVersion>
+    <version.spotless-maven-plugin>3.0.0</version.spotless-maven-plugin>
 
     <!-- default maven version, will be overridden by maven3 profile -->
     <mavenVersion>4.0.0-alpha-8</mavenVersion>
@@ -427,6 +428,17 @@ under the License.
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <configuration>
+          <java>
+            <palantirJavaFormat>
+              <version>2.81.0</version>
+            </palantirJavaFormat>
+          </java>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

src/main/java/org/apache/maven/buildcache/CacheControllerImpl.java

@@ -534,12 +534,11 @@ public void save(
                 attachOutputs(project, state, buildStartTime);
             }
 
-            final List<org.apache.maven.artifact.Artifact> attachedArtifacts = project.getAttachedArtifacts() != null
-                    ? project.getAttachedArtifacts()
-                    : Collections.emptyList();
+            final List<org.apache.maven.artifact.Artifact> attachedArtifacts =
+                    project.getAttachedArtifacts() != null ? project.getAttachedArtifacts() : Collections.emptyList();
             final List<Artifact> attachedArtifactDtos = artifactDtos(attachedArtifacts, algorithm, project, state);
-            final Artifact projectArtifactDto = hasPackagePhase ? artifactDto(project.getArtifact(), algorithm, project, state)
-                    : null;
+            final Artifact projectArtifactDto =
+                    hasPackagePhase ? artifactDto(project.getArtifact(), algorithm, project, state) : null;
 
             // CRITICAL: Don't create incomplete cache entries!
             // Only save cache entry if we have SOMETHING useful to restore.
@@ -576,7 +575,8 @@ public void save(
             }
             for (org.apache.maven.artifact.Artifact attachedArtifact : attachedArtifacts) {
                 if (attachedArtifact.getFile() != null) {
-                    boolean storeArtifact = isOutputArtifact(attachedArtifact.getFile().getName());
+                    boolean storeArtifact =
+                            isOutputArtifact(attachedArtifact.getFile().getName());
                     if (storeArtifact) {
                         localCache.saveArtifactFile(cacheResult, attachedArtifact);
                     } else {
@@ -662,7 +662,9 @@ public void produceDiffReport(CacheResult cacheResult, Build build) {
     }
 
     private List<Artifact> artifactDtos(
-            List<org.apache.maven.artifact.Artifact> attachedArtifacts, HashAlgorithm digest, MavenProject project,
+            List<org.apache.maven.artifact.Artifact> attachedArtifacts,
+            HashAlgorithm digest,
+            MavenProject project,
             ProjectCacheState state)
             throws IOException {
         List<Artifact> result = new ArrayList<>();
@@ -676,7 +678,9 @@ && isOutputArtifact(attachedArtifact.getFile().getName())) {
     }
 
     private Artifact artifactDto(
-            org.apache.maven.artifact.Artifact projectArtifact, HashAlgorithm algorithm, MavenProject project,
+            org.apache.maven.artifact.Artifact projectArtifact,
+            HashAlgorithm algorithm,
+            MavenProject project,
             ProjectCacheState state)
             throws IOException {
         final Artifact dto = DtoUtils.createDto(projectArtifact);
@@ -940,15 +944,29 @@ private void restoreGeneratedSources(Artifact artifact, Path artifactFilePath, M
     }
 
     // TODO: move to config
-    public void attachGeneratedSources(MavenProject project, ProjectCacheState state, long buildStartTime) throws IOException {
+    public void attachGeneratedSources(MavenProject project, ProjectCacheState state, long buildStartTime)
+            throws IOException {
         final Path targetDir = Paths.get(project.getBuild().getDirectory());
 
         final Path generatedSourcesDir = targetDir.resolve("generated-sources");
-        attachDirIfNotEmpty(generatedSourcesDir, targetDir, project, state, OutputType.GENERATED_SOURCE, DEFAULT_FILE_GLOB, buildStartTime);
+        attachDirIfNotEmpty(
+                generatedSourcesDir,
+                targetDir,
+                project,
+                state,
+                OutputType.GENERATED_SOURCE,
+                DEFAULT_FILE_GLOB,
+                buildStartTime);
 
         final Path generatedTestSourcesDir = targetDir.resolve("generated-test-sources");
         attachDirIfNotEmpty(
-                generatedTestSourcesDir, targetDir, project, state, OutputType.GENERATED_SOURCE, DEFAULT_FILE_GLOB, buildStartTime);
+                generatedTestSourcesDir,
+                targetDir,
+                project,
+                state,
+                OutputType.GENERATED_SOURCE,
+                DEFAULT_FILE_GLOB,
+                buildStartTime);
 
         Set<String> sourceRoots = new TreeSet<>();
         if (project.getCompileSourceRoots() != null) {
@@ -964,7 +982,14 @@ public void attachGeneratedSources(MavenProject project, ProjectCacheState state
                     && sourceRootPath.startsWith(targetDir)
                     && !(sourceRootPath.startsWith(generatedSourcesDir)
                             || sourceRootPath.startsWith(generatedTestSourcesDir))) { // dir within target
-                attachDirIfNotEmpty(sourceRootPath, targetDir, project, state, OutputType.GENERATED_SOURCE, DEFAULT_FILE_GLOB, buildStartTime);
+                attachDirIfNotEmpty(
+                        sourceRootPath,
+                        targetDir,
+                        project,
+                        state,
+                        OutputType.GENERATED_SOURCE,
+                        DEFAULT_FILE_GLOB,
+                        buildStartTime);
             }
         }
     }
@@ -975,7 +1000,8 @@ private void attachOutputs(MavenProject project, ProjectCacheState state, long b
             final Path targetDir = Paths.get(project.getBuild().getDirectory());
             final Path outputDir = targetDir.resolve(dir.getValue());
             if (isPathInsideProject(project, outputDir)) {
-                attachDirIfNotEmpty(outputDir, targetDir, project, state, OutputType.EXTRA_OUTPUT, dir.getGlob(), buildStartTime);
+                attachDirIfNotEmpty(
+                        outputDir, targetDir, project, state, OutputType.EXTRA_OUTPUT, dir.getGlob(), buildStartTime);
             } else {
                 LOGGER.warn("Outside project output candidate directory discarded ({})", outputDir.normalize());
             }

src/test/java/org/apache/maven/buildcache/its/CacheCompileDisabledTest.java

@@ -62,10 +62,9 @@ void compileDoesNotCacheWhenDisabled(Verifier verifier) throws VerificationExcep
         verifier.verifyErrorFreeLog();
 
         // Verify NO cache entry was created (no buildinfo.xml in local cache)
-        boolean hasCacheEntry = Files.walk(localCache)
-                .anyMatch(p -> p.getFileName().toString().equals("buildinfo.xml"));
-        assertFalse(hasCacheEntry,
-                "Cache entry should NOT be created when maven.build.cache.cacheCompile=false");
+        boolean hasCacheEntry =
+                Files.walk(localCache).anyMatch(p -> p.getFileName().toString().equals("buildinfo.xml"));
+        assertFalse(hasCacheEntry, "Cache entry should NOT be created when maven.build.cache.cacheCompile=false");
 
         // Clean project and run compile again
         verifier.setLogFileName("../log-compile-disabled-2.txt");
@@ -78,7 +77,8 @@ void compileDoesNotCacheWhenDisabled(Verifier verifier) throws VerificationExcep
         // Verify cache miss (should NOT restore from cache)
         Path logFile = Paths.get(verifier.getBasedir()).getParent().resolve("log-compile-disabled-2.txt");
         String logContent = new String(Files.readAllBytes(logFile));
-        assertFalse(logContent.contains("Found cached build, restoring"),
+        assertFalse(
+                logContent.contains("Found cached build, restoring"),
                 "Should NOT restore from cache when cacheCompile was disabled");
     }
 
@@ -103,10 +103,9 @@ void compileCreatesCacheEntryWhenEnabled(Verifier verifier) throws VerificationE
         verifier.verifyErrorFreeLog();
 
         // Verify cache entry WAS created
-        boolean hasCacheEntry = Files.walk(localCache)
-                .anyMatch(p -> p.getFileName().toString().equals("buildinfo.xml"));
-        assertTrue(hasCacheEntry,
-                "Cache entry should be created when maven.build.cache.cacheCompile=true (default)");
+        boolean hasCacheEntry =
+                Files.walk(localCache).anyMatch(p -> p.getFileName().toString().equals("buildinfo.xml"));
+        assertTrue(hasCacheEntry, "Cache entry should be created when maven.build.cache.cacheCompile=true (default)");
 
         // Clean project and run compile again
         verifier.setLogFileName("../log-compile-enabled-2.txt");
@@ -123,14 +122,13 @@ void compileCreatesCacheEntryWhenEnabled(Verifier verifier) throws VerificationE
     private void deleteDirectory(Path directory) throws IOException {
         if (Files.exists(directory)) {
             try (Stream<Path> walk = Files.walk(directory)) {
-                walk.sorted((a, b) -> b.compareTo(a))
-                        .forEach(path -> {
-                            try {
-                                Files.delete(path);
-                            } catch (IOException e) {
-                                // Ignore
-                            }
-                        });
+                walk.sorted((a, b) -> b.compareTo(a)).forEach(path -> {
+                    try {
+                        Files.delete(path);
+                    } catch (IOException e) {
+                        // Ignore
+                    }
+                });
             }
         }
     }

src/test/java/org/apache/maven/buildcache/its/Issue393CompileRestoreTest.java

@@ -41,11 +41,13 @@ void restoresAttachedOutputsAfterCompileOnlyBuild(Verifier verifier) throws Veri
         verifier.setLogFileName("../log-verify.txt");
         verifier.executeGoals(Arrays.asList("clean", "verify"));
         verifier.verifyErrorFreeLog();
-        verifier.verifyTextInLog("Found cached build, restoring org.apache.maven.caching.test.jpms:issue-393-app from cache");
+        verifier.verifyTextInLog(
+                "Found cached build, restoring org.apache.maven.caching.test.jpms:issue-393-app from cache");
         verifier.verifyTextInLog("Skipping plugin execution (cached): compiler:compile");
 
         verifier.verifyFilePresent("app/target/classes/module-info.class");
         verifier.verifyFilePresent("consumer/target/classes/module-info.class");
-        verifier.verifyFilePresent("consumer/target/test-classes/org/apache/maven/caching/test/jpms/consumer/ConsumerTest.class");
+        verifier.verifyFilePresent(
+                "consumer/target/test-classes/org/apache/maven/caching/test/jpms/consumer/ConsumerTest.class");
     }
 }