Code simplifications

Author: michael-o

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

@@ -96,7 +96,7 @@ public abstract class AbstractProjectInfoReport extends AbstractMavenReport {
      *
      * @since 3.1.0
      */
-    @Parameter(property = "project.pluginArtifactRepositories")
+    @Parameter(defaultValue = "${project.pluginArtifactRepositories}", readonly = true, required = true)
     protected List<ArtifactRepository> pluginRepositories;
 
     /**
@@ -211,11 +211,6 @@ protected MavenSession getSession() {
         return session;
     }
 
-    /**
-     * Reactor projects
-     *
-     * @return List of projects
-     */
     protected List<MavenProject> getReactorProjects() {
         return reactorProjects;
     }

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

@@ -140,8 +140,8 @@ public void executeReport(Locale locale) {
                 projectBuilder,
                 repositorySystem,
                 resolver,
-                project.getRemoteArtifactRepositories(),
-                project.getPluginArtifactRepositories(),
+                remoteRepositories,
+                pluginRepositories,
                 buildingRequest,
                 repositoryMetadataManager);
 

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

@@ -96,8 +96,8 @@ public void executeReport(Locale locale) {
                 projectBuilder,
                 repositorySystem,
                 resolver,
-                project.getRemoteArtifactRepositories(),
-                project.getPluginArtifactRepositories(),
+                remoteRepositories,
+                pluginRepositories,
                 buildingRequest,
                 repositoryMetadataManager);
 

src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java

@@ -249,7 +249,7 @@ protected void startSection(String name) {
      * @param name not null
      */
     // TODO Remove me when MSHARED-390 has been resolved
-    protected void startSection(String anchor, String name) {
+    protected void startSection(String name, String anchor) {
         section = section + 1;
 
         super.sink.anchor(HtmlTools.encodeId(anchor));
@@ -435,8 +435,6 @@ private void renderSectionDependencyTree() {
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
 
-        pw.println("");
-        pw.println("<script language=\"javascript\" type=\"text/javascript\">");
         pw.println("      function toggleDependencyDetails( divId, imgId )");
         pw.println("      {");
         pw.println("        var div = document.getElementById( divId );");
@@ -454,9 +452,8 @@ private void renderSectionDependencyTree() {
         pw.printf("          img.alt='%s';%n", getI18nString("graph.icon.close"));
         pw.println("        }");
         pw.println("      }");
-        pw.println("</script>");
 
-        sink.rawText(sw.toString());
+        javaScript(sw.toString());
 
         // for Dependencies Graph Tree
         startSection(getI18nString("graph.tree.title"));
@@ -701,7 +698,7 @@ private void renderDependenciesForScope(String scope, List<Artifact> artifacts,
             String anchorByScope = (isTransitive
                     ? getI18nString("transitive.title") + "_" + scope
                     : getI18nString("title") + "_" + scope);
-            startSection(anchorByScope, scope);
+            startSection(scope, anchorByScope);
 
             paragraph(getI18nString("intro." + scope));
 
@@ -849,8 +846,7 @@ private void printDescriptionsAndURLs(DependencyNode node, String uid) {
 
                 List<License> licenses = artifactProject.getLicenses();
 
-                sink.table();
-                sink.tableRows(null, false);
+                startTable();
 
                 sink.tableRow();
                 sink.tableHeaderCell();
@@ -931,8 +927,7 @@ private void printDescriptionsAndURLs(DependencyNode node, String uid) {
                 sink.tableCell_();
                 sink.tableRow_();
 
-                sink.tableRows_();
-                sink.table_();
+                endTable();
             } catch (ProjectBuildingException e) {
                 sink.text(getI18nString("index", "nodescription"));
                 if (log.isDebugEnabled()) {
@@ -945,8 +940,7 @@ private void printDescriptionsAndURLs(DependencyNode node, String uid) {
                 }
             }
         } else {
-            sink.table();
-            sink.tableRows(null, false);
+            startTable();
 
             sink.tableRow();
             sink.tableHeaderCell();
@@ -976,8 +970,7 @@ private void printDescriptionsAndURLs(DependencyNode node, String uid) {
             sink.tableCell_();
             sink.tableRow_();
 
-            sink.tableRows_();
-            sink.table_();
+            endTable();
         }
 
         sink.rawText("</div>");