Skip to content

Update schema generator for required fields #79

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

Merged
goneall merged 1 commit into from
Oct 7, 2022
Merged

Update schema generator for required fields #79

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
8 changes: 7 additions & 1 deletion src/main/java/org/spdx/tools/schema/OwlToJsonSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ public ObjectNode convertToJsonSchema() {
// Add in the extra properties
properties.set(SpdxConstants.PROP_DOCUMENT_NAMESPACE, createSimpleTypeSchema(JSON_TYPE_STRING,
"The URI provides an unambiguous mechanism for other SPDX documents to reference SPDX elements within this SPDX document."));
required.add(SpdxConstants.PROP_DOCUMENT_NAMESPACE);
properties.set(SpdxConstants.PROP_DOCUMENT_DESCRIBES, toArraySchema(createSimpleTypeSchema(JSON_TYPE_STRING, "SPDX ID for each Package, File, or Snippet."),
"Packages, files and/or Snippets described by this SPDX document", 0));

Expand Down Expand Up @@ -300,8 +301,13 @@ private ObjectNode derivePropertySchema(OntProperty property, PropertyRestrictio
propertySchema.put(JSON_RESTRICTION_TYPE, JSON_TYPE_STRING);
ArrayNode enums = jsonMapper.createArrayNode();
for (String val:restrictions.getEnumValues()) {
if (property.getLocalName().equals("algorithm") || property.getLocalName().equals("referenceCategory")) {
if (property.getLocalName().equals("algorithm")) {
enums.add(val.replaceAll("_", "-"));
} else if (property.getLocalName().equals("referenceCategory")) {
if (val.contains("_")) {
enums.add(val.replaceAll("_", "-"));
}
enums.add(val);
} else {
enums.add(val);
}
Expand Down