From 3aaca2de11a2fcf8a67f271779a2e500f1de6a78 Mon Sep 17 00:00:00 2001
From: Jochen Mader <jochen.mader@hivemq.com>
Date: Fri, 24 Jan 2025 14:25:04 +0100
Subject: [PATCH] FIxed a bug where null-values resulted in nonrenderable json

---
 .../java/com/hivemq/persistence/domain/DomainTag.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/hivemq-edge/src/main/java/com/hivemq/persistence/domain/DomainTag.java b/hivemq-edge/src/main/java/com/hivemq/persistence/domain/DomainTag.java
index 820f0009b5..965c0fd8bc 100644
--- a/hivemq-edge/src/main/java/com/hivemq/persistence/domain/DomainTag.java
+++ b/hivemq-edge/src/main/java/com/hivemq/persistence/domain/DomainTag.java
@@ -28,13 +28,13 @@ public class DomainTag {
 
     private final @NotNull String tagName;
     private final @NotNull String adapterId;
-    private final @NotNull String description;
+    private final @Nullable String description;
     private final @NotNull JsonNode definition;
 
     public DomainTag(
             final @NotNull String tagName,
             final @NotNull String adapterId,
-            final @NotNull String description,
+            final @Nullable String description,
             final @NotNull JsonNode definition) {
         this.tagName = tagName;
         this.adapterId = adapterId;
@@ -46,7 +46,8 @@ public DomainTag(
             final @NotNull com.hivemq.edge.api.model.DomainTag domainTag,
             final @NotNull String adapterId,
             final @NotNull ObjectMapper objectMapper) {
-        return new DomainTag(domainTag.getName(),
+        return new DomainTag(
+                domainTag.getName(),
                 adapterId,
                 domainTag.getDescription(),
                 objectMapper.valueToTree(domainTag.getDefinition()));
@@ -75,7 +76,7 @@ public DomainTag(
     }
 
     public @NotNull Map<String, Object> toTagMap() {
-        return Map.of("name", tagName, "description", description, "definition", definition);
+        return Map.of("name", tagName, "description", description != null ? description : "", "definition", definition);
     }
 
     // only tag is used as duplicates based on this field are not allowed.