You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/01/18 20:24:57 UTC

[maven-project-info-reports-plugin] 01/01: Fix checkstyle issues

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

slachiewicz pushed a commit to branch fix-checkstype
in repository https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git

commit db82c71a36f878aed7258ac6af5a4ab8fa01b51b
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Jan 18 21:24:40 2020 +0100

    Fix checkstyle issues
---
 pom.xml                                            |  1 +
 .../projectinfo/DependencyConvergenceReport.java   | 27 +++++++++-------------
 .../report/projectinfo/ProjectInfoReportUtils.java |  2 --
 .../maven/report/projectinfo/TeamReport.java       |  3 ---
 .../renderer/DependenciesRenderer.java             |  5 ++--
 5 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index 692a7af..a1ddf8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,6 +125,7 @@ under the License.
     <sitePluginVersion>3.7</sitePluginVersion>
     <surefire.version>2.21.0</surefire.version>
     <javaVersion>7</javaVersion>
+    <checkstyle.violation.ignore>ParameterNumber,MethodLength</checkstyle.violation.ignore>
   </properties>
 
   <dependencies>
diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
index c47376e..875a11e 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
@@ -187,9 +187,8 @@ public class DependencyConvergenceReport
      * @param dependencyMap
      * @return snapshots dependencies
      */
-    // CHECKSTYLE_OFF: LineLength
-    private List<ReverseDependencyLink> getSnapshotDependencies( Map<String, List<ReverseDependencyLink>> dependencyMap )
-    // CHECKSTYLE_ON: LineLength
+    private List<ReverseDependencyLink> getSnapshotDependencies(
+                    Map<String, List<ReverseDependencyLink>> dependencyMap )
     {
         List<ReverseDependencyLink> snapshots = new ArrayList<>();
         for ( Map.Entry<String, List<ReverseDependencyLink>> entry : dependencyMap.entrySet() )
@@ -338,9 +337,8 @@ public class DependencyConvergenceReport
      * @param artifactMap
      * @param version
      */
-    // CHECKSTYLE_OFF: LineLength
-    private void generateVersionDetails( Sink sink, Map<String, List<ReverseDependencyLink>> artifactMap, String version )
-    // CHECKSTYLE_ON: LineLength
+    private void generateVersionDetails( Sink sink, Map<String, List<ReverseDependencyLink>> artifactMap,
+                    String version )
     {
         sink.numberedList( 0 ); // Use lower alpha numbering
         List<ReverseDependencyLink> depList = artifactMap.get( version );
@@ -766,10 +764,9 @@ public class DependencyConvergenceReport
      * @return DependencyAnalyzeResult contains conflicting dependencies map, snapshot dependencies map and all
      *         dependencies map.
      */
-    // CHECKSTYLE_OFF: LineLength
-    private DependencyAnalyzeResult populateDependencyAnalyzeResult( Map<String, List<ReverseDependencyLink>> conflictingDependencyMap,
-                                                                     Map<String, List<ReverseDependencyLink>> allDependencies )
-    // CHECKSTYLE_ON: LineLength
+    private DependencyAnalyzeResult populateDependencyAnalyzeResult(
+            Map<String, List<ReverseDependencyLink>> conflictingDependencyMap,
+            Map<String, List<ReverseDependencyLink>> allDependencies )
     {
         DependencyAnalyzeResult dependencyResult = new DependencyAnalyzeResult();
 
@@ -808,15 +805,13 @@ public class DependencyConvergenceReport
                 dependencyList = new ArrayList<>();
             }
 
-            // CHECKSTYLE_OFF: LineLength
-            dependencyList.add( new ReverseDependencyLink( toDependency( dependencyNode.getArtifact() ), reactorProject ) );
-            // CHECKSTYLE_ON: LineLength
+            dependencyList.add( new ReverseDependencyLink(
+                    toDependency( dependencyNode.getArtifact() ), reactorProject ) );
 
             for ( DependencyNode workNode : nodes.subList( 1, nodes.size() ) )
             {
-                // CHECKSTYLE_OFF: LineLength
-                dependencyList.add( new ReverseDependencyLink( toDependency( workNode.getArtifact() ), reactorProject ) );
-                // CHECKSTYLE_ON: LineLength
+                dependencyList.add( new ReverseDependencyLink(
+                        toDependency( workNode.getArtifact() ), reactorProject ) );
             }
 
             conflictingDependencyMap.put( key, dependencyList );
diff --git a/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java b/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
index b7d5181..3cb22b9 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
@@ -47,10 +47,8 @@ import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.ProjectBuilder;
 import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.project.ProjectBuildingRequest;
-// CHECKSTYLE_OFF: UnusedImports
 import org.apache.maven.reporting.AbstractMavenReportRenderer;
 import org.apache.maven.repository.RepositorySystem;
-// CHECKSTYLE_ON: UnusedImports
 import org.apache.maven.settings.Proxy;
 import org.apache.maven.settings.Server;
 import org.apache.maven.settings.Settings;
diff --git a/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java b/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java
index d9ff379..4ff61b1 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java
@@ -80,11 +80,8 @@ public class TeamReport
     @Override
     public void executeReport( Locale locale )
     {
-        // CHECKSTYLE_OFF: LineLength
         ProjectTeamRenderer r =
             new ProjectTeamRenderer( getSink(), project.getModel(), getI18N( locale ), locale, showAvatarImages );
-        // CHECKSTYLE_ON: LineLength
-
         r.render();
     }
 
diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
index b0169be..d483d64 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
@@ -660,9 +660,8 @@ public class DependenciesRenderer
         {
             if ( titles != null && content.length != titles.length )
             {
-                // CHECKSTYLE_OFF: LineLength
-                throw new IllegalArgumentException( "Length of title array must equal the length of the content array" );
-                // CHECKSTYLE_ON: LineLength
+                throw new IllegalArgumentException(
+                        "Length of title array must equal the length of the content array" );
             }
 
             for ( int i = 0; i < content.length; i++ )