You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2021/09/04 19:35:10 UTC

[maven-resolver] 03/03: [MRESOLVER-201] Make variables final whenever possible

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

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git

commit be8ecb8ac9ad0953822b215f157baed113fc7767
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Fri Sep 3 06:32:16 2021 +0200

    [MRESOLVER-201] Make variables final whenever possible
    
    This closes #120
---
 .../src/main/java/org/eclipse/aether/RepositoryEvent.java         | 4 ++--
 .../src/main/java/org/eclipse/aether/transfer/TransferEvent.java  | 4 ++--
 .../org/apache/maven/resolver/examples/resolver/Resolver.java     | 6 +++---
 .../apache/maven/resolver/examples/resolver/ResolverResult.java   | 6 +++---
 .../resolver/examples/util/ConsoleDependencyGraphDumper.java      | 4 ++--
 .../maven/resolver/examples/util/ConsoleRepositoryListener.java   | 2 +-
 .../maven/resolver/examples/util/ConsoleTransferListener.java     | 4 ++--
 .../org/eclipse/aether/internal/impl/ArtifactRequestBuilder.java  | 2 +-
 .../java/org/eclipse/aether/internal/impl/collect/DataPool.java   | 4 ++--
 .../eclipse/aether/internal/test/util/ArtifactDescription.java    | 8 ++++----
 .../aether/internal/test/util/IniArtifactDescriptorReader.java    | 2 +-
 .../java/org/eclipse/aether/internal/test/util/NodeBuilder.java   | 6 +++---
 .../aether/internal/test/util/TestLocalRepositoryManager.java     | 6 +++---
 .../java/org/eclipse/aether/internal/test/util/TestVersion.java   | 2 +-
 .../aether/internal/transport/wagon/PlexusWagonConfigurator.java  | 2 +-
 .../aether/internal/transport/wagon/PlexusWagonProvider.java      | 2 +-
 .../eclipse/aether/util/repository/ChainedWorkspaceReader.java    | 2 +-
 .../org/eclipse/aether/util/repository/DefaultProxySelector.java  | 2 +-
 18 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/RepositoryEvent.java b/maven-resolver-api/src/main/java/org/eclipse/aether/RepositoryEvent.java
