Author: brianf Date: Wed May 28 19:54:15 2008 New Revision: 661191 URL: http://svn.apache.org/viewvc?rev=661191&view=rev Log: convert the non-cacheable rules to use the new abstract class
Modified: 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/EvaluateBeanshell.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/RequireNoRepositories.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/RequireProperty.java maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireReleaseVersion.java 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=661191&r1=661190&r2=661191&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 Wed May 28 19:54:15 2008 @@ -37,7 +37,7 @@ * @version $Id$ */ public abstract class AbstractBanDependencies - extends AbstractStandardEnforcerRule + extends AbstractNonCacheableEnforcerRule { /** Specify if transitive dependencies should be searched (default) or only look at direct dependencies. */ @@ -47,7 +47,6 @@ * Execute the rule. * * @param helper the helper - * * @throws EnforcerRuleException the enforcer rule exception */ public void execute( EnforcerRuleHelper helper ) @@ -105,9 +104,7 @@ * * @param dependencies the dependencies * @param log the log - * * @return the sets the - * * @throws EnforcerRuleException the enforcer rule exception */ abstract protected Set checkDependencies( Set dependencies, Log log ) @@ -153,35 +150,4 @@ this.searchTransitive = theSearchTransitive; } - /* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#getCacheId() - */ - public String getCacheId() - { - return "0"; - } - - /* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isCacheable() - */ - public boolean isCacheable() - { - // dependencies change per project, therefore they must always be rerun. - return false; - } - - /* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isResultValid(org.apache.maven.enforcer.rule.api.EnforcerRule) - */ - public boolean isResultValid( EnforcerRule theCachedRule ) - { - // dependencies change per project, therefore they must always be rerun. - 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=661191&r1=661190&r2=661191&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 Wed May 28 19:54:15 2008 @@ -18,7 +18,6 @@ */ package org.apache.maven.plugins.enforcer; -import org.apache.maven.enforcer.rule.api.EnforcerRule; import org.apache.maven.enforcer.rule.api.EnforcerRuleException; import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; import org.apache.maven.plugin.logging.Log; @@ -35,7 +34,7 @@ * @author hugonnem Rule for Maven Enforcer using Beanshell to evaluate a conditional expression */ public class EvaluateBeanshell - extends AbstractStandardEnforcerRule + extends AbstractNonCacheableEnforcerRule { /** Beanshell interpreter. */ @@ -96,35 +95,4 @@ } return evaluation.booleanValue(); } - - /* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#getCacheId() - */ - public String getCacheId() - { - return "" + this.condition.hashCode(); - } - - /* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isCacheable() - */ - public boolean isCacheable() - { - return false; - } - - /* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isResultValid(org.apache.maven.enforcer.rule.api.EnforcerRule) - */ - public boolean isResultValid( EnforcerRule theCachedRule ) - { - return false; - } - } 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=661191&r1=661190&r2=661191&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 Wed May 28 19:54:15 2008 @@ -22,7 +22,6 @@ import java.util.Iterator; import java.util.List; -import org.apache.maven.enforcer.rule.api.EnforcerRule; import org.apache.maven.enforcer.rule.api.EnforcerRuleException; import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; import org.apache.maven.model.Profile; @@ -37,7 +36,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a> This rule checks that the current project is not a snapshot */ public class RequireActiveProfile - extends AbstractStandardEnforcerRule + extends AbstractNonCacheableEnforcerRule { /** Comma separated list of profiles to check. */ @@ -137,35 +136,4 @@ return false; } - - /* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#getCacheId() - */ - public String getCacheId() - { - return "0"; - } - - /* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isCacheable() - */ - public boolean isCacheable() - { - return false; - } - - /* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isResultValid(org.apache.maven.enforcer.rule.api.EnforcerRule) - */ - public boolean isResultValid( EnforcerRule theCachedRule ) - { - return false; - } - } 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=661191&r1=661190&r2=661191&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 Wed May 28 19:54:15 2008 @@ -26,7 +26,6 @@ import org.apache.maven.artifact.resolver.ArtifactNotFoundException; import org.apache.maven.artifact.resolver.ArtifactResolutionException; -import org.apache.maven.enforcer.rule.api.EnforcerRule; import org.apache.maven.enforcer.rule.api.EnforcerRuleException; import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; import org.apache.maven.model.Model; @@ -43,7 +42,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a> */ public class RequireNoRepositories - extends AbstractStandardEnforcerRule + extends AbstractNonCacheableEnforcerRule { /* @@ -133,34 +132,4 @@ } return badModels; } - - /* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#getCacheId() - */ - public String getCacheId() - { - return "0"; - } - - /* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isCacheable() - */ - public boolean isCacheable() - { - return false; - } - - /* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isResultValid(org.apache.maven.enforcer.rule.api.EnforcerRule) - */ - public boolean isResultValid( EnforcerRule theCachedRule ) - { - return false; - } } 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=661191&r1=661190&r2=661191&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 Wed May 28 19:54:15 2008 @@ -78,7 +78,7 @@ * specified in the poms have a version declared. */ public class RequirePluginVersions - extends AbstractStandardEnforcerRule + extends AbstractNonCacheableEnforcerRule { /** Don't allow the LATEST identifier. */ @@ -1046,36 +1046,6 @@ this.utils = theUtils; } - /* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#getCacheId() - */ - public String getCacheId() - { - return "0"; - } - - /* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isCacheable() - */ - public boolean isCacheable() - { - return false; - } - - /* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isResultValid(org.apache.maven.enforcer.rule.api.EnforcerRule) - */ - public boolean isResultValid( EnforcerRule theCachedRule ) - { - return false; - } - /** * Checks if is ban snapshots. * Modified: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireProperty.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireProperty.java?rev=661191&r1=661190&r2=661191&view=diff ============================================================================== --- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireProperty.java (original) +++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireProperty.java Wed May 28 19:54:15 2008 @@ -31,7 +31,7 @@ * @author Paul Gier */ public class RequireProperty - extends AbstractStandardEnforcerRule + extends AbstractNonCacheableEnforcerRule { /** Specify the required property. */ @@ -83,47 +83,4 @@ throw new EnforcerRuleException( regexMessage ); } } - - /* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#getCacheId() - */ - public String getCacheId() - { - // return the hashcodes of all the parameters - StringBuffer b = new StringBuffer(); - if ( StringUtils.isNotEmpty( property ) ) - { - b.append( property.hashCode() ); - } - if ( StringUtils.isNotEmpty( regex ) ) - { - b.append( regex.hashCode() ); - } - return b.toString(); - } - - /* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isCacheable() - */ - public boolean isCacheable() - { - // TODO Auto-generated method stub - return false; - } - - /* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isResultValid(org.apache.maven.enforcer.rule.api.EnforcerRule) - */ - public boolean isResultValid( EnforcerRule theCachedRule ) - { - // TODO Auto-generated method stub - return false; - } - } 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=661191&r1=661190&r2=661191&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 Wed May 28 19:54:15 2008 @@ -18,7 +18,6 @@ */ package org.apache.maven.plugins.enforcer; -import org.apache.maven.enforcer.rule.api.EnforcerRule; import org.apache.maven.enforcer.rule.api.EnforcerRuleException; import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; import org.apache.maven.project.MavenProject; @@ -31,7 +30,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a> This rule checks that the current project is not a snapshot */ public class RequireReleaseVersion - extends AbstractStandardEnforcerRule + extends AbstractNonCacheableEnforcerRule { /* @@ -63,35 +62,4 @@ } } - - /* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#getCacheId() - */ - public String getCacheId() - { - return "0"; - } - - /* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isCacheable() - */ - public boolean isCacheable() - { - return false; - } - - /* - * (non-Javadoc) - * - * @see org.apache.maven.enforcer.rule.api.EnforcerRule#isResultValid(org.apache.maven.enforcer.rule.api.EnforcerRule) - */ - public boolean isResultValid( EnforcerRule theCachedRule ) - { - return false; - } - }