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/06/01 19:34:35 UTC
svn commit: r1345283 - in
/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer:
RequireActiveProfile.java RequireJavaVersion.java
RequireNoRepositories.java utils/EnforcerRuleUtils.java
Author: rfscholte
Date: Fri Jun 1 17:34:35 2012
New Revision: 1345283
URL: http://svn.apache.org/viewvc?rev=1345283&view=rev
Log:
Apply generics
Modified:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireJavaVersion.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java?rev=1345283&r1=1345282&r2=1345283&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireActiveProfile.java Fri Jun 1 17:34:35 2012
@@ -20,7 +20,6 @@ package org.apache.maven.plugins.enforce
*/
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
@@ -53,18 +52,18 @@ public class RequireActiveProfile
public void execute( EnforcerRuleHelper theHelper )
throws EnforcerRuleException
{
- List missingProfiles = new ArrayList();
+ List<String> missingProfiles = new ArrayList<String>();
try
{
MavenProject project = (MavenProject) theHelper.evaluate( "${project}" );
if ( StringUtils.isNotEmpty( profiles ) )
{
String[] profs = profiles.split( "," );
- for ( int i = 0; i < profs.length; i++ )
+ for ( String profile : profs )
{
- if ( !isProfileActive( project, profs[i] ) )
+ if ( !isProfileActive( project, profile ) )
{
- missingProfiles.add( profs[i] );
+ missingProfiles.add( profile );
}
}
@@ -87,16 +86,15 @@ public class RequireActiveProfile
if ( fail )
{
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
if ( message != null )
{
buf.append( message + "\n" );
}
- Iterator iter = missingProfiles.iterator();
- while ( iter.hasNext() )
+ for ( String profile : missingProfiles )
{
- buf.append( "Profile \"" + iter.next().toString() + "\" is not activated.\n" );
+ buf.append( "Profile \"" + profile + "\" is not activated.\n" );
}
throw new EnforcerRuleException( buf.toString() );
@@ -117,16 +115,16 @@ public class RequireActiveProfile
*
* @param project the project
* @param profileName the profile name
- * @return <code>true</code> if profile is active
+ * @return <code>true</code> if profile is active, otherwise <code>false</code>
*/
protected boolean isProfileActive( MavenProject project, String profileName )
{
- List activeProfiles = project.getActiveProfiles();
+ @SuppressWarnings( "unchecked" )
+ List<Profile> activeProfiles = project.getActiveProfiles();
if ( activeProfiles != null && !activeProfiles.isEmpty() )
{
- for ( Iterator it = activeProfiles.iterator(); it.hasNext(); )
+ for ( Profile profile : activeProfiles )
{
- Profile profile = (Profile) it.next();
if ( profile.getId().equals( profileName ) )
{
return true;
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireJavaVersion.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireJavaVersion.java?rev=1345283&r1=1345282&r2=1345283&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireJavaVersion.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireJavaVersion.java Fri Jun 1 17:34:35 2012
@@ -76,10 +76,10 @@ public class RequireJavaVersion
theJdkVersion = theJdkVersion.replaceAll( "_|-", "." );
String tokenArray[] = StringUtils.split( theJdkVersion, "." );
- List tokens = Arrays.asList( tokenArray );
+ List<String> tokens = Arrays.asList( tokenArray );
StringBuffer buffer = new StringBuffer( theJdkVersion.length() );
- Iterator iter = tokens.iterator();
+ Iterator<String> iter = tokens.iterator();
for ( int i = 0; i < tokens.size() && i < 4; i++ )
{
String section = (String) iter.next();
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java?rev=1345283&r1=1345282&r2=1345283&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireNoRepositories.java Fri Jun 1 17:34:35 2012
@@ -19,6 +19,12 @@ package org.apache.maven.plugins.enforce
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
@@ -31,13 +37,6 @@ import org.codehaus.plexus.component.con
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
/**
* This rule checks that this pom or its parents don't define a repository.
*
@@ -59,12 +58,12 @@ public class RequireNoRepositories
/**
* Specify explicitly allowed non-plugin repositories. This is a list of ids.
*/
- public List allowedRepositories = Collections.EMPTY_LIST;
+ public List<String> allowedRepositories = Collections.emptyList();
/**
* Specify explicitly allowed plugin repositories. This is a list of ids.
*/
- public List allowedPluginRepositories = Collections.EMPTY_LIST;
+ public List<String> allowedPluginRepositories = Collections.emptyList();
/**
* Whether to allow repositories which only resolve snapshots. By default they are banned.
@@ -91,23 +90,23 @@ public class RequireNoRepositories
{
project = (MavenProject) helper.evaluate( "${project}" );
- List models =
+ List<Model> models =
utils.getModelsRecursively( project.getGroupId(), project.getArtifactId(), project.getVersion(),
new File( project.getBasedir(), "pom.xml" ) );
- List badModels = new ArrayList();
+ List<Model> badModels = new ArrayList<Model>();
StringBuffer newMsg = new StringBuffer();
newMsg.append( "Some poms have repositories defined:\n" );
- for ( Iterator i = models.iterator(); i.hasNext(); )
+ for ( Model model : models )
{
- Model model = (Model) i.next();
if ( banRepositories )
{
- List repos = model.getRepositories();
+ @SuppressWarnings( "unchecked" )
+ List<Repository> repos = model.getRepositories();
if ( repos != null && !repos.isEmpty() )
{
- List bannedRepos =
+ List<String> bannedRepos =
findBannedRepositories( repos, allowedRepositories, allowSnapshotRepositories );
if ( !bannedRepos.isEmpty() )
{
@@ -120,10 +119,11 @@ public class RequireNoRepositories
}
if ( banPluginRepositories )
{
- List repos = model.getPluginRepositories();
+ @SuppressWarnings( "unchecked" )
+ List<Repository> repos = model.getPluginRepositories();
if ( repos != null && !repos.isEmpty() )
{
- List bannedRepos =
+ List<String> bannedRepos =
findBannedRepositories( repos, allowedPluginRepositories, allowSnapshotPluginRepositories );
if ( !bannedRepos.isEmpty() )
{
@@ -171,12 +171,11 @@ public class RequireNoRepositories
}
}
- private static List findBannedRepositories( List repos, List allowedRepos, boolean allowSnapshots )
+ private static List<String> findBannedRepositories( List<Repository> repos, List<String> allowedRepos, boolean allowSnapshots )
{
- List bannedRepos = new ArrayList( allowedRepos.size() );
- for ( Iterator i = repos.iterator(); i.hasNext(); )
+ List<String> bannedRepos = new ArrayList<String>( allowedRepos.size() );
+ for ( Repository r : repos )
{
- Repository r = (Repository) i.next();
if ( !allowedRepos.contains( r.getId() ) )
{
if ( !allowSnapshots || r.getReleases().isEnabled() )
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java?rev=1345283&r1=1345282&r2=1345283&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java Fri Jun 1 17:34:35 2012
@@ -62,7 +62,7 @@ public class EnforcerRuleUtils
ArtifactRepository local;
/** The remote repositories. */
- List remoteRepositories;
+ List<ArtifactRepository> remoteRepositories;
/** The log. */
Log log;
@@ -83,7 +83,7 @@ public class EnforcerRuleUtils
* @param theLog the the log
*/
public EnforcerRuleUtils( ArtifactFactory theFactory, ArtifactResolver theResolver, ArtifactRepository theLocal,
- List theRemoteRepositories, MavenProject project, Log theLog )
+ List<ArtifactRepository> theRemoteRepositories, MavenProject project, Log theLog )
{
super();
this.factory = theFactory;
@@ -99,6 +99,7 @@ public class EnforcerRuleUtils
*
* @param helper the helper
*/
+ @SuppressWarnings( "unchecked" )
public EnforcerRuleUtils( EnforcerRuleHelper helper )
{
@@ -231,10 +232,10 @@ public class EnforcerRuleUtils
* @throws IOException Signals that an I/O exception has occurred.
* @throws XmlPullParserException the xml pull parser exception
*/
- public List getModelsRecursively ( String groupId, String artifactId, String version, File pom )
+ public List<Model> getModelsRecursively ( String groupId, String artifactId, String version, File pom )
throws ArtifactResolutionException, ArtifactNotFoundException, IOException, XmlPullParserException
{
- List models = null;
+ List<Model> models = null;
Model model = getPomModel( groupId, artifactId, version, pom );
Parent parent = model.getParent();
@@ -262,7 +263,7 @@ public class EnforcerRuleUtils
else
{
// only create it here since I'm not at the top
- models = new ArrayList();
+ models = new ArrayList<Model>();
}
models.add( model );