Added LATEST_RELEASE pseudo version

phax · Apr 11, 2024 · 9ec5f69 · 9ec5f69
1 parent 605591b
commit 9ec5f69
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 4 deletions.
diff --git a/ph-diver-api/src/main/java/com/helger/diver/api/version/VESPseudoVersionRegistry.java b/ph-diver-api/src/main/java/com/helger/diver/api/version/VESPseudoVersionRegistry.java
@@ -63,7 +63,7 @@ public int compareToVersion (@Nonnull final Version aStaticVersion)
   });
 
   /**
-   * Latest indicates the very latest version.
+   * Latest indicates the very latest version (including snapshot).
    */
   public static final IVESPseudoVersion LATEST = new VESPseudoVersion ("latest", new IPseudoVersionComparable ()
   {
@@ -80,6 +80,32 @@ public int compareToVersion (@Nonnull final Version aStaticVersion)
     }
   });
 
+  /**
+   * Latest indicates the very latest version (excluding snapshot).
+   */
+  public static final IVESPseudoVersion LATEST_RELEASE;
+  static
+  {
+    LATEST_RELEASE = new VESPseudoVersion ("latest-release", new IPseudoVersionComparable ()
+    {
+      public int compareToPseudoVersion (@Nonnull final IVESPseudoVersion aOtherPseudoVersion)
+      {
+        // We are before LATEST
+        if (aOtherPseudoVersion.equals (LATEST))
+          return -1;
+
+        // LATEST_RELEASE is always greater than the rest
+        return +1;
+      }
+
+      public int compareToVersion (@Nonnull final Version aStaticVersion)
+      {
+        // LATEST_RELEASE is always greater
+        return +1;
+      }
+    });
+  }
+
   private static final class SingletonHolder
   {
     static final VESPseudoVersionRegistry INSTANCE = new VESPseudoVersionRegistry ();

diff --git a/.../src/main/java/com/helger/diver/api/version/spi/DefaultPseudoVersionRegistrarSPIImpl.java b/.../src/main/java/com/helger/diver/api/version/spi/DefaultPseudoVersionRegistrarSPIImpl.java
@@ -40,6 +40,7 @@ public DefaultPseudoVersionRegistrarSPIImpl ()
   public void registerPseudoVersions (@Nonnull final IVESPseudoVersionRegistry aRegistry)
   {
     aRegistry.registerPseudoVersion (VESPseudoVersionRegistry.OLDEST);
+    aRegistry.registerPseudoVersion (VESPseudoVersionRegistry.LATEST_RELEASE);
     aRegistry.registerPseudoVersion (VESPseudoVersionRegistry.LATEST);
   }
 }
diff --git a/ph-diver-api/src/test/java/com/helger/diver/api/version/VESPseudoVersionRegistryTest.java b/ph-diver-api/src/test/java/com/helger/diver/api/version/VESPseudoVersionRegistryTest.java
@@ -35,10 +35,11 @@ public void testBasic ()
     final VESPseudoVersionRegistry a = VESPseudoVersionRegistry.getInstance ();
     assertNotNull (a);
 
-    assertEquals (2, a.size ());
+    assertEquals (3, a.size ());
 
-    assertNotNull (a.getFromIDOrNull (VESPseudoVersionRegistry.LATEST.getID ()));
     assertNotNull (a.getFromIDOrNull (VESPseudoVersionRegistry.OLDEST.getID ()));
+    assertNotNull (a.getFromIDOrNull (VESPseudoVersionRegistry.LATEST_RELEASE.getID ()));
+    assertNotNull (a.getFromIDOrNull (VESPseudoVersionRegistry.LATEST.getID ()));
     assertNull (a.getFromIDOrNull ("hoppla"));
   }
 }
diff --git a/ph-diver-api/src/test/java/com/helger/diver/api/version/VESVersionTest.java b/ph-diver-api/src/test/java/com/helger/diver/api/version/VESVersionTest.java
@@ -143,7 +143,8 @@ public void testCompare ()
     final VESVersion ver3 = VESVersion.parseOrNull ("1.2.4");
     final VESVersion ver4 = VESVersion.parseOrNull ("1.3");
     final VESVersion ver5 = VESVersion.parseOrNull ("2023.5");
-    final VESVersion ver6 = VESVersion.of (VESPseudoVersionRegistry.LATEST);
+    final VESVersion ver6 = VESVersion.of (VESPseudoVersionRegistry.LATEST_RELEASE);
+    final VESVersion ver7 = VESVersion.of (VESPseudoVersionRegistry.LATEST);
 
     assertEquals (0, ver0.compareTo (ver0));
     assertTrue (ver0.compareTo (ver1) < 0);
@@ -152,6 +153,7 @@ public void testCompare ()
     assertTrue (ver0.compareTo (ver4) < 0);
     assertTrue (ver0.compareTo (ver5) < 0);
     assertTrue (ver0.compareTo (ver6) < 0);
+    assertTrue (ver0.compareTo (ver7) < 0);
 
     assertTrue (ver1.compareTo (ver0) > 0);
     assertEquals (0, ver1.compareTo (ver1));
@@ -160,6 +162,7 @@ public void testCompare ()
     assertTrue (ver1.compareTo (ver4) < 0);
     assertTrue (ver1.compareTo (ver5) < 0);
     assertTrue (ver1.compareTo (ver6) < 0);
+    assertTrue (ver1.compareTo (ver7) < 0);
 
     assertTrue (ver2.compareTo (ver0) > 0);
     assertTrue (ver2.compareTo (ver1) > 0);
@@ -168,6 +171,7 @@ public void testCompare ()
     assertTrue (ver2.compareTo (ver4) < 0);
     assertTrue (ver2.compareTo (ver5) < 0);
     assertTrue (ver2.compareTo (ver6) < 0);
+    assertTrue (ver2.compareTo (ver7) < 0);
 
     assertTrue (ver3.compareTo (ver0) > 0);
     assertTrue (ver3.compareTo (ver1) > 0);
@@ -176,6 +180,7 @@ public void testCompare ()
     assertTrue (ver3.compareTo (ver4) < 0);
     assertTrue (ver3.compareTo (ver5) < 0);
     assertTrue (ver3.compareTo (ver6) < 0);
+    assertTrue (ver3.compareTo (ver7) < 0);
 
     assertTrue (ver4.compareTo (ver0) > 0);
     assertTrue (ver4.compareTo (ver1) > 0);
@@ -184,6 +189,7 @@ public void testCompare ()
     assertEquals (0, ver4.compareTo (ver4));
     assertTrue (ver4.compareTo (ver5) < 0);
     assertTrue (ver4.compareTo (ver6) < 0);
+    assertTrue (ver4.compareTo (ver7) < 0);
 
     assertTrue (ver5.compareTo (ver0) > 0);
     assertTrue (ver5.compareTo (ver1) > 0);
@@ -192,6 +198,7 @@ public void testCompare ()
     assertTrue (ver5.compareTo (ver4) > 0);
     assertEquals (0, ver5.compareTo (ver5));
     assertTrue (ver5.compareTo (ver6) < 0);
+    assertTrue (ver5.compareTo (ver7) < 0);
 
     assertTrue (ver6.compareTo (ver0) > 0);
     assertTrue (ver6.compareTo (ver1) > 0);
@@ -200,6 +207,16 @@ public void testCompare ()
     assertTrue (ver6.compareTo (ver4) > 0);
     assertTrue (ver6.compareTo (ver5) > 0);
     assertEquals (0, ver6.compareTo (ver6));
+    assertTrue (ver6.compareTo (ver7) < 0);
+
+    assertTrue (ver7.compareTo (ver0) > 0);
+    assertTrue (ver7.compareTo (ver1) > 0);
+    assertTrue (ver7.compareTo (ver2) > 0);
+    assertTrue (ver7.compareTo (ver3) > 0);
+    assertTrue (ver7.compareTo (ver4) > 0);
+    assertTrue (ver7.compareTo (ver5) > 0);
+    assertTrue (ver7.compareTo (ver6) > 0);
+    assertEquals (0, ver7.compareTo (ver7));
   }
 
   @Test