wip

Author: hmottestad

core/rio/api/src/test/java/org/eclipse/rdf4j/rio/RDFWriterTest.java

@@ -32,6 +32,7 @@
 import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.io.Writer;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -445,6 +446,8 @@ private void testRoundTripInternal(boolean preserveBNodeIds)
 		rdfWriter.handleStatement(st30);
 		rdfWriter.endRDF();
 
+		System.out.println(out.toString(StandardCharsets.UTF_8));
+
 		ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
 		RDFParser rdfParser = rdfParserFactory.getParser();
 		setupParserConfig(rdfParser.getParserConfig());

core/rio/jsonld/pom.xml

@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>no.hasmac</groupId>
 			<artifactId>hasmac-json-ld</artifactId>
-			<version>0.3.0-SNAPSHOT</version>
+			<version>0.4.0</version>
 		</dependency>
 		<dependency>
 			<groupId>jakarta.json</groupId>

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

@@ -179,10 +179,6 @@ public void handleQuad(Statement statement) {
 					}
 				}
 
-				@Override
-				public void handleNamespace(String prefix, String uri) {
-
-				}
 			}, new RdfValueFactory<Statement, Statement, IRI, Resource, Resource, Literal, Value>() {
 				@Override
 				public Statement createTriple(Resource subject, IRI predicate, Value object) {

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

@@ -15,7 +15,6 @@
 import org.eclipse.rdf4j.rio.helpers.ClassRioSetting;
 import org.eclipse.rdf4j.rio.helpers.RioSettingImpl;
 
-import no.hasmac.jsonld.document.Document;
 import no.hasmac.jsonld.document.JsonDocument;
 
 /**

core/rio/jsonld/src/main/java/org/eclipse/rdf4j/rio/ndjsonld/NDJSONLDParser.java

@@ -17,8 +17,9 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
-import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 import org.apache.commons.io.input.BOMInputStream;
 import org.eclipse.rdf4j.model.Value;
@@ -28,9 +29,14 @@
 import org.eclipse.rdf4j.rio.RDFParseException;
 import org.eclipse.rdf4j.rio.jsonld.JSONLDParser;
 
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonParser;
-import com.github.jsonldjava.utils.JsonUtils;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonArrayBuilder;
+import jakarta.json.JsonStructure;
+import jakarta.json.JsonValue;
+import no.hasmac.jsonld.JsonLdError;
+import no.hasmac.jsonld.document.Document;
+import no.hasmac.jsonld.document.JsonDocument;
 
 /**
  * Introduce a parser capable of parsing Newline Delimited JSON-LD, where each line is a serialized JSON-LD record. The
@@ -62,27 +68,38 @@ public NDJSONLDParser(final ValueFactory valueFactory) {
 	public RDFFormat getRDFFormat() {
 		return RDFFormat.NDJSONLD;
 	}
-//
-//	@Override
-//	protected Object getJSONObject(InputStream in, Reader reader, JsonFactory factory) throws IOException {
-//		List<Object> arrayOfJSONLD = new LinkedList<>();
-//		try (BufferedReader bufferedReader = new BufferedReader(reader)) {
-//			String line;
-//			while ((line = bufferedReader.readLine()) != null) {
-//				if (!line.isEmpty()) {
-//					JsonParser nextParser = factory
-//							.createParser(new ByteArrayInputStream(line.getBytes(StandardCharsets.UTF_8)));
-//					Object singleJSONLD = JsonUtils.fromJsonParser(nextParser);
-//					if (singleJSONLD instanceof List) {
-//						arrayOfJSONLD.addAll((List) singleJSONLD);
-//					} else {
-//						arrayOfJSONLD.add(singleJSONLD);
-//					}
-//				}
-//			}
-//			return arrayOfJSONLD;
-//		}
-//	}
+
+	@Override
+	protected Document getDocument(InputStream in, Reader reader) throws JsonLdError, IOException {
+		if (in != null && reader == null) {
+			reader = new InputStreamReader(in, StandardCharsets.UTF_8);
+		}
+
+		List<JsonValue> arrayOfJSONLD = new ArrayList<>();
+		try (BufferedReader bufferedReader = new BufferedReader(reader)) {
+			String line;
+			while ((line = bufferedReader.readLine()) != null) {
+				if (!line.isEmpty()) {
+					JsonDocument jsonDocument = JsonDocument
+							.of(new ByteArrayInputStream(line.getBytes(StandardCharsets.UTF_8)));
+					Optional<JsonStructure> jsonContent = jsonDocument.getJsonContent();
+					if (jsonContent.isPresent()) {
+						JsonStructure jsonStructure = jsonContent.get();
+						if (jsonStructure.getValueType() == JsonStructure.ValueType.ARRAY) {
+							arrayOfJSONLD.addAll(jsonStructure.asJsonArray());
+						}
+						arrayOfJSONLD.add(jsonContent.get());
+					}
+				}
+			}
+
+			JsonArrayBuilder arrayBuilder = Json.createArrayBuilder(arrayOfJSONLD);
+			JsonArray jsonArray = arrayBuilder.build();
+
+			return JsonDocument.of(jsonArray);
+		}
+
+	}
 
 	@Override
 	public void parse(InputStream in, String baseURI) throws RDFParseException, RDFHandlerException, IOException {

core/rio/jsonld/src/test/java/org/eclipse/rdf4j/rio/jsonld/JSONLDParserCustomTest.java

@@ -12,10 +12,7 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.StringReader;
 import java.net.URI;

core/rio/jsonld/src/test/java/org/eclipse/rdf4j/rio/jsonld/JSONLDWriterTest.java

@@ -15,7 +15,6 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.io.StringWriter;
 
 import org.eclipse.rdf4j.model.IRI;

core/rio/jsonld/src/test/java/org/eclipse/rdf4j/rio/ndjsonld/NDJSONLDParserHandlerTest.java

@@ -27,4 +27,50 @@ protected RDFParser getParser() {
 	protected RDFWriter createWriter(OutputStream output) {
 		return new NDJSONLDWriter(output);
 	}
+
+	@Override
+	public final void testUnknownLanguageWithMessageWithFailCase1() throws Exception {
+		// Not support by JSON-LD
+	}
+
+	@Override
+	public void testUnknownLanguageNoMessageNoFailCase1() throws Exception {
+		// Not support by JSON-LD
+	}
+
+	@Override
+	public void testUnknownLanguageNoMessageNoFailCase2() throws Exception {
+		// Not support by JSON-LD
+	}
+
+	@Override
+	public void testUnknownLanguageNoMessageNoFailCase3() throws Exception {
+		// Not support by JSON-LD
+	}
+
+	@Override
+	public void testUnknownLanguageNoMessageNoFailCase4() throws Exception {
+		// Not support by JSON-LD
+	}
+
+	@Override
+	public void testUnknownLanguageNoMessageNoFailCase5() throws Exception {
+		// Not support by JSON-LD
+	}
+
+	@Override
+	public void testUnknownLanguageWithMessageNoFailCase1() throws Exception {
+		// Not support by JSON-LD
+	}
+
+	@Override
+	public void testUnknownLanguageWithMessageNoFailCase2() throws Exception {
+		// Not support by JSON-LD
+	}
+
+	@Override
+	public void testUnknownLanguageWithMessageNoFailCase3() throws Exception {
+		// Not support by JSON-LD
+	}
+
 }