Add deserializer

Signed-off-by: Alex Alzate <[email protected]>

Author: mr-zepol

src/main/java/org/cyclonedx/model/ReleaseNotes.java

@@ -69,6 +69,7 @@ public ReleaseNotes() {}
   @VersionFilter(Version.VERSION_14)
   private Date timestamp;
   private List<String> aliases;
+  @JsonProperty("tags")
   private Tags tags;
   private List<Resolves> resolves;
   private List<Notes> notes;

src/main/java/org/cyclonedx/model/Service.java

@@ -75,6 +75,7 @@ public class Service extends ExtensibleElement {
     @VersionFilter(Version.VERSION_13)
     private List<Property> properties;
     @VersionFilter(value = Version.VERSION_16)
+    @JsonProperty("tags")
     private Tags tags;
     private List<Service> services;
     private ReleaseNotes releaseNotes;

src/main/java/org/cyclonedx/model/component/Tags.java

@@ -5,19 +5,22 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import org.cyclonedx.util.deserializer.StringListDeserializer;
+import org.cyclonedx.util.deserializer.TagsDeserializer;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
+@JsonDeserialize(using = TagsDeserializer.class)
 public class Tags
 {
   private List<String> tags;
 
-  @JacksonXmlElementWrapper(localName = "tags")
-  @JacksonXmlProperty(localName = "tag")
-  @JsonDeserialize(using = StringListDeserializer.class)
+  public Tags() {
+  }
+
+  public Tags(List<String> tags){
+    this.tags = tags;
+  }
+
   public List<String> getTags() {
     return tags;
   }

src/main/java/org/cyclonedx/util/deserializer/TagsDeserializer.java

@@ -0,0 +1,44 @@
+package org.cyclonedx.util.deserializer;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import org.cyclonedx.model.component.Tags;
+
+public class TagsDeserializer
+    extends JsonDeserializer<Tags>
+{
+
+  private final ObjectMapper mapper = new ObjectMapper();
+  @Override
+  public Tags deserialize(JsonParser parser, DeserializationContext context) throws IOException {
+    JsonNode node = parser.getCodec().readTree(parser);
+
+    if(node.has("tag")) {
+      return parseNode(node.get("tag"));
+    } else {
+      return parseNode(node);
+    }
+  }
+
+  private Tags parseNode(JsonNode node) {
+    List<String> list = new ArrayList<>();
+
+    ArrayNode nodes = (node.isArray() ? (ArrayNode) node : new ArrayNode(null).add(node));
+    for (JsonNode tagNode : nodes) {
+      list.add(tagNode.asText());
+    }
+
+    if(!list.isEmpty()) {
+      return new Tags(list);
+    }
+    return null;
+  }
+}