wip

Author: dlg1206

core/src/main/java/org/svip/repair/repair/RepairSPDX23CDX14.java

@@ -78,7 +78,7 @@ public SBOM repairSBOM(SBOM sbom, Map<Integer, Set<Fix<?>>> repairs) {
         String documentComment = sbom.getDocumentComment();
         Component rootComponent = sbom.getRootComponent();
         Set<Component> components = sbom.getComponents();
-        HashMap<String, Set<Relationship>> relationships = (HashMap<String, Set<Relationship>>) sbom.getRelationships();
+        Map<String, Set<Relationship>> relationships = sbom.getRelationships();
         Set<ExternalReference> externalReferences = sbom.getExternalReferences();
 
         for (Integer key : repairs.keySet()) {
@@ -121,7 +121,7 @@ public SBOM repairSBOM(SBOM sbom, Map<Integer, Set<Fix<?>>> repairs) {
             String scope = null;
             Set<String> purls = null;
             String publisher = null;
-            HashMap<String, Set<String>> properties = null;
+            Map<String, Set<String>> properties = null;
             String comment = null;
             String attributionText = null;
             String fileNotice = null;

core/src/main/java/org/svip/sbom/model/objects/CycloneDX14/CDX14ComponentObject.java

@@ -31,6 +31,8 @@
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import org.svip.compare.conflicts.Conflict;
 import org.svip.compare.conflicts.ConflictFactory;
 import org.svip.sbom.model.interfaces.generics.Component;
@@ -61,97 +63,123 @@
  */
 // todo - release notes
 @JsonPropertyOrder({"type", "mime-type", "bom-ref", "supplier", "author", "publisher",  "group", "name", "version", "description", "scope",  "hashes", "licenses", "copyright", "cpe", "purl", "externalReferences", "properties"})
+@JacksonXmlRootElement(localName = "component")
 public class CDX14ComponentObject implements CDX14Package {
 
     /**
      * Component's type
      */
+    @JsonProperty("type")
+    @JacksonXmlProperty(localName = "type", isAttribute = true)
     private final String type;
 
     /**
      * Component's uid
      */
+    @JsonProperty("bom-ref")
+    @JacksonXmlProperty(localName = "bom-ref", isAttribute = true)
     private final String uid;
 
     /**
      * Component's author
      */
+    @JsonProperty("author")
     private final String author;
 
     /**
      * Component's name
      */
+    @JsonProperty("name")
     private final String name;
 
     /**
      * Component's licenses
      */
+    @JsonProperty("licenses")
+    @JsonSerialize(using = CDX14LicenseCollectionSerializer.class)
     private final LicenseCollection licenses;
 
     /**
      * Component's copyright
      */
+    @JsonProperty("copyright")
     private final String copyright;
 
     /**
      * Component's hashes
      */
+    @JsonProperty("hashes")
+    @JsonSerialize(using = CDX14HashesSerializer.class)
     private final Map<String, String> hashes;
 
     /**
      * Component's supplier
      */
+    @JsonProperty("supplier")
     private final Organization supplier;
 
     /**
      * Component's version
      */
+    @JsonProperty("version")
     private final String version;
 
     /**
      * Component's description
      */
+    @JsonProperty("description")
+    @JsonSerialize(using = CDX14DescriptionSerializer.class)
     private final Description description;
 
     /**
      * Component's CPEs
      */
+    @JsonIgnore
     private final Set<String> cpes;
 
     /**
      * Component's PURLs
      */
+    @JsonIgnore
     private final Set<String> purls;
 
     /**
      * Component's mime type
      */
+    @JsonProperty("mime-type")
     private final String mimeType;
 
     /**
      * Component's publisher
      */
+    @JsonProperty("publisher")
     private final String publisher;
 
     /**
      * Component's scope
      */
+    @JsonProperty("scope")
     private final String scope;
 
     /**
      * Component's group
      */
+    @JsonProperty("group")
     private final String group;
 
     /**
      * Component's external references
      */
+    @JsonProperty("externalReferences")
     private final Set<ExternalReference> externalReferences;
 
     /**
      * Component's properties
      */
-    private final HashMap<String, Set<String>> properties;
+    @JsonProperty("properties")
+    @JacksonXmlProperty(localName = "properties")
+    @JsonSerialize(using = CDX14PropertiesSerializer.class)
+    private final Map<String, Set<String>> properties;
 
     /**
      * Constructor to build a new CDX 1.4 Component Object
@@ -209,7 +237,6 @@ public CDX14ComponentObject(String type, String uid, String author, String name,
      * @return the component's type
      */
     @Override
-    @JsonProperty("type")
     public String getType() {
         return this.type;
     }
@@ -220,7 +247,6 @@ public String getType() {
      * @return the component's uid
      */
     @Override
-    @JsonProperty("bom-ref")
     public String getUID() {
         return this.uid;
     }
@@ -231,7 +257,7 @@ public String getUID() {
      * @return the component's author
      */
     @Override
-    @JsonProperty("author")
+
     public String getAuthor() {
         return this.author;
     }
@@ -242,7 +268,6 @@ public String getAuthor() {
      * @return the component's name
      */
     @Override
-    @JsonProperty("name")
     public String getName() {
         return this.name;
     }
@@ -253,8 +278,6 @@ public String getName() {
      * @return the component's licenses
      */
     @Override
-    @JsonProperty("licenses")
-    @JsonSerialize(using = CDX14LicenseCollectionSerializer.class)
     public LicenseCollection getLicenses() {
         return this.licenses;
     }
@@ -265,7 +288,6 @@ public LicenseCollection getLicenses() {
      * @return the component's copyright info
      */
     @Override
-    @JsonProperty("copyright")
     public String getCopyright() {
         return this.copyright;
     }
@@ -276,8 +298,6 @@ public String getCopyright() {
      * @return the component's hashes
      */
     @Override
-    @JsonProperty("hashes")
-    @JsonSerialize(using = CDX14HashesSerializer.class)
     public Map<String, String> getHashes() {
         return this.hashes;
     }
@@ -288,7 +308,6 @@ public Map<String, String> getHashes() {
      * @return The component's supplier
      */
     @Override
-    @JsonProperty("supplier")
     public Organization getSupplier() {
         return this.supplier;
     }
@@ -299,7 +318,6 @@ public Organization getSupplier() {
      * @return the component's version
      */
     @Override
-    @JsonProperty("version")
     public String getVersion() {
         return this.version;
     }
@@ -310,8 +328,6 @@ public String getVersion() {
      * @return the component's description
      */
     @Override
-    @JsonProperty("description")
-    @JsonSerialize(using = CDX14DescriptionSerializer.class)
     public Description getDescription() {
         return this.description;
     }
@@ -322,7 +338,6 @@ public Description getDescription() {
      * @return the component's CPEs
      */
     @Override
-    @JsonIgnore
     public Set<String> getCPEs() {
         return this.cpes;
     }
@@ -333,7 +348,6 @@ public Set<String> getCPEs() {
      * @return the component's PURLs
      */
     @Override
-    @JsonIgnore
     public Set<String> getPURLs() {
         return this.purls;
     }
@@ -344,7 +358,6 @@ public Set<String> getPURLs() {
      * @return the component's external references
      */
     @Override
-    @JsonProperty("externalReferences")
     public Set<ExternalReference> getExternalReferences() {
         return this.externalReferences;
     }
@@ -355,7 +368,6 @@ public Set<ExternalReference> getExternalReferences() {
      * @return the component's mime type
      */
     @Override
-    @JsonProperty("mime-type")
     public String getMimeType() {
         return this.mimeType;
     }
@@ -366,7 +378,6 @@ public String getMimeType() {
      * @return the component's publisher
      */
     @Override
-    @JsonProperty("publisher")
     public String getPublisher() {
         return this.publisher;
     }
@@ -377,7 +388,6 @@ public String getPublisher() {
      * @return the component's scope
      */
     @Override
-    @JsonProperty("scope")
     public String getScope() {
         return this.scope;
     }
@@ -388,7 +398,6 @@ public String getScope() {
      * @return the component's group
      */
     @Override
-    @JsonProperty("group")
     public String getGroup() {
         return this.group;
     }
@@ -399,9 +408,7 @@ public String getGroup() {
      * @return the component's properties
      */
     @Override
-    @JsonProperty("properties")
-    @JsonSerialize(using = CDX14PropertiesSerializer.class)
-    public HashMap<String, Set<String>> getProperties() {
+    public Map<String, Set<String>> getProperties() {
         return this.properties;
     }