Skip to content

OWL to JSON LD Context - only add singular properties if singular #30

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 4 commits into from
Oct 22, 2021
Merged

OWL to JSON LD Context - only add singular properties if singular #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6e905a
OWL to JSON LD Context - only add singular properties if singular
goneall Sep 20, 2021
c259362
Merge sort changes from master
goneall Sep 25, 2021
727de1c
Fix formatting
goneall Sep 25, 2021
b01080a
Change sort to allow for same local name in different namespaces
goneall Sep 27, 2021
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
1 change: 0 additions & 1 deletion src/main/java/org/spdx/tools/RdfSchemaToJsonSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Objects;

import org.apache.jena.ontology.OntModel;
Expand Down
19 changes: 11 additions & 8 deletions src/main/java/org/spdx/tools/schema/OwlToJsonContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,22 +82,18 @@ public ObjectNode convertToContext() {
ExtendedIterator<OntProperty> iter = model.listAllOntProperties();
while (iter.hasNext()) {
OntProperty property = iter.next();
String propNamespace = uriToNamespace(property.getURI());
String propName = uriToPropName(property.getURI());
sortedOntProperties.put(propName, property);
String id = propNamespace + propName;
sortedOntProperties.put(id, property);
}
for (Entry<String, OntProperty> ontPropEntry:sortedOntProperties.entrySet()) {
String propNamespace = uriToNamespace(ontPropEntry.getValue().getURI());
String propName = ontPropEntry.getKey();
ObjectNode propContext = JSON_MAPPER.createObjectNode();
propContext.put("@id", propNamespace + propName);
String propName = uriToPropName(ontPropEntry.getValue().getURI());

PropertyRestrictions propertyRestrictions = new PropertyRestrictions(ontPropEntry.getValue());
boolean hasListProperty = propertyRestrictions.isListProperty();
String typeUri = propertyRestrictions.getTypeUri();
if (Objects.nonNull(typeUri)) {
propContext.put("@type", uriToNamespace(typeUri) + uriToPropName(typeUri));
}
contexts.set(propName, propContext);
if (hasListProperty) {
String listPropName = MultiFormatStore.propertyNameToCollectionPropertyName(propName);
ObjectNode listPropContext = JSON_MAPPER.createObjectNode();
Expand All @@ -107,6 +103,13 @@ public ObjectNode convertToContext() {
}
listPropContext.put("@container", "@set");
contexts.set(listPropName, listPropContext);
} if (propertyRestrictions.isSingleProperty()) {
Comment thread
goneall marked this conversation as resolved.
ObjectNode propContext = JSON_MAPPER.createObjectNode();
propContext.put("@id", ontPropEntry.getKey());
if (Objects.nonNull(typeUri)) {
propContext.put("@type", uriToNamespace(typeUri) + uriToPropName(typeUri));
}
contexts.set(propName, propContext);
}
}
ObjectNode context = JSON_MAPPER.createObjectNode();
Expand Down