You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2012/09/30 21:39:44 UTC

svn commit: r1392097 - in /maven/shared/trunk/maven-invoker/src: main/java/org/apache/maven/shared/invoker/ test/java/org/apache/maven/shared/invoker/

Author: rfscholte
Date: Sun Sep 30 19:39:43 2012
New Revision: 1392097

URL: http://svn.apache.org/viewvc?rev=1392097&view=rev
Log:
Add generics

Modified:
    maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java
    maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java
    maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
    maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java
    maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java

Modified: maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java?rev=1392097&r1=1392096&r2=1392097&view=diff
==============================================================================
--- maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java (original)
+++ maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationRequest.java Sun Sep 30 19:39:43 2012
@@ -44,7 +44,7 @@ public class DefaultInvocationRequest
 
     private String failureBehavior = REACTOR_FAIL_FAST;
 
-    private List goals;
+    private List<String> goals;
 
     private InputStream inputStream;
 
@@ -76,11 +76,11 @@ public class DefaultInvocationRequest
 
     private File javaHome;
 
-    private List profiles;
+    private List<String> profiles;
 
     private boolean nonPluginUpdates;
 
-    private Map shellEnvironments;
+    private Map<String, String> shellEnvironments;
 
     private String mavenOpts;
     
@@ -118,7 +118,7 @@ public class DefaultInvocationRequest
         return failureBehavior;
     }
 
-    public List getGoals()
+    public List<String> getGoals()
     {
         return goals;
     }
@@ -208,7 +208,7 @@ public class DefaultInvocationRequest
         return this;
     }
 
-    public InvocationRequest setGoals( List goals )
+    public InvocationRequest setGoals( List<String> goals )
     {
         this.goals = goals;
         return this;
@@ -323,12 +323,12 @@ public class DefaultInvocationRequest
         return this;
     }
 
-    public List getProfiles()
+    public List<String> getProfiles()
     {
         return profiles;
     }
 
-    public InvocationRequest setProfiles( List profiles )
+    public InvocationRequest setProfiles( List<String> profiles )
     {
         this.profiles = profiles;
         return this;
@@ -349,15 +349,15 @@ public class DefaultInvocationRequest
     {
         if ( this.shellEnvironmentInherited )
         {
-            this.shellEnvironments = new HashMap();
+            this.shellEnvironments = new HashMap<String, String>();
         }
         this.shellEnvironments.put( name, value );
         return this;
     }
 
-    public Map getShellEnvironments()
+    public Map<String, String> getShellEnvironments()
     {
-        return shellEnvironments == null ? Collections.EMPTY_MAP : shellEnvironments;
+        return shellEnvironments == null ? Collections.<String, String>emptyMap(): shellEnvironments;
     }
 
     public String getMavenOpts()

Modified: maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java?rev=1392097&r1=1392096&r2=1392097&view=diff
==============================================================================
--- maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java (original)
+++ maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/InvocationRequest.java Sun Sep 30 19:39:43 2012
@@ -211,7 +211,7 @@ public interface InvocationRequest
      * 
      * @return The goals for the Maven invocation or <code>null</code> if not set.
      */
-    List getGoals();
+    List<String> getGoals();
 
     /**
      * Gets the path to the user settings for the Maven invocation.
@@ -233,14 +233,14 @@ public interface InvocationRequest
      * 
      * @return The profiles for the Maven invocation or <code>null</code> if not set.
      */
-    List getProfiles();
+    List<String> getProfiles();
 
     /**
      * Gets the environment variables for the Maven invocation.
      * 
      * @return The environment variables for the Maven invocation or <code>null</code> if not set.
      */
-    Map getShellEnvironments();
+    Map<String, String> getShellEnvironments();
 
     /**
      * Gets the value of the <code>MAVEN_OPTS</code> environment variable.
@@ -440,7 +440,7 @@ public interface InvocationRequest
      * @param goals The goals for the Maven invocation, may be <code>null</code> to execute the POMs default goal.
      * @return This invocation request.
      */
-    InvocationRequest setGoals( List goals );
+    InvocationRequest setGoals( List<String> goals );
 
     /**
      * Sets the profiles for the Maven invocation.
@@ -448,7 +448,7 @@ public interface InvocationRequest
      * @param profiles The profiles for the Maven invocation, may be <code>null</code> to use the default profiles.
      * @return This invocation request.
      */
-    InvocationRequest setProfiles( List profiles );
+    InvocationRequest setProfiles( List<String> profiles );
 
     /**
      * Specifies whether the environment variables of the current process should be propagated to the Maven invocation.

Modified: maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java?rev=1392097&r1=1392096&r2=1392097&view=diff
==============================================================================
--- maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java (original)
+++ maven/shared/trunk/maven-invoker/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java Sun Sep 30 19:39:43 2012
@@ -189,17 +189,15 @@ public class MavenCommandLineBuilder
             cli.addEnvironment( "MAVEN_OPTS", request.getMavenOpts() );
         }
 
-        for ( Iterator iterator = request.getShellEnvironments().keySet().iterator(); iterator.hasNext(); )
+        for ( Map.Entry<String, String> entry : request.getShellEnvironments().entrySet() )
         {
-            String key = (String) iterator.next();
-            String value = (String) request.getShellEnvironments().get( key );
-            cli.addEnvironment( key, value );
+            cli.addEnvironment( entry.getKey(), entry.getValue() );
         }
     }
 
     protected void setProfiles( InvocationRequest request, Commandline cli )
     {
-        List profiles = request.getProfiles();
+        List<String> profiles = request.getProfiles();
 
         if ( ( profiles != null ) && !profiles.isEmpty() )
         {
@@ -211,7 +209,7 @@ public class MavenCommandLineBuilder
 
     protected void setGoals( InvocationRequest request, Commandline cli )
     {
-        List goals = request.getGoals();
+        List<String> goals = request.getGoals();
 
         if ( ( goals != null ) && !goals.isEmpty() )
         {

Modified: maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java?rev=1392097&r1=1392096&r2=1392097&view=diff
==============================================================================
--- maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java (original)
+++ maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java Sun Sep 30 19:39:43 2012
@@ -49,7 +49,7 @@ public class DefaultInvokerTest
 
         request.setDebug( true );
 
-        List goals = new ArrayList();
+        List<String> goals = new ArrayList<String>();
         goals.add( "clean" );
         goals.add( "package" );
 
@@ -72,7 +72,7 @@ public class DefaultInvokerTest
 
         request.setDebug( true );
 
-        List goals = new ArrayList();
+        List<String> goals = new ArrayList<String>();
         goals.add( "clean" );
         goals.add( "package" );
 
@@ -99,7 +99,7 @@ public class DefaultInvokerTest
 
         request.setDebug( true );
 
-        List goals = new ArrayList();
+        List<String> goals = new ArrayList<String>();
         goals.add( "clean" );
 
         request.setGoals( goals );
@@ -125,7 +125,7 @@ public class DefaultInvokerTest
 
         request.setDebug( true );
 
-        List goals = new ArrayList();
+        List<String> goals = new ArrayList<String>();
         goals.add( "validate" );
 
         request.setGoals( goals );
@@ -151,7 +151,7 @@ public class DefaultInvokerTest
 
         request.setDebug( true );
 
-        List goals = new ArrayList();
+        List<String> goals = new ArrayList<String>();
         goals.add( "validate" );
 
         request.setGoals( goals );
@@ -180,7 +180,7 @@ public class DefaultInvokerTest
 
         request.setDebug( true );
 
-        List goals = new ArrayList();
+        List<String> goals = new ArrayList<String>();
         goals.add( "validate" );
 
         request.setGoals( goals );

Modified: maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java?rev=1392097&r1=1392096&r2=1392097&view=diff
==============================================================================
--- maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java (original)
+++ maven/shared/trunk/maven-invoker/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java Sun Sep 30 19:39:43 2012
@@ -19,12 +19,6 @@ package org.apache.maven.shared.invoker;
  * under the License.
  */
 
-import junit.framework.TestCase;
-import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.utils.io.IOUtil;
-import org.apache.maven.shared.utils.Os;
-import org.apache.maven.shared.utils.cli.Commandline;
-
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -32,16 +26,22 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 import java.util.Set;
 
+import junit.framework.TestCase;
+
+import org.apache.maven.shared.utils.Os;
+import org.apache.maven.shared.utils.cli.Commandline;
+import org.apache.maven.shared.utils.io.FileUtils;
+import org.apache.maven.shared.utils.io.IOUtil;
+
 public class MavenCommandLineBuilderTest
     extends TestCase
 {
 
-    private List toDelete = new ArrayList();
+    private List<File> toDelete = new ArrayList<File>();
 
     private Properties sysProps;
 
@@ -456,7 +456,7 @@ public class MavenCommandLineBuilderTest
         
         tcb.setReactorBehavior( newRequest().activateReactor( includes, excludes ), cli );
         
-        Set args = new HashSet();
+        Set<String> args = new HashSet<String>();
         args.add( "-r" );
         args.add( "-D" );
         args.add( "maven.reactor.includes=foo,bar" );
@@ -525,7 +525,7 @@ public class MavenCommandLineBuilderTest
 
         tcb.setReactorBehavior( newRequest().setFailureBehavior( InvocationRequest.REACTOR_FAIL_FAST ), cli );
 
-        Set banned = new HashSet();
+        Set<String> banned = new HashSet<String>();
         banned.add( "-fae" );
         banned.add( "-fn" );
 
@@ -558,7 +558,7 @@ public class MavenCommandLineBuilderTest
 
         assertEquals( projectDir, cli.getWorkingDirectory() );
 
-        Set args = new HashSet();
+        Set<String> args = new HashSet<String>();
         args.add( "-f" );
         args.add( "non-standard-pom.xml" );
 
@@ -591,7 +591,7 @@ public class MavenCommandLineBuilderTest
 
         assertEquals( projectDir, cli.getWorkingDirectory() );
 
-        Set args = new HashSet();
+        Set<String> args = new HashSet<String>();
         args.add( "-f" );
         args.add( "non-standard-pom.xml" );
 
@@ -624,7 +624,7 @@ public class MavenCommandLineBuilderTest
 
         assertEquals( projectDir, cli.getWorkingDirectory() );
 
-        Set args = new HashSet();
+        Set<String> args = new HashSet<String>();
         args.add( "-f" );
         args.add( "pom.xml" );
 
@@ -657,7 +657,7 @@ public class MavenCommandLineBuilderTest
 
         assertEquals( projectDir, cli.getWorkingDirectory() );
 
-        Set args = new HashSet();
+        Set<String> args = new HashSet<String>();
         args.add( "-f" );
         args.add( "pom.xml" );
 
@@ -688,7 +688,7 @@ public class MavenCommandLineBuilderTest
 
         assertEquals( projectDir, cli.getWorkingDirectory() );
 
-        Set args = new HashSet();
+        Set<String> args = new HashSet<String>();
         args.add( "-f" );
         args.add( "pom.xml" );
 
@@ -719,7 +719,7 @@ public class MavenCommandLineBuilderTest
 
         assertEquals( projectDir, cli.getWorkingDirectory() );
 
-        Set args = new HashSet();
+        Set<String> args = new HashSet<String>();
         args.add( "-f" );
         args.add( "non-standard-pom.xml" );
 
@@ -747,7 +747,7 @@ public class MavenCommandLineBuilderTest
         TestCommandLineBuilder tcb = new TestCommandLineBuilder();
         tcb.setSettingsLocation( newRequest().setUserSettingsFile( settingsFile ), cli );
 
-        Set args = new HashSet();
+        Set<String> args = new HashSet<String>();
         args.add( "-s" );
         args.add( settingsFile.getCanonicalPath() );
 
@@ -809,7 +809,7 @@ public class MavenCommandLineBuilderTest
 
         Commandline cli = new Commandline();
 
-        List goals = new ArrayList();
+        List<String> goals = new ArrayList<String>();
         goals.add( "test" );
 
         TestCommandLineBuilder tcb = new TestCommandLineBuilder();
@@ -825,14 +825,14 @@ public class MavenCommandLineBuilderTest
 
         Commandline cli = new Commandline();
 
-        List goals = new ArrayList();
+        List<String> goals = new ArrayList<String>();
         goals.add( "test" );
         goals.add( "clean" );
 
         TestCommandLineBuilder tcb = new TestCommandLineBuilder();
         tcb.setGoals( newRequest().setGoals( goals ), cli );
 
-        assertArgumentsPresent( new HashSet( goals ), cli );
+        assertArgumentsPresent( new HashSet<String>( goals ), cli );
         assertArgumentsPresentInOrder( goals, cli );
     }
 
@@ -852,8 +852,8 @@ public class MavenCommandLineBuilderTest
 
         request.setBaseDirectory( projectDir );
 
-        Set expectedArgs = new HashSet();
-        Set bannedArgs = new HashSet();
+        Set<String> expectedArgs = new HashSet<String>();
+        Set<String> bannedArgs = new HashSet<String>();
 
         createDummyFile( projectDir, "pom.xml" );
 
@@ -872,7 +872,7 @@ public class MavenCommandLineBuilderTest
 
         expectedArgs.add( "-o" );
 
-        List goals = new ArrayList();
+        List<String> goals = new ArrayList<String>();
 
         goals.add( "post-clean" );
         goals.add( "deploy" );
@@ -923,7 +923,7 @@ public class MavenCommandLineBuilderTest
 
         createDummyFile( projectDir, "pom.xml" );
 
-        List goals = new ArrayList();
+        List<String> goals = new ArrayList<String>();
 
         goals.add( "clean" );
         request.setGoals( goals );
@@ -957,7 +957,7 @@ public class MavenCommandLineBuilderTest
 
         InvocationRequest request = newRequest();
 
-        List profiles = new ArrayList();
+        List<String> profiles = new ArrayList<String>();
         profiles.add( profile1 );
         profiles.add( profile2 );
 
@@ -984,10 +984,8 @@ public class MavenCommandLineBuilderTest
     {
         System.setProperties( sysProps );
 
-        for ( Iterator it = toDelete.iterator(); it.hasNext(); )
+        for ( File file : toDelete )
         {
-            File file = (File) it.next();
-
             if ( file.exists() )
             {
                 if ( file.isDirectory() )
@@ -1016,7 +1014,7 @@ public class MavenCommandLineBuilderTest
         assertArgumentsPresentInOrder( Arrays.asList( expected ), cli );
     }
 
-    private void assertArgumentsPresentInOrder( List expected, Commandline cli )
+    private void assertArgumentsPresentInOrder( List<String> expected, Commandline cli )
     {
         String[] arguments = cli.getArguments();
 
@@ -1034,28 +1032,24 @@ public class MavenCommandLineBuilderTest
             + Arrays.asList( arguments ), expected.size(), expectedCounter );
     }
 
-    private void assertArgumentsPresent( Set requiredArgs, Commandline cli )
+    private void assertArgumentsPresent( Set<String> requiredArgs, Commandline cli )
     {
         String[] argv = cli.getArguments();
-        List args = Arrays.asList( argv );
+        List<String> args = Arrays.asList( argv );
 
-        for ( Iterator it = requiredArgs.iterator(); it.hasNext(); )
+        for ( String arg : requiredArgs )
         {
-            String arg = (String) it.next();
-
             assertTrue( "Command-line argument: \'" + arg + "\' is missing in " + args, args.contains( arg ) );
         }
     }
 
-    private void assertArgumentsNotPresent( Set bannedArgs, Commandline cli )
+    private void assertArgumentsNotPresent( Set<String> bannedArgs, Commandline cli )
     {
         String[] argv = cli.getArguments();
-        List args = Arrays.asList( argv );
+        List<String> args = Arrays.asList( argv );
 
-        for ( Iterator it = bannedArgs.iterator(); it.hasNext(); )
+        for ( String arg : bannedArgs )
         {
-            String arg = (String) it.next();
-
             assertFalse( "Command-line argument: \'" + arg + "\' should not be present.", args.contains( arg ) );
         }
     }