Skip to content

Commit a01eeef

Browse files
committed
GH-5095 correctly call startRDF() and endRDF() when parsing json-ld
1 parent 6b277fe commit a01eeef

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

core/rio/jsonld/src/main/java/org/eclipse/rdf4j/rio/jsonld/JSONLDParser.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import java.net.URI;
2121
import java.net.URISyntaxException;
2222
import java.util.Collection;
23-
import java.util.HashSet;
24-
import java.util.List;
2523
import java.util.Optional;
2624
import java.util.Set;
2725
import java.util.function.BiConsumer;
@@ -44,9 +42,6 @@
4442
import org.slf4j.Logger;
4543
import org.slf4j.LoggerFactory;
4644

47-
import com.fasterxml.jackson.core.type.TypeReference;
48-
import com.fasterxml.jackson.databind.ObjectMapper;
49-
5045
import jakarta.json.JsonObject;
5146
import jakarta.json.JsonString;
5247
import jakarta.json.JsonStructure;
@@ -125,6 +120,10 @@ private void parse(InputStream in, Reader reader, String baseURI)
125120
throws RDFParseException, RDFHandlerException, IOException {
126121
clear();
127122

123+
if (rdfHandler != null) {
124+
rdfHandler.startRDF();
125+
}
126+
128127
try {
129128

130129
Document document = getDocument(in, reader);
@@ -179,6 +178,9 @@ private void parse(InputStream in, Reader reader, String baseURI)
179178
}
180179

181180
RDFHandler rdfHandler = getRDFHandler();
181+
if (rdfHandler != null) {
182+
extractPrefixes(document, rdfHandler::handleNamespace);
183+
}
182184

183185
JsonLd.toRdf(document).options(opts).base(baseURI).get(new RdfConsumer<>() {
184186
@Override
@@ -242,7 +244,7 @@ public Literal createLangString(String value, String lang) {
242244
});
243245

244246
if (rdfHandler != null) {
245-
extractPrefixes(document, rdfHandler::handleNamespace);
247+
rdfHandler.endRDF();
246248
}
247249

248250
} catch (no.hasmac.jsonld.JsonLdError e) {

0 commit comments

Comments
 (0)