You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2021/11/11 08:59:57 UTC

[maven] 02/02: [MNG-5577] Use JSR 330 constructor injection

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

hboutemy pushed a commit to branch MNG-7129_Separate
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 77f4bbfd508fa4542c87c9e9b58cf1c63a99c630
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Nov 10 14:39:04 2021 +0100

    [MNG-5577] Use JSR 330 constructor injection
---
 .../apache/maven/caching/CacheControllerImpl.java  | 61 ++++++++++++----------
 .../org/apache/maven/caching/CacheEventSpy.java    | 10 ++--
 .../apache/maven/caching/CachingMojoExecutor.java  | 49 ++++++++---------
 .../apache/maven/caching/HttpRepositoryImpl.java   | 21 ++++----
 .../apache/maven/caching/LocalRepositoryImpl.java  | 33 +++++++-----
 .../maven/caching/MojoParametersListener.java      |  7 ++-
 .../apache/maven/caching/xml/CacheConfigImpl.java  | 13 +++--
 7 files changed, 109 insertions(+), 85 deletions(-)

diff --git a/maven-caching/src/main/java/org/apache/maven/caching/CacheControllerImpl.java b/maven-caching/src/main/java/org/apache/maven/caching/CacheControllerImpl.java
index 1444916..739d661 100644
--- a/maven-caching/src/main/java/org/apache/maven/caching/CacheControllerImpl.java
+++ b/maven-caching/src/main/java/org/apache/maven/caching/CacheControllerImpl.java
@@ -112,39 +112,42 @@ public class CacheControllerImpl implements CacheController
     private static final String GENERATEDSOURCES = "generatedsources";
     private static final String GENERATEDSOURCES_PREFIX = GENERATEDSOURCES + FILE_SEPARATOR_SUBST;
 
-    @Inject
-    private Logger logger;
-
-    @Inject
-    private MavenPluginManager mavenPluginManager;
-
-    @Inject
-    private MavenProjectHelper projectHelper;
-
-    @Inject
-    private LocalArtifactsRepository localCache;
-
-    @Inject
-    private RemoteArtifactsRepository remoteCache;
-
-    @Inject
-    private CacheConfig cacheConfig;
-
-    @Inject
-    private RepositorySystem repoSystem;
-
-    @Inject
-    private ArtifactHandlerManager artifactHandlerManager;
-
-    @Inject
-    private XmlService xmlService;
-
+    private final  Logger logger;
+    private final  MavenPluginManager mavenPluginManager;
+    private final  MavenProjectHelper projectHelper;
+    private final  LocalArtifactsRepository localCache;
+    private final RemoteArtifactsRepository remoteCache;
+    private final  CacheConfig cacheConfig;
+    private final  RepositorySystem repoSystem;
+    private final ArtifactHandlerManager artifactHandlerManager;
+    private final XmlService xmlService;
     private final ConcurrentMap<String, DigestItem> artifactDigestByKey = new ConcurrentHashMap<>();
-
     private final ConcurrentMap<String, CacheResult> cacheResults = new ConcurrentHashMap<>();
-
     private volatile Scm scm;
 
+    @Inject
+    public CacheControllerImpl(
+            Logger logger, 
+            MavenPluginManager mavenPluginManager, 
+            MavenProjectHelper projectHelper, 
+            LocalArtifactsRepository localCache, 
+            RemoteArtifactsRepository remoteCache, 
+            CacheConfig cacheConfig, 
+            RepositorySystem repoSystem, 
+            ArtifactHandlerManager artifactHandlerManager, 
+            XmlService xmlService )
+    {
+        this.logger = logger;
+        this.mavenPluginManager = mavenPluginManager;
+        this.projectHelper = projectHelper;
+        this.localCache = localCache;
+        this.remoteCache = remoteCache;
+        this.cacheConfig = cacheConfig;
+        this.repoSystem = repoSystem;
+        this.artifactHandlerManager = artifactHandlerManager;
+        this.xmlService = xmlService;
+    }
+
     @Override
     @Nonnull
     public CacheResult findCachedBuild( MavenSession session, MavenProject project, ProjectIndex projectIndex,
diff --git a/maven-caching/src/main/java/org/apache/maven/caching/CacheEventSpy.java b/maven-caching/src/main/java/org/apache/maven/caching/CacheEventSpy.java
index 39b83d6..cb5a80f 100644
--- a/maven-caching/src/main/java/org/apache/maven/caching/CacheEventSpy.java
+++ b/maven-caching/src/main/java/org/apache/maven/caching/CacheEventSpy.java
@@ -34,11 +34,15 @@ import org.apache.maven.execution.ExecutionEvent;
 @Named
 public class CacheEventSpy extends AbstractEventSpy
 {
-    @Inject
-    private CacheConfig cacheConfig;
+    private final CacheConfig cacheConfig;
+    private final CacheController cacheController;
 
     @Inject
-    private CacheController cacheController;
+    public CacheEventSpy( CacheConfig cacheConfig, CacheController cacheController )
+    {
+        this.cacheConfig = cacheConfig;
+        this.cacheController = cacheController;
+    }
 
     @Override
     public void onEvent( Object event ) throws Exception
diff --git a/maven-caching/src/main/java/org/apache/maven/caching/CachingMojoExecutor.java b/maven-caching/src/main/java/org/apache/maven/caching/CachingMojoExecutor.java
index c45dbae..d4e7ec4 100644
--- a/maven-caching/src/main/java/org/apache/maven/caching/CachingMojoExecutor.java
+++ b/maven-caching/src/main/java/org/apache/maven/caching/CachingMojoExecutor.java
@@ -83,33 +83,34 @@ import static org.apache.maven.caching.xml.CacheState.INITIALIZED;
 @Priority( 10 )
 public class CachingMojoExecutor implements MojoExecutor
 {
+    private final Logger logger;
+    private final BuildPluginManager pluginManager;
+    private final MavenPluginManager mavenPluginManager;
+    private final LifecycleDependencyResolver lifeCycleDependencyResolver;
+    private final ExecutionEventCatapult eventCatapult;
+    private final CacheController cacheController;
+    private final CacheConfig cacheConfig;
+    private final MojoParametersListener mojoListener;
 
     @Inject
-    private Logger logger;
-
-    @Inject
-    private BuildPluginManager pluginManager;
-
-    @Inject
-    private MavenPluginManager mavenPluginManager;
-
-    @Inject
-    private LifecycleDependencyResolver lifeCycleDependencyResolver;
-
-    @Inject
-    private ExecutionEventCatapult eventCatapult;
-
-    @Inject
-    private CacheController cacheController;
-
-    @Inject
-    private CacheConfig cacheConfig;
-
-    @Inject
-    private MojoParametersListener mojoListener;
-
-    public CachingMojoExecutor()
+    public CachingMojoExecutor(
+            Logger logger, 
+            BuildPluginManager pluginManager, 
+            MavenPluginManager mavenPluginManager, 
+            LifecycleDependencyResolver lifeCycleDependencyResolver, 
+            ExecutionEventCatapult eventCatapult, 
+            CacheController cacheController, 
+            CacheConfig cacheConfig, 
+            MojoParametersListener mojoListener )
     {
+        this.logger = logger;
+        this.pluginManager = pluginManager;
+        this.mavenPluginManager = mavenPluginManager;
+        this.lifeCycleDependencyResolver = lifeCycleDependencyResolver;
+        this.eventCatapult = eventCatapult;
+        this.cacheController = cacheController;
+        this.cacheConfig = cacheConfig;
+        this.mojoListener = mojoListener;
     }
 
     public DependencyContext newDependencyContext( MavenSession session, List<MojoExecution> mojoExecutions )
diff --git a/maven-caching/src/main/java/org/apache/maven/caching/HttpRepositoryImpl.java b/maven-caching/src/main/java/org/apache/maven/caching/HttpRepositoryImpl.java
index 8cf57ee..9cf169d 100644
--- a/maven-caching/src/main/java/org/apache/maven/caching/HttpRepositoryImpl.java
+++ b/maven-caching/src/main/java/org/apache/maven/caching/HttpRepositoryImpl.java
@@ -65,17 +65,20 @@ public class HttpRepositoryImpl implements RemoteArtifactsRepository
     public static final String BUILDINFO_XML = "buildinfo.xml";
     public static final String CACHE_REPORT_XML = "cache-report.xml";
 
-    @Inject
-    private Logger logger;
-
-    @Inject
-    LegacySupport legacySupport;
+    private final Logger logger;
+    private final LegacySupport legacySupport;
+    private final XmlService xmlService;
+    private final CacheConfig cacheConfig;
 
     @Inject
-    XmlService xmlService;
-
-    @Inject
-    private CacheConfig cacheConfig;
+    public HttpRepositoryImpl( Logger logger, LegacySupport legacySupport,
+                               XmlService xmlService, CacheConfig cacheConfig )
+    {
+        this.logger = logger;
+        this.legacySupport = legacySupport;
+        this.xmlService = xmlService;
+        this.cacheConfig = cacheConfig;
+    }
 
     @SuppressWarnings( "checkstyle:constantname" )
     private static final ThreadLocal<HttpClient> httpClient =
diff --git a/maven-caching/src/main/java/org/apache/maven/caching/LocalRepositoryImpl.java b/maven-caching/src/main/java/org/apache/maven/caching/LocalRepositoryImpl.java
index b7da9cd..c162e09 100644
--- a/maven-caching/src/main/java/org/apache/maven/caching/LocalRepositoryImpl.java
+++ b/maven-caching/src/main/java/org/apache/maven/caching/LocalRepositoryImpl.java
@@ -83,22 +83,27 @@ public class LocalRepositoryImpl implements LocalArtifactsRepository
     private static final long ONE_DAY_MILLIS = DAYS.toMillis( 1 );
     private static final String EMPTY = "";
 
-    @Inject
-    private Logger logger;
-
-    @Inject
-    private LegacySupport legacySupport;
-
-    @Inject
-    private RemoteArtifactsRepository remoteRepository;
-
-    @Inject
-    private XmlService xmlService;
+    private final Logger logger;
+    private final LegacySupport legacySupport;
+    private final RemoteArtifactsRepository remoteRepository;
+    private final XmlService xmlService;
+    private final CacheConfig cacheConfig;
+    private final Map<Pair<MavenSession, Dependency>, Optional<Build>> bestBuildCache = new ConcurrentHashMap<>();
 
     @Inject
-    private CacheConfig cacheConfig;
-
-    private final Map<Pair<MavenSession, Dependency>, Optional<Build>> bestBuildCache = new ConcurrentHashMap<>();
+    public LocalRepositoryImpl(
+            Logger logger,
+            LegacySupport legacySupport,
+            RemoteArtifactsRepository remoteRepository,
+            XmlService xmlService,
+            CacheConfig cacheConfig )
+    {
+        this.logger = logger;
+        this.legacySupport = legacySupport;
+        this.remoteRepository = remoteRepository;
+        this.xmlService = xmlService;
+        this.cacheConfig = cacheConfig;
+    }
 
     @Override
     public Build findLocalBuild( CacheContext context ) throws IOException
diff --git a/maven-caching/src/main/java/org/apache/maven/caching/MojoParametersListener.java b/maven-caching/src/main/java/org/apache/maven/caching/MojoParametersListener.java
index 78c81be..9f1de6d 100644
--- a/maven-caching/src/main/java/org/apache/maven/caching/MojoParametersListener.java
+++ b/maven-caching/src/main/java/org/apache/maven/caching/MojoParametersListener.java
@@ -44,8 +44,13 @@ public class MojoParametersListener implements MojoExecutionListener
     private final ConcurrentMap<MavenProject, Map<String, MojoExecutionEvent>> projectExecutions =
             new ConcurrentHashMap<>();
 
+    private final Logger logger;
+
     @Inject
-    private Logger logger;
+    public MojoParametersListener( Logger logger )
+    {
+        this.logger = logger;
+    }
 
     @Override
     public void beforeMojoExecution( MojoExecutionEvent event )
diff --git a/maven-caching/src/main/java/org/apache/maven/caching/xml/CacheConfigImpl.java b/maven-caching/src/main/java/org/apache/maven/caching/xml/CacheConfigImpl.java
index 96a20e4..c433117 100644
--- a/maven-caching/src/main/java/org/apache/maven/caching/xml/CacheConfigImpl.java
+++ b/maven-caching/src/main/java/org/apache/maven/caching/xml/CacheConfigImpl.java
@@ -83,11 +83,8 @@ public class CacheConfigImpl implements org.apache.maven.caching.xml.CacheConfig
     public static final String FAIL_FAST_PROPERTY_NAME = "remote.cache.failFast";
     public static final String BASELINE_BUILD_URL_PROPERTY_NAME = "remote.cache.baselineUrl";
 
-    @Inject
-    private Logger logger;
-
-    @Inject
-    private XmlService xmlService;
+    private final Logger logger;
+    private final XmlService xmlService;
 
     private volatile CacheState state = CacheState.NOT_INITIALIZED;
     private volatile CacheConfig cacheConfig;
@@ -97,6 +94,12 @@ public class CacheConfigImpl implements org.apache.maven.caching.xml.CacheConfig
 
     private List<Pattern> excludePatterns;
 
+    @Inject
+    public CacheConfigImpl( Logger logger, XmlService xmlService )
+    {
+        this.logger = logger;
+        this.xmlService = xmlService;
+    }
 
     @Override
     public synchronized CacheState initialize( MavenProject project, MavenSession session )