Revert "update dependencies and refactor code (#323)" (#329)

This reverts commit af08a65.

Author: s-yonkov-yonkov

multiapps-common/pom.xml

@@ -29,7 +29,7 @@
             <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
-            <groupId>tools.jackson.core</groupId>
+            <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
         <dependency>

multiapps-mta/pom.xml

@@ -21,7 +21,7 @@
             <artifactId>commons-collections4</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.semver4j</groupId>
+            <groupId>com.vdurmont</groupId>
             <artifactId>semver4j</artifactId>
         </dependency>
         <dependency>

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 org.semver4j;
+    requires semver4j;
     requires org.apache.commons.compress;
 
     requires static java.compiler;

multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/model/Version.java

@@ -4,12 +4,16 @@
 
 import org.cloudfoundry.multiapps.common.ParsingException;
 import org.cloudfoundry.multiapps.mta.Messages;
+import org.cloudfoundry.multiapps.mta.parsers.PartialVersionConverter;
 
-import org.semver4j.Semver;
-import org.semver4j.SemverException;
+import com.vdurmont.semver4j.Semver;
+import com.vdurmont.semver4j.Semver.SemverType;
+import com.vdurmont.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) {
@@ -28,12 +32,21 @@ public int getPatch() {
         return version.getPatch();
     }
 
+    public String getBuild() {
+        return version.getBuild();
+    }
+
+    public String[] getSuffixTokens() {
+        return version.getSuffixTokens();
+    }
+
     public static Version parseVersion(String versionString) {
-        var version = Semver.coerce(versionString);
-        if (version == null) {
-            throw new ParsingException(MessageFormat.format(Messages.UNABLE_TO_PARSE_VERSION, 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);
         }
-        return new Version(version);
     }
 
     @Override
@@ -43,7 +56,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return version.toString();
+        return version.getValue();
     }
 
     @Override
@@ -68,8 +81,7 @@ public boolean equals(Object obj) {
 
     public boolean satisfies(String requirement) {
         try {
-            // The second parameter is preventing the default behavior of Semver to treat the suffix as a pre-release tag.
-            return version.satisfies(requirement, true);
+            return version.satisfies(requirement);
         } catch (SemverException e) {
             throw new IllegalArgumentException(MessageFormat.format(Messages.UNABLE_TO_PARSE_VERSION_REQUIREMENT, requirement));
         }

multiapps-mta/src/main/java/org/cloudfoundry/multiapps/mta/parsers/PartialVersionConverter.java

@@ -0,0 +1,48 @@
+package org.cloudfoundry.multiapps.mta.parsers;
+
+import com.vdurmont.semver4j.Semver;
+import com.vdurmont.semver4j.Semver.SemverType;
+
+public class PartialVersionConverter {
+
+    private static final String VERSION_STRING_TEMPLATE = "%s.%s.%s%s%s";
+    private static final String VERSION_SUFFIX_STRING_TEMPLATE = "-%s";
+    private static final String VERSION_BUILD_STRING_TEMPLATE = "+%s";
+    private static final String DEFAULT_VERSION_SUFFIX = "";
+
+    public String convertToFullVersionString(String partialVersionString) {
+        Semver partialVersion = new Semver(partialVersionString, SemverType.LOOSE);
+        Integer majorVersion = partialVersion.getMajor();
+        Integer minorVersion = partialVersion.getMinor();
+        Integer patchVersion = partialVersion.getPatch();
+
+        if (minorVersion == null) {
+            minorVersion = 0;
+        }
+        if (patchVersion == null) {
+            patchVersion = 0;
+        }
+        return buildVersionString(majorVersion, minorVersion, patchVersion, partialVersion.getSuffixTokens(), partialVersion.getBuild());
+    }
+
+    private String buildVersionString(int major, int minor, int patch, String[] suffixTokens, String buildVersion) {
+        String formattedSuffixTokens = formatSuffixTokens(suffixTokens);
+        String formattedBuildVersion = formatBuildVersion(buildVersion);
+        return String.format(VERSION_STRING_TEMPLATE, major, minor, patch, formattedSuffixTokens, formattedBuildVersion);
+    }
+
+    private String formatSuffixTokens(String[] suffixTokens) {
+        if (suffixTokens.length == 0) {
+            return DEFAULT_VERSION_SUFFIX;
+        }
+        return String.format(VERSION_SUFFIX_STRING_TEMPLATE, String.join(".", suffixTokens));
+    }
+
+    private String formatBuildVersion(String buildVersion) {
+        if (buildVersion == null) {
+            return DEFAULT_VERSION_SUFFIX;
+        }
+        return String.format(VERSION_BUILD_STRING_TEMPLATE, buildVersion);
+    }
+
+}