wip

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/PrimaryUpdateAndCacheUtils.java

@@ -463,27 +463,25 @@ public static int compareResourceVersions(String v1, String v2) {
     if (v1Length > v2Length) {
       return 1;
     }
-    if (v2Length > v1Length) {
+    if (v1Length < v2Length) {
       return -1;
     }
     for (int i = 0; i < v1Length; i++) {
-      if (v1.charAt(i) > v2.charAt(i)) {
-        var char1 = v1.charAt(i);
-        var char2 = v2.charAt(i);
-        if (!Character.isDigit(char1)) {
-          throw new IllegalArgumentException(
-              "Non numeric characters in resource version (1): " + char1);
-        }
-        if (!Character.isDigit(char2)) {
-          throw new IllegalArgumentException(
-              "Non numeric characters in resource version (2): " + char2);
-        }
-        if (char1 > char2) {
-          return 1;
-        }
-        if (char1 < char2) {
-          return -1;
-        }
+      var char1 = v1.charAt(i);
+      var char2 = v2.charAt(i);
+      if (!Character.isDigit(char1)) {
+        throw new IllegalArgumentException(
+            "Non numeric characters in resource version (1): " + char1);
+      }
+      if (!Character.isDigit(char2)) {
+        throw new IllegalArgumentException(
+            "Non numeric characters in resource version (2): " + char2);
+      }
+      if (char1 > char2) {
+        return 1;
+      }
+      if (char1 < char2) {
+        return -1;
       }
     }
     return 0;

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/reconciler/PrimaryUpdateAndCacheUtilsTest.java

@@ -193,6 +193,8 @@ public void compareResourceVersionsTest() {
 
     assertThrows(IllegalArgumentException.class, () -> compareResourceVersions("aa", "22"));
     assertThrows(IllegalArgumentException.class, () -> compareResourceVersions("11", "ba"));
+    assertThrows(IllegalArgumentException.class, () -> compareResourceVersions("", "22"));
+    assertThrows(IllegalArgumentException.class, () -> compareResourceVersions("11", ""));
   }
 
   // naive performance that compares the works case scenario for non parsing variant