Enhancements and polish code

mr-zepol · mr-zepol · commit 823b53faafdb · 2024-09-13T22:44:41.000-05:00
diff --git a/src/main/java/org/cyclonedx/model/attestation/Attestation.java b/src/main/java/org/cyclonedx/model/attestation/Attestation.java
@@ -5,9 +5,11 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
 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.ExtensibleElement;
 import org.cyclonedx.model.JsonOnly;
 import org.cyclonedx.model.Signature;
 
@@ -19,14 +21,15 @@
     "map",
     "signature"
 })
-public class Attestation
+public class Attestation extends ExtensibleElement
 {
   private String summary;
 
   private String assessor;
 
   private List<AttestationMap> map;
 
+  @JsonProperty("signature")
   @JsonOnly
   private Signature signature;
 
diff --git a/src/main/java/org/cyclonedx/model/attestation/Claim.java b/src/main/java/org/cyclonedx/model/attestation/Claim.java
@@ -9,6 +9,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.ExtensibleElement;
 import org.cyclonedx.model.ExternalReference;
 import org.cyclonedx.model.JsonOnly;
 import org.cyclonedx.model.Signature;
@@ -25,7 +26,7 @@
     "externalReferences",
     "signature"
 })
-public class Claim
+public class Claim extends ExtensibleElement
 {
   @JacksonXmlProperty(isAttribute = true, localName = "bom-ref")
   @JsonProperty("bom-ref")
diff --git a/src/main/java/org/cyclonedx/model/attestation/affirmation/Signatory.java b/src/main/java/org/cyclonedx/model/attestation/affirmation/Signatory.java
@@ -5,7 +5,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.cyclonedx.model.ExtensibleElement;
 import org.cyclonedx.model.ExternalReference;
diff --git a/src/main/java/org/cyclonedx/model/definition/Standard.java b/src/main/java/org/cyclonedx/model/definition/Standard.java
@@ -9,6 +9,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.ExtensibleElement;
 import org.cyclonedx.model.ExternalReference;
 import org.cyclonedx.model.JsonOnly;
 import org.cyclonedx.model.Signature;
@@ -25,7 +26,7 @@
     "externalReferences",
     "signature"
 })
-public class Standard
+public class Standard extends ExtensibleElement
 {
   @JacksonXmlProperty(isAttribute = true, localName = "bom-ref")
   @JsonProperty("bom-ref")
diff --git a/src/main/java/org/cyclonedx/model/vulnerability/ProofOfConcept.java b/src/main/java/org/cyclonedx/model/vulnerability/ProofOfConcept.java
@@ -71,4 +71,4 @@ public boolean equals(final Object object) {
   public int hashCode() {
     return Objects.hash(reproductionSteps, environment, supportingMaterial);
   }
-}
+}
diff --git a/src/main/java/org/cyclonedx/util/deserializer/ExpressionDeserializer.java b/src/main/java/org/cyclonedx/util/deserializer/ExpressionDeserializer.java
@@ -38,7 +38,7 @@ public Expression deserialize(final JsonParser p, final DeserializationContext c
     }
 
     if (node.isTextual()) {
-      return new Expression(node.asText());
+      return new Expression(node.asText().trim());
     }
     else {
       return parseExpressionNode(node);
@@ -58,10 +58,10 @@ private Expression parseExpressionNode(JsonNode node) {
 
     JsonNode textNode = node.get("expression");
     if (textNode != null) {
-      expression.setValue(textNode.asText());
+      expression.setValue(textNode.asText().trim());
     }
     else if (node.has("")) {
-      expression.setValue(node.get("").asText());
+      expression.setValue(node.get("").asText().trim());
     }
 
     return expression;
diff --git a/src/main/java/org/cyclonedx/util/deserializer/SignatoryDeserializer.java b/src/main/java/org/cyclonedx/util/deserializer/SignatoryDeserializer.java
@@ -54,7 +54,7 @@ private Signatory parseSignatory(JsonNode node) throws IOException {
       signatory.setRole(node.get("role").asText());
     }
 
-    JsonNode signatureNode = node.get("Signature");
+    JsonNode signatureNode = node.get("signature");
     if (signatureNode != null) {
       Signature signature = mapper.convertValue(node.get("signature"), Signature.class);
       signatory.setSignature(signature);
diff --git a/src/main/java/org/cyclonedx/util/serializer/SignatorySerializer.java b/src/main/java/org/cyclonedx/util/serializer/SignatorySerializer.java
@@ -29,7 +29,7 @@ public void serialize(Signatory value, JsonGenerator jsonGenerator, SerializerPr
       throws IOException {
     if (isXml && jsonGenerator instanceof ToXmlGenerator) {
       ToXmlGenerator xmlGenerator = (ToXmlGenerator) jsonGenerator;
-      serializeJson(xmlGenerator, value);
+      serializeXml(xmlGenerator, value, serializerProvider);
     } else {
       serializeJson(jsonGenerator, value);
     }

Original file line number	Diff line number	Diff line change
`@@ -71,4 +71,4 @@ public boolean equals(final Object object) {`
`71`	`71`	`public int hashCode() {`
`72`	`72`	`return Objects.hash(reproductionSteps, environment, supportingMaterial);`
`73`	`73`	`}`
`74`		`-}`
	`74`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public Expression deserialize(final JsonParser p, final DeserializationContext c`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`if (node.isTextual()) {`
`41`		`- return new Expression(node.asText());`
	`41`	`+ return new Expression(node.asText().trim());`
`42`	`42`	`}`
`43`	`43`	`else {`
`44`	`44`	`return parseExpressionNode(node);`
`@@ -58,10 +58,10 @@ private Expression parseExpressionNode(JsonNode node) {`
`58`	`58`
`59`	`59`	`JsonNode textNode = node.get("expression");`
`60`	`60`	`if (textNode != null) {`
`61`		`- expression.setValue(textNode.asText());`
	`61`	`+ expression.setValue(textNode.asText().trim());`
`62`	`62`	`}`
`63`	`63`	`else if (node.has("")) {`
`64`		`- expression.setValue(node.get("").asText());`
	`64`	`+ expression.setValue(node.get("").asText().trim());`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`return expression;`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ private Signatory parseSignatory(JsonNode node) throws IOException {`
`54`	`54`	`signatory.setRole(node.get("role").asText());`
`55`	`55`	`}`
`56`	`56`
`57`		`- JsonNode signatureNode = node.get("Signature");`
	`57`	`+ JsonNode signatureNode = node.get("signature");`
`58`	`58`	`if (signatureNode != null) {`
`59`	`59`	`Signature signature = mapper.convertValue(node.get("signature"), Signature.class);`
`60`	`60`	`signatory.setSignature(signature);`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public void serialize(Signatory value, JsonGenerator jsonGenerator, SerializerPr`
`29`	`29`	`throws IOException {`
`30`	`30`	`if (isXml && jsonGenerator instanceof ToXmlGenerator) {`
`31`	`31`	`ToXmlGenerator xmlGenerator = (ToXmlGenerator) jsonGenerator;`
`32`		`- serializeJson(xmlGenerator, value);`
	`32`	`+ serializeXml(xmlGenerator, value, serializerProvider);`
`33`	`33`	`} else {`
`34`	`34`	`serializeJson(jsonGenerator, value);`
`35`	`35`	`}`