Clean up code

apache · Apr 22, 2021 · 620b085 · 620b085
1 parent d3e52d0
commit 620b085
Show file tree

Hide file tree

Showing 37 changed files with 134 additions and 18 deletions.
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
@@ -182,6 +182,7 @@ public abstract class AbstractGeneratorMojo
     /**
      * {@inheritDoc}
      */
+    @Override
     public void execute()
         throws MojoExecutionException
     {

diff --git a/...n-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java b/...n-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
@@ -64,6 +64,7 @@ public class DescriptorGeneratorMojo
     /**
      * {@inheritDoc}
      */
+    @Override
     protected File getOutputDirectory()
     {
         return outputDirectory;
@@ -72,6 +73,7 @@ protected File getOutputDirectory()
     /**
      * {@inheritDoc}
      */
+    @Override
     protected Generator createGenerator()
     {
         return new PluginDescriptorGenerator( getLog() );
@@ -80,6 +82,7 @@ protected Generator createGenerator()
     /**
      * {@inheritDoc}
      */
+    @Override
     public void execute()
         throws MojoExecutionException
     {

diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java
@@ -67,6 +67,7 @@ public class HelpGeneratorMojo
     /**
      * {@inheritDoc}
      */
+    @Override
     protected File getOutputDirectory()
     {
         return outputDirectory;
@@ -75,6 +76,7 @@ protected File getOutputDirectory()
     /**
      * {@inheritDoc}
      */
+    @Override
     protected Generator createGenerator()
     {
         return new PluginHelpGenerator().setHelpPackageName( helpPackageName ).setVelocityComponent( this.velocity );
@@ -83,6 +85,7 @@ protected Generator createGenerator()
     /**
      * {@inheritDoc}
      */
+    @Override
     public void execute()
         throws MojoExecutionException
     {

diff --git a/.../src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java b/.../src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
@@ -72,6 +72,7 @@ public class AddPluginArtifactMetadataMojo
     private boolean skip;
 
     /** {@inheritDoc} */
+    @Override
     public void execute()
         throws MojoExecutionException
     {

diff --git a/.../main/java/org/apache/maven/plugins/plugin/descriptor/MNG6109PluginDescriptorBuilder.java b/.../main/java/org/apache/maven/plugins/plugin/descriptor/MNG6109PluginDescriptorBuilder.java
@@ -51,7 +51,7 @@ public MojoDescriptor buildComponentDescriptor( PlexusConfiguration c, PluginDes
         for ( PlexusConfiguration d : parameterConfigurations )
         {
             String parameterName = d.getChild( "name" ).getValue();
-            Parameter pd = (Parameter) mojoDescriptor.getParameterMap().get( parameterName );
+            Parameter pd = mojoDescriptor.getParameterMap().get( parameterName );
 
             String parameterSince = d.getChild( "since" ).getValue();
             pd.setSince( parameterSince );

diff --git a/...ache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java b/...ache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java
@@ -31,6 +31,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
@@ -97,6 +98,7 @@ public class JavaAnnotationsMojoDescriptorExtractor
     @org.codehaus.plexus.component.annotations.Requirement
     private ArchiverManager archiverManager;
 
+    @Override
     public List<MojoDescriptor> execute( PluginToolsRequest request )
         throws ExtractionException, InvalidPluginDescriptorException
     {
@@ -137,7 +139,7 @@ private Map<String, JavaClass> scanJavadoc( PluginToolsRequest request,
 
         for ( MojoAnnotatedClass mojoAnnotatedClass : mojoAnnotatedClasses )
         {
-            if ( StringUtils.equals( mojoAnnotatedClass.getArtifact().getArtifactId(),
+            if ( Objects.equals( mojoAnnotatedClass.getArtifact().getArtifactId(),
                                      request.getProject().getArtifact().getArtifactId() ) )
             {
                 continue;
@@ -413,12 +415,11 @@ protected Map<String, JavaClass> discoverClasses( final PluginToolsRequest reque
         return discoverClasses( request.getEncoding(), request.getProject() );
     }
 
-    @SuppressWarnings( "unchecked" )
     protected Map<String, JavaClass> discoverClasses( final String encoding, final MavenProject project )
     {
         List<File> sources = new ArrayList<>();
 
-        for ( String source : (List<String>) project.getCompileSourceRoots() )
+        for ( String source : project.getCompileSourceRoots() )
         {
             sources.add( new File( source ) );
         }
@@ -725,11 +726,10 @@ protected MavenProject getFromProjectReferences( Artifact artifact, MavenProject
         {
             return null;
         }
-        @SuppressWarnings( "unchecked" ) Collection<MavenProject> mavenProjects =
-            project.getProjectReferences().values();
+        Collection<MavenProject> mavenProjects = project.getProjectReferences().values();
         for ( MavenProject mavenProject : mavenProjects )
         {
-            if ( StringUtils.equals( mavenProject.getId(), artifact.getId() ) )
+            if ( Objects.equals( mavenProject.getId(), artifact.getId() ) )
             {
                 return mavenProject;
             }

diff --git a/...in/java/org/apache/maven/tools/plugin/extractor/annotations/datamodel/AnnotatedField.java b/...in/java/org/apache/maven/tools/plugin/extractor/annotations/datamodel/AnnotatedField.java
@@ -54,6 +54,7 @@ public String toString()
         return sb.toString();
     }
 
+    @Override
     public int compareTo( AnnotatedField annotatedField )
     {
         return getFieldName().compareTo( annotatedField.getFieldName() );

diff --git a/...apache/maven/tools/plugin/extractor/annotations/datamodel/ComponentAnnotationContent.java b/...apache/maven/tools/plugin/extractor/annotations/datamodel/ComponentAnnotationContent.java
@@ -47,6 +47,7 @@ public ComponentAnnotationContent( String fieldName, String role, String hint )
         this.hint = hint;
     }
 
+    @Override
     public Class<?> role()
     {
         // not used
@@ -63,6 +64,7 @@ public String getRoleClassName()
         return roleClassName;
     }
 
+    @Override
     public String hint()
     {
         return hint == null ? "" : hint;
@@ -73,6 +75,7 @@ public void hint( String hint )
         this.hint = hint;
     }
 
+    @Override
     public Class<? extends Annotation> annotationType()
     {
         return null;

diff --git a/...g/apache/maven/tools/plugin/extractor/annotations/datamodel/ExecuteAnnotationContent.java b/...g/apache/maven/tools/plugin/extractor/annotations/datamodel/ExecuteAnnotationContent.java
@@ -37,16 +37,19 @@ public class ExecuteAnnotationContent
 
     private LifecyclePhase phase;
 
+    @Override
     public LifecyclePhase phase()
     {
         return this.phase;
     }
 
+    @Override
     public String goal()
     {
         return this.goal;
     }
 
+    @Override
     public String lifecycle()
     {
         return this.lifecycle;
@@ -69,6 +72,7 @@ public void lifecycle( String lifecycle )
     }
 
 
+    @Override
     public Class<? extends Annotation> annotationType()
     {
         return null;

diff --git a/.../org/apache/maven/tools/plugin/extractor/annotations/datamodel/MojoAnnotationContent.java b/.../org/apache/maven/tools/plugin/extractor/annotations/datamodel/MojoAnnotationContent.java
@@ -62,11 +62,13 @@ public class MojoAnnotationContent
 
     private boolean threadSafe = false;
 
+    @Override
     public Class<? extends Annotation> annotationType()
     {
         return null;
     }
 
+    @Override
     public LifecyclePhase defaultPhase()
     {
         return defaultPhase;
@@ -77,6 +79,7 @@ public void defaultPhase( String phase )
         this.defaultPhase = LifecyclePhase.valueOf( phase );
     }
 
+    @Override
     public ResolutionScope requiresDependencyResolution()
     {
         return requiresDependencyResolution;
@@ -87,6 +90,7 @@ public void requiresDependencyResolution( String requiresDependencyResolution )
         this.requiresDependencyResolution = ResolutionScope.valueOf( requiresDependencyResolution );
     }
 
+    @Override
     public ResolutionScope requiresDependencyCollection()
     {
         return requiresDependencyCollection;
@@ -97,6 +101,7 @@ public void requiresDependencyCollection( String requiresDependencyCollection )
         this.requiresDependencyCollection = ResolutionScope.valueOf( requiresDependencyCollection );
     }
 
+    @Override
     public InstantiationStrategy instantiationStrategy()
     {
         return instantiationStrategy;
@@ -107,6 +112,7 @@ public void instantiationStrategy( String instantiationStrategy )
         this.instantiationStrategy = InstantiationStrategy.valueOf( instantiationStrategy );
     }
 
+    @Override
     public String executionStrategy()
     {
         return executionStrategy;
@@ -117,6 +123,7 @@ public void executionStrategy( String executionStrategy )
         this.executionStrategy = executionStrategy;
     }
 
+    @Override
     public boolean requiresProject()
     {
         return requiresProject;
@@ -127,6 +134,7 @@ public void requiresProject( boolean requiresProject )
         this.requiresProject = requiresProject;
     }
 
+    @Override
     public boolean requiresReports()
     {
         return requiresReports;
@@ -137,6 +145,7 @@ public void requiresReports( boolean requiresReports )
         this.requiresReports = requiresReports;
     }
 
+    @Override
     public boolean aggregator()
     {
         return aggregator;
@@ -147,6 +156,7 @@ public void aggregator( boolean aggregator )
         this.aggregator = aggregator;
     }
 
+    @Override
     public boolean requiresDirectInvocation()
     {
         return requiresDirectInvocation;
@@ -157,6 +167,7 @@ public void requiresDirectInvocation( boolean requiresDirectInvocation )
         this.requiresDirectInvocation = requiresDirectInvocation;
     }
 
+    @Override
     public boolean requiresOnline()
     {
         return requiresOnline;
@@ -167,6 +178,7 @@ public void requiresOnline( boolean requiresOnline )
         this.requiresOnline = requiresOnline;
     }
 
+    @Override
     public boolean inheritByDefault()
     {
         return inheritByDefault;
@@ -177,6 +189,7 @@ public void inheritByDefault( boolean inheritByDefault )
         this.inheritByDefault = inheritByDefault;
     }
 
+    @Override
     public String configurator()
     {
         return configurator;
@@ -187,6 +200,7 @@ public void configurator( String configurator )
         this.configurator = configurator;
     }
 
+    @Override
     public boolean threadSafe()
     {
         return threadSafe;
@@ -197,6 +211,7 @@ public void threadSafe( boolean threadSafe )
         this.threadSafe = threadSafe;
     }
 
+    @Override
     public String name()
     {
         return this.name;

diff --git a/...apache/maven/tools/plugin/extractor/annotations/datamodel/ParameterAnnotationContent.java b/...apache/maven/tools/plugin/extractor/annotations/datamodel/ParameterAnnotationContent.java
@@ -63,6 +63,7 @@ public ParameterAnnotationContent( String fieldName, String alias, String proper
         this.readonly = readonly;
     }
 
+    @Override
     public String name()
     {
         return name;
@@ -73,6 +74,7 @@ public void name( String name )
         this.name = name;
     }
 
+    @Override
     public String alias()
     {
         return alias;
@@ -83,6 +85,7 @@ public void alias( String alias )
         this.alias = alias;
     }
 
+    @Override
     public String property()
     {
         return property;
@@ -93,6 +96,7 @@ public void property( String property )
         this.property = property;
     }
 
+    @Override
     public String defaultValue()
     {
         return defaultValue;
@@ -103,6 +107,7 @@ public void defaultValue( String defaultValue )
         this.defaultValue = defaultValue;
     }
 
+    @Override
     public boolean required()
     {
         return required;
@@ -113,6 +118,7 @@ public void required( boolean required )
         this.required = required;
     }
 
+    @Override
     public boolean readonly()
     {
         return readonly;
@@ -123,6 +129,7 @@ public void readonly( boolean readonly )
         this.readonly = readonly;
     }
 
+    @Override
     public Class<? extends Annotation> annotationType()
     {
         return null;

diff --git a/...pache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScanner.java b/...pache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScanner.java
@@ -66,6 +66,7 @@ public class DefaultMojoAnnotationsScanner
 
     private Reflector reflector = new Reflector();
 
+    @Override
     public Map<String, MojoAnnotatedClass> scan( MojoAnnotationsScannerRequest request )
         throws ExtractionException
     {
@@ -311,7 +312,7 @@ protected void analyzeVisitors( MojoClassVisitor mojoClassVisitor )
                     for ( Map.Entry<String, Object> entry : annotationVisitor.getAnnotationValues().entrySet() )
                     {
                         String methodName = entry.getKey();
-                        if ( StringUtils.equals( "role", methodName ) )
+                        if ( "role".equals( methodName ) )
                         {
                             Type type = (Type) entry.getValue();
                             componentAnnotationContent.setRoleClassName( type.getClassName() );