Skip to content

Update JSON Schema generation #27

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
Sep 2, 2021
Merged

Update JSON Schema generation #27

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
20 changes: 16 additions & 4 deletions 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 @@ -80,6 +80,8 @@ public class OwlToJsonSchema extends AbstractOwlRdfConverter {
spdxids.add(SpdxConstants.CLASS_SPDX_SNIPPET);
USES_SPDXIDS = Collections.unmodifiableSet(spdxids);
}

static final String SINGLE_POINTER_URI = "http://www.w3.org/2009/pointers#SinglePointer";

public OwlToJsonSchema(OntModel model) {
super(model);
Expand Down Expand Up @@ -126,6 +128,7 @@ public ObjectNode convertToJsonSchema() {
properties.set("relationships", toArrayPropertySchema(relationshipClass, 0));
root.set("properties", properties);
root.set("required", required);
root.put("additionalProperties", false);
return root;
}

Expand Down Expand Up @@ -178,6 +181,7 @@ private ObjectNode ontClassToJsonSchema(OntClass ontClass) {
if (required.size() > 0) {
retval.set("required", required);
}
retval.put("additionalProperties", false);
}
return retval;
}
Expand Down Expand Up @@ -334,10 +338,6 @@ private ObjectNode derivePropertySchema(OntProperty property, PropertyRestrictio
propertySchema.put(JSON_RESTRICTION_TYPE, JSON_TYPE_STRING);
} else if (Objects.nonNull(clazz) && ReferenceType.class.isAssignableFrom(clazz)) {
// check for ReferenceType - these are strings URI's and not the full object description
JsonNode description = propertySchema.get("description");
if (Objects.nonNull(description)) {
propertySchema.put("description", description.asText());
}
propertySchema.put(JSON_RESTRICTION_TYPE, JSON_TYPE_STRING);
} else {
OntClass typeClass = model.getOntClass(restrictions.getTypeUri());
Expand All @@ -360,6 +360,18 @@ private ObjectNode derivePropertySchema(OntProperty property, PropertyRestrictio
}
Objects.requireNonNull(typeClass, "No type class found for "+restrictions.getTypeUri());
propertySchema = ontClassToJsonSchema(typeClass);
if (SINGLE_POINTER_URI.equals(restrictions.getTypeUri())) {
// Need to add in the line and offset properties
// These are not in the OWL schema since the generic OffsetPointer in the range
// does not include these subclass values
ObjectNode properties = (ObjectNode) propertySchema.get("properties");
if (!properties.has("offset")) {
properties.set("offset", createSimpleTypeSchema(JSON_TYPE_INTEGER, "Byte offset in the file"));
}
if (!properties.has("lineNumber")) {
properties.set("lineNumber", createSimpleTypeSchema(JSON_TYPE_INTEGER, "line number offset in the file"));
}
}
}
return propertySchema;
}
Expand Down