change Tag.data type to JsonNode

Author: Puckoland

shongo-controller/src/main/java/cz/cesnet/shongo/controller/booking/request/auxdata/tagdata/NotifyEmailAuxData.java

@@ -1,14 +1,11 @@
 package cz.cesnet.shongo.controller.booking.request.auxdata.tagdata;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
 import cz.cesnet.shongo.controller.booking.request.auxdata.AuxData;
 import cz.cesnet.shongo.controller.booking.resource.Tag;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 public class NotifyEmailAuxData extends TagData<List<String>>
 {
@@ -21,26 +18,14 @@ public NotifyEmailAuxData(Tag tag, AuxData auxData)
     @Override
     public List<String> getData()
     {
-        List<String> tagDataEmails;
-        List<String> auxDataEmails;
+        List<String> emails = new ArrayList<>();
 
-        try {
-            tagDataEmails = objectMapper.readValue(tag.getData(), new TypeReference<>() {
-            });
-        } catch (JsonProcessingException | NullPointerException e) {
-            logger.warn("Error while parsing tag data: {}", e.getMessage());
-            tagDataEmails = new ArrayList<>();
+        for (JsonNode child : tag.getData()) {
+            emails.add(child.asText());
         }
-        try {
-            auxDataEmails = objectMapper.readValue(aux.getData().toString(), new TypeReference<>() {
-            });
-        } catch (JsonProcessingException | NullPointerException e) {
-            logger.warn("Error while parsing aux data: {}", e.getMessage());
-            auxDataEmails = new ArrayList<>();
+        for (JsonNode child : aux.getData()) {
+            emails.add(child.asText());
         }
-
-        return Stream
-                .concat(tagDataEmails.stream(), auxDataEmails.stream())
-                .collect(Collectors.toList());
+        return emails;
     }
 }

shongo-controller/src/main/java/cz/cesnet/shongo/controller/booking/request/auxdata/tagdata/TagData.java

@@ -1,6 +1,5 @@
 package cz.cesnet.shongo.controller.booking.request.auxdata.tagdata;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import cz.cesnet.shongo.TodoImplementException;
 import cz.cesnet.shongo.controller.booking.request.auxdata.AuxData;
 import cz.cesnet.shongo.controller.booking.request.auxdata.AuxDataFilter;
@@ -13,8 +12,6 @@ public abstract class TagData<T>
 
     protected static Logger logger = LoggerFactory.getLogger(TagData.class);
 
-    protected final ObjectMapper objectMapper = new ObjectMapper();
-
     protected final Tag tag;
     protected final AuxData aux;
 

shongo-controller/src/main/java/cz/cesnet/shongo/controller/booking/resource/Tag.java

@@ -1,28 +1,31 @@
 package cz.cesnet.shongo.controller.booking.resource;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import cz.cesnet.shongo.SimplePersistentObject;
 import cz.cesnet.shongo.api.AbstractComplexType;
 import cz.cesnet.shongo.controller.api.TagType;
 import cz.cesnet.shongo.controller.booking.ObjectIdentifier;
 import org.hibernate.annotations.Type;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
+import javax.persistence.*;
 
 /**
  * @author: Ondřej Pavelka <pavelka@cesnet.cz>
  */
 @Entity
 public class Tag extends SimplePersistentObject {
 
+    @Transient
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
     @Column(unique = true)
     private String name;
 
     private TagType type;
 
-    private String data;
+    private JsonNode data;
 
     public String getName()
     {
@@ -47,13 +50,13 @@ public void setType(TagType type)
     }
 
     @Type(type = "jsonb")
-    @Column(columnDefinition = "text")
-    public String getData()
+    @Column(columnDefinition = "jsonb")
+    public JsonNode getData()
     {
         return data;
     }
 
-    public void setData(String data)
+    public void setData(JsonNode data)
     {
         this.data = data;
     }
@@ -73,7 +76,16 @@ public void toApi(cz.cesnet.shongo.controller.api.Tag tagApi)
         tagApi.setId(ObjectIdentifier.formatId(this));
         tagApi.setName(name);
         tagApi.setType(type);
-        tagApi.setData(data);
+        if (data == null) {
+            tagApi.setData("");
+        }
+        else {
+            try {
+                tagApi.setData(objectMapper.writeValueAsString(data));
+            } catch (JsonProcessingException e) {
+                throw new IllegalArgumentException("Failed to parse data", e);
+            }
+        }
     }
 
     /**
@@ -91,6 +103,12 @@ public void fromApi(cz.cesnet.shongo.controller.api.Tag tagApi)
     {
         this.setName(tagApi.getName());
         this.setType(tagApi.getType());
-        this.setData(tagApi.getData());
+        if (tagApi.getData() != null) {
+            try {
+                setData(objectMapper.readTree(tagApi.getData()));
+            } catch (JsonProcessingException e) {
+                throw new IllegalArgumentException("Data is not a valid JSON", e);
+            }
+        }
     }
 }