You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2024/08/15 07:57:49 UTC

(maven-build-cache-extension) branch master updated: Some minor cleanup fixing IDE warnings (#172)

This is an automated email from the ASF dual-hosted git repository.

olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-build-cache-extension.git


The following commit(s) were added to refs/heads/master by this push:
     new c9aaacb  Some minor cleanup fixing IDE warnings (#172)
c9aaacb is described below

commit c9aaacb1140c699e305cff9e2dd9ac9b9bff844c
Author: Olivier Lamy <ol...@apache.org>
AuthorDate: Thu Aug 15 17:57:44 2024 +1000

    Some minor cleanup fixing IDE warnings (#172)
    
    Signed-off-by: Olivier Lamy <ol...@apache.org>
---
 .../BuildCacheMojosExecutionStrategy.java          |  4 ++--
 .../maven/buildcache/CacheControllerImpl.java      |  4 ++--
 .../buildcache/DefaultMultiModuleSupport.java      |  3 ++-
 .../buildcache/DefaultRestoredArtifactHandler.java |  6 +++---
 .../buildcache/RemoteCacheRepositoryNoOp.java      |  1 -
 .../buildcache/checksum/MavenProjectInput.java     | 11 ++--------
 .../buildcache/checksum/exclude/Exclusion.java     |  4 ++--
 .../maven/buildcache/hash/CloseableBuffer.java     | 24 +++++++---------------
 .../maven/buildcache/xml/CacheConfigImpl.java      |  5 +++--
 9 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/src/main/java/org/apache/maven/buildcache/BuildCacheMojosExecutionStrategy.java b/src/main/java/org/apache/maven/buildcache/BuildCacheMojosExecutionStrategy.java
index 7726312..5790d19 100644
--- a/src/main/java/org/apache/maven/buildcache/BuildCacheMojosExecutionStrategy.java
+++ b/src/main/java/org/apache/maven/buildcache/BuildCacheMojosExecutionStrategy.java
@@ -79,7 +79,7 @@ public class BuildCacheMojosExecutionStrategy implements MojosExecutionStrategy
     private final MojoParametersListener mojoListener;
     private final LifecyclePhasesHelper lifecyclePhasesHelper;
     private final MavenPluginManager mavenPluginManager;
-    private MojoExecutionScope mojoExecutionScope;
+    private final MojoExecutionScope mojoExecutionScope;
 
     @Inject
     public BuildCacheMojosExecutionStrategy(
@@ -434,6 +434,6 @@ public class BuildCacheMojosExecutionStrategy implements MojosExecutionStrategy
     private enum CacheRestorationStatus {
         SUCCESS,
         FAILURE,
-        FAILURE_NEEDS_CLEAN;
+        FAILURE_NEEDS_CLEAN
     }
 }
diff --git a/src/main/java/org/apache/maven/buildcache/CacheControllerImpl.java b/src/main/java/org/apache/maven/buildcache/CacheControllerImpl.java
index 11cec50..6cc644f 100644
--- a/src/main/java/org/apache/maven/buildcache/CacheControllerImpl.java
+++ b/src/main/java/org/apache/maven/buildcache/CacheControllerImpl.java
@@ -137,7 +137,7 @@ public class CacheControllerImpl implements CacheController {
      * (ex : generated source basedir).
      * Used to link the resource to its path on disk
      */
-    private Map<String, Path> attachedResourcesPathsById = new HashMap<>();
+    private final Map<String, Path> attachedResourcesPathsById = new HashMap<>();
 
     private int attachedResourceCounter = 0;
 
@@ -467,7 +467,7 @@ public class CacheControllerImpl implements CacheController {
             if (!Files.exists(artifactFile)) {
                 throw new FileNotFoundException("Missing file for cached build, cannot restore. File: " + artifactFile);
             }
-            LOGGER.debug("Downloaded artifact " + artifact.getArtifactId() + " to: " + artifactFile);
+            LOGGER.debug("Downloaded artifact {} to: {}", artifact.getArtifactId(), artifactFile);
             return restoreArtifactHandler
                     .adjustArchiveArtifactVersion(project, originalVersion, artifactFile)
                     .toFile();
diff --git a/src/main/java/org/apache/maven/buildcache/DefaultMultiModuleSupport.java b/src/main/java/org/apache/maven/buildcache/DefaultMultiModuleSupport.java
index 7693b3d..41cb021 100644
--- a/src/main/java/org/apache/maven/buildcache/DefaultMultiModuleSupport.java
+++ b/src/main/java/org/apache/maven/buildcache/DefaultMultiModuleSupport.java
@@ -24,6 +24,7 @@ import javax.inject.Named;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -132,7 +133,7 @@ public class DefaultMultiModuleSupport implements MultiModuleSupport {
         File multiModulePomFile = getMultiModulePomFile(session);
 
         ProjectBuildingRequest projectBuildingRequest = currentProject.getProjectBuildingRequest();
-        boolean profilesMatched = projectBuildingRequest.getActiveProfileIds().containsAll(scanProfiles);
+        boolean profilesMatched = new HashSet<>(projectBuildingRequest.getActiveProfileIds()).containsAll(scanProfiles);
 
         // we are building from root with the same profiles, no need to re-scan the whole multi-module project
         if (currentProject.getFile().getAbsolutePath().equals(multiModulePomFile.getAbsolutePath())
diff --git a/src/main/java/org/apache/maven/buildcache/DefaultRestoredArtifactHandler.java b/src/main/java/org/apache/maven/buildcache/DefaultRestoredArtifactHandler.java
index 0742a30..96af8d9 100644
--- a/src/main/java/org/apache/maven/buildcache/DefaultRestoredArtifactHandler.java
+++ b/src/main/java/org/apache/maven/buildcache/DefaultRestoredArtifactHandler.java
@@ -24,10 +24,10 @@ import javax.inject.Singleton;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Enumeration;
@@ -96,7 +96,7 @@ public class DefaultRestoredArtifactHandler implements RestoredArtifactHandler {
         String pomPropsVersion = "version=" + currentVersion;
         try (JarFile jarFile = new JarFile(artifactFile.toFile())) {
             try (JarOutputStream jos =
-                    new JarOutputStream(new BufferedOutputStream(new FileOutputStream(tmpJarFile)))) {
+                    new JarOutputStream(new BufferedOutputStream(Files.newOutputStream(tmpJarFile.toPath())))) {
                 // Copy original jar file to the temporary one.
                 Enumeration<JarEntry> jarEntries = jarFile.entries();
                 byte[] buffer = new byte[1024];
@@ -140,7 +140,7 @@ public class DefaultRestoredArtifactHandler implements RestoredArtifactHandler {
     private static void replaceEntry(
             JarFile jarFile, JarEntry entry, String toReplace, String replacement, JarOutputStream jos)
             throws IOException {
-        String fullManifest = IOUtils.toString(jarFile.getInputStream(entry), StandardCharsets.UTF_8.name());
+        String fullManifest = IOUtils.toString(jarFile.getInputStream(entry), StandardCharsets.UTF_8);
         String modified = fullManifest.replaceAll(toReplace, replacement);
 
         byte[] bytes = modified.getBytes(StandardCharsets.UTF_8);
diff --git a/src/main/java/org/apache/maven/buildcache/RemoteCacheRepositoryNoOp.java b/src/main/java/org/apache/maven/buildcache/RemoteCacheRepositoryNoOp.java
index 3808696..e66d0e5 100644
--- a/src/main/java/org/apache/maven/buildcache/RemoteCacheRepositoryNoOp.java
+++ b/src/main/java/org/apache/maven/buildcache/RemoteCacheRepositoryNoOp.java
@@ -58,7 +58,6 @@ public class RemoteCacheRepositoryNoOp implements RemoteCacheRepository {
         return false;
     }
 
-    @Nonnull
     @Override
     public String getResourceUrl(CacheContext context, String filename) {
         return null;
diff --git a/src/main/java/org/apache/maven/buildcache/checksum/MavenProjectInput.java b/src/main/java/org/apache/maven/buildcache/checksum/MavenProjectInput.java
index e196edd..bd2a728 100644
--- a/src/main/java/org/apache/maven/buildcache/checksum/MavenProjectInput.java
+++ b/src/main/java/org/apache/maven/buildcache/checksum/MavenProjectInput.java
@@ -82,7 +82,6 @@ import org.apache.maven.model.PluginExecution;
 import org.apache.maven.model.Resource;
 import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
 import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.WriterFactory;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.artifact.DefaultArtifactType;
@@ -344,19 +343,13 @@ public class MavenProjectInput {
     private String getEffectivePom(Model prototype) throws IOException {
         ByteArrayOutputStream output = new ByteArrayOutputStream();
 
-        Writer writer = null;
-        try {
-            writer = WriterFactory.newXmlWriter(output);
+        try (Writer writer = WriterFactory.newXmlWriter(output)) {
             new MavenXpp3Writer().write(writer, prototype);
 
             // normalize env specifics
             final String[] searchList = {baseDirPath.toString(), "\\", "windows", "linux"};
             final String[] replacementList = {"", "/", "os.classifier", "os.classifier"};
-
             return replaceEachRepeatedly(output.toString(), searchList, replacementList);
-
-        } finally {
-            IOUtil.close(writer);
         }
     }
 
@@ -520,7 +513,7 @@ public class MavenProjectInput {
                     return FileVisitResult.SKIP_SUBTREE;
                 }
 
-                walkDirectoryFiles(path, collectedFiles, key.getGlob(), entry -> exclusionResolver.excludesPath(entry));
+                walkDirectoryFiles(path, collectedFiles, key.getGlob(), exclusionResolver::excludesPath);
 
                 if (!key.isRecursive()) {
                     LOGGER.debug("Skipping subtree (non recursive): {}", path);
diff --git a/src/main/java/org/apache/maven/buildcache/checksum/exclude/Exclusion.java b/src/main/java/org/apache/maven/buildcache/checksum/exclude/Exclusion.java
index f89bc36..26988b3 100644
--- a/src/main/java/org/apache/maven/buildcache/checksum/exclude/Exclusion.java
+++ b/src/main/java/org/apache/maven/buildcache/checksum/exclude/Exclusion.java
@@ -146,12 +146,12 @@ public class Exclusion {
 
     public enum MatcherType {
         FILENAME,
-        PATH;
+        PATH
     }
 
     public enum EntryType {
         FILE,
         DIRECTORY,
-        ALL;
+        ALL
     }
 }
diff --git a/src/main/java/org/apache/maven/buildcache/hash/CloseableBuffer.java b/src/main/java/org/apache/maven/buildcache/hash/CloseableBuffer.java
index 791168d..df67df7 100644
--- a/src/main/java/org/apache/maven/buildcache/hash/CloseableBuffer.java
+++ b/src/main/java/org/apache/maven/buildcache/hash/CloseableBuffer.java
@@ -34,16 +34,12 @@ import static org.apache.maven.buildcache.hash.ReflectionUtils.getMethod;
  */
 public class CloseableBuffer implements AutoCloseable {
 
-    private static final Cleaner CLEANER = doPrivileged(new PrivilegedAction<Cleaner>() {
-
-        @Override
-        public Cleaner run() {
-            final String jsv = System.getProperty("java.specification.version", "9");
-            if (jsv.startsWith("1.")) {
-                return DirectCleaner.isSupported() ? new DirectCleaner() : new NoopCleaner();
-            } else {
-                return UnsafeCleaner.isSupported() ? new UnsafeCleaner() : new NoopCleaner();
-            }
+    private static final Cleaner CLEANER = doPrivileged((PrivilegedAction<Cleaner>) () -> {
+        final String jsv = System.getProperty("java.specification.version", "9");
+        if (jsv.startsWith("1.")) {
+            return DirectCleaner.isSupported() ? new DirectCleaner() : new NoopCleaner();
+        } else {
+            return UnsafeCleaner.isSupported() ? new UnsafeCleaner() : new NoopCleaner();
         }
     });
 
@@ -75,13 +71,7 @@ public class CloseableBuffer implements AutoCloseable {
     @Override
     public void close() {
         // Java 8: () -> CLEANER.clean(buffer)
-        boolean done = doPrivileged(new PrivilegedAction<Boolean>() {
-
-            @Override
-            public Boolean run() {
-                return CLEANER.clean(buffer);
-            }
-        });
+        boolean done = doPrivileged((PrivilegedAction<Boolean>) () -> CLEANER.clean(buffer));
         if (done) {
             buffer = null;
         }
diff --git a/src/main/java/org/apache/maven/buildcache/xml/CacheConfigImpl.java b/src/main/java/org/apache/maven/buildcache/xml/CacheConfigImpl.java
index 4b6287d..566a067 100644
--- a/src/main/java/org/apache/maven/buildcache/xml/CacheConfigImpl.java
+++ b/src/main/java/org/apache/maven/buildcache/xml/CacheConfigImpl.java
@@ -138,8 +138,9 @@ public class CacheConfigImpl implements org.apache.maven.buildcache.xml.CacheCon
                     final boolean enabled = getProperty(CACHE_ENABLED_PROPERTY_NAME, true);
 
                     if (!rtInfo.isMavenVersion("[3.9.0,)")) {
-                        LOGGER.warn("Cache requires Maven >= 3.9, but version is " + rtInfo.getMavenVersion()
-                                + ". Disabling cache.");
+                        LOGGER.warn(
+                                "Cache requires Maven >= 3.9, but version is {}. Disabling cache.",
+                                rtInfo.getMavenVersion());
                         state = CacheState.DISABLED;
                     } else if (!enabled) {
                         LOGGER.info("Cache disabled by command line flag, project will be built fully and not cached");