Merge pull request #501 from CycloneDX/issue_497

CycloneDX · Nov 22, 2024 · 08a9448 · 08a9448
2 parents d9f8d4c + 08e03f8
commit 08a9448
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 13 deletions.
diff --git a/src/main/java/org/cyclonedx/model/Component.java b/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;

diff --git a/src/main/java/org/cyclonedx/model/attestation/evidence/Data.java b/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)

diff --git a/...el/component/modelCard/ComponentData.java → ...x/model/component/data/ComponentData.java b/...el/component/modelCard/ComponentData.java → ...x/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)

diff --git a/...del/component/modelCard/data/Content.java → ...clonedx/model/component/data/Content.java b/...del/component/modelCard/data/Content.java → ...clonedx/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;

diff --git a/...el/component/modelCard/DatasetChoice.java → ...x/model/component/data/DatasetChoice.java b/...el/component/modelCard/DatasetChoice.java → ...x/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;
 

diff --git a/.../component/modelCard/data/Governance.java → ...nedx/model/component/data/Governance.java b/.../component/modelCard/data/Governance.java → ...nedx/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;

diff --git a/...el/component/modelCard/data/Graphics.java → ...lonedx/model/component/data/Graphics.java b/...el/component/modelCard/data/Graphics.java → ...lonedx/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;

diff --git a/src/main/java/org/cyclonedx/model/component/modelCard/ModelParameters.java b/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)

diff --git a/src/main/java/org/cyclonedx/model/component/modelCard/QuantitativeAnalysis.java b/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"})

diff --git a/src/main/java/org/cyclonedx/util/deserializer/DatasetsChoiceDeserializer.java b/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;