Repository: any23 Updated Branches: refs/heads/master c271cdb33 -> ed662baee
Use RDF4J writer to return JSON-LD outputs. Project: http://git-wip-us.apache.org/repos/asf/any23/repo Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/f8e94d18 Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/f8e94d18 Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/f8e94d18 Branch: refs/heads/master Commit: f8e94d188baa4a7dabf08d4dbc9b6bb47ec26ea2 Parents: c271cdb Author: Julio Caguano <[email protected]> Authored: Mon Apr 30 16:24:05 2018 -0500 Committer: Julio Caguano <[email protected]> Committed: Mon Apr 30 16:24:05 2018 -0500 ---------------------------------------------------------------------- .../org/apache/any23/writer/JSONWriter.java | 214 +------------------ .../org/apache/any23/writer/JSONWriterTest.java | 90 ++++---- .../org/apache/any23/servlet/ServletTest.java | 23 +- 3 files changed, 52 insertions(+), 275 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/f8e94d18/core/src/main/java/org/apache/any23/writer/JSONWriter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/any23/writer/JSONWriter.java b/core/src/main/java/org/apache/any23/writer/JSONWriter.java index 331a65b..567c014 100644 --- a/core/src/main/java/org/apache/any23/writer/JSONWriter.java +++ b/core/src/main/java/org/apache/any23/writer/JSONWriter.java @@ -14,226 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.any23.writer; -import org.apache.any23.extractor.ExtractionContext; -import org.eclipse.rdf4j.model.BNode; -import org.eclipse.rdf4j.model.Literal; -import org.eclipse.rdf4j.model.Resource; -import org.eclipse.rdf4j.model.IRI; -import org.eclipse.rdf4j.model.Value; - -import java.io.BufferedOutputStream; import java.io.OutputStream; -import java.io.PrintStream; -import java.util.Optional; +import org.eclipse.rdf4j.rio.RDFFormat; +import org.eclipse.rdf4j.rio.Rio; /** * Implementation of <i>JSON</i> format writer. * * @author Michele Mostarda ([email protected]) */ -public class JSONWriter implements FormatWriter { - - private final PrintStream ps; - - private boolean documentStarted = false; - - private boolean firstArrayElemWritten = false; - private boolean firstObjectWritten = false; +public class JSONWriter extends RDFWriterTripleHandler implements FormatWriter { public JSONWriter(OutputStream os) { - if(os == null) { - throw new NullPointerException("Output stream cannot be null."); - } - this.ps = new PrintStream(new BufferedOutputStream(os)); - } - - @Override - public void startDocument(IRI documentIRI) throws TripleHandlerException { - if(documentStarted) { - throw new IllegalStateException("Document already started."); - } - documentStarted = true; - - firstArrayElemWritten = false; - ps.print("{ \"quads\" : ["); - } - - @Override - public void openContext(ExtractionContext context) throws TripleHandlerException { - // Empty. - } - - @Override - public void receiveTriple(Resource s, IRI p, Value o, IRI g, ExtractionContext context) - throws TripleHandlerException { - validateDocumentStarted(); - - if(firstArrayElemWritten) { - ps.print(", "); - } else { - firstArrayElemWritten = true; - } - firstObjectWritten = false; - - ps.print('['); - - if(s instanceof IRI) { - printExplicitIRI(s.stringValue(), ps); - } else { - printBNode(s.stringValue(), ps); - } - - printIRI(p.stringValue(), ps); - - if(o instanceof IRI) { - printExplicitIRI(o.stringValue(), ps); - } else if(o instanceof BNode) { - printBNode(o.stringValue(), ps); - } else { - printLiteral((Literal) o, ps); - } - - printIRI(g == null ? null : g.stringValue(), ps); - - ps.print(']'); - } - - @Override - public void receiveNamespace(String prefix, String uri, ExtractionContext context) - throws TripleHandlerException { - // Empty. - } - - @Override - public void closeContext(ExtractionContext context) throws TripleHandlerException { - // Empty. - } - - @Override - public void endDocument(IRI documentIRI) throws TripleHandlerException { - validateDocumentStarted(); - ps.print("]}"); - documentStarted = false; - } - - @Override - public void setContentLength(long contentLength) { - // Empty. - } - - @Override - public void close() throws TripleHandlerException { - if(documentStarted) { - endDocument(null); - } - ps.close(); - } - - private void validateDocumentStarted() { - if(!documentStarted) { - throw new IllegalStateException("Document didn't start."); - } - } - - private void printIRI(String uri, PrintStream ps) { - printValue(uri, ps); - } - - private void printExplicitIRI(String uri, PrintStream ps) { - printValue("uri", uri, ps); - } - - private void printBNode(String bnode, PrintStream ps) { - printValue("bnode", bnode, ps); - } - - private void printCommaIfNeeded(PrintStream ps) { - if(firstObjectWritten) { - ps.print(", "); - } else { - firstObjectWritten = true; - } - } - - private void printLiteral(Literal literal, PrintStream ps) { - printCommaIfNeeded(ps); - - ps.print('{'); - - ps.print("\"type\" : \"literal\""); - - ps.print(", "); - - ps.print("\"value\" : "); - ps.print('"'); - ps.print(literal.stringValue()); - ps.print('"'); - - ps.print(", "); - - ps.print("\"lang\" : "); - final Optional<String> language = literal.getLanguage(); - if (language.isPresent()) { - ps.print('"'); - ps.print(literal.getLanguage().get()); - ps.print('"'); - } else { - ps.print("null"); - } - - ps.print(", "); - - ps.print("\"datatype\" : "); - final IRI datatype = literal.getDatatype(); - if(datatype != null) { - ps.print('"'); - ps.print(datatype.stringValue()); - ps.print('"'); - } else { - ps.print("null"); - } - - ps.print('}'); - } - - private void printValue(String type, String value, PrintStream ps) { - printCommaIfNeeded(ps); - - ps.print("{ \"type\" : \""); - ps.print(type); - ps.print("\", \"value\" : "); - if (value != null) { - ps.print('"'); - ps.print(value); - ps.print('"'); - } else { - ps.print("null"); - } - ps.print('}'); - } - - private void printValue(String value, PrintStream ps) { - printCommaIfNeeded(ps); - - if (value != null) { - ps.print('"'); - ps.print(value); - ps.print('"'); - } else { - ps.print("null"); - } - } - - @Override - public boolean isAnnotated() { - return false; // TODO: add annotation support. - } - - @Override - public void setAnnotated(boolean f) { - // Empty. + super(Rio.createWriter(RDFFormat.JSONLD, os)); } } http://git-wip-us.apache.org/repos/asf/any23/blob/f8e94d18/core/src/test/java/org/apache/any23/writer/JSONWriterTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/any23/writer/JSONWriterTest.java b/core/src/test/java/org/apache/any23/writer/JSONWriterTest.java index 92ae30f..1b1d846 100644 --- a/core/src/test/java/org/apache/any23/writer/JSONWriterTest.java +++ b/core/src/test/java/org/apache/any23/writer/JSONWriterTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.any23.writer; -import org.junit.Assert; -import org.junit.Test; +import java.io.ByteArrayOutputStream; +import org.apache.any23.extractor.ExtractionContext; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.model.impl.SimpleValueFactory; -import java.io.ByteArrayOutputStream; +import org.junit.Assert; +import org.junit.Test; /** * Test case for {@link JSONWriter} class. @@ -33,57 +33,41 @@ public class JSONWriterTest { @Test public void testWriting() throws TripleHandlerException { ByteArrayOutputStream baos = new ByteArrayOutputStream(); - try(JSONWriter jsonWriter = new JSONWriter(baos);) { - final IRI documentIRI = SimpleValueFactory.getInstance().createIRI("http://fake/uri";); - jsonWriter.startDocument(documentIRI); - jsonWriter.receiveTriple( - SimpleValueFactory.getInstance().createBNode("bn1"), - SimpleValueFactory.getInstance().createIRI("http://pred/1";), - SimpleValueFactory.getInstance().createIRI("http://value/1";), - SimpleValueFactory.getInstance().createIRI("http://graph/1";), - null - ); - jsonWriter.receiveTriple( - SimpleValueFactory.getInstance().createIRI("http://sub/2";), - SimpleValueFactory.getInstance().createIRI("http://pred/2";), - SimpleValueFactory.getInstance().createLiteral("language literal", "en"), - SimpleValueFactory.getInstance().createIRI("http://graph/2";), - null - ); - jsonWriter.receiveTriple( - SimpleValueFactory.getInstance().createIRI("http://sub/3";), - SimpleValueFactory.getInstance().createIRI("http://pred/3";), - SimpleValueFactory.getInstance().createLiteral("123", SimpleValueFactory.getInstance().createIRI("http://datatype";)), - null, - null - ); - jsonWriter.endDocument(documentIRI); + try (JSONWriter jsonWriter = new JSONWriter(baos);) { + final IRI documentIRI = SimpleValueFactory.getInstance().createIRI("http://fake/uri";); + ExtractionContext extractionContext = new ExtractionContext("rdf-nq", SimpleValueFactory.getInstance().createIRI("http://any23.org/tmp/";)); + + jsonWriter.startDocument(documentIRI); + jsonWriter.receiveTriple( + SimpleValueFactory.getInstance().createBNode("bn1"), + SimpleValueFactory.getInstance().createIRI("http://pred/1";), + SimpleValueFactory.getInstance().createIRI("http://value/1";), + SimpleValueFactory.getInstance().createIRI("http://graph/1";), + null + ); + jsonWriter.receiveTriple( + SimpleValueFactory.getInstance().createIRI("http://sub/2";), + SimpleValueFactory.getInstance().createIRI("http://pred/2";), + SimpleValueFactory.getInstance().createLiteral("language literal", "en"), + SimpleValueFactory.getInstance().createIRI("http://graph/2";), + null + ); + jsonWriter.receiveTriple( + SimpleValueFactory.getInstance().createIRI("http://sub/3";), + SimpleValueFactory.getInstance().createIRI("http://pred/3";), + SimpleValueFactory.getInstance().createLiteral("123", SimpleValueFactory.getInstance().createIRI("http://datatype";)), + null, + extractionContext + ); + jsonWriter.endDocument(documentIRI); } - final String expected = - "{ " + - "\"quads\" : " + - "[" + - "[" + - "{ \"type\" : \"bnode\", \"value\" : \"bn1\"}, " + - "\"http://pred/1\";, " + - "{ \"type\" : \"uri\", \"value\" : \"http://value/1\"}, " + - "\"http://graph/1\""; + - "], " + - "[" + - "{ \"type\" : \"uri\", \"value\" : \"http://sub/2\"}, " + - "\"http://pred/2\";, " + - "{\"type\" : \"literal\", \"value\" : \"language literal\", \"lang\" : \"en\", \"datatype\" : \"http://www.w3.org/1999/02/22-rdf-syntax-ns#langString\"}, " + - "\"http://graph/2\""; + - "], " + - "[" + - "{ \"type\" : \"uri\", \"value\" : \"http://sub/3\"}, " + - "\"http://pred/3\";, " + - "{\"type\" : \"literal\", \"value\" : \"123\", \"lang\" : null, \"datatype\" : \"http://datatype\"}, " + - "null" + - "]" + - "]" + - "}"; + final String expected + = "[" + + "{\"@graph\":[{\"@id\":\"http://sub/3\",\"http://pred/3\":[{\"@type\":\"http://datatype\",\"@value\":\"123\"}]}],\"@id\":\"http://any23.org/tmp/\"},"; + + "{\"@graph\":[{\"@id\":\"_:bn1\",\"http://pred/1\":[{\"@id\":\"http://value/1\"}]}],\"@id\":\"http://graph/1\"},"; + + "{\"@graph\":[{\"@id\":\"http://sub/2\",\"http://pred/2\":[{\"@language\":\"en\",\"@value\":\"language literal\"}]}],\"@id\":\"http://graph/2\"}"; + + "]"; Assert.assertEquals(expected, baos.toString()); } } http://git-wip-us.apache.org/repos/asf/any23/blob/f8e94d18/service/src/test/java/org/apache/any23/servlet/ServletTest.java ---------------------------------------------------------------------- diff --git a/service/src/test/java/org/apache/any23/servlet/ServletTest.java b/service/src/test/java/org/apache/any23/servlet/ServletTest.java index bc87737..02c0603 100644 --- a/service/src/test/java/org/apache/any23/servlet/ServletTest.java +++ b/service/src/test/java/org/apache/any23/servlet/ServletTest.java @@ -17,23 +17,22 @@ package org.apache.any23.servlet; +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; +import java.net.URLEncoder; import org.apache.any23.http.HTTPClient; import org.apache.any23.source.DocumentSource; import org.apache.any23.source.FileDocumentSource; import org.apache.any23.source.StringDocumentSource; import org.apache.any23.util.StringUtils; -import org.junit.Assert; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mortbay.jetty.testing.HttpTester; import org.mortbay.jetty.testing.ServletTester; -import java.io.File; -import java.io.IOException; -import java.net.URISyntaxException; -import java.net.URLEncoder; - /** * Test case for {@link Servlet} class. */ @@ -395,12 +394,12 @@ public class ServletTest { HttpTester response = doPostRequest("/json", body, "application/n-quads"); Assert.assertEquals(200, response.getStatus()); final String EXPECTED_JSON = - "[" + - "{ \"type\" : \"uri\", \"value\" : \"http://sub/1\"}, " + - "\"http://pred/1\";, " + - "{\"type\" : \"literal\", \"value\" : \"123\", \"lang\" : null, \"datatype\" : \"http://datatype\"}, " + - "\"http://graph/1\""; + - "]"; + "[" + + "{\"@graph\":" + + "[" + + "{\"@id\":\"http://sub/1\","; + + "\"http://pred/1\":[{\"@type\":\"http://datatype\",\"@value\":\"123\"}]}],"; + + "\"@id\":\"http://graph/1\"}]";; assertContains(EXPECTED_JSON, response.getContent()); }
