Fix Issue

CycloneDX · Sep 7, 2024 · e91811b · e91811b
1 parent dde0024
commit e91811b
Show file tree

Hide file tree

Showing 5 changed files with 138 additions and 192 deletions.
diff --git a/src/main/java/org/cyclonedx/model/component/evidence/Occurrence.java b/src/main/java/org/cyclonedx/model/component/evidence/Occurrence.java
@@ -5,6 +5,7 @@
 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.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import org.cyclonedx.Version;
@@ -14,6 +15,7 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 @JacksonXmlRootElement(localName = "occurrence")
+@JsonPropertyOrder({"bom-ref", "location", "line", "offset", "symbol", "additionalContext"})
 public class Occurrence extends ExtensibleElement
 {
   @JacksonXmlProperty(isAttribute = true, localName = "bom-ref")
@@ -30,7 +32,7 @@ public class Occurrence extends ExtensibleElement
   private Integer offset;
 
   @VersionFilter(Version.VERSION_16)
-  private Integer symbol;
+  private String symbol;
 
   @VersionFilter(Version.VERSION_16)
   private String additionalContext;
@@ -67,11 +69,11 @@ public void setOffset(final Integer offset) {
     this.offset = offset;
   }
 
-  public Integer getSymbol() {
+  public String getSymbol() {
     return symbol;
   }
 
-  public void setSymbol(final Integer symbol) {
+  public void setSymbol(final String symbol) {
     this.symbol = symbol;
   }
 

diff --git a/src/test/java/org/cyclonedx/parsers/AbstractParserTest.java b/src/test/java/org/cyclonedx/parsers/AbstractParserTest.java
@@ -680,9 +680,9 @@ private void assertEvidence(final Evidence evidence, final Version version) {
     assertEquals("http://www.apache.org/licenses/LICENSE-2.0",
         evidence.getLicenseChoice().getLicenses().get(0).getUrl());
 
-    if (version == Version.VERSION_15) {
+    if (version.getVersion() >= Version.VERSION_15.getVersion()) {
       assertCallStack(evidence.getCallstack());
-      assertOccurrences(evidence.getOccurrences());
+      assertOccurrences(evidence.getOccurrences(), version);
       assertEquals(1, evidence.getIdentities().size());
       assertIdentifiers(evidence.getIdentities().get(0), version);
     }
@@ -693,12 +693,16 @@ private void assertEvidence(final Evidence evidence, final Version version) {
     }
   }
 
-  private void assertOccurrences(final List<Occurrence> occurrences){
+  private void assertOccurrences(final List<Occurrence> occurrences, Version version){
     assertEquals(occurrences.size(), 1);
     Occurrence occurrence = occurrences.get(0);
 
     assertNotNull(occurrence.getBomRef());
     assertNotNull(occurrence.getLocation());
+
+    if (version.getVersion() >= Version.VERSION_16.getVersion()) {
+      assertNotNull(occurrence.getSymbol());
+    }
   }
 
   private void assertCallStack(final Callstack callstack){