Skip to content

Commit 8e83322

Browse files
committed
Fix Issue
1 parent dde0024 commit 8e83322

4 files changed

Lines changed: 13 additions & 7 deletions

File tree

src/main/java/org/cyclonedx/model/component/evidence/Occurrence.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class Occurrence extends ExtensibleElement
3030
private Integer offset;
3131

3232
@VersionFilter(Version.VERSION_16)
33-
private Integer symbol;
33+
private String symbol;
3434

3535
@VersionFilter(Version.VERSION_16)
3636
private String additionalContext;
@@ -67,11 +67,11 @@ public void setOffset(final Integer offset) {
6767
this.offset = offset;
6868
}
6969

70-
public Integer getSymbol() {
70+
public String getSymbol() {
7171
return symbol;
7272
}
7373

74-
public void setSymbol(final Integer symbol) {
74+
public void setSymbol(final String symbol) {
7575
this.symbol = symbol;
7676
}
7777

src/test/java/org/cyclonedx/parsers/AbstractParserTest.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -680,9 +680,9 @@ private void assertEvidence(final Evidence evidence, final Version version) {
680680
assertEquals("http://www.apache.org/licenses/LICENSE-2.0",
681681
evidence.getLicenseChoice().getLicenses().get(0).getUrl());
682682

683-
if (version == Version.VERSION_15) {
683+
if (version.getVersion() >= Version.VERSION_15.getVersion()) {
684684
assertCallStack(evidence.getCallstack());
685-
assertOccurrences(evidence.getOccurrences());
685+
assertOccurrences(evidence.getOccurrences(), version);
686686
assertEquals(1, evidence.getIdentities().size());
687687
assertIdentifiers(evidence.getIdentities().get(0), version);
688688
}
@@ -693,12 +693,16 @@ private void assertEvidence(final Evidence evidence, final Version version) {
693693
}
694694
}
695695

696-
private void assertOccurrences(final List<Occurrence> occurrences){
696+
private void assertOccurrences(final List<Occurrence> occurrences, Version version){
697697
assertEquals(occurrences.size(), 1);
698698
Occurrence occurrence = occurrences.get(0);
699699

700700
assertNotNull(occurrence.getBomRef());
701701
assertNotNull(occurrence.getLocation());
702+
703+
if (version.getVersion() >= Version.VERSION_16.getVersion()) {
704+
assertNotNull(occurrence.getSymbol());
705+
}
702706
}
703707

704708
private void assertCallStack(final Callstack callstack){

src/test/resources/1.6/valid-evidence-1.6.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646
"occurrences": [
4747
{
4848
"bom-ref": "d6bf237e-4e11-4713-9f62-56d18d5e2079",
49-
"location": "/path/to/component"
49+
"location": "/path/to/component",
50+
"symbol": "test"
5051
},
5152
{
5253
"bom-ref": "b574d5d1-e3cf-4dcd-9ba5-f3507eb1b175",

src/test/resources/1.6/valid-evidence-1.6.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<occurrences>
4141
<occurrence bom-ref="d6bf237e-4e11-4713-9f62-56d18d5e2079">
4242
<location>/path/to/component</location>
43+
<symbol>test</symbol>
4344
</occurrence>
4445
<occurrence bom-ref="b574d5d1-e3cf-4dcd-9ba5-f3507eb1b175">
4546
<location>/another/path/to/component</location>

0 commit comments

Comments
 (0)