KEYCLOAK-12877 Fix ModelVersion for testing pipeline

stianst · stianst · commit 87c73c3ece7b · 2020-02-03T12:13:06.000+01:00
diff --git a/server-spi-private/src/main/java/org/keycloak/migration/ModelVersion.java b/server-spi-private/src/main/java/org/keycloak/migration/ModelVersion.java
@@ -25,11 +25,11 @@
 */
 public class ModelVersion {
     private static Logger logger = Logger.getLogger(ModelVersion.class);
+
     int major;
     int minor;
     int micro;
     String qualifier;
-    boolean snapshot;
 
     public ModelVersion(int major, int minor, int micro) {
         this.major = major;
@@ -38,10 +38,7 @@ public ModelVersion(int major, int minor, int micro) {
     }
 
     public ModelVersion(String version) {
-        if (version.endsWith("-SNAPSHOT") || version.endsWith("-snapshot")) {
-            snapshot = true;
-            version = version.substring(0, version.length() - 9);
-        }
+        version = version.split("-")[0];
 
         String[] split = version.split("\\.");
         try {
@@ -56,6 +53,10 @@ public ModelVersion(String version) {
             }
             if (split.length > 3) {
                 qualifier = split[3];
+
+                if (qualifier.startsWith("redhat")) {
+                    qualifier = null;
+                }
             }
         } catch (NumberFormatException e) {
             logger.warn("failed to parse version: " + version, e);
@@ -78,10 +79,6 @@ public String getQualifier() {
         return qualifier;
     }
 
-    public boolean isSnapshot() {
-        return snapshot;
-    }
-
     public boolean lessThan(ModelVersion version) {
         if (major < version.major) {
             return true;
@@ -111,10 +108,6 @@ public boolean lessThan(ModelVersion version) {
             return false;
         }
 
-        if (snapshot && !version.snapshot) {
-            return true;
-        }
-
         return false;
     }
 
diff --git a/server-spi-private/src/test/java/org/keycloak/models/MigrationVersionTest.java b/server-spi-private/src/test/java/org/keycloak/models/MigrationVersionTest.java
@@ -35,10 +35,10 @@ public class MigrationVersionTest {
     @Test
     public void testVersion() {
         ModelVersion version_100Beta1 = new ModelVersion("1.0.0.Beta1-SNAPSHOT");
-        Assert.assertEquals(version_100Beta1.getMajor(), 1);
-        Assert.assertEquals(version_100Beta1.getMinor(), 0);
-        Assert.assertEquals(version_100Beta1.getMicro(), 0);
-        Assert.assertTrue(version_100Beta1.isSnapshot());
+        Assert.assertEquals(1, version_100Beta1.getMajor());
+        Assert.assertEquals(0, version_100Beta1.getMinor());
+        Assert.assertEquals(0, version_100Beta1.getMicro());
+
         ModelVersion version_100CR1 = new ModelVersion("1.0.0.CR1");
         ModelVersion version_100 = new ModelVersion("1.0.0");
         ModelVersion version_110Beta1 = new ModelVersion("1.1.0.Beta1");
@@ -51,19 +51,18 @@ public void testVersion() {
         ModelVersion version_140 = new ModelVersion("1.4.0");
 
         ModelVersion version_211CR1 = new ModelVersion("2.1.1.CR1");
-        Assert.assertEquals(version_211CR1.getMajor(), 2);
-        Assert.assertEquals(version_211CR1.getMinor(), 1);
-        Assert.assertEquals(version_211CR1.getMicro(), 1);
-        Assert.assertEquals(version_211CR1.getQualifier(), "CR1");
-        Assert.assertFalse(version_211CR1.isSnapshot());
+        Assert.assertEquals(2, version_211CR1.getMajor());
+        Assert.assertEquals(1, version_211CR1.getMinor());
+        Assert.assertEquals(1, version_211CR1.getMicro());
+        Assert.assertEquals("CR1", version_211CR1.getQualifier());
+
         ModelVersion version_211 = new ModelVersion("2.1.1");
 
         ModelVersion version50Snapshot = new ModelVersion("5.0.0-SNAPSHOT");
-        Assert.assertEquals(version50Snapshot.getMajor(), 5);
-        Assert.assertEquals(version50Snapshot.getMinor(), 0);
-        Assert.assertEquals(version50Snapshot.getMicro(), 0);
+        Assert.assertEquals(5, version50Snapshot.getMajor());
+        Assert.assertEquals(0, version50Snapshot.getMinor());
+        Assert.assertEquals(0, version50Snapshot.getMicro());
         Assert.assertNull(version50Snapshot.getQualifier());
-        Assert.assertTrue(version50Snapshot.isSnapshot());
 
         Assert.assertFalse(version_100Beta1.lessThan(version_100Beta1));
         Assert.assertTrue(version_100Beta1.lessThan(version_100CR1));
@@ -82,6 +81,17 @@ public void testVersion() {
 
         Assert.assertTrue(version_211CR1.lessThan(version50Snapshot));
 
+        ModelVersion versionPipeline = new ModelVersion("8.0.2-REL-20200130-143126");
+        Assert.assertEquals(8, versionPipeline.getMajor());
+        Assert.assertEquals(0, versionPipeline.getMinor());
+        Assert.assertEquals(2, versionPipeline.getMicro());
+        Assert.assertNull(versionPipeline.getQualifier());
+
+        ModelVersion versionProduct = new ModelVersion("7.0.0.redhat-00002");
+        Assert.assertEquals(7, versionProduct.getMajor());
+        Assert.assertEquals(0, versionProduct.getMinor());
+        Assert.assertEquals(0, versionProduct.getMicro());
+        Assert.assertNull(versionProduct.getQualifier());
     }
 
     @Test
