From cda54869511bba6f128c124b444d4017e447bdc7 Mon Sep 17 00:00:00 2001
From: Silvio Giebl <silvio.giebl@hivemq.com>
Date: Mon, 2 Sep 2024 17:51:01 +0200
Subject: [PATCH] Serialize PolicyOperation.onBranch empty list same as null

---
 .../com/hivemq/cli/utils/json/DataHubSerialization.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/hivemq/cli/utils/json/DataHubSerialization.java b/src/main/java/com/hivemq/cli/utils/json/DataHubSerialization.java
index 79b4bc94..c1a4e934 100644
--- a/src/main/java/com/hivemq/cli/utils/json/DataHubSerialization.java
+++ b/src/main/java/com/hivemq/cli/utils/json/DataHubSerialization.java
@@ -22,6 +22,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collection;
+
 public class DataHubSerialization {
     public static @Nullable JsonElement serializePolicyOperation(
             final @Nullable HivemqOpenapiPolicyOperation policyOperation,
@@ -38,7 +40,11 @@ public class DataHubSerialization {
         operationObject.add(HivemqOpenapiPolicyOperation.SERIALIZED_NAME_ARGUMENTS,
                 context.serialize(policyOperation.getArguments()));
         operationObject.add(HivemqOpenapiPolicyOperation.SERIALIZED_NAME_ON_BRANCH,
-                context.serialize(policyOperation.getOnBranch()));
+                context.serialize(emptyToNull(policyOperation.getOnBranch())));
         return operationObject;
     }
+
+    private static <T extends Collection<?>> @Nullable T emptyToNull(final @Nullable T collection) {
+        return (collection == null) ? null : ((collection.isEmpty()) ? null : collection);
+    }
 }