index 812ef7d..8d1e601 100644
--- a/maven-resolver-api/src/main/java/org/eclipse/aether/RepositoryEvent.java
+++ b/maven-resolver-api/src/main/java/org/eclipse/aether/RepositoryEvent.java
@@ -293,9 +293,9 @@ public final class RepositoryEvent
     public static final class Builder
     {
 
-        EventType type;
+        final EventType type;
 
-        RepositorySystemSession session;
+        final RepositorySystemSession session;
 
         Artifact artifact;
 
diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferEvent.java b/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferEvent.java
index 7d33d50..b735439 100644
--- a/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferEvent.java
+++ b/maven-resolver-api/src/main/java/org/eclipse/aether/transfer/TransferEvent.java
@@ -226,9 +226,9 @@ public final class TransferEvent
 
         RequestType requestType;
 
-        RepositorySystemSession session;
+        final RepositorySystemSession session;
 
-        TransferResource resource;
+        final TransferResource resource;
 
         ByteBuffer dataBuffer;
 
diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/Resolver.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/Resolver.java
index 42193b7..606b129 100644
--- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/Resolver.java
+++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/Resolver.java
@@ -48,11 +48,11 @@ import org.eclipse.aether.util.repository.AuthenticationBuilder;
  */
 public class Resolver
 {
-    private String remoteRepository;
+    private final String remoteRepository;
 
-    private RepositorySystem repositorySystem;
+    private final RepositorySystem repositorySystem;
 
-    private LocalRepository localRepository;
+    private final LocalRepository localRepository;
 
     public Resolver( String factory, String remoteRepository, String localRepository )
     {
diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/ResolverResult.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/ResolverResult.java
index 2978441..813e22b 100644
--- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/ResolverResult.java
+++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/ResolverResult.java
@@ -28,9 +28,9 @@ import org.eclipse.aether.graph.DependencyNode;
  */
 public class ResolverResult
 {
-    private DependencyNode root;
-    private List<File> resolvedFiles;
-    private String resolvedClassPath;
+    private final DependencyNode root;
+    private final List<File> resolvedFiles;
+    private final String resolvedClassPath;
     
     public ResolverResult( DependencyNode root, List<File> resolvedFiles, String resolvedClassPath )
     {
diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleDependencyGraphDumper.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleDependencyGraphDumper.java
index d03aa46..b5f65da 100644
--- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleDependencyGraphDumper.java
+++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleDependencyGraphDumper.java
@@ -39,9 +39,9 @@ public class ConsoleDependencyGraphDumper
     implements DependencyVisitor
 {
 
-    private PrintStream out;
+    private final PrintStream out;
 
-    private List<ChildInfo> childInfos = new ArrayList<>();
+    private final List<ChildInfo> childInfos = new ArrayList<>();
 
     public ConsoleDependencyGraphDumper()
     {
diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleRepositoryListener.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleRepositoryListener.java
index d561d7f..2d5fbaf 100644
--- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleRepositoryListener.java
+++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleRepositoryListener.java
@@ -33,7 +33,7 @@ public class ConsoleRepositoryListener
     extends AbstractRepositoryListener
 {
 
-    private PrintStream out;
+    private final PrintStream out;
 
     public ConsoleRepositoryListener()
     {
diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleTransferListener.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleTransferListener.java
index ad48993..c5de1e2 100644
--- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleTransferListener.java
+++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/util/ConsoleTransferListener.java
@@ -40,9 +40,9 @@ public class ConsoleTransferListener
     extends AbstractTransferListener
 {
 
-    private PrintStream out;
+    private final PrintStream out;
 
-    private Map<TransferResource, Long> downloads = new ConcurrentHashMap<>();
+    private final Map<TransferResource, Long> downloads = new ConcurrentHashMap<>();
 
     private int lastLength;
 
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/ArtifactRequestBuilder.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/ArtifactRequestBuilder.java
index 9e04e82..1c46eae 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/ArtifactRequestBuilder.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/ArtifactRequestBuilder.java
@@ -35,7 +35,7 @@ class ArtifactRequestBuilder
 
     private final RequestTrace trace;
 
-    private List<ArtifactRequest> requests;
+    private final List<ArtifactRequest> requests;
 
     ArtifactRequestBuilder( RequestTrace trace )
     {
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DataPool.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DataPool.java
index 0d3187c..4a14555 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DataPool.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DataPool.java
@@ -67,9 +67,9 @@ final class DataPool
 
     private Map<Object, Descriptor> descriptors;
 
-    private Map<Object, Constraint> constraints = new HashMap<>();
+    private final Map<Object, Constraint> constraints = new HashMap<>();
 
-    private Map<Object, List<DependencyNode>> nodes = new HashMap<>( 256 );
+    private final Map<Object, List<DependencyNode>> nodes = new HashMap<>( 256 );
 
     @SuppressWarnings( "unchecked" )
     DataPool( RepositorySystemSession session )
diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/ArtifactDescription.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/ArtifactDescription.java
index bdb5c7f..5c1f530 100644
--- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/ArtifactDescription.java
+++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/ArtifactDescription.java
@@ -30,13 +30,13 @@ import org.eclipse.aether.repository.RemoteRepository;
 class ArtifactDescription
 {
 
-    private List<RemoteRepository> repositories;
+    private final List<RemoteRepository> repositories;
 
-    private List<Dependency> managedDependencies;
+    private final List<Dependency> managedDependencies;
 
-    private List<Dependency> dependencies;
+    private final List<Dependency> dependencies;
 
-    private Artifact relocation;
+    private final Artifact relocation;
 
     ArtifactDescription( Artifact relocation, List<Dependency> dependencies, List<Dependency> managedDependencies,
                          List<RemoteRepository> repositories )
diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReader.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReader.java
index c571517..17f98b3 100644
--- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReader.java
+++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReader.java
@@ -77,7 +77,7 @@ import static java.util.Objects.requireNonNull;
  */
 public class IniArtifactDescriptorReader
 {
-    private IniArtifactDataReader reader;
+    private final IniArtifactDataReader reader;
 
     /**
      * Use the given prefix to load the artifact descriptions from the classpath.
diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeBuilder.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeBuilder.java
index a327b5b..446c0c2 100644
--- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeBuilder.java
+++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeBuilder.java
@@ -50,7 +50,7 @@ public class NodeBuilder
 
     private String ext = "jar";
 
-    private String classifier = "";
+    private final String classifier = "";
 
     private String scope = "compile";
 
@@ -58,9 +58,9 @@ public class NodeBuilder
 
     private String context;
 
-    private List<Artifact> relocations = new ArrayList<>();
+    private final List<Artifact> relocations = new ArrayList<>();
 
-    private VersionScheme versionScheme = new TestVersionScheme();
+    private final VersionScheme versionScheme = new TestVersionScheme();
 
     private Map<String, String> properties = new HashMap<>( 0 );
 
diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLocalRepositoryManager.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLocalRepositoryManager.java
index 9785933..c927d44 100644
--- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLocalRepositoryManager.java
+++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLocalRepositoryManager.java
@@ -48,11 +48,11 @@ public class TestLocalRepositoryManager
 
     private LocalRepository localRepository;
 
-    private Set<Artifact> unavailableArtifacts = new HashSet<>();
+    private final Set<Artifact> unavailableArtifacts = new HashSet<>();
 
-    private Set<Artifact> artifactRegistrations = new HashSet<>();
+    private final Set<Artifact> artifactRegistrations = new HashSet<>();
 
-    private Set<Metadata> metadataRegistrations = new HashSet<>();
+    private final Set<Metadata> metadataRegistrations = new HashSet<>();
 
     public TestLocalRepositoryManager()
     {
diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersion.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersion.java
index 8109beb..d9d29e2 100644
--- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersion.java
+++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersion.java
@@ -28,7 +28,7 @@ public final class TestVersion
     implements Version
 {
 
-    private String version;
+    private final String version;
 
     public TestVersion( String version )
     {
diff --git a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonConfigurator.java b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonConfigurator.java
index 7f8d7dc..e41b1ee 100644
--- a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonConfigurator.java
+++ b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonConfigurator.java
@@ -46,7 +46,7 @@ import javax.inject.Singleton;
 public class PlexusWagonConfigurator
     implements WagonConfigurator
 {
-    private PlexusContainer container;
+    private final PlexusContainer container;
 
     /**
      * Creates a wagon configurator using the specified Plexus container.
diff --git a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonProvider.java b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonProvider.java
index 6b46f67..e46130c 100644
--- a/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonProvider.java
+++ b/maven-resolver-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonProvider.java
@@ -37,7 +37,7 @@ import javax.inject.Singleton;
 public class PlexusWagonProvider
     implements WagonProvider
 {
-    private PlexusContainer container;
+    private final PlexusContainer container;
 
     /**
      * Creates a wagon provider using the specified Plexus container.
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ChainedWorkspaceReader.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ChainedWorkspaceReader.java
index 1f41d21..024d718 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ChainedWorkspaceReader.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/ChainedWorkspaceReader.java
@@ -39,7 +39,7 @@ public final class ChainedWorkspaceReader
     implements WorkspaceReader
 {
 
-    private List<WorkspaceReader> readers = new ArrayList<>();
+    private final List<WorkspaceReader> readers = new ArrayList<>();
 
     private WorkspaceRepository repository;
 
diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/DefaultProxySelector.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/DefaultProxySelector.java
index 09e0ce9..e1e58c5 100644
--- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/DefaultProxySelector.java
+++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/repository/DefaultProxySelector.java
@@ -39,7 +39,7 @@ public final class DefaultProxySelector
     implements ProxySelector
 {
 
-    private List<ProxyDef> proxies = new ArrayList<>();
+    private final List<ProxyDef> proxies = new ArrayList<>();
 
     /**
      * Adds the specified proxy definition to the selector. Proxy definitions are ordered, the first matching proxy for