You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2020/12/30 00:31:59 UTC

[maven-enforcer] branch pr/81 created (now 1820a17)

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

slachiewicz pushed a change to branch pr/81
in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git.


      at 1820a17  simplify code: use containsVersion from VersionRange instead of Restriction

This branch includes the following new commits:

     new 1820a17  simplify code: use containsVersion from VersionRange instead of Restriction

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[maven-enforcer] 01/01: simplify code: use containsVersion from VersionRange instead of Restriction

Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch pr/81
in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git

commit 1820a17c3c0dc9b1f869c2ba888893e4d8ae845c
Author: madlexa <le...@trifle.one>
AuthorDate: Fri Nov 27 15:59:19 2020 +0700

    simplify code: use containsVersion from VersionRange instead of Restriction
---
 .../maven/plugins/enforcer/AbstractVersionEnforcer.java | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java
index bedf7dd..f10215e 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/AbstractVersionEnforcer.java
@@ -19,11 +19,8 @@ package org.apache.maven.plugins.enforcer;
  * under the License.
  */
 
-import java.util.List;
-
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.artifact.versioning.Restriction;
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.apache.maven.enforcer.rule.api.EnforcerRule;
 import org.apache.maven.enforcer.rule.api.EnforcerRuleException;
@@ -125,28 +122,18 @@ public abstract class AbstractVersionEnforcer
      */
     public static boolean containsVersion( VersionRange allowedRange, ArtifactVersion theVersion )
     {
-        boolean matched = false;
         ArtifactVersion recommendedVersion = allowedRange.getRecommendedVersion();
         if ( recommendedVersion == null )
         {
-            List<Restriction> restrictions = allowedRange.getRestrictions();
-            for ( Restriction restriction : restrictions )
-            {
-                if ( restriction.containsVersion( theVersion ) )
-                {
-                    matched = true;
-                    break;
-                }
-            }
+            return allowedRange.containsVersion( theVersion );
         }
         else
         {
             // only singular versions ever have a recommendedVersion
             @SuppressWarnings( "unchecked" )
             int compareTo = recommendedVersion.compareTo( theVersion );
-            matched = ( compareTo <= 0 );
+            return ( compareTo <= 0 );
         }
-        return matched;
     }
 
     @Override