fix: Safely serialize JSON map [DHIS2-18253] [2.40] (#18875)

dhis2 · Oct 22, 2024 · 15457f5 · 15457f5
1 parent a420343
commit 15457f5
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/...ernate/src/main/java/org/hisp/dhis/hibernate/jsonb/type/JsonAttributeValueBinaryType.java b/...ernate/src/main/java/org/hisp/dhis/hibernate/jsonb/type/JsonAttributeValueBinaryType.java
@@ -30,6 +30,7 @@
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
+import java.io.UncheckedIOException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -58,16 +59,18 @@ public String convertObjectToJson(Object object) {
       Map<String, AttributeValue> attrValueMap = new HashMap<>();
 
       for (AttributeValue attributeValue : attributeValues) {
-        if (attributeValue.getAttribute() != null) {
-          attributeValue.setAttribute(new Attribute(attributeValue.getAttribute().getUid()));
-          attrValueMap.put(attributeValue.getAttribute().getUid(), attributeValue);
+        if (attributeValue.getAttribute() != null
+            && attributeValue.getAttribute().getUid() != null) {
+          String uid = attributeValue.getAttribute().getUid();
+          attributeValue.setAttribute(new Attribute(uid));
+          attrValueMap.put(uid, attributeValue);
         }
       }
 
       return writer.writeValueAsString(attrValueMap);
 
-    } catch (IOException e) {
-      throw new RuntimeException(e);
+    } catch (IOException ex) {
+      throw new UncheckedIOException("Failed to serialize JSON", ex);
     }
   }
 
@@ -83,8 +86,8 @@ public Object convertJsonToObject(String content) {
       Map<String, AttributeValue> data = reader.readValue(content);
 
       return convertAttributeValueMapIntoSet(data);
-    } catch (IOException e) {
-      throw new RuntimeException(e);
+    } catch (IOException ex) {
+      throw new UncheckedIOException("Failed to deserialize JSON", ex);
     }
   }