Merge pull request #501 from CycloneDX/issue_497

Author: nscuro

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

@@ -28,7 +28,7 @@
 import org.cyclonedx.model.component.ModelCard;
 import org.cyclonedx.model.component.crypto.CryptoProperties;
 import org.cyclonedx.model.component.Tags;
-import org.cyclonedx.model.component.modelCard.ComponentData;
+import org.cyclonedx.model.component.data.ComponentData;
 import org.cyclonedx.util.deserializer.ExternalReferencesDeserializer;
 import org.cyclonedx.util.deserializer.HashesDeserializer;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

src/main/java/org/cyclonedx/model/attestation/evidence/Data.java

@@ -8,7 +8,7 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import org.cyclonedx.model.component.modelCard.data.Governance;
+import org.cyclonedx.model.component.data.Governance;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)

src/main/java/org/cyclonedx/model/component/modelCard/ComponentData.java renamed to src/main/java/org/cyclonedx/model/component/data/ComponentData.java

@@ -1,4 +1,4 @@
-package org.cyclonedx.model.component.modelCard;
+package org.cyclonedx.model.component.data;
 
 import java.util.List;
 import java.util.Objects;
@@ -8,9 +8,6 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import org.cyclonedx.model.ExtensibleElement;
-import org.cyclonedx.model.component.modelCard.data.Content;
-import org.cyclonedx.model.component.modelCard.data.Governance;
-import org.cyclonedx.model.component.modelCard.data.Graphics;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)

src/main/java/org/cyclonedx/model/component/modelCard/data/Content.java renamed to src/main/java/org/cyclonedx/model/component/data/Content.java

@@ -1,4 +1,4 @@
-package org.cyclonedx.model.component.modelCard.data;
+package org.cyclonedx.model.component.data;
 
 import java.util.List;
 import java.util.Objects;

src/main/java/org/cyclonedx/model/component/modelCard/DatasetChoice.java renamed to src/main/java/org/cyclonedx/model/component/data/DatasetChoice.java

@@ -1,4 +1,4 @@
-package org.cyclonedx.model.component.modelCard;
+package org.cyclonedx.model.component.data;
 
 import java.util.Objects;
 

src/main/java/org/cyclonedx/model/component/modelCard/data/Governance.java renamed to src/main/java/org/cyclonedx/model/component/data/Governance.java

@@ -1,4 +1,4 @@
-package org.cyclonedx.model.component.modelCard.data;
+package org.cyclonedx.model.component.data;
 
 import java.util.List;
 import java.util.Objects;

src/main/java/org/cyclonedx/model/component/modelCard/data/Graphics.java renamed to src/main/java/org/cyclonedx/model/component/data/Graphics.java

@@ -1,4 +1,4 @@
-package org.cyclonedx.model.component.modelCard.data;
+package org.cyclonedx.model.component.data;
 
 import java.util.List;
 import java.util.Objects;

src/main/java/org/cyclonedx/model/component/modelCard/ModelParameters.java

@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import org.cyclonedx.model.ExtensibleElement;
+import org.cyclonedx.model.component.data.DatasetChoice;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)

src/main/java/org/cyclonedx/model/component/modelCard/QuantitativeAnalysis.java

@@ -9,7 +9,8 @@
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import org.cyclonedx.model.ExtensibleElement;
-import org.cyclonedx.model.component.modelCard.data.Graphics;
+import org.cyclonedx.model.component.data.Graphics;
+
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 @JsonPropertyOrder({"performanceMetrics", "graphics"})

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

@@ -6,8 +6,8 @@
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.cyclonedx.model.component.modelCard.ComponentData;
-import org.cyclonedx.model.component.modelCard.DatasetChoice;
+import org.cyclonedx.model.component.data.ComponentData;
+import org.cyclonedx.model.component.data.DatasetChoice;
 
 import java.io.IOException;