Convert to Guice constructor injection (#90)

* Convert to Guice constructor injection

Author: elharo

pom.xml

@@ -267,6 +267,18 @@ under the License.
       <version>${doxiaSitetoolsVersion}</version>
     </dependency>
 
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.sisu</groupId>
+      <artifactId>org.eclipse.sisu.plexus</artifactId>
+      <version>0.9.0.M3</version>
+      <scope>provided</scope>
+    </dependency>
     <!-- Plexus -->
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java

@@ -36,7 +36,6 @@
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.plugin.MojoExecution;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.ProjectBuilder;
@@ -61,31 +60,6 @@
  * @since 2.0
  */
 public abstract class AbstractProjectInfoReport extends AbstractMavenReport {
-    // ----------------------------------------------------------------------
-    // Mojo components
-    // ----------------------------------------------------------------------
-
-    /**
-     * Artifact Resolver component.
-     */
-    @Component
-    protected ArtifactResolver resolver;
-
-    /**
-     * Artifact Factory component.
-     */
-    @Component
-    RepositorySystem repositorySystem;
-
-    /**
-     * Internationalization component, could support also custom bundle using {@link #customBundle}.
-     */
-    @Component
-    private I18N i18n;
-
-    @Component
-    protected ProjectBuilder projectBuilder;
-
     // ----------------------------------------------------------------------
     // Mojo parameters
     // ----------------------------------------------------------------------
@@ -152,6 +126,35 @@ public abstract class AbstractProjectInfoReport extends AbstractMavenReport {
     @Parameter(defaultValue = "${localRepository}", readonly = true, required = true)
     protected ArtifactRepository localRepository;
 
+    // ----------------------------------------------------------------------
+    // Mojo components
+    // ----------------------------------------------------------------------
+
+    /**
+     * Artifact Resolver component.
+     */
+    protected final ArtifactResolver resolver;
+
+    /**
+     * Artifact Factory component.
+     */
+    final RepositorySystem repositorySystem;
+
+    /**
+     * Internationalization component, could support also custom bundle using {@link #customBundle}.
+     */
+    private I18N i18n;
+
+    protected final ProjectBuilder projectBuilder;
+
+    protected AbstractProjectInfoReport(
+            ArtifactResolver resolver, RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
+        this.resolver = resolver;
+        this.repositorySystem = repositorySystem;
+        this.i18n = i18n;
+        this.projectBuilder = projectBuilder;
+    }
+
     // ----------------------------------------------------------------------
     // Public methods
     // ----------------------------------------------------------------------
@@ -209,7 +212,7 @@ protected MojoExecution getMojoExecution() {
 
     /**
      * @param pluginId The id of the plugin
-     * @return The information about the plugin.
+     * @return The information about the plugin
      */
     protected Plugin getPlugin(String pluginId) {
         if ((getProject().getBuild() == null) || (getProject().getBuild().getPluginsAsMap() == null)) {
@@ -232,9 +235,9 @@ protected Plugin getPlugin(String pluginId) {
     }
 
     /**
-     * @param pluginId The pluginId
-     * @param param The child which should be checked.
-     * @return The value of the dom tree.
+     * @param pluginId the pluginId
+     * @param param the child which should be checked
+     * @return the value of the dom tree
      */
     protected String getPluginParameter(String pluginId, String param) {
         Plugin plugin = getPlugin(pluginId);

src/main/java/org/apache/maven/report/projectinfo/CiManagementReport.java

@@ -18,6 +18,8 @@
  */
 package org.apache.maven.report.projectinfo;
 
+import javax.inject.Inject;
+
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -29,7 +31,10 @@
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Notifier;
 import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.project.ProjectBuilder;
 import org.apache.maven.reporting.MavenReportException;
+import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
 import org.codehaus.plexus.i18n.I18N;
 
 /**
@@ -40,6 +45,12 @@
  */
 @Mojo(name = "ci-management")
 public class CiManagementReport extends AbstractProjectInfoReport {
+
+    @Inject
+    public CiManagementReport(
+            ArtifactResolver resolver, RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
+        super(resolver, repositorySystem, i18n, projectBuilder);
+    }
     // ----------------------------------------------------------------------
     // Public methods
     // ----------------------------------------------------------------------

src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java

@@ -18,6 +18,9 @@
  */
 package org.apache.maven.report.projectinfo;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -32,21 +35,24 @@
 import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
 import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
 import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.DefaultProjectBuildingRequest;
+import org.apache.maven.project.ProjectBuilder;
 import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.report.projectinfo.dependencies.Dependencies;
 import org.apache.maven.report.projectinfo.dependencies.DependenciesReportConfiguration;
 import org.apache.maven.report.projectinfo.dependencies.RepositoryUtils;
 import org.apache.maven.report.projectinfo.dependencies.renderer.DependenciesRenderer;
 import org.apache.maven.reporting.MavenReportException;
+import org.apache.maven.repository.RepositorySystem;
 import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder;
 import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException;
 import org.apache.maven.shared.dependency.graph.DependencyNode;
 import org.apache.maven.shared.jar.classes.JarClassesAnalysis;
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
+import org.codehaus.plexus.i18n.I18N;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
 
@@ -64,6 +70,19 @@ public class DependenciesReport extends AbstractProjectInfoReport {
      */
     private static final String RESOURCES_DIR = "org/apache/maven/report/projectinfo/resources";
 
+    // ----------------------------------------------------------------------
+    // Mojo parameters
+    // ----------------------------------------------------------------------
+
+    /**
+     * Display file details for each dependency, such as: file size, number of
+     * classes, number of packages etc.
+     *
+     * @since 2.1
+     */
+    @Parameter(property = "dependency.details.enabled", defaultValue = "true")
+    private boolean dependencyDetailsEnabled;
+
     // ----------------------------------------------------------------------
     // Mojo components
     // ----------------------------------------------------------------------
@@ -73,37 +92,36 @@ public class DependenciesReport extends AbstractProjectInfoReport {
      *
      * @since 2.5
      */
-    @Component(hint = "default")
-    private DependencyGraphBuilder dependencyGraphBuilder;
+    private final DependencyGraphBuilder dependencyGraphBuilder;
 
     /**
      * Jar classes analyzer component.
      *
      * @since 2.1
      */
-    @Component
-    private JarClassesAnalysis classesAnalyzer;
+    private final JarClassesAnalysis classesAnalyzer;
 
     /**
      * Repository metadata component.
      *
      * @since 2.1
      */
-    @Component
-    private RepositoryMetadataManager repositoryMetadataManager;
+    private final RepositoryMetadataManager repositoryMetadataManager;
 
-    // ----------------------------------------------------------------------
-    // Mojo parameters
-    // ----------------------------------------------------------------------
-
-    /**
-     * Display file details for each dependency, such as: file size, number of
-     * classes, number of packages etc.
-     *
-     * @since 2.1
-     */
-    @Parameter(property = "dependency.details.enabled", defaultValue = "true")
-    private boolean dependencyDetailsEnabled;
+    @Inject
+    protected DependenciesReport(
+            ArtifactResolver resolver,
+            RepositorySystem repositorySystem,
+            I18N i18n,
+            ProjectBuilder projectBuilder,
+            @Named("default") DependencyGraphBuilder dependencyGraphBuilder,
+            JarClassesAnalysis classesAnalyzer,
+            RepositoryMetadataManager repositoryMetadataManager) {
+        super(resolver, repositorySystem, i18n, projectBuilder);
+        this.dependencyGraphBuilder = dependencyGraphBuilder;
+        this.classesAnalyzer = classesAnalyzer;
+        this.repositoryMetadataManager = repositoryMetadataManager;
+    }
 
     // ----------------------------------------------------------------------
     // Public methods

src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java

@@ -18,6 +18,8 @@
  */
 package org.apache.maven.report.projectinfo;
 
+import javax.inject.Inject;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -37,14 +39,15 @@
 import org.apache.maven.doxia.sink.SinkEventAttributes;
 import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet;
 import org.apache.maven.model.Dependency;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.project.DefaultProjectBuildingRequest;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.ProjectBuilder;
 import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.report.projectinfo.dependencies.DependencyVersionMap;
 import org.apache.maven.report.projectinfo.dependencies.SinkSerializingDependencyNodeVisitor;
 import org.apache.maven.reporting.MavenReportException;
+import org.apache.maven.repository.RepositorySystem;
 import org.apache.maven.shared.artifact.filter.StrictPatternIncludesArtifactFilter;
 import org.apache.maven.shared.dependency.graph.DependencyCollectorBuilder;
 import org.apache.maven.shared.dependency.graph.DependencyCollectorBuilderException;
@@ -57,6 +60,8 @@
 import org.apache.maven.shared.dependency.graph.traversal.CollectingDependencyNodeVisitor;
 import org.apache.maven.shared.dependency.graph.traversal.DependencyNodeVisitor;
 import org.apache.maven.shared.dependency.graph.traversal.FilteringDependencyNodeVisitor;
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
+import org.codehaus.plexus.i18n.I18N;
 
 /**
  * Generates the Project Dependency Convergence report for (reactor) builds.
@@ -80,19 +85,29 @@ public class DependencyConvergenceReport extends AbstractProjectInfoReport {
 
     private static final int FULL_CONVERGENCE = 100;
 
+    private ArtifactFilter filter = null;
+
+    private Map<MavenProject, DependencyNode> projectMap = new HashMap<>();
+
     // ----------------------------------------------------------------------
     // Mojo parameters
     // ----------------------------------------------------------------------
 
     /**
      * Raw dependency collector builder, will use it to build dependency tree.
      */
-    @Component
-    private DependencyCollectorBuilder dependencyCollectorBuilder;
-
-    private ArtifactFilter filter = null;
-
-    private Map<MavenProject, DependencyNode> projectMap = new HashMap<>();
+    private final DependencyCollectorBuilder dependencyCollectorBuilder;
+
+    @Inject
+    protected DependencyConvergenceReport(
+            ArtifactResolver resolver,
+            RepositorySystem repositorySystem,
+            I18N i18n,
+            ProjectBuilder projectBuilder,
+            DependencyCollectorBuilder dependencyCollectorBuilder) {
+        super(resolver, repositorySystem, i18n, projectBuilder);
+        this.dependencyCollectorBuilder = dependencyCollectorBuilder;
+    }
 
     // ----------------------------------------------------------------------
     // Public methods

src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java

@@ -18,13 +18,18 @@
  */
 package org.apache.maven.report.projectinfo;
 
+import javax.inject.Inject;
+
 import java.util.Formatter;
 import java.util.Locale;
 
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.ProjectBuilder;
 import org.apache.maven.reporting.MavenReportException;
+import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
 import org.codehaus.plexus.i18n.I18N;
 
 /**
@@ -39,26 +44,24 @@ public final class DependencyInformationReport extends AbstractProjectInfoReport
     private static final String JAR_PACKAGING = "jar";
     private static final String PLUGIN_PACKAGING = "maven-plugin";
 
-    /**
-     */
     @Parameter(defaultValue = "${project.groupId}", required = true)
     protected String groupId;
 
-    /**
-     */
     @Parameter(defaultValue = "${project.artifactId}", required = true)
     protected String artifactId;
 
-    /**
-     */
     @Parameter(defaultValue = "${project.version}", required = true)
     protected String version;
 
-    /**
-     */
     @Parameter(defaultValue = "${project.packaging}", required = true)
     protected String packaging;
 
+    @Inject
+    public DependencyInformationReport(
+            ArtifactResolver resolver, RepositorySystem repositorySystem, I18N i18n, ProjectBuilder projectBuilder) {
+        super(resolver, repositorySystem, i18n, projectBuilder);
+    }
+
     // ----------------------------------------------------------------------
     // Public methods
     // ----------------------------------------------------------------------