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 2017/07/21 13:39:48 UTC
svn commit: r1802595 - in /maven/enforcer/trunk:
enforcer-api/src/main/java/org/apache/maven/enforcer/rule/api/
enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/
enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/
enforc...
Author: rfscholte
Date: Fri Jul 21 13:39:48 2017
New Revision: 1802595
URL: http://svn.apache.org/viewvc?rev=1802595&view=rev
Log:
Apply generics, add @Override
Removed:
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/NoSnapshots.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestNoSnapshots.java
Modified:
maven/enforcer/trunk/enforcer-api/src/main/java/org/apache/maven/enforcer/rule/api/EnforcerRule.java
maven/enforcer/trunk/enforcer-api/src/main/java/org/apache/maven/enforcer/rule/api/EnforcerRuleHelper.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractNonCacheableEnforcerRule.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractPropertyEnforcerRule.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractStandardEnforcerRule.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDistributionManagement.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDuplicatePomDependencyVersions.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanTransitiveDependencies.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedDependencies.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedPlugins.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedRepositories.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DefaultEnforcementRuleHelper.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergence.java
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/RequireEnvironmentVariable.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesDontExist.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesExist.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesSize.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/RequireMavenVersion.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/RequireOS.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePrerequisite.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseDeps.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSameVersions.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSnapshotVersion.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DependencyVersionMap.java
maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/EnforcerRuleUtils.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequirePluginVersions.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/MockEnforcerExpressionEvaluator.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestEnforcerRuleUtils.java
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestMockEnforcerExpressionEvaluator.java
Modified: maven/enforcer/trunk/enforcer-api/src/main/java/org/apache/maven/enforcer/rule/api/EnforcerRule.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/src/main/java/org/apache/maven/enforcer/rule/api/EnforcerRule.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-api/src/main/java/org/apache/maven/enforcer/rule/api/EnforcerRule.java (original)
+++ maven/enforcer/trunk/enforcer-api/src/main/java/org/apache/maven/enforcer/rule/api/EnforcerRule.java Fri Jul 21 13:39:48 2017
@@ -57,7 +57,10 @@ public interface EnforcerRule
boolean isCacheable();
/**
- * Checks if cached result is valid.
+ * If the rule is cacheable and the same id is found in the cache, the stored results are passed to this method to
+ * allow double checking of the results. Most of the time this can be done by generating unique ids, but sometimes
+ * the results of objects returned by the helper need to be queried. You may for example, store certain objects in
+ * your rule and then query them later.
*
* @param cachedRule the last cached instance of the rule. This is to be used by the rule to
* potentially determine if the results are still valid (ie if the configuration has been overridden)
Modified: maven/enforcer/trunk/enforcer-api/src/main/java/org/apache/maven/enforcer/rule/api/EnforcerRuleHelper.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-api/src/main/java/org/apache/maven/enforcer/rule/api/EnforcerRuleHelper.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-api/src/main/java/org/apache/maven/enforcer/rule/api/EnforcerRuleHelper.java (original)
+++ maven/enforcer/trunk/enforcer-api/src/main/java/org/apache/maven/enforcer/rule/api/EnforcerRuleHelper.java Fri Jul 21 13:39:48 2017
@@ -59,7 +59,7 @@ public interface EnforcerRuleHelper
* @throws ComponentLookupException the component lookup exception
*/
@Nonnull
- Object getComponent ( Class clazz )
+ <T> T getComponent ( Class<T> clazz )
throws ComponentLookupException;
/**
@@ -89,6 +89,19 @@ public interface EnforcerRuleHelper
throws ComponentLookupException;
/**
+ * Gets the component.
+ *
+ * @param clazz the clazz
+ * @param roleHint the role hint
+ *
+ * @return the component
+ *
+ * @throws ComponentLookupException the component lookup exception
+ */
+ <T> T getComponent ( Class<T> clazz, String roleHint )
+ throws ComponentLookupException;
+
+ /**
* Gets the component map.
*
* @param role the role
@@ -97,7 +110,7 @@ public interface EnforcerRuleHelper
*
* @throws ComponentLookupException the component lookup exception
*/
- Map getComponentMap ( String role )
+ Map<String, ?> getComponentMap ( String role )
throws ComponentLookupException;
/**
@@ -109,7 +122,7 @@ public interface EnforcerRuleHelper
*
* @throws ComponentLookupException the component lookup exception
*/
- List getComponentList ( String role )
+ List<?> getComponentList ( String role )
throws ComponentLookupException;
/**
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractBanDependencies.java Fri Jul 21 13:39:48 2017
@@ -47,12 +47,7 @@ public abstract class AbstractBanDepende
private transient DependencyGraphBuilder graphBuilder;
- /**
- * Execute the rule.
- *
- * @param helper the helper
- * @throws EnforcerRuleException the enforcer rule exception
- */
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractNonCacheableEnforcerRule.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractNonCacheableEnforcerRule.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractNonCacheableEnforcerRule.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractNonCacheableEnforcerRule.java Fri Jul 21 13:39:48 2017
@@ -31,35 +31,21 @@ import org.apache.maven.enforcer.rule.ap
public abstract class AbstractNonCacheableEnforcerRule
extends AbstractStandardEnforcerRule
{
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.maven.enforcer.rule.api.EnforcerRule#getCacheId()
- */
+ @Override
public String getCacheId()
{
return "0";
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isCacheable()
- */
+ @Override
public boolean isCacheable()
{
return false;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isResultValid(org.apache.maven.enforcer.rule.api.EnforcerRule)
- */
+ @Override
public boolean isResultValid( EnforcerRule cachedRule )
{
return false;
}
-
}
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractPropertyEnforcerRule.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractPropertyEnforcerRule.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractPropertyEnforcerRule.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractPropertyEnforcerRule.java Fri Jul 21 13:39:48 2017
@@ -93,14 +93,8 @@ public abstract class AbstractPropertyEn
{
return regexMessage;
}
-
- /**
- * Execute the rule.
- *
- * @param helper the helper
- * @throws EnforcerRuleException the enforcer rule exception
- */
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractRequireFiles.java Fri Jul 21 13:39:48 2017
@@ -59,11 +59,7 @@ public abstract class AbstractRequireFil
*/
abstract String getErrorMsg();
- /*
- * (non-Javadoc)
- *
- * @see org.apache.maven.enforcer.rule.api.EnforcerRule#execute(org.apache.maven.enforcer.rule.api.EnforcerRuleHelper)
- */
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
@@ -114,14 +110,7 @@ public abstract class AbstractRequireFil
}
}
- /**
- * If your rule is cacheable, you must return a unique id when parameters or conditions change that would cause the
- * result to be different. Multiple cached results are stored based on their id. The easiest way to do this is to
- * return a hash computed from the values of your parameters. If your rule is not cacheable, then the result here is
- * not important, you may return anything.
- *
- * @return the cache id
- */
+ @Override
public String getCacheId()
{
return Integer.toString( hashCode( files ) );
@@ -149,27 +138,13 @@ public abstract class AbstractRequireFil
return hash;
}
- /**
- * This tells the system if the results are cacheable at all. Keep in mind that during forked builds and other
- * things, a given rule may be executed more than once for the same project. This means that even things that change
- * from project to project may still be cacheable in certain instances.
- *
- * @return <code>true</code> if rule is cacheable
- */
+ @Override
public boolean isCacheable()
{
return true;
}
- /**
- * If the rule is cacheable and the same id is found in the cache, the stored results are passed to this method to
- * allow double checking of the results. Most of the time this can be done by generating unique ids, but sometimes
- * the results of objects returned by the helper need to be queried. You may for example, store certain objects in
- * your rule and then query them later.
- *
- * @param cachedRule the cached rule
- * @return <code>true</code> if the stored results are valid for the same id.
- */
+ @Override
public boolean isResultValid( EnforcerRule cachedRule )
{
return true;
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractStandardEnforcerRule.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractStandardEnforcerRule.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractStandardEnforcerRule.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractStandardEnforcerRule.java Fri Jul 21 13:39:48 2017
@@ -49,11 +49,7 @@ public abstract class AbstractStandardEn
return message;
}
- /**
- * Returns the level of enforcement.
- *
- * @return level
- */
+ @Override
public EnforcerLevel getLevel()
{
return level;
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java Fri Jul 21 13:39:48 2017
@@ -150,10 +150,7 @@ public abstract class AbstractVersionEnf
return matched;
}
- /*
- * (non-Javadoc)
- * @see org.apache.maven.enforcer.rule.api.EnforcerRule#getCacheId()
- */
+ @Override
public String getCacheId()
{
if ( StringUtils.isNotEmpty( version ) )
@@ -168,21 +165,14 @@ public abstract class AbstractVersionEnf
}
- /*
- * (non-Javadoc)
- * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isCacheable()
- */
+ @Override
public boolean isCacheable()
{
// the maven version is not going to change between projects in the same build.
return true;
}
- /*
- * (non-Javadoc)
- * @see
- * org.apache.maven.enforcer.rule.api.EnforcerRule#isResultValid(org.apache.maven.enforcer.rule.api.EnforcerRule)
- */
+ @Override
public boolean isResultValid( EnforcerRule theCachedRule )
{
// i will always return the hash of the parameters as my id. If my parameters are the same, this
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysFail.java Fri Jul 21 13:39:48 2017
@@ -31,9 +31,7 @@ public class AlwaysFail
extends AbstractNonCacheableEnforcerRule
{
- /**
- * {@inheritDoc}
- */
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AlwaysPass.java Fri Jul 21 13:39:48 2017
@@ -31,9 +31,7 @@ public class AlwaysPass
extends AbstractNonCacheableEnforcerRule
{
- /**
- * {@inheritDoc}
- */
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDistributionManagement.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDistributionManagement.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDistributionManagement.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDistributionManagement.java Fri Jul 21 13:39:48 2017
@@ -61,9 +61,7 @@ public class BanDistributionManagement
private Log logger;
- /**
- * {@inheritDoc}
- */
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDuplicatePomDependencyVersions.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDuplicatePomDependencyVersions.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDuplicatePomDependencyVersions.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanDuplicatePomDependencyVersions.java Fri Jul 21 13:39:48 2017
@@ -49,7 +49,7 @@ import org.codehaus.plexus.util.xml.pull
public class BanDuplicatePomDependencyVersions
extends AbstractNonCacheableEnforcerRule
{
-
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanTransitiveDependencies.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanTransitiveDependencies.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanTransitiveDependencies.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BanTransitiveDependencies.java Fri Jul 21 13:39:48 2017
@@ -136,6 +136,7 @@ public class BanTransitiveDependencies
return hasTransitiveDependencies;
}
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedDependencies.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedDependencies.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedDependencies.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedDependencies.java Fri Jul 21 13:39:48 2017
@@ -67,9 +67,7 @@ public class BannedDependencies
*/
private List<String> includes = null;
- /**
- * {@inheritDoc}
- */
+ @Override
protected Set<Artifact> checkDependencies( Set<Artifact> theDependencies, Log log )
throws EnforcerRuleException
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedPlugins.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedPlugins.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedPlugins.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedPlugins.java Fri Jul 21 13:39:48 2017
@@ -32,12 +32,13 @@ import org.apache.maven.project.MavenPro
public class BannedPlugins
extends BannedDependencies
{
-
+ @Override
protected Set<Artifact> getDependenciesToCheck( MavenProject project )
{
return project.getPluginArtifacts();
}
+ @Override
protected CharSequence getErrorMessage( Artifact artifact )
{
return "Found Banned Plugin: " + artifact.getId() + "\n";
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedRepositories.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedRepositories.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedRepositories.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/BannedRepositories.java Fri Jul 21 13:39:48 2017
@@ -78,11 +78,7 @@ public class BannedRepositories
// Public methods
// ----------------------------------------------------------------------
- /*
- * (non-Javadoc)
- * @see
- * org.apache.maven.enforcer.rule.api.EnforcerRule#execute(org.apache.maven.enforcer.rule.api.EnforcerRuleHelper)
- */
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DefaultEnforcementRuleHelper.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DefaultEnforcementRuleHelper.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DefaultEnforcementRuleHelper.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DefaultEnforcementRuleHelper.java Fri Jul 21 13:39:48 2017
@@ -48,9 +48,6 @@ public class DefaultEnforcementRuleHelpe
/** The evaluator. */
private ExpressionEvaluator evaluator;
- /** The session. */
- private MavenSession session;
-
/** The container. */
private PlexusContainer container;
@@ -67,7 +64,6 @@ public class DefaultEnforcementRuleHelpe
{
this.evaluator = evaluator;
this.log = log;
- this.session = session;
if ( container != null )
{
this.container = container;
@@ -78,97 +74,68 @@ public class DefaultEnforcementRuleHelpe
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.maven.enforcer.rule.api.EnforcerRuleHelper#getLog()
- */
+ @Override
public Log getLog()
{
return log;
}
- /*
- * (non-Javadoc)
- *
- * @see org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator#alignToBaseDirectory(java.io.File)
- */
+ @Override
public File alignToBaseDirectory( File theFile )
{
return evaluator.alignToBaseDirectory( theFile );
}
- /*
- * (non-Javadoc)
- *
- * @see org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator#evaluate(java.lang.String)
- */
+ @Override
public Object evaluate( String theExpression )
throws ExpressionEvaluationException
{
return evaluator.evaluate( theExpression );
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.maven.shared.enforcer.rule.api.EnforcerRuleHelper#getRuntimeInformation()
- */
- public Object getComponent( Class clazz )
+ @Override
+ public <T> T getComponent( Class<T> clazz )
throws ComponentLookupException
{
- return getComponent( clazz.getName() );
+ return container.lookup( clazz );
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.maven.enforcer.rule.api.EnforcerRuleHelper#lookup(java.lang.String)
- */
+ @Override
public Object getComponent( String theComponentKey )
throws ComponentLookupException
{
return container.lookup( theComponentKey );
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.maven.enforcer.rule.api.EnforcerRuleHelper#lookup(java.lang.String, java.lang.String)
- */
+ @Override
public Object getComponent( String theRole, String theRoleHint )
throws ComponentLookupException
{
return container.lookup( theRole, theRoleHint );
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.maven.enforcer.rule.api.EnforcerRuleHelper#lookupList(java.lang.String)
- */
- public List getComponentList( String theRole )
+ @Override
+ public List<Object> getComponentList( String theRole )
throws ComponentLookupException
{
return container.lookupList( theRole );
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.maven.enforcer.rule.api.EnforcerRuleHelper#lookupMap(java.lang.String)
- */
- public Map getComponentMap( String theRole )
+ @Override
+ public Map<String, Object> getComponentMap( String theRole )
throws ComponentLookupException
{
return container.lookupMap( theRole );
}
+
+ @Override
+ public <T> T getComponent( Class<T> clazz, String roleHint )
+ throws ComponentLookupException
+ {
+ return container.lookup( clazz, roleHint );
+ }
- /*
- * (non-Javadoc)
- *
- * @see org.apache.maven.enforcer.rule.api.EnforcerRuleHelper#getContainer()
- */
+ @Override
public PlexusContainer getContainer()
{
return container;
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/DependencyConvergence.java Fri Jul 21 13:39:48 2017
@@ -101,6 +101,7 @@ public class DependencyConvergence
}
}
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
@@ -187,35 +188,19 @@ public class DependencyConvergence
return builder.toString();
}
- /**
- * If your rule is cacheable, you must return a unique id when parameters or conditions change that would cause the
- * result to be different. Multiple cached results are stored based on their id. The easiest way to do this is to
- * return a hash computed from the values of your parameters. If your rule is not cacheable, then the result here is
- * not important, you may return anything.
- */
+ @Override
public String getCacheId()
{
return "";
}
- /**
- * This tells the system if the results are cacheable at all. Keep in mind that during forked builds and other
- * things, a given rule may be executed more than once for the same project. This means that even things that change
- * from project to project may still be cacheable in certain instances.
- */
+ @Override
public boolean isCacheable()
{
return false;
}
- /**
- * If the rule is cacheable and the same id is found in the cache, the stored results are passed to this method to
- * allow double checking of the results. Most of the time this can be done by generating unique ids, but sometimes
- * the results of objects returned by the helper need to be queried. You may for example, store certain objects in
- * your rule and then query them later.
- *
- * @param rule
- */
+ @Override
public boolean isResultValid( EnforcerRule rule )
{
return false;
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/EvaluateBeanshell.java Fri Jul 21 13:39:48 2017
@@ -57,11 +57,7 @@ public class EvaluateBeanshell
return condition;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.maven.enforcer.rule.api.EnforcerRule#execute(org.apache.maven.enforcer.rule.api.EnforcerRuleHelper)
- */
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergence.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergence.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergence.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ReactorModuleConvergence.java Fri Jul 21 13:39:48 2017
@@ -48,6 +48,7 @@ public class ReactorModuleConvergence
private Log logger;
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
@@ -382,7 +383,6 @@ public class ReactorModuleConvergence
{
logger.debug( "Project: " + mavenProject.getId() );
- @SuppressWarnings( "unchecked" )
List<Dependency> dependencies = mavenProject.getDependencies();
if ( hasDependencies( dependencies ) )
{
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=1802595&r1=1802594&r2=1802595&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 Jul 21 13:39:48 2017
@@ -72,11 +72,7 @@ public class RequireActiveProfile
this.all = all;
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.maven.enforcer.rule.api.EnforcerRule#execute(org.apache.maven.enforcer.rule.api.EnforcerRuleHelper)
- */
+ @Override
public void execute( EnforcerRuleHelper theHelper )
throws EnforcerRuleException
{
@@ -140,7 +136,6 @@ public class RequireActiveProfile
*/
protected boolean isProfileActive( MavenProject project, String profileName )
{
- @SuppressWarnings( "unchecked" )
List<Profile> activeProfiles = project.getActiveProfiles();
if ( activeProfiles != null && !activeProfiles.isEmpty() )
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireEnvironmentVariable.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireEnvironmentVariable.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireEnvironmentVariable.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireEnvironmentVariable.java Fri Jul 21 13:39:48 2017
@@ -59,12 +59,14 @@ public class RequireEnvironmentVariable
return envValue;
}
+ @Override
public boolean isCacheable()
{
// environment variables won't change while maven is on the run
return true;
}
+ @Override
public boolean isResultValid( EnforcerRule cachedRule )
{
// this rule shall always have the same result, since environment
@@ -72,6 +74,7 @@ public class RequireEnvironmentVariable
return true;
}
+ @Override
public String getCacheId()
{
return variableName;
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFileChecksum.java Fri Jul 21 13:39:48 2017
@@ -45,6 +45,7 @@ public class RequireFileChecksum
private String type;
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesDontExist.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesDontExist.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesDontExist.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesDontExist.java Fri Jul 21 13:39:48 2017
@@ -27,23 +27,14 @@ import java.io.File;
public class RequireFilesDontExist
extends AbstractRequireFiles
{
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.maven.plugins.enforcer.AbstractRequireFiles#checkFile(java.io.File)
- */
+ @Override
boolean checkFile( File file )
{
// if we get here and the handle is null, treat it as a success
return file == null ? true : !file.exists();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.maven.plugins.enforcer.AbstractRequireFiles#getErrorMsg()
- */
+ @Override
String getErrorMsg()
{
return "Some files should not exist:\n";
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesExist.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesExist.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesExist.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesExist.java Fri Jul 21 13:39:48 2017
@@ -27,23 +27,14 @@ import java.io.File;
public class RequireFilesExist
extends AbstractRequireFiles
{
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.maven.plugins.enforcer.AbstractRequireFiles#checkFile(java.io.File)
- */
+ @Override
boolean checkFile( File file )
{
// if we get here and the handle is null, treat it as a success
return file == null ? true : file.exists();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.maven.plugins.enforcer.AbstractRequireFiles#getErrorMsg()
- */
+ @Override
String getErrorMsg()
{
return "Some required files are missing:\n";
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesSize.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesSize.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesSize.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireFilesSize.java Fri Jul 21 13:39:48 2017
@@ -52,9 +52,7 @@ public class RequireFilesSize
/** The log. */
private Log log;
- /**
- * {@inheritDoc}
- */
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
@@ -83,25 +81,19 @@ public class RequireFilesSize
}
- /**
- * {@inheritDoc}
- */
+ @Override
public boolean isCacheable()
{
return false;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public boolean isResultValid( EnforcerRule cachedRule )
{
return false;
}
- /**
- * {@inheritDoc}
- */
+ @Override
boolean checkFile( File file )
{
if ( file == null )
@@ -144,9 +136,7 @@ public class RequireFilesSize
}
}
- /**
- * {@inheritDoc}
- */
+ @Override
String getErrorMsg()
{
return this.errorMsg;
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=1802595&r1=1802594&r2=1802595&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 Jul 21 13:39:48 2017
@@ -40,12 +40,7 @@ import org.codehaus.plexus.util.StringUt
public class RequireJavaVersion
extends AbstractVersionEnforcer
{
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.maven.enforcer.rule.api.EnforcerRule#execute(org.apache.maven.enforcer.rule.api.EnforcerRuleHelper)
- */
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireMavenVersion.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireMavenVersion.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireMavenVersion.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireMavenVersion.java Fri Jul 21 13:39:48 2017
@@ -34,12 +34,7 @@ import org.codehaus.plexus.component.con
public class RequireMavenVersion
extends AbstractVersionEnforcer
{
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.maven.enforcer.rule.api.EnforcerRule#execute(org.apache.maven.enforcer.rule.api.EnforcerRuleHelper)
- */
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
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=1802595&r1=1802594&r2=1802595&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 Jul 21 13:39:48 2017
@@ -117,9 +117,7 @@ public class RequireNoRepositories
this.allowSnapshotPluginRepositories = allowSnapshotPluginRepositories;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireOS.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireOS.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireOS.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireOS.java Fri Jul 21 13:39:48 2017
@@ -104,9 +104,7 @@ public class RequireOS
}
- /**
- * {@inheritDoc}
- */
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
@@ -367,9 +365,7 @@ public class RequireOS
return display;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public String getCacheId()
{
// return the hashcodes of all the parameters
@@ -393,18 +389,14 @@ public class RequireOS
return b.toString();
}
- /**
- * {@inheritDoc}
- */
+ @Override
public boolean isCacheable()
{
// the os is not going to change between projects in the same build.
return true;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public boolean isResultValid( EnforcerRule theCachedRule )
{
// i will always return the hash of the parameters as my id. If my parameters are the same, this
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java Fri Jul 21 13:39:48 2017
@@ -28,11 +28,9 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.Map.Entry;
import org.apache.maven.BuildFailureException;
import org.apache.maven.artifact.Artifact;
@@ -83,6 +81,8 @@ import org.codehaus.plexus.util.xml.pull
public class RequirePluginVersions
extends AbstractNonCacheableEnforcerRule
{
+
+ private EnforcerRuleHelper helper;
/**
* Don't allow the LATEST identifier.
@@ -142,7 +142,7 @@ public class RequirePluginVersions
* @see {@link #setUnCheckedPlugins(List)}
* @see {@link #getUnCheckedPlugins()}
*/
- private List unCheckedPlugins;
+ private List<String> unCheckedPlugins;
/**
* Same as unCheckedPlugins but as a comma list to better support properties. Sample form:
@@ -184,15 +184,12 @@ public class RequirePluginVersions
/** The utils. */
EnforcerRuleUtils utils;
- /*
- * (non-Javadoc)
- * @see
- * org.apache.maven.enforcer.rule.api.EnforcerRule#execute(org.apache.maven.enforcer.rule.api.EnforcerRuleHelper)
- */
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
- log = helper.getLog();
+ this.log = helper.getLog();
+ this.helper = helper;
MavenProject project;
try
@@ -237,8 +234,7 @@ public class RequirePluginVersions
// pull out any we should skip
allPlugins =
- (Set) removeUncheckedPlugins( combineUncheckedPlugins( unCheckedPlugins, unCheckedPluginList ),
- allPlugins );
+ removeUncheckedPlugins( combineUncheckedPlugins( unCheckedPlugins, unCheckedPluginList ), allPlugins );
// there's nothing to do here
if ( allPlugins.isEmpty() )
@@ -375,7 +371,7 @@ public class RequirePluginVersions
* @throws MojoExecutionException
* @return The plugins which have been removed.
*/
- public Collection<Plugin> removeUncheckedPlugins( Collection<String> uncheckedPlugins, Collection<Plugin> plugins )
+ public Set<Plugin> removeUncheckedPlugins( Collection<String> uncheckedPlugins, Set<Plugin> plugins )
throws MojoExecutionException
{
if ( uncheckedPlugins != null && !uncheckedPlugins.isEmpty() )
@@ -492,7 +488,6 @@ public class RequirePluginVersions
public Set<Plugin> getProfilePlugins( MavenProject project )
{
Set<Plugin> result = new HashSet<Plugin>();
- @SuppressWarnings( "unchecked" )
List<Profile> profiles = project.getActiveProfiles();
if ( profiles != null && !profiles.isEmpty() )
{
@@ -525,7 +520,6 @@ public class RequirePluginVersions
try
{
Model model = project.getModel();
- @SuppressWarnings( "unchecked" )
Map<String, Plugin> plugins = model.getBuild().getPluginsAsMap();
found = plugins.get( plugin.getKey() );
}
@@ -552,7 +546,6 @@ public class RequirePluginVersions
protected Plugin resolvePlugin( Plugin plugin, MavenProject project )
{
- @SuppressWarnings( "unchecked" )
List<ArtifactRepository> pluginRepositories = project.getPluginArtifactRepositories();
Artifact artifact =
factory.createPluginArtifact( plugin.getGroupId(), plugin.getArtifactId(),
@@ -720,7 +713,6 @@ public class RequirePluginVersions
* @throws PluginNotFoundException the plugin not found exception
* @throws LifecycleExecutionException the lifecycle execution exception
*/
- @SuppressWarnings( "unchecked" )
private Set<Plugin> getAllPlugins( MavenProject project, Lifecycle lifecycle )
throws PluginNotFoundException, LifecycleExecutionException
@@ -729,12 +721,10 @@ public class RequirePluginVersions
Set<Plugin> plugins = new HashSet<Plugin>();
// first, bind those associated with the packaging
- Map mappings = findMappingsForLifecycle( project, lifecycle );
+ Map<String, String> mappings = findMappingsForLifecycle( project, lifecycle );
- Iterator iter = mappings.entrySet().iterator();
- while ( iter.hasNext() )
+ for ( Map.Entry<String, String> entry : mappings.entrySet() )
{
- Entry entry = (Entry) iter.next();
log.debug( " lifecycleMapping = " + entry.getKey() );
String pluginsForLifecycle = (String) entry.getValue();
log.debug( " plugins = " + pluginsForLifecycle );
@@ -791,7 +781,6 @@ public class RequirePluginVersions
for ( Lifecycle lifecycle : lifecycles )
{
- @SuppressWarnings( "unchecked" )
List<String> phases = lifecycle.getPhases();
for ( String phase : phases )
{
@@ -841,11 +830,11 @@ public class RequirePluginVersions
* @throws LifecycleExecutionException the lifecycle execution exception
* @throws PluginNotFoundException the plugin not found exception
*/
- private Map findMappingsForLifecycle( MavenProject project, Lifecycle lifecycle )
+ private Map<String, String> findMappingsForLifecycle( MavenProject project, Lifecycle lifecycle )
throws LifecycleExecutionException, PluginNotFoundException
{
String packaging = project.getPackaging();
- Map mappings = null;
+ Map<String, String> mappings = null;
LifecycleMapping m =
(LifecycleMapping) findExtension( project, LifecycleMapping.ROLE, packaging, session.getSettings(),
@@ -855,13 +844,13 @@ public class RequirePluginVersions
mappings = m.getPhases( lifecycle.getId() );
}
- Map defaultMappings = lifecycle.getDefaultPhases();
+ Map<String, String> defaultMappings = lifecycle.getDefaultPhases();
if ( mappings == null )
{
try
{
- m = (LifecycleMapping) session.lookup( LifecycleMapping.ROLE, packaging );
+ m = helper.getComponent( LifecycleMapping.class, packaging );
mappings = m.getPhases( lifecycle.getId() );
}
catch ( ComponentLookupException e )
@@ -899,7 +888,6 @@ public class RequirePluginVersions
* @throws LifecycleExecutionException the lifecycle execution exception
* @throws PluginNotFoundException the plugin not found exception
*/
- @SuppressWarnings( "unchecked" )
private List<String> findOptionalMojosForLifecycle( MavenProject project, Lifecycle lifecycle )
throws LifecycleExecutionException, PluginNotFoundException
{
@@ -919,7 +907,7 @@ public class RequirePluginVersions
{
try
{
- m = (LifecycleMapping) session.lookup( LifecycleMapping.ROLE, packaging );
+ m = (LifecycleMapping) helper.getComponent( LifecycleMapping.class, packaging );
optionalMojos = m.getOptionalMojos( lifecycle.getId() );
}
catch ( ComponentLookupException e )
@@ -955,7 +943,6 @@ public class RequirePluginVersions
{
Object pluginComponent = null;
- @SuppressWarnings( "unchecked" )
List<Plugin> buildPlugins = project.getBuildPlugins();
for ( Plugin plugin : buildPlugins )
{
@@ -1253,12 +1240,12 @@ public class RequirePluginVersions
this.banTimestamps = theBanTimestamps;
}
- public List getUnCheckedPlugins()
+ public List<String> getUnCheckedPlugins()
{
return unCheckedPlugins;
}
- public void setUnCheckedPlugins( List unCheckedPlugins )
+ public void setUnCheckedPlugins( List<String> unCheckedPlugins )
{
this.unCheckedPlugins = unCheckedPlugins;
}
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePrerequisite.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePrerequisite.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePrerequisite.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePrerequisite.java Fri Jul 21 13:39:48 2017
@@ -69,9 +69,7 @@ public class RequirePrerequisite
this.packagings = packagings;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseDeps.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseDeps.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseDeps.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseDeps.java Fri Jul 21 13:39:48 2017
@@ -82,12 +82,8 @@ public class RequireReleaseDeps
*/
private List<String> includes = null;
- /**
- * Override parent to allow optional ignore of this rule.
- *
- * @param helper the enforcerRuleHelper
- * @throws EnforcerRuleException when an exception occurs
- */
+ // Override parent to allow optional ignore of this rule.
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
@@ -141,10 +137,7 @@ public class RequireReleaseDeps
}
}
-
- /**
- * {@inheritDoc}
- */
+ @Override
protected Set<Artifact> checkDependencies( Set<Artifact> dependencies, Log log )
throws EnforcerRuleException
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java Fri Jul 21 13:39:48 2017
@@ -44,11 +44,7 @@ public class RequireReleaseVersion
*/
private boolean failWhenParentIsSnapshot = true;
- /*
- * (non-Javadoc)
- *
- * @see org.apache.maven.enforcer.rule.api.EnforcerRule#execute(org.apache.maven.enforcer.rule.api.EnforcerRuleHelper)
- */
+ @Override
public void execute( EnforcerRuleHelper theHelper )
throws EnforcerRuleException
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSameVersions.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSameVersions.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSameVersions.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSameVersions.java Fri Jul 21 13:39:48 2017
@@ -51,6 +51,7 @@ public class RequireSameVersions
private Set<String> reportPlugins = new HashSet<String>();
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSnapshotVersion.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSnapshotVersion.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSnapshotVersion.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSnapshotVersion.java Fri Jul 21 13:39:48 2017
@@ -37,6 +37,7 @@ public class RequireSnapshotVersion
*/
private boolean failWhenParentIsRelease = true;
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireUpperBoundDeps.java Fri Jul 21 13:39:48 2017
@@ -133,6 +133,7 @@ public class RequireUpperBoundDeps
}
}
+ @Override
public void execute( EnforcerRuleHelper helper )
throws EnforcerRuleException
{
Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DependencyVersionMap.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DependencyVersionMap.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DependencyVersionMap.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/utils/DependencyVersionMap.java Fri Jul 21 13:39:48 2017
@@ -36,15 +36,12 @@ import org.apache.maven.shared.dependenc
public class DependencyVersionMap
implements DependencyNodeVisitor
{
- private Log log;
-
private boolean uniqueVersions;
private Map<String, List<DependencyNode>> idsToNode;
public DependencyVersionMap( Log log )
{
- this.log = log;
idsToNode = new HashMap<String, List<DependencyNode>>();
}
@@ -53,12 +50,14 @@ public class DependencyVersionMap
this.uniqueVersions = uniqueVersions;
}
+ @Override
public boolean visit( DependencyNode node )
{
addDependency( node );
return !containsConflicts( node );
}
+ @Override
public boolean endVisit( DependencyNode node )
{
return true;
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=1802595&r1=1802594&r2=1802595&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 Jul 21 13:39:48 2017
@@ -45,7 +45,6 @@ import org.codehaus.plexus.util.ReaderFa
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-// TODO: Auto-generated Javadoc
/**
* The Class EnforcerRuleUtils.
*
@@ -101,7 +100,6 @@ public class EnforcerRuleUtils
*
* @param helper the helper
*/
- @SuppressWarnings( "unchecked" )
public EnforcerRuleUtils( EnforcerRuleHelper helper )
{
Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java Fri Jul 21 13:39:48 2017
@@ -29,7 +29,6 @@ import org.apache.maven.enforcer.rule.ap
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugin.logging.SystemStreamLog;
-// TODO: Auto-generated Javadoc
/**
* The Class TestAbstractVersionEnforcer.
*
Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequirePluginVersions.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequirePluginVersions.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequirePluginVersions.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequirePluginVersions.java Fri Jul 21 13:39:48 2017
@@ -38,7 +38,6 @@ import org.apache.maven.plugins.enforcer
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-// TODO: Auto-generated Javadoc
/**
* The Class TestRequirePluginVersions.
*
Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireProperty.java Fri Jul 21 13:39:48 2017
@@ -24,7 +24,6 @@ import junit.framework.TestCase;
import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper;
-// TODO: Auto-generated Javadoc
/**
* The Class TestRequireProperty.
*
Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireReleaseVersion.java Fri Jul 21 13:39:48 2017
@@ -28,7 +28,6 @@ import org.apache.maven.enforcer.rule.ap
import org.apache.maven.plugin.testing.ArtifactStubFactory;
import org.apache.maven.plugins.enforcer.utils.TestEnforcerRuleUtils;
-// TODO: Auto-generated Javadoc
/**
* The Class TestRequireReleaseVersion.
*
Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/MockEnforcerExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/MockEnforcerExpressionEvaluator.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/MockEnforcerExpressionEvaluator.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/MockEnforcerExpressionEvaluator.java Fri Jul 21 13:39:48 2017
@@ -27,7 +27,6 @@ import org.apache.maven.project.MavenPro
import org.apache.maven.project.path.PathTranslator;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
-// TODO: Auto-generated Javadoc
/**
* The Class MockEnforcerExpressionEvaluator.
*/
Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestEnforcerRuleUtils.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestEnforcerRuleUtils.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestEnforcerRuleUtils.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestEnforcerRuleUtils.java Fri Jul 21 13:39:48 2017
@@ -36,7 +36,6 @@ import org.apache.maven.plugins.enforcer
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-// TODO: Auto-generated Javadoc
/**
* The Class TestEnforcerRuleUtils.
*
Modified: maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestMockEnforcerExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestMockEnforcerExpressionEvaluator.java?rev=1802595&r1=1802594&r2=1802595&view=diff
==============================================================================
--- maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestMockEnforcerExpressionEvaluator.java (original)
+++ maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/utils/TestMockEnforcerExpressionEvaluator.java Fri Jul 21 13:39:48 2017
@@ -28,7 +28,6 @@ import org.apache.maven.plugins.enforcer
import org.apache.maven.plugins.enforcer.MockProject;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
-// TODO: Auto-generated Javadoc
/**
* The Class TestMockEnforcerExpressionEvaluator.
*/