Skip to content

Commit

Permalink
chore: do not generate combined output jsonld in case of single input…
Browse files Browse the repository at this point in the history
… file
  • Loading branch information
kshychko committed Jul 10, 2024
1 parent e05a4a2 commit ed000c4
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 18 deletions.
2 changes: 1 addition & 1 deletion jsonld-utility/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.unece.uncefact</groupId>
<artifactId>vocab-jsonld-utility</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
<build>
<plugins>
<plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -836,25 +836,28 @@ else if (comment instanceof JsonArray){
rootObject.add("batch", batchArrayDeleteBuilder.build());
new FileGenerator().generateFile(rootObject.build(), false, workingDir.concat("batch-delete").concat(".json"));


combinedVocabulary.add("@context", context);
combinedVocabulary.add("@graph", combinedGraphVocabulary.build());
new FileGenerator().generateFile(combinedVocabulary.build(), true, workingDir.concat("unece").concat(".jsonld"));

JsonObjectBuilder combinedContextObjectBuilder = Json.createObjectBuilder(context);
combinedContextObjectBuilder.add("id", Constants.ID);
combinedContextObjectBuilder.add("type", Constants.TYPE);

List<String> contextItemsKeys = new ArrayList<>();
contextItemsKeys.addAll(contextItemsMap.keySet());
Collections.sort(contextItemsKeys);

for (String contextItem: contextItemsKeys){
combinedContextObjectBuilder.add(contextItem, contextItemsMap.get(contextItem));
if (inputFileNames.size()>1) {
combinedVocabulary.add("@context", context);
combinedVocabulary.add("@graph", combinedGraphVocabulary.build());
new FileGenerator().generateFile(combinedVocabulary.build(), true, workingDir.concat("combined").concat(".jsonld"));

JsonObjectBuilder combinedContextObjectBuilder = Json.createObjectBuilder(context);
combinedContextObjectBuilder.add("id", Constants.ID);
combinedContextObjectBuilder.add("type", Constants.TYPE);

List<String> contextItemsKeys = new ArrayList<>();
contextItemsKeys.addAll(contextItemsMap.keySet());
Collections.sort(contextItemsKeys);

for (String contextItem: contextItemsKeys){
combinedContextObjectBuilder.add(contextItem, contextItemsMap.get(contextItem));
}
combinedContext.add("@context", combinedContextObjectBuilder.build());
new FileGenerator().generateFile(combinedContext.build(), true, workingDir.concat("combined-context").concat(".jsonld"));

}
combinedContext.add("@context", combinedContextObjectBuilder.build());
new FileGenerator().generateFile(combinedContext.build(), true, workingDir.concat("unece-context").concat(".jsonld"));


if (!missingDefinitions.isEmpty()) {
for (String uri : missingDefinitions) {
System.err.println(uri);
Expand Down

0 comments on commit ed000c4

Please sign in to comment.