Skip to content

Write standard levels as level elements in XML #985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wleeaf wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Write standard levels as level elements in XML #985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/org/cyclonedx/model/definition/Standard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ public void setRequirements(final List<Requirement> requirements) {
this.requirements = requirements;
}

@JacksonXmlElementWrapper(localName = "levels")
@JacksonXmlProperty(localName = "level")
public List<Level> getLevels() {
return levels;
}
Expand Down
10 changes: 10 additions & 0 deletions src/test/java/org/cyclonedx/BomXmlGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1335,6 +1335,16 @@ private File writeToFile(String xmlString) throws Exception {
return tempFile;
}

@Test
public void schema16StandardLevelsGenerationTest() throws Exception {
BomXmlGenerator generator = BomGeneratorFactory.createXml(Version.VERSION_16, createCommonBomXml("/1.6/valid-standard-1.6.xml"));
String xml = generator.toXmlString();
assertTrue(xml.contains("<level bom-ref=\"level-1\">"), xml);
File file = writeToFile(xml);
XmlParser parser = new XmlParser();
assertTrue(parser.isValid(file, Version.VERSION_16));
}

private Bom createCommonBomXml(String resource) throws Exception {
final byte[] bomBytes = Objects.requireNonNull(this.getClass().getResourceAsStream(resource)).readAllBytes();
XmlParser parser = new XmlParser();
Expand Down