Update semver library

cloudfoundry · Nov 7, 2023 · 2ad4165 · 2ad4165
1 parent 0936ad1
commit 2ad4165
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 157 deletions.
diff --git a/multiapps-mta/pom.xml b/multiapps-mta/pom.xml
@@ -21,7 +21,7 @@
             <artifactId>commons-collections4</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.vdurmont</groupId>
+            <groupId>org.semver4j</groupId>
             <artifactId>semver4j</artifactId>
         </dependency>
         <dependency>

diff --git a/multiapps-mta/src/main/java/module-info.java b/multiapps-mta/src/main/java/module-info.java
@@ -29,7 +29,7 @@
     requires org.apache.commons.collections4;
     requires org.apache.commons.io;
     requires org.apache.commons.lang3;
-    requires semver4j;
+    requires org.semver4j;
 
     requires static java.compiler;
     requires static org.immutables.value;

diff --git a/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/model/Version.java b/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/model/Version.java
@@ -4,16 +4,11 @@
 
 import org.cloudfoundry.multiapps.common.ParsingException;
 import org.cloudfoundry.multiapps.mta.Messages;
-import org.cloudfoundry.multiapps.mta.parsers.PartialVersionConverter;
-
-import com.vdurmont.semver4j.Semver;
-import com.vdurmont.semver4j.Semver.SemverType;
-import com.vdurmont.semver4j.SemverException;
+import org.semver4j.Semver;
+import org.semver4j.SemverException;
 
 public class Version implements Comparable<Version> {
 
-    private static final PartialVersionConverter PARTIAL_VERSION_CONVERTER = new PartialVersionConverter();
-
     private final Semver version;
 
     private Version(Semver version) {
@@ -32,21 +27,12 @@ public int getPatch() {
         return version.getPatch();
     }
 
-    public String getBuild() {
-        return version.getBuild();
-    }
-
-    public String[] getSuffixTokens() {
-        return version.getSuffixTokens();
-    }
-
     public static Version parseVersion(String versionString) {
-        try {
-            String fullVersionString = PARTIAL_VERSION_CONVERTER.convertToFullVersionString(versionString);
-            return new Version(new Semver(fullVersionString, SemverType.NPM));
-        } catch (SemverException e) {
-            throw new ParsingException(e, Messages.UNABLE_TO_PARSE_VERSION, versionString);
+        var version = Semver.coerce(versionString); //allows incomplete version strings like "3" or "3.0"
+        if (version == null) {
+            throw new ParsingException(Messages.UNABLE_TO_PARSE_VERSION, versionString);
         }
+        return new Version(version);
     }
 
     @Override
@@ -56,7 +42,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return version.getValue();
+        return version.toString();
     }
 
     @Override

diff --git a/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/model/VersionRule.java b/multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/model/VersionRule.java
@@ -1,5 +1,7 @@
 package org.cloudfoundry.multiapps.mta.model;
 
+import java.util.function.Predicate;
+
 public enum VersionRule {
 
     SAME_HIGHER(VersionRule::isNotDowngrade),
@@ -8,22 +10,14 @@ public enum VersionRule {
 
     ALL(VersionRule::isAny);
 
-    private interface VersionRuleValidator {
-        boolean allows(DeploymentType deploymentType);
-    }
-
-    private VersionRuleValidator versionRuleValidator;
+    private final Predicate<DeploymentType> versionRuleValidator;
 
-    VersionRule(VersionRuleValidator versionRuleValidator) {
+    VersionRule(Predicate<DeploymentType> versionRuleValidator) {
         this.versionRuleValidator = versionRuleValidator;
     }
 
     public boolean allows(DeploymentType deploymentType) {
-        return versionRuleValidator.allows(deploymentType);
-    }
-
-    public static VersionRule value(String caseInsensitiveValue) {
-        return VersionRule.valueOf(caseInsensitiveValue.toUpperCase());
+        return versionRuleValidator.test(deploymentType);
     }
 
     private static boolean isNotDowngrade(DeploymentType deploymentType) {

diff --git a/...pps-mta/src/main/java/org/cloudfoundry/multiapps/mta/parsers/PartialVersionConverter.java b/...pps-mta/src/main/java/org/cloudfoundry/multiapps/mta/parsers/PartialVersionConverter.java
diff --git a/...mta/src/test/java/org/cloudfoundry/multiapps/mta/parsers/PartialVersionConverterTest.java b/...mta/src/test/java/org/cloudfoundry/multiapps/mta/parsers/PartialVersionConverterTest.java
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
         <commons-io.version>2.11.0</commons-io.version>
         <slf4j.version>2.0.6</slf4j.version>
         <snakeyaml.version>2.0</snakeyaml.version>
-        <semver4j.version>3.1.0</semver4j.version>
+        <semver4j.version>5.2.2</semver4j.version>
         <immutables.version>2.8.8</immutables.version>
         <jaxb-api.version>2.3.3</jaxb-api.version>
         <jaxb-core.version>2.3.0.1</jaxb-core.version>
@@ -292,9 +292,9 @@
                 <artifactId>snakeyaml</artifactId>
                 <version>${snakeyaml.version}</version>
             </dependency>
-            <!-- https://mvnrepository.com/artifact/com.vdurmont/semver4j -->
+            <!-- https://mvnrepository.com/artifact/org.semver4j/semver4j -->
             <dependency>
-                <groupId>com.vdurmont</groupId>
+                <groupId>org.semver4j</groupId>
                 <artifactId>semver4j</artifactId>
                 <version>${semver4j.version}</version>
             </dependency>