spotless

vectorize-io · Aug 23, 2024 · 7df0a9b · 7df0a9b
1 parent 3eb3cb1
commit 7df0a9b
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 34 deletions.
diff --git a/...k8s-deployer-core/src/main/java/ai/langstream/deployer/k8s/util/JSONAssertComparator.java b/...k8s-deployer-core/src/main/java/ai/langstream/deployer/k8s/util/JSONAssertComparator.java
@@ -194,6 +194,7 @@ private static String getValueByDotNotation(final Map<String, Object> map, Strin
             }
         }
 
-        return currentMap.get(words.get(words.size() - 1)).toString();
+        Object value = currentMap.get(words.get(words.size() - 1));
+        return value == null ? "<null>" : value.toString();
     }
 }
diff --git a/...angstream-k8s-deployer-core/src/main/java/ai/langstream/deployer/k8s/util/SpecDiffer.java b/...angstream-k8s-deployer-core/src/main/java/ai/langstream/deployer/k8s/util/SpecDiffer.java
@@ -16,6 +16,7 @@
 package ai.langstream.deployer.k8s.util;
 
 import java.util.List;
+import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
@@ -53,7 +54,8 @@ public List<JSONComparator.FieldComparisonDiff> diffs() {
 
     private SpecDiffer() {}
 
-    public static JSONComparator.Result generateDiff(String expectedJson, String actualJson) {
+    private static JSONComparator.Result generateDiffFromStrings(
+            String expectedJson, String actualJson) {
         if (expectedJson == null && actualJson == null) {
             return JSONComparator.RESULT_EQUALS;
         }
@@ -66,36 +68,11 @@ public static JSONComparator.Result generateDiff(String expectedJson, String act
         return new JSONAssertComparator().compare(expectedJson, actualJson);
     }
 
-    public static JSONComparator.Result generateDiff(Object expectedSpec, Object actualSpec) {
-        if (expectedSpec == null && actualSpec == null) {
-            return JSONComparator.RESULT_EQUALS;
-        }
-        if (expectedSpec == null) {
-            return EXPECTED_WAS_NULL_RESULT;
-        }
-        if (actualSpec == null) {
-            return ACTUAL_WAS_NULL_RESULT;
-        }
-        final String expectedStr = SerializationUtil.writeAsJson(expectedSpec);
-        final String actualStr = SerializationUtil.writeAsJson(actualSpec);
-        return generateDiff(expectedStr, actualStr);
-    }
-
-    public static JSONComparator.Result generateDiff(Object expectedSpec, String actualJson) {
-        if (expectedSpec == null && actualJson == null) {
-            return JSONComparator.RESULT_EQUALS;
-        }
-        if (expectedSpec == null) {
-            return EXPECTED_WAS_NULL_RESULT;
-        }
-        if (actualJson == null) {
-            return ACTUAL_WAS_NULL_RESULT;
-        }
-        final String expectedStr = SerializationUtil.writeAsJson(expectedSpec);
-        return generateDiff(expectedStr, actualJson);
-    }
-
     public static JSONComparator.Result generateDiff(String expectedJson, Object actualSpec) {
+        if (actualSpec instanceof String) {
+            throw new IllegalArgumentException(
+                    "actualSpec should be a parsed object, not a string");
+        }
         if (expectedJson == null && actualSpec == null) {
             return JSONComparator.RESULT_EQUALS;
         }
@@ -106,7 +83,9 @@ public static JSONComparator.Result generateDiff(String expectedJson, Object act
             return EXPECTED_WAS_NULL_RESULT;
         }
         final String actualStr = SerializationUtil.writeAsJson(actualSpec);
-        return generateDiff(expectedJson, actualStr);
+        final String expectedJsonStrSameSerialization =
+                SerializationUtil.writeAsJson(SerializationUtil.readJson(expectedJson, Map.class));
+        return generateDiffFromStrings(expectedJsonStrSameSerialization, actualStr);
     }
 
     public static void logDetailedSpecDiff(JSONComparator.Result diff) {

diff --git a/...tream-k8s-deployer-core/src/test/java/ai/langstream/deployer/k8s/util/SpecDifferTest.java b/...tream-k8s-deployer-core/src/test/java/ai/langstream/deployer/k8s/util/SpecDifferTest.java
@@ -0,0 +1,24 @@
+package ai.langstream.deployer.k8s.util;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+class SpecDifferTest {
+
+    @Test
+    void testJsonOrderAndNulls() throws Exception {
+        String json1 =
+                """
+                {
+                  "c": 3,
+                  "a": 1,
+                  "b": null
+                }""";
+
+        JSONComparator.Result result = SpecDiffer.generateDiff(json1, Map.of("a", 1, "c", 3));
+        SpecDiffer.logDetailedSpecDiff(result);
+        assertTrue(result.areEquals());
+    }
+}
diff --git a/...age/src/test/java/ai/langstream/impl/storage/k8s/apps/KubernetesApplicationStoreTest.java b/...age/src/test/java/ai/langstream/impl/storage/k8s/apps/KubernetesApplicationStoreTest.java
@@ -66,11 +66,11 @@ void testApp() {
         assertNull(createdCr.getSpec().getImage());
         assertNull(createdCr.getSpec().getImagePullPolicy());
         assertEquals(
-                "{\"resources\":{},\"modules\":{},\"instance\":null,\"gateways\":null,\"agentRunners\":{}}",
+                "{\"resources\":{},\"modules\":{},\"agentRunners\":{}}",
                 createdCr.getSpec().getApplication());
         assertEquals(tenant, createdCr.getSpec().getTenant());
         assertEquals(
-                "{\"deleteMode\":\"CLEANUP_REQUIRED\",\"markedForDeletion\":false,\"seed\":0,\"runtimeVersion\":null,\"autoUpgradeRuntimeImagePullPolicy\":false,\"autoUpgradeAgentResources\":false,\"autoUpgradeAgentPodTemplate\":false}",
+                "{\"deleteMode\":\"CLEANUP_REQUIRED\",\"markedForDeletion\":false,\"seed\":0,\"autoUpgradeRuntimeImagePullPolicy\":false,\"autoUpgradeAgentResources\":false,\"autoUpgradeAgentPodTemplate\":false}",
                 createdCr.getSpec().getOptions());
 
         final Secret createdSecret =