[maven-antrun-plugin] 01/02: [MANTRUN-217] Small code improvements

[slachiewicz]

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

slachiewicz pushed a commit to branch MANTRUN-222
in repository https://gitbox.apache.org/repos/asf/maven-antrun-plugin.git

commit 4baa2f16d2ce8c2de05586ab4aa4a9b5ec8c497b
Author: Sylwester Lachiewicz <slachiew...@apache.org>
AuthorDate: Sun Feb 9 15:38:06 2020 +0100

    [MANTRUN-217] Small code improvements
---
 src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java    | 3 ++-
 .../java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java     | 4 ++--
 src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java       | 6 ++++--
 src/main/java/org/apache/maven/plugins/antrun/MavenLogger.java      | 4 +---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java 
b/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java
index 18afaa4..f57b21a 100644
--- a/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java
+++ b/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java
@@ -45,6 +45,7 @@ public class AttachArtifactTask
     /**
      * The refId of the Maven project helper component.
      */
+    @SuppressWarnings( "FieldCanBeLocal" )
     private String mavenProjectHelperRefId = 
AntRunMojo.DEFAULT_MAVEN_PROJECT_HELPER_REFID;
 
     /**
@@ -95,7 +96,7 @@ public class AttachArtifactTask
         }
 
         log( "Attaching " + file + " as an attached artifact", 
Project.MSG_VERBOSE );
-        MavenProjectHelper projectHelper = (MavenProjectHelper) 
getProject().getReference( mavenProjectHelperRefId );
+        MavenProjectHelper projectHelper = getProject().getReference( 
mavenProjectHelperRefId );
         projectHelper.attachArtifact( mavenProject, type, classifier, file );
     }
 
diff --git 
a/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java 
b/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
index 01ed138..38849e8 100644
--- a/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
+++ b/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
@@ -107,14 +107,14 @@ public class DependencyFilesetsTask
             throw new BuildException( "Maven project reference not found: " + 
mavenProjectId );
         }
 
-        MavenProject mavenProject = (MavenProject) 
this.getProject().getReference( "maven.project" );
+        MavenProject mavenProject = this.getProject().getReference( 
"maven.project" );
 
         // Add filesets for depenedency artifacts
         Set<Artifact> depArtifacts = filterArtifacts( 
mavenProject.getArtifacts() );
 
         FileSet dependenciesFileSet = new FileSet();
         dependenciesFileSet.setProject( getProject() );
-        ArtifactRepository localRepository = (ArtifactRepository) 
getProject().getReference( "maven.local.repository" );
+        ArtifactRepository localRepository = getProject().getReference( 
"maven.local.repository" );
         dependenciesFileSet.setDir( new File( localRepository.getBasedir() ) );
 
         if ( depArtifacts.isEmpty() )
diff --git a/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java 
b/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
index fe80897..84dc79b 100644
--- a/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
+++ b/src/main/java/org/apache/maven/plugins/antrun/AntRunMojo.java
@@ -196,6 +196,7 @@ public class AntRunMojo
      * @deprecated Use the <code>build-helper-maven-plugin</code> to bind 
source directories. For version 3.0.0, this
      *             parameter is only defined to break the build if you use it!
      */
+    @SuppressWarnings( "DeprecatedIsStillUsed" )
     @Deprecated
     @Parameter( property = "sourceRoot" )
     private File sourceRoot;
@@ -207,6 +208,7 @@ public class AntRunMojo
      * @deprecated Use the <code>build-helper-maven-plugin</code> to bind test 
source directories. For version 3.0.0,
      *             this parameter is only defined to break the build if you 
use it!
      */
+    @SuppressWarnings( "DeprecatedIsStillUsed" )
     @Deprecated
     @Parameter( property = "testSourceRoot" )
     private File testSourceRoot;
@@ -418,7 +420,7 @@ public class AntRunMojo
     {
         Properties mavenProps = mavenProject.getProperties();
         Properties userProps = session.getUserProperties();
-        List<String> allPropertyKeys = new ArrayList<String>( 
mavenProps.stringPropertyNames() );
+        List<String> allPropertyKeys = new ArrayList<>( 
mavenProps.stringPropertyNames() );
         allPropertyKeys.addAll( userProps.stringPropertyNames() );
         for ( String key : allPropertyKeys )
         {
@@ -522,7 +524,7 @@ public class AntRunMojo
     /**
      * Write the Ant target and surrounding tags to a temporary file
      *
-     * @throws IOException
+     * @throws IOException problem with write to file
      */
     private File writeTargetToProjectFile( String targetName )
         throws IOException
diff --git a/src/main/java/org/apache/maven/plugins/antrun/MavenLogger.java 
b/src/main/java/org/apache/maven/plugins/antrun/MavenLogger.java
index ceccd43..8a355be 100644
--- a/src/main/java/org/apache/maven/plugins/antrun/MavenLogger.java
+++ b/src/main/java/org/apache/maven/plugins/antrun/MavenLogger.java
@@ -50,13 +50,11 @@ public class MavenLogger
             case Project.MSG_WARN:
                 log.warn( message );
                 break;
-            case Project.MSG_INFO:
-                log.info( message );
-                break;
             case Project.MSG_DEBUG:
             case Project.MSG_VERBOSE:
                 log.debug( message );
                 break;
+            case Project.MSG_INFO:
             default:
                 log.info( message );
                 break;