You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commonsrdf.apache.org by st...@apache.org on 2016/10/03 16:39:57 UTC
[01/50] incubator-commonsrdf git commit: Merge branch 'master' into
jsonld-java
Repository: incubator-commonsrdf
Updated Branches:
refs/heads/master e9b52ebf9 -> 0beee9d85
Merge branch 'master' into jsonld-java
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/4da1bae3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/4da1bae3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/4da1bae3
Branch: refs/heads/master
Commit: 4da1bae3406aacf3b85fddf6f0a29f0ddcfed4b5
Parents: 3dc5a44 73994db
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Apr 4 15:48:43 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Apr 4 15:48:43 2016 +0100
----------------------------------------------------------------------
.travis.yml | 2 --
.../java/org/apache/commons/rdf/api/RDFTermFactory.java | 12 ++++++------
2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[43/50] incubator-commonsrdf git commit: COMMONSRDF-39 Moved
JsonLdParser to experimental package
Posted by st...@apache.org.
COMMONSRDF-39 Moved JsonLdParser to experimental package
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/1412edd6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/1412edd6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/1412edd6
Branch: refs/heads/master
Commit: 1412edd66f24401da13a45de6d06ef68c0e19fa7
Parents: 2510a07
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Sep 28 14:32:07 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Sep 28 14:32:07 2016 +0100
----------------------------------------------------------------------
.../rdf/jsonldjava/JsonLdParserBuilder.java | 157 ------------------
.../jsonldjava/experimental/JsonLdParser.java | 160 +++++++++++++++++++
.../jsonldjava/experimental/package-info.java | 34 ++++
.../rdf/jsonldjava/JsonLdParserBuilderTest.java | 7 +-
4 files changed, 198 insertions(+), 160 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/1412edd6/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
deleted file mode 100644
index e38af2c..0000000
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.commons.rdf.jsonldjava;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.file.Files;
-import java.util.function.Predicate;
-
-import org.apache.commons.rdf.api.Dataset;
-import org.apache.commons.rdf.api.Graph;
-import org.apache.commons.rdf.api.IRI;
-import org.apache.commons.rdf.api.RDFSyntax;
-import org.apache.commons.rdf.simple.AbstractRDFParserBuilder;
-
-import com.github.jsonldjava.core.JsonLdError;
-import com.github.jsonldjava.core.JsonLdOptions;
-import com.github.jsonldjava.core.JsonLdProcessor;
-import com.github.jsonldjava.core.RDFDataset;
-import com.github.jsonldjava.utils.JsonUtils;
-
-public class JsonLdParserBuilder extends AbstractRDFParserBuilder<JsonLdParserBuilder> {
-
- @Override
- protected JsonLdRDFTermFactory createRDFTermFactory() {
- return new JsonLdRDFTermFactory();
- }
-
- @Override
- public JsonLdParserBuilder contentType(RDFSyntax rdfSyntax) throws IllegalArgumentException {
- if (rdfSyntax != null && rdfSyntax != RDFSyntax.JSONLD) {
- throw new IllegalArgumentException("Unsupported contentType: " + rdfSyntax);
- }
- return super.contentType(rdfSyntax);
- }
-
- @Override
- public JsonLdParserBuilder contentType(String contentType) throws IllegalArgumentException {
- JsonLdParserBuilder c = (JsonLdParserBuilder) super.contentType(contentType);
- if (c.getContentType().filter(Predicate.isEqual(RDFSyntax.JSONLD).negate()).isPresent()) {
- throw new IllegalArgumentException("Unsupported contentType: " + contentType);
- }
- return c;
- }
-
- private static URL asURL(IRI iri) throws IllegalStateException {
- try {
- return new URI(iri.getIRIString()).toURL();
- } catch (MalformedURLException | URISyntaxException e) {
- throw new IllegalStateException("Invalid URL: " + iri.getIRIString());
- }
- }
-
- @Override
- protected void checkSource() throws IOException {
- super.checkSource();
- // Might throw IllegalStateException if invalid
- getSourceIri().map(JsonLdParserBuilder::asURL);
- }
-
- @Override
- protected void parseSynchronusly() throws IOException {
- Object json = readSource();
- JsonLdOptions options = new JsonLdOptions();
- getBase().map(IRI::getIRIString).ifPresent(options::setBase);
- // TODO: base from readSource() (after redirection and Content-Location header)
- // should be forwarded
-
- // TODO: Modify JsonLdProcessor to accept the target RDFDataset
- RDFDataset rdfDataset;
- try {
- rdfDataset = (RDFDataset) JsonLdProcessor.toRDF(json, options);
- } catch (JsonLdError e) {
- throw new IOException("Could not parse Json-LD", e);
- }
- if (getTargetGraph().isPresent()) {
- Graph intoGraph = getTargetGraph().get();
- if (intoGraph instanceof JsonLdGraph && ! intoGraph.contains(null, null, null)) {
- // Empty graph, we can just move over the map content directly:
- JsonLdGraph jsonLdGraph = (JsonLdGraph) intoGraph;
- jsonLdGraph.getRdfDataSet().putAll(rdfDataset);
- return;
- // otherwise we have to merge as normal
- }
- // TODO: Modify JsonLdProcessor to have an actual triple callback
- Graph parsedGraph = getJsonLdRDFTermFactory().asGraph(rdfDataset);
- // sequential() as we don't know if destination is thread safe :-/
- parsedGraph.stream().sequential().forEach(intoGraph::add);
- } else if (getTargetDataset().isPresent()) {
- Dataset intoDataset = getTargetDataset().get();
- if (intoDataset instanceof JsonLdDataset &&
- ! intoDataset.contains(null, null, null, null)) {
- JsonLdDataset jsonLdDataset = (JsonLdDataset) intoDataset;
- // Empty - we can just do a brave replace!
- jsonLdDataset.getRdfDataSet().putAll(rdfDataset);
- return;
- // otherwise we have to merge.. but also avoid duplicate triples,
- // map blank nodes etc, so we'll fall back to normal Dataset appending.
- }
- Dataset fromDataset = getJsonLdRDFTermFactory().asDataset(rdfDataset);
- // .sequential() as we don't know if destination is thread-safe :-/
- fromDataset.stream().sequential().forEach(intoDataset::add);
- } else {
- Dataset fromDataset = getJsonLdRDFTermFactory().asDataset(rdfDataset);
- // No need for .sequential() here
- fromDataset.stream().forEach(getTarget());
- }
- }
-
- private JsonLdRDFTermFactory getJsonLdRDFTermFactory() {
- if (getRdfTermFactory().isPresent() && getRdfTermFactory().get() instanceof JsonLdRDFTermFactory) {
- return (JsonLdRDFTermFactory) getRdfTermFactory().get();
- }
- return createRDFTermFactory();
- }
-
- private Object readSource() throws IOException {
- // Due to checked IOException we can't easily
- // do this with .map and .orElseGet()
-
- if (getSourceInputStream().isPresent()) {
- return JsonUtils.fromInputStream(getSourceInputStream().get());
- }
- if (getSourceIri().isPresent()) {
- // TODO: propagate @base from content
- return JsonUtils.fromURL(asURL(getSourceIri().get()),
- JsonUtils.getDefaultHttpClient());
- }
- if (getSourceFile().isPresent()) {
- try (InputStream inputStream = Files.newInputStream(getSourceFile().get())){
- return JsonUtils.fromInputStream(inputStream);
- }
- }
- throw new IllegalStateException("No known source found");
- }
-
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/1412edd6/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/JsonLdParser.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/JsonLdParser.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/JsonLdParser.java
new file mode 100644
index 0000000..102b2d4
--- /dev/null
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/JsonLdParser.java
@@ -0,0 +1,160 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.rdf.jsonldjava.experimental;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.util.function.Predicate;
+
+import org.apache.commons.rdf.api.Dataset;
+import org.apache.commons.rdf.api.Graph;
+import org.apache.commons.rdf.api.IRI;
+import org.apache.commons.rdf.api.RDFSyntax;
+import org.apache.commons.rdf.jsonldjava.JsonLdDataset;
+import org.apache.commons.rdf.jsonldjava.JsonLdGraph;
+import org.apache.commons.rdf.jsonldjava.JsonLdRDFTermFactory;
+import org.apache.commons.rdf.simple.experimental.AbstractRDFParser;
+
+import com.github.jsonldjava.core.JsonLdError;
+import com.github.jsonldjava.core.JsonLdOptions;
+import com.github.jsonldjava.core.JsonLdProcessor;
+import com.github.jsonldjava.core.RDFDataset;
+import com.github.jsonldjava.utils.JsonUtils;
+
+public class JsonLdParser extends AbstractRDFParser<JsonLdParser> {
+
+ @Override
+ protected JsonLdRDFTermFactory createRDFTermFactory() {
+ return new JsonLdRDFTermFactory();
+ }
+
+ @Override
+ public JsonLdParser contentType(RDFSyntax rdfSyntax) throws IllegalArgumentException {
+ if (rdfSyntax != null && rdfSyntax != RDFSyntax.JSONLD) {
+ throw new IllegalArgumentException("Unsupported contentType: " + rdfSyntax);
+ }
+ return super.contentType(rdfSyntax);
+ }
+
+ @Override
+ public JsonLdParser contentType(String contentType) throws IllegalArgumentException {
+ JsonLdParser c = (JsonLdParser) super.contentType(contentType);
+ if (c.getContentType().filter(Predicate.isEqual(RDFSyntax.JSONLD).negate()).isPresent()) {
+ throw new IllegalArgumentException("Unsupported contentType: " + contentType);
+ }
+ return c;
+ }
+
+ private static URL asURL(IRI iri) throws IllegalStateException {
+ try {
+ return new URI(iri.getIRIString()).toURL();
+ } catch (MalformedURLException | URISyntaxException e) {
+ throw new IllegalStateException("Invalid URL: " + iri.getIRIString());
+ }
+ }
+
+ @Override
+ protected void checkSource() throws IOException {
+ super.checkSource();
+ // Might throw IllegalStateException if invalid
+ getSourceIri().map(JsonLdParser::asURL);
+ }
+
+ @Override
+ protected void parseSynchronusly() throws IOException {
+ Object json = readSource();
+ JsonLdOptions options = new JsonLdOptions();
+ getBase().map(IRI::getIRIString).ifPresent(options::setBase);
+ // TODO: base from readSource() (after redirection and Content-Location header)
+ // should be forwarded
+
+ // TODO: Modify JsonLdProcessor to accept the target RDFDataset
+ RDFDataset rdfDataset;
+ try {
+ rdfDataset = (RDFDataset) JsonLdProcessor.toRDF(json, options);
+ } catch (JsonLdError e) {
+ throw new IOException("Could not parse Json-LD", e);
+ }
+ if (getTargetGraph().isPresent()) {
+ Graph intoGraph = getTargetGraph().get();
+ if (intoGraph instanceof JsonLdGraph && ! intoGraph.contains(null, null, null)) {
+ // Empty graph, we can just move over the map content directly:
+ JsonLdGraph jsonLdGraph = (JsonLdGraph) intoGraph;
+ jsonLdGraph.getRdfDataSet().putAll(rdfDataset);
+ return;
+ // otherwise we have to merge as normal
+ }
+ // TODO: Modify JsonLdProcessor to have an actual triple callback
+ Graph parsedGraph = getJsonLdRDFTermFactory().asGraph(rdfDataset);
+ // sequential() as we don't know if destination is thread safe :-/
+ parsedGraph.stream().sequential().forEach(intoGraph::add);
+ } else if (getTargetDataset().isPresent()) {
+ Dataset intoDataset = getTargetDataset().get();
+ if (intoDataset instanceof JsonLdDataset &&
+ ! intoDataset.contains(null, null, null, null)) {
+ JsonLdDataset jsonLdDataset = (JsonLdDataset) intoDataset;
+ // Empty - we can just do a brave replace!
+ jsonLdDataset.getRdfDataSet().putAll(rdfDataset);
+ return;
+ // otherwise we have to merge.. but also avoid duplicate triples,
+ // map blank nodes etc, so we'll fall back to normal Dataset appending.
+ }
+ Dataset fromDataset = getJsonLdRDFTermFactory().asDataset(rdfDataset);
+ // .sequential() as we don't know if destination is thread-safe :-/
+ fromDataset.stream().sequential().forEach(intoDataset::add);
+ } else {
+ Dataset fromDataset = getJsonLdRDFTermFactory().asDataset(rdfDataset);
+ // No need for .sequential() here
+ fromDataset.stream().forEach(getTarget());
+ }
+ }
+
+ private JsonLdRDFTermFactory getJsonLdRDFTermFactory() {
+ if (getRdfTermFactory().isPresent() && getRdfTermFactory().get() instanceof JsonLdRDFTermFactory) {
+ return (JsonLdRDFTermFactory) getRdfTermFactory().get();
+ }
+ return createRDFTermFactory();
+ }
+
+ private Object readSource() throws IOException {
+ // Due to checked IOException we can't easily
+ // do this with .map and .orElseGet()
+
+ if (getSourceInputStream().isPresent()) {
+ return JsonUtils.fromInputStream(getSourceInputStream().get());
+ }
+ if (getSourceIri().isPresent()) {
+ // TODO: propagate @base from content
+ return JsonUtils.fromURL(asURL(getSourceIri().get()),
+ JsonUtils.getDefaultHttpClient());
+ }
+ if (getSourceFile().isPresent()) {
+ try (InputStream inputStream = Files.newInputStream(getSourceFile().get())){
+ return JsonUtils.fromInputStream(inputStream);
+ }
+ }
+ throw new IllegalStateException("No known source found");
+ }
+
+}
+
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/1412edd6/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/package-info.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/package-info.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/package-info.java
new file mode 100644
index 0000000..fbd595e
--- /dev/null
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/package-info.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Experimental Commons RDF RDF4J implementations.
+ * <p>
+ * Classes in this package should be considered <strong>at
+ * risk</strong>; they might change or be removed in the next minor update of
+ * Commons RDF.
+ * <p>
+ * When a class has stabilized, it will move to the
+ * {@link org.apache.commons.rdf.rdf4j} package.
+ * <p>
+ * <ul>
+ * <li>{@link RDF4JParser} - an RDF4J-backed
+ * implementations of
+ * {@link org.apache.commons.rdf.api.experimental.RDFParser}.</li>
+ * </ul>
+ */
+package org.apache.commons.rdf.jsonldjava.experimental;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/1412edd6/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
index 37fa560..4d846ee 100644
--- a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
+++ b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
@@ -32,6 +32,7 @@ import org.apache.commons.rdf.api.Graph;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.Literal;
import org.apache.commons.rdf.api.RDFSyntax;
+import org.apache.commons.rdf.jsonldjava.experimental.JsonLdParser;
import org.apache.commons.rdf.simple.Types;
import org.junit.Test;
@@ -57,7 +58,7 @@ public class JsonLdParserBuilderTest {
assertNotNull("Test resource not found: " + TEST_JSONLD, url);
IRI iri = factory.createIRI(url.toString());
Graph g = factory.createGraph();
- new JsonLdParserBuilder()
+ new JsonLdParser()
.contentType(RDFSyntax.JSONLD)
.source(iri)
.target(g)
@@ -75,7 +76,7 @@ public class JsonLdParserBuilderTest {
Files.copy(is, path, StandardCopyOption.REPLACE_EXISTING);
}
Graph g = factory.createGraph();
- new JsonLdParserBuilder()
+ new JsonLdParser()
.contentType(RDFSyntax.JSONLD)
.source(path)
.target(g)
@@ -89,7 +90,7 @@ public class JsonLdParserBuilderTest {
Graph g = factory.createGraph();
try (InputStream is = getClass().getResourceAsStream(TEST_JSONLD)) {
assertNotNull("Test resource not found: " + TEST_JSONLD, is);
- new JsonLdParserBuilder()
+ new JsonLdParser()
.base("http://example.com/base/")
.contentType(RDFSyntax.JSONLD).source(is)
.target(g)
[08/50] incubator-commonsrdf git commit: Ignore invalidity errors in
RDFTermFactory for now
Posted by st...@apache.org.
Ignore invalidity errors in RDFTermFactory for now
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/0ce530fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/0ce530fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/0ce530fe
Branch: refs/heads/master
Commit: 0ce530fe9e41f9f2a7b2d13d947b68a391102263
Parents: b5aa0a0
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Apr 4 17:07:31 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Apr 4 17:07:31 2016 +0100
----------------------------------------------------------------------
.../rdf/jsonldjava/JsonLdRDFTermFactory.java | 3 ++-
.../jsonldjava/JsonLdRDFTermFactoryTest.java | 25 ++++++++++++++++++++
2 files changed, 27 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/0ce530fe/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
index 1d9f6d7..e07cbae 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
@@ -27,6 +27,7 @@ import org.apache.commons.rdf.api.Literal;
import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.RDFTermFactory;
import org.apache.commons.rdf.api.Triple;
+import org.apache.commons.rdf.simple.Types;
import com.github.jsonldjava.core.RDFDataset;
import com.github.jsonldjava.core.RDFDataset.Node;
@@ -81,7 +82,7 @@ final class JsonLdRDFTermFactory implements RDFTermFactory {
return new JsonLdLiteral(new RDFDataset.Literal(literal, dataType.getIRIString(), null)); }
@Override
public Literal createLiteral(String literal, String language) {
- return new JsonLdLiteral(new RDFDataset.Literal(literal, null, language));
+ return new JsonLdLiteral(new RDFDataset.Literal(literal, Types.RDF_LANGSTRING.getIRIString(), language));
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/0ce530fe/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactoryTest.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactoryTest.java b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactoryTest.java
index 6017dd9..0e86b33 100644
--- a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactoryTest.java
+++ b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactoryTest.java
@@ -19,6 +19,8 @@ package org.apache.commons.rdf.jsonldjava;
import org.apache.commons.rdf.api.AbstractRDFTermFactoryTest;
import org.apache.commons.rdf.api.RDFTermFactory;
+import org.junit.Ignore;
+import org.junit.Test;
public class JsonLdRDFTermFactoryTest extends AbstractRDFTermFactoryTest {
@@ -26,4 +28,27 @@ public class JsonLdRDFTermFactoryTest extends AbstractRDFTermFactoryTest {
public RDFTermFactory createFactory() {
return new JsonLdRDFTermFactory();
}
+
+ // TODO: Add support for checking for invalid lang/iri/blanknode IDs
+
+ @Ignore
+ @Test
+ @Override
+ public void testInvalidLiteralLang() throws Exception {
+ super.testInvalidLiteralLang();
+ }
+
+ @Ignore
+ @Test
+ @Override
+ public void testInvalidIRI() throws Exception {
+ super.testInvalidIRI();
+ }
+
+ @Ignore
+ @Test
+ @Override
+ public void testPossiblyInvalidBlankNode() throws Exception {
+ super.testPossiblyInvalidBlankNode();
+ }
}
[36/50] incubator-commonsrdf git commit: Merge branch
'parser-with-quads' into jsonld-java
Posted by st...@apache.org.
Merge branch 'parser-with-quads' into jsonld-java
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/7010541c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/7010541c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/7010541c
Branch: refs/heads/master
Commit: 7010541cbc72173b540d8fd5166a16aa2f05491d
Parents: 3a8cb56 cbfb670
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Sep 9 16:44:02 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Sep 9 16:44:02 2016 +0100
----------------------------------------------------------------------
.../org/apache/commons/rdf/simple/AbstractRDFParserBuilder.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
[07/50] incubator-commonsrdf git commit: blank node test
Posted by st...@apache.org.
blank node test
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/b5aa0a03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/b5aa0a03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/b5aa0a03
Branch: refs/heads/master
Commit: b5aa0a038431bd1de570d80cd2bc52ab98ef420a
Parents: 0613a08
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Apr 4 17:03:45 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Apr 4 17:03:45 2016 +0100
----------------------------------------------------------------------
.../rdf/jsonldjava/JsonLdBlankNodeTest.java | 24 ++++++++++++++++++++
1 file changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b5aa0a03/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
new file mode 100644
index 0000000..7687e2c
--- /dev/null
+++ b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
@@ -0,0 +1,24 @@
+package org.apache.commons.rdf.jsonldjava;
+
+import java.util.UUID;
+
+import org.apache.commons.rdf.api.AbstractBlankNodeTest;
+import org.apache.commons.rdf.api.BlankNode;
+
+import com.github.jsonldjava.core.RDFDataset;
+
+public class JsonLdBlankNodeTest extends AbstractBlankNodeTest {
+
+ String fixedPrefix = "urn:uuid:d028ca89-8b2f-4e18-90a0-8959f955038d#";
+
+ @Override
+ protected BlankNode getBlankNode() {
+ return getBlankNode(UUID.randomUUID().toString());
+ }
+
+ @Override
+ protected BlankNode getBlankNode(String identifier) {
+ return new JsonLdBlankNode(new RDFDataset.BlankNode("_:" + identifier), fixedPrefix);
+ }
+
+}
[17/50] incubator-commonsrdf git commit: Merge branch 'master' into
jsonld-java
Posted by st...@apache.org.
Merge branch 'master' into jsonld-java
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/06a44b9f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/06a44b9f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/06a44b9f
Branch: refs/heads/master
Commit: 06a44b9fb1756f9670abc14d605255b6abd7ae52
Parents: a2e482f 9782a58
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Sep 8 15:32:31 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Sep 8 15:32:31 2016 +0100
----------------------------------------------------------------------
LICENSE-header.txt | 16 +
RELEASE-NOTES.txt | 39 ++
RELEASE-PROCESS.md | 36 ++
api/pom.xml | 7 +-
.../org/apache/commons/rdf/api/Dataset.java | 338 ++++++++++++++++
.../java/org/apache/commons/rdf/api/Graph.java | 40 +-
.../org/apache/commons/rdf/api/GraphLike.java | 113 ++++++
.../java/org/apache/commons/rdf/api/Quad.java | 213 ++++++++++
.../org/apache/commons/rdf/api/QuadLike.java | 69 ++++
.../apache/commons/rdf/api/RDFTermFactory.java | 41 ++
.../java/org/apache/commons/rdf/api/Triple.java | 4 +-
.../org/apache/commons/rdf/api/TripleLike.java | 71 ++++
api/src/site/resources/profile.jacoco | 0
api/src/site/resources/profile.japicmp | 0
.../commons/rdf/api/AbstractGraphTest.java | 192 ++++++++-
.../rdf/api/AbstractRDFTermFactoryTest.java | 29 ++
examples/pom.xml | 4 +-
examples/src/example/UserGuideTest.java | 1 +
pom.xml | 400 +++++++++++--------
simple/pom.xml | 3 +-
.../commons/rdf/simple/BlankNodeImpl.java | 3 +-
.../commons/rdf/simple/DatasetGraphView.java | 138 +++++++
.../apache/commons/rdf/simple/DatasetImpl.java | 221 ++++++++++
.../apache/commons/rdf/simple/GraphImpl.java | 30 +-
.../org/apache/commons/rdf/simple/IRIImpl.java | 2 +-
.../apache/commons/rdf/simple/LiteralImpl.java | 2 +-
.../org/apache/commons/rdf/simple/QuadImpl.java | 109 +++++
.../rdf/simple/SimpleRDFTermFactory.java | 25 ++
.../org/apache/commons/rdf/simple/Types.java | 2 +-
simple/src/site/resources/profile.jacoco | 0
simple/src/site/resources/profile.japicmp | 0
.../commons/rdf/simple/TestWritingGraph.java | 8 +-
src/assembly/src.xml | 45 +++
src/conf/checkstyle-suppressions.xml | 32 ++
src/conf/checkstyle.xml | 197 +++++++++
src/conf/findbugs-exclude-filter.xml | 27 ++
src/conf/pmd.xml | 25 ++
src/main/assembly/src.xml | 44 --
src/site/markdown/download.md | 34 +-
src/site/markdown/implementations.md | 63 ++-
src/site/markdown/index.md | 58 ++-
src/site/markdown/userguide.md | 60 ++-
src/site/resources/images/class-diagram.nomnoml | 49 ++-
src/site/resources/images/class-diagram.png | Bin 57632 -> 56161 bytes
src/site/site.xml | 3 +-
45 files changed, 2470 insertions(+), 323 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/06a44b9f/pom.xml
----------------------------------------------------------------------
[04/50] incubator-commonsrdf git commit: Added JsonLdLiteral
Posted by st...@apache.org.
Added JsonLdLiteral
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/286813cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/286813cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/286813cc
Branch: refs/heads/master
Commit: 286813cc9ff98c7c926f4e3740124e503be89c15
Parents: fe7ed27
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Apr 4 16:58:18 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Apr 4 16:58:18 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jsonldjava/JsonLdBlankNode.java | 8 +-
.../commons/rdf/jsonldjava/JsonLdIRI.java | 13 +++-
.../commons/rdf/jsonldjava/JsonLdLiteral.java | 80 ++++++++++++++++++++
.../rdf/jsonldjava/JsonLdRDFTermFactory.java | 38 +++++++---
.../commons/rdf/jsonldjava/JsonLdTerm.java | 14 ++++
5 files changed, 137 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/286813cc/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNode.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNode.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNode.java
index 383bb94..f93d3b4 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNode.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNode.java
@@ -21,13 +21,15 @@ import org.apache.commons.rdf.api.BlankNode;
import com.github.jsonldjava.core.RDFDataset.Node;
-final class JsonLdBlankNode implements BlankNode {
- private final Node node;
+final class JsonLdBlankNode extends JsonLdTerm implements BlankNode {
private String blankNodePrefix;
JsonLdBlankNode(Node node, String blankNodePrefix) {
+ super(node);
this.blankNodePrefix = blankNodePrefix;
- this.node = node;
+ if (! node.isBlankNode()) {
+ throw new IllegalArgumentException("Node is not a BlankNode:" + node);
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/286813cc/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdIRI.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdIRI.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdIRI.java
index 3e14ad5..e21f55c 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdIRI.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdIRI.java
@@ -19,13 +19,20 @@ package org.apache.commons.rdf.jsonldjava;
import org.apache.commons.rdf.api.IRI;
+import com.github.jsonldjava.core.RDFDataset;
import com.github.jsonldjava.core.RDFDataset.Node;
-final class JsonLdIRI implements IRI {
- private final Node node;
+final class JsonLdIRI extends JsonLdTerm implements IRI {
JsonLdIRI(Node node) {
- this.node = node;
+ super(node);
+ if (! node.isIRI()) {
+ throw new IllegalArgumentException("Node is not an IRI:" + node);
+ }
+ }
+
+ public JsonLdIRI(String iri) {
+ super(new RDFDataset.IRI(iri));
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/286813cc/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
new file mode 100644
index 0000000..87e688a
--- /dev/null
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
@@ -0,0 +1,80 @@
+package org.apache.commons.rdf.jsonldjava;
+
+import java.util.Objects;
+import java.util.Optional;
+
+import org.apache.commons.rdf.api.IRI;
+import org.apache.commons.rdf.api.Literal;
+import org.apache.commons.rdf.simple.Types;
+
+import com.github.jsonldjava.core.RDFDataset.Node;
+
+public class JsonLdLiteral extends JsonLdTerm implements Literal {
+
+ JsonLdLiteral(Node node) {
+ super(node);
+ if (! node.isLiteral()) {
+ throw new IllegalArgumentException("Node is not a Literal:" + node);
+ }
+ }
+
+ @Override
+ public String ntriplesString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append('"');
+ // Escape special characters
+ sb.append(getLexicalForm().replace("\\", "\\\\"). // escaped to \\
+ replace("\"", "\\\""). // escaped to \"
+ replace("\r", "\\r"). // escaped to \r
+ replace("\n", "\\n")); // escaped to \n
+ sb.append('"');
+
+ if (getLanguageTag().isPresent()) {
+ sb.append("@");
+ sb.append(getLanguageTag().get());
+ } else if (!getDatatype().equals(Types.XSD_STRING)) {
+ sb.append("^^");
+ sb.append(getDatatype().ntriplesString());
+ }
+ return sb.toString();
+ }
+
+ @Override
+ public String getLexicalForm() {
+ return node.getValue();
+ }
+
+ @Override
+ public IRI getDatatype() {
+ return new JsonLdIRI(node.getDatatype());
+ }
+
+ @Override
+ public Optional<String> getLanguageTag() {
+ return Optional.ofNullable(node.getLanguage());
+ }
+
+ @Override
+ public int hashCode() {
+ // Should be the same as
+ // Objects.hash(getLexicalForm(), getDatatype(), getLanguageTag());
+ return Objects.hash(node.getValue(), node.getDatatype(), node.getLanguage());
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj instanceof JsonLdLiteral) {
+ JsonLdLiteral other = (JsonLdLiteral) obj;
+ return asNode().compareTo(other.asNode()) == 0;
+ }
+ if (obj instanceof Literal) {
+ Literal other = (Literal) obj;
+ return getLexicalForm().equals(other.getLexicalForm()) &&
+ getDatatype().equals(other.getDatatype()) &&
+ getLanguageTag().equals(other.getLanguageTag());
+ }
+ return false;
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/286813cc/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
index 99927ad..1d9f6d7 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
@@ -25,13 +25,13 @@ import org.apache.commons.rdf.api.Graph;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.Literal;
import org.apache.commons.rdf.api.RDFTerm;
+import org.apache.commons.rdf.api.RDFTermFactory;
import org.apache.commons.rdf.api.Triple;
-import org.apache.commons.rdf.simple.SimpleRDFTermFactory;
import com.github.jsonldjava.core.RDFDataset;
import com.github.jsonldjava.core.RDFDataset.Node;
-final class JsonLdRDFTermFactory extends SimpleRDFTermFactory {
+final class JsonLdRDFTermFactory implements RDFTermFactory {
public JsonLdRDFTermFactory() {
// An "outside Graph" bnodePrefix
@@ -51,7 +51,7 @@ final class JsonLdRDFTermFactory extends SimpleRDFTermFactory {
@Override
public IRI createIRI(String iri) {
- return new JsonLdIRI(new RDFDataset.IRI(iri));
+ return new JsonLdIRI(iri);
}
@Override
@@ -69,11 +69,27 @@ final class JsonLdRDFTermFactory extends SimpleRDFTermFactory {
@Override
public Triple createTriple(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- return super.createTriple(subject, predicate, object);
+ return new JsonLdTriple(asJsonLdQuad(subject, predicate, object), bnodePrefix);
+ }
+
+ @Override
+ public Literal createLiteral(String literal) {
+ return new JsonLdLiteral(new RDFDataset.Literal(literal, null, null));
+ }
+ @Override
+ public Literal createLiteral(String literal, IRI dataType) {
+ return new JsonLdLiteral(new RDFDataset.Literal(literal, dataType.getIRIString(), null)); }
+ @Override
+ public Literal createLiteral(String literal, String language) {
+ return new JsonLdLiteral(new RDFDataset.Literal(literal, null, language));
}
private Node asJsonLdNode(RDFTerm term) {
+ if (term instanceof JsonLdTerm) {
+ // Return original Node
+ return ((JsonLdTerm)term).asNode();
+ }
if (term instanceof IRI) {
return new RDFDataset.IRI( ((IRI)term).getIRIString() );
}
@@ -96,19 +112,21 @@ final class JsonLdRDFTermFactory extends SimpleRDFTermFactory {
}
- public RDFDataset.Quad asJsonLdQuad(Triple triple) {
- Node subject = asJsonLdNode(triple.getSubject());
- Node predicate = asJsonLdNode(triple.getPredicate());
- Node object = asJsonLdNode(triple.getObject());
+ public RDFDataset.Quad asJsonLdQuad(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
String graph = null;
// TODO: Add Quad to commons-rdf
// if (triple instanceof Quad) {
// String graph = triple.getGraph().getIRIString();
// }
- return new RDFDataset.Quad(subject, predicate, object, graph);
-
+ return new RDFDataset.Quad(asJsonLdNode(subject), asJsonLdNode(predicate), asJsonLdNode(object), graph);
}
+
+
+ public RDFDataset.Quad asJsonLdQuad(Triple triple) {
+ return asJsonLdQuad(triple.getSubject(), triple.getPredicate(), triple.getObject());
+ }
+
RDFTerm asTerm(final Node node, String blankNodePrefix) {
if (node.isIRI()) {
return new JsonLdIRI(node);
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/286813cc/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
new file mode 100644
index 0000000..f1c4718
--- /dev/null
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
@@ -0,0 +1,14 @@
+package org.apache.commons.rdf.jsonldjava;
+
+import com.github.jsonldjava.core.RDFDataset.Node;
+
+public abstract class JsonLdTerm {
+ final Node node;
+ JsonLdTerm(Node node) {
+ this.node = node;
+ }
+ public Node asNode() {
+ return node;
+ }
+
+}
[06/50] incubator-commonsrdf git commit: license headers
Posted by st...@apache.org.
license headers
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/0613a08f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/0613a08f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/0613a08f
Branch: refs/heads/master
Commit: 0613a08f421e4bd38092708268bec243c6ddde7d
Parents: ce658d2
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Apr 4 17:00:21 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Apr 4 17:00:21 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jsonldjava/JsonLdLiteral.java | 17 +++++++++++++++++
.../apache/commons/rdf/jsonldjava/JsonLdTerm.java | 17 +++++++++++++++++
2 files changed, 34 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/0613a08f/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
index 87e688a..e492486 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.commons.rdf.jsonldjava;
import java.util.Objects;
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/0613a08f/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
index f1c4718..39ef1a6 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.commons.rdf.jsonldjava;
import com.github.jsonldjava.core.RDFDataset.Node;
[31/50] incubator-commonsrdf git commit: factory converter methods
called asSomething()
Posted by st...@apache.org.
factory converter methods called asSomething()
e.g. asGraph(rdfDataSet)
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/fd8dcefd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/fd8dcefd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/fd8dcefd
Branch: refs/heads/master
Commit: fd8dcefd08170804ac80e24bc770fc7abfb5d1e7
Parents: e3a4fba
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Sep 9 15:42:09 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Sep 9 15:43:42 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jsonldjava/JsonLdDataset.java | 10 +++---
.../commons/rdf/jsonldjava/JsonLdGraph.java | 12 ++++---
.../commons/rdf/jsonldjava/JsonLdGraphLike.java | 4 +--
.../rdf/jsonldjava/JsonLdParserBuilder.java | 5 ++-
.../commons/rdf/jsonldjava/JsonLdQuadLike.java | 10 +++---
.../rdf/jsonldjava/JsonLdRDFTermFactory.java | 33 ++++++++++++++------
.../rdf/jsonldjava/JsonLdUnionGraph.java | 8 ++---
7 files changed, 51 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/fd8dcefd/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
index 569180e..1ab4b11 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
@@ -32,9 +32,9 @@ import org.apache.commons.rdf.api.RDFTerm;
import com.github.jsonldjava.core.RDFDataset;
-public class JsonLdDataset extends JsonLdGraphLike<org.apache.commons.rdf.api.Quad> implements Dataset {
+class JsonLdDataset extends JsonLdGraphLike<org.apache.commons.rdf.api.Quad> implements Dataset {
- public JsonLdDataset(RDFDataset rdfDataSet) {
+ JsonLdDataset(RDFDataset rdfDataSet) {
super(rdfDataSet);
}
@@ -75,7 +75,7 @@ public class JsonLdDataset extends JsonLdGraphLike<org.apache.commons.rdf.api.Qu
public Stream<BlankNodeOrIRI> getGraphNames() {
return rdfDataSet.graphNames().parallelStream().filter(Predicate.isEqual("@default").negate())
.map(s -> s.startsWith("_:") ? new RDFDataset.BlankNode(s) : new RDFDataset.IRI(s))
- .map(n -> (BlankNodeOrIRI) factory.asTerm(n, bnodePrefix));
+ .map(n -> (BlankNodeOrIRI) factory.asRDFTerm(n));
}
@Override
@@ -95,7 +95,7 @@ public class JsonLdDataset extends JsonLdGraphLike<org.apache.commons.rdf.api.Qu
return filteredGraphs(graphName)
.flatMap(List::stream)
.filter(quadFilter(subject, predicate, object))
- .map(factory::createQuad);
+ .map(factory::asQuad);
}
@Override
@@ -105,7 +105,7 @@ public class JsonLdDataset extends JsonLdGraphLike<org.apache.commons.rdf.api.Qu
@Override
Quad asTripleOrQuad(com.github.jsonldjava.core.RDFDataset.Quad jsonldQuad) {
- return factory.createQuad(jsonldQuad);
+ return factory.asQuad(jsonldQuad);
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/fd8dcefd/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
index 5e13a4e..a07f9b1 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
@@ -30,11 +30,15 @@ import org.apache.commons.rdf.api.Triple;
import com.github.jsonldjava.core.RDFDataset;
-public class JsonLdGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Triple> implements Graph {
+/**
+ * A {@link Graph} view of a JsonLd {@link RDFDataset}.
+ *
+ */
+class JsonLdGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Triple> implements Graph {
private final Optional<BlankNodeOrIRI> graphName;
- public JsonLdGraph(RDFDataset rdfDataSet) {
+ JsonLdGraph(RDFDataset rdfDataSet) {
super(rdfDataSet);
this.graphName = Optional.empty();
}
@@ -99,12 +103,12 @@ public class JsonLdGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Trip
return filteredGraphs(graphName)
.flatMap(List::stream)
.filter(quadFilter(subject, predicate, object))
- .map(factory::createTriple);
+ .map(factory::asTriple);
}
@Override
JsonLdTriple asTripleOrQuad(com.github.jsonldjava.core.RDFDataset.Quad jsonldQuad) {
- return factory.createTriple(jsonldQuad);
+ return factory.asTriple(jsonldQuad);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/fd8dcefd/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
index ad2cc23..81f2ee7 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
@@ -175,8 +175,8 @@ abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm
* Convert JsonLd Quad to a Commons RDF {@link Triple} or {@link org.apache.commons.rdf.api.Quad}
*
*
- * @see JsonLdRDFTermFactory#createTriple(Quad)
- * @see JsonLdRDFTermFactory#createQuad(Quad)
+ * @see JsonLdRDFTermFactory#asTriple(Quad)
+ * @see JsonLdRDFTermFactory#asQuad(Quad)
* @param jsonldQuad jsonld quad to convert
* @return converted {@link TripleLike}
*/
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/fd8dcefd/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
index 4b6edfe..d609aa8 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
@@ -92,8 +92,7 @@ public class JsonLdParserBuilder extends AbstractRDFParserBuilder {
rdfDataset = (RDFDataset) JsonLdProcessor.toRDF(json, options);
} catch (JsonLdError e) {
throw new RDFParseException(e);
- }
-
+ }
Graph intoGraph = getIntoGraph().get();
if (intoGraph instanceof JsonLdGraph && ! intoGraph.contains(null, null, null)) {
// Empty graph, we can just move over the map content directly:
@@ -103,7 +102,7 @@ public class JsonLdParserBuilder extends AbstractRDFParserBuilder {
// TODO: Modify JsonLdProcessor to have an actual triple callback
try (JsonLdGraph parsedGraph = new JsonLdGraph(rdfDataset)) {
// sequential() as we don't know if intoGraph is thread safe :-/
- parsedGraph.getTriples().sequential().forEach(intoGraph::add);
+ parsedGraph.stream().sequential().forEach(intoGraph::add);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/fd8dcefd/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
index 753e332..224dc30 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
@@ -30,6 +30,8 @@ public interface JsonLdQuadLike<S extends RDFTerm, P extends RDFTerm, O extends
class JsonLdQuadLikeImpl<S extends RDFTerm, P extends RDFTerm, O extends RDFTerm, G extends RDFTerm> implements JsonLdQuadLike<S,P,O,G> {
+ // Note: We always pass the blankNodePrefix and don't rely on the internal
+ // blankNodePrefix in this static factory
private static JsonLdRDFTermFactory rdfTermFactory = new JsonLdRDFTermFactory();
private final Quad quad;
@@ -43,26 +45,26 @@ public interface JsonLdQuadLike<S extends RDFTerm, P extends RDFTerm, O extends
@SuppressWarnings("unchecked")
@Override
public Optional<G> getGraphName() {
- G g = (G) rdfTermFactory.asTerm(quad.getGraph(), blankNodePrefix);
+ G g = (G) rdfTermFactory.asRDFTerm(quad.getGraph(), blankNodePrefix);
return Optional.ofNullable(g);
}
@SuppressWarnings("unchecked")
@Override
public S getSubject() {
- return (S) rdfTermFactory.asTerm(quad.getSubject(), blankNodePrefix);
+ return (S) rdfTermFactory.asRDFTerm(quad.getSubject(), blankNodePrefix);
}
@SuppressWarnings("unchecked")
@Override
public P getPredicate() {
- return (P) rdfTermFactory.asTerm(quad.getPredicate(), blankNodePrefix);
+ return (P) rdfTermFactory.asRDFTerm(quad.getPredicate(), blankNodePrefix);
}
@SuppressWarnings("unchecked")
@Override
public O getObject() {
- return (O) rdfTermFactory.asTerm(quad.getObject(), blankNodePrefix);
+ return (O) rdfTermFactory.asRDFTerm(quad.getObject(), blankNodePrefix);
}
public Quad asJsonLdQuad() {
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/fd8dcefd/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
index 1dff9fb..6d490b8 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
@@ -48,7 +48,7 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
// An "outside Graph" bnodePrefix
this("urn:uuid:" + UUID.randomUUID() + "#b");
}
-
+
JsonLdRDFTermFactory(String bnodePrefix) {
this.bnodePrefix = Objects.requireNonNull(bnodePrefix);
}
@@ -61,8 +61,7 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
if (term instanceof IRI) {
return new RDFDataset.IRI( ((IRI)term).getIRIString() );
}
- if (term instanceof BlankNode) {
-
+ if (term instanceof BlankNode) {
String ref = ((BlankNode)term).uniqueReference();
if (ref.startsWith(bnodePrefix)) {
// one of our own (but no longer a JsonLdBlankNode),
@@ -113,14 +112,26 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
// TODO: Check if name is valid JSON-LD BlankNode identifier
return new JsonLdBlankNodeImpl(new RDFDataset.BlankNode(id), bnodePrefix);
}
-
+
@Override
- public Dataset createDataset() throws UnsupportedOperationException {
+ public Dataset createDataset() {
return new JsonLdDataset(bnodePrefix);
}
+
+ public Dataset asDataset(RDFDataset rdfDataSet) {
+ return new JsonLdDataset(rdfDataSet);
+ }
+ public Graph asGraph(RDFDataset rdfDataSet) {
+ return new JsonLdGraph(rdfDataSet);
+ }
+
+ public Graph asUnionGraph(RDFDataset rdfDataSet) {
+ return new JsonLdUnionGraph(rdfDataSet);
+ }
+
@Override
- public Graph createGraph() throws UnsupportedOperationException {
+ public Graph createGraph() {
return new JsonLdGraph(bnodePrefix);
}
@@ -151,7 +162,7 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
}
- public JsonLdQuad createQuad(final RDFDataset.Quad quad) {
+ public JsonLdQuad asQuad(final RDFDataset.Quad quad) {
return new JsonLdQuadImpl(quad, bnodePrefix);
}
@@ -160,11 +171,15 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
return new JsonLdTripleImpl(asJsonLdQuad(subject, predicate, object), bnodePrefix);
}
- public JsonLdTriple createTriple(final RDFDataset.Quad quad) {
+ public JsonLdTriple asTriple(final RDFDataset.Quad quad) {
return new JsonLdTripleImpl(quad, bnodePrefix);
}
- JsonLdTerm asTerm(final Node node, String blankNodePrefix) {
+ public JsonLdTerm asRDFTerm(final Node node) {
+ return asRDFTerm(node, bnodePrefix);
+ }
+
+ JsonLdTerm asRDFTerm(final Node node, String blankNodePrefix) {
if (node == null) {
return null; // e.g. default graph
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/fd8dcefd/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
index 6b32f8c..46598ed 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
@@ -46,13 +46,13 @@ import com.github.jsonldjava.core.RDFDataset;
* inefficient as they skip any duplicate triples from multiple
* graphs.
*/
-public class JsonLdUnionGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Triple> implements Graph {
+class JsonLdUnionGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Triple> implements Graph {
JsonLdUnionGraph(String bnodePrefix) {
super(bnodePrefix);
}
- public JsonLdUnionGraph(RDFDataset rdfDataSet) {
+ JsonLdUnionGraph(RDFDataset rdfDataSet) {
super(rdfDataSet);
}
@@ -88,7 +88,7 @@ public class JsonLdUnionGraph extends JsonLdGraphLike<org.apache.commons.rdf.api
return filteredGraphs(null)
.flatMap(List::stream)
.filter(quadFilter(subject, predicate, object))
- .map(factory::createTriple)
+ .map(factory::asTriple)
// Make sure we don't have duplicate triples
// NOTE: This can be quite inefficient
.distinct();
@@ -103,7 +103,7 @@ public class JsonLdUnionGraph extends JsonLdGraphLike<org.apache.commons.rdf.api
@Override
JsonLdTriple asTripleOrQuad(com.github.jsonldjava.core.RDFDataset.Quad jsonldQuad) {
- return factory.createTriple(jsonldQuad);
+ return factory.asTriple(jsonldQuad);
}
@Override
[35/50] incubator-commonsrdf git commit: Merge branch
'parser-with-quads' into jsonld-java
Posted by st...@apache.org.
Merge branch 'parser-with-quads' into jsonld-java
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/3a8cb563
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/3a8cb563
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/3a8cb563
Branch: refs/heads/master
Commit: 3a8cb5635e0aad45ae03ebb221fd777953b1d91a
Parents: ddbe6bf b1b657f
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Sep 9 16:28:41 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Sep 9 16:28:41 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/api/RDFParserBuilder.java | 174 ++++++++++----
.../rdf/simple/AbstractRDFParserBuilder.java | 230 +++++++++++++------
.../commons/rdf/simple/RDFParseException.java | 50 ++++
.../simple/AbstractRDFParserBuilderTest.java | 40 ++--
.../rdf/simple/DummyRDFParserBuilder.java | 36 +--
5 files changed, 379 insertions(+), 151 deletions(-)
----------------------------------------------------------------------
[38/50] incubator-commonsrdf git commit: updated test - parsed don't
report graph
Posted by st...@apache.org.
updated test - parsed don't report graph
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/fa5580c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/fa5580c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/fa5580c9
Branch: refs/heads/master
Commit: fa5580c9e3ed3acffecc9f99f08eff8c1c571c05
Parents: 3d63a0e
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Sep 9 17:20:21 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Sep 9 17:20:21 2016 +0100
----------------------------------------------------------------------
.../rdf/jsonldjava/JsonLdParserBuilderTest.java | 40 ++++++++++++--------
1 file changed, 25 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/fa5580c9/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
index d3eae2b..37fa560 100644
--- a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
+++ b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
@@ -35,9 +35,9 @@ import org.apache.commons.rdf.api.RDFSyntax;
import org.apache.commons.rdf.simple.Types;
import org.junit.Test;
-public class JsonLdParserBuilderTest {
-
+public class JsonLdParserBuilderTest {
private static final String TEST_JSONLD = "/test.jsonld";
+
static JsonLdRDFTermFactory factory = new JsonLdRDFTermFactory();
IRI test = factory.createIRI("http://example.com/test");
IRI Type = factory.createIRI("http://example.com/Type");
@@ -55,9 +55,13 @@ public class JsonLdParserBuilderTest {
public void parseByUrl() throws Exception {
URL url = getClass().getResource(TEST_JSONLD);
assertNotNull("Test resource not found: " + TEST_JSONLD, url);
- IRI iri = factory.createIRI(url.toString());
- Graph g = new JsonLdParserBuilder()
- .contentType(RDFSyntax.JSONLD).source(iri).parse()
+ IRI iri = factory.createIRI(url.toString());
+ Graph g = factory.createGraph();
+ new JsonLdParserBuilder()
+ .contentType(RDFSyntax.JSONLD)
+ .source(iri)
+ .target(g)
+ .parse()
.get(10, TimeUnit.SECONDS);
checkGraph(g);
}
@@ -70,20 +74,26 @@ public class JsonLdParserBuilderTest {
assertNotNull("Test resource not found: " + TEST_JSONLD, is);
Files.copy(is, path, StandardCopyOption.REPLACE_EXISTING);
}
- Graph g = new JsonLdParserBuilder()
- .contentType(RDFSyntax.JSONLD).source(path).parse()
+ Graph g = factory.createGraph();
+ new JsonLdParserBuilder()
+ .contentType(RDFSyntax.JSONLD)
+ .source(path)
+ .target(g)
+ .parse()
.get(10, TimeUnit.SECONDS);
checkGraph(g);
}
@Test
public void parseByStream() throws Exception {
- Graph g;
+ Graph g = factory.createGraph();
try (InputStream is = getClass().getResourceAsStream(TEST_JSONLD)) {
assertNotNull("Test resource not found: " + TEST_JSONLD, is);
- g = new JsonLdParserBuilder()
+ new JsonLdParserBuilder()
.base("http://example.com/base/")
- .contentType(RDFSyntax.JSONLD).source(is).parse()
+ .contentType(RDFSyntax.JSONLD).source(is)
+ .target(g)
+ .parse()
.get(10, TimeUnit.SECONDS);
}
checkGraph(g);
@@ -94,19 +104,19 @@ public class JsonLdParserBuilderTest {
assertTrue(g.contains(test, type, Type));
// Should not include statements from the named graph
- assertEquals(1, g.getTriples(test, pred1, null).count());
- assertEquals(1, g.getTriples(test, pred2, null).count());
+ assertEquals(1, g.stream(test, pred1, null).count());
+ assertEquals(1, g.stream(test, pred2, null).count());
assertEquals("Hello",
- ((Literal) g.getTriples(test, pred1, null)
+ ((Literal) g.stream(test, pred1, null)
.findFirst().get().getObject() ).getLexicalForm());
assertTrue(g.contains(test, pred2, other));
assertEquals("1337",
- ((Literal) g.getTriples(test, pred3, null)
+ ((Literal) g.stream(test, pred3, null)
.findFirst().get().getObject() ).getLexicalForm());
assertEquals(Types.XSD_INTEGER,
- ((Literal) g.getTriples(test, pred3, null)
+ ((Literal) g.stream(test, pred3, null)
.findFirst().get().getObject() ).getDatatype());
// While the named graph 'graph' is not included, the relationship
[42/50] incubator-commonsrdf git commit: Merge branch 'master' into
jsonld-java
Posted by st...@apache.org.
Merge branch 'master' into jsonld-java
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/2510a07a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/2510a07a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/2510a07a
Branch: refs/heads/master
Commit: 2510a07aca0ec277a4d23e17f4eeef754d0348dd
Parents: be7bfc8 e0d3191
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Sep 28 14:31:00 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Sep 28 14:31:00 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/api/RDFParserBuilder.java | 479 ----------------
.../commons/rdf/experimental/RDFParser.java | 495 +++++++++++++++++
.../commons/rdf/experimental/package-info.java | 34 ++
.../test/resources/example-rdf/example.jsonld | 25 +
api/src/test/resources/example-rdf/example.nq | 3 +
api/src/test/resources/example-rdf/example.nt | 2 +
api/src/test/resources/example-rdf/example.rdf | 23 +
api/src/test/resources/example-rdf/example.trig | 3 +
api/src/test/resources/example-rdf/example.ttl | 2 +
.../rdf/simple/AbstractRDFParserBuilder.java | 541 ------------------
.../apache/commons/rdf/simple/GraphImpl.java | 39 +-
.../commons/rdf/simple/RDFParseException.java | 50 --
.../simple/experimental/AbstractRDFParser.java | 542 +++++++++++++++++++
.../simple/experimental/RDFParseException.java | 50 ++
.../rdf/simple/experimental/package-info.java | 34 ++
.../simple/AbstractRDFParserBuilderTest.java | 253 ---------
.../rdf/simple/DummyRDFParserBuilder.java | 12 +-
.../experimental/AbstractRDFParserTest.java | 256 +++++++++
18 files changed, 1497 insertions(+), 1346 deletions(-)
----------------------------------------------------------------------
[34/50] incubator-commonsrdf git commit: Sorted methods
Posted by st...@apache.org.
Sorted methods
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/ddbe6bfb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/ddbe6bfb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/ddbe6bfb
Branch: refs/heads/master
Commit: ddbe6bfb0404f0da82062db3d48ae7cdccd166a0
Parents: 44a40d3
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Sep 9 16:22:33 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Sep 9 16:22:33 2016 +0100
----------------------------------------------------------------------
.../rdf/jsonldjava/JsonLdRDFTermFactory.java | 232 +++++++++----------
1 file changed, 116 insertions(+), 116 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/ddbe6bfb/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
index d436434..fa60213 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
@@ -52,6 +52,39 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
this.bnodePrefix = Objects.requireNonNull(bnodePrefix);
}
+ /**
+ * Adapt a JsonLd {@link RDFDataset} as a Commons RDF {@link Dataset}.
+ * <p>
+ * Changes to the Commons RDF {@link Dataset} are reflected in the JsonLd
+ * {@link RDFDataset} and vice versa.
+ *
+ * @see #asGraph(RDFDataset)
+ * @param rdfDataSet JsonLd {@link RDFDataset} to adapt
+ * @return Adapted {@link Dataset}
+ */
+ public Dataset asDataset(RDFDataset rdfDataSet) {
+ return new JsonLdDataset(rdfDataSet);
+ }
+
+ /**
+ * Adapt a JsonLd {@link RDFDataset} as a Commons RDF {@link Graph}.
+ * <p>
+ * Only triples in the <em>default graph</em> are included. To retrieve
+ * any other graph, {@link #asDataset(RDFDataset)} together with
+ * {@link Dataset#getGraph(BlankNodeOrIRI)}.
+ * <p>
+ * Changes to the Commons RDF {@link Graph} are reflected in the JsonLd
+ * {@link RDFDataset} and vice versa.
+ *
+ * @see #asDataset(RDFDataset)
+ * @see #asUnionGraph(RDFDataset)
+ * @param rdfDataSet JsonLd {@link RDFDataset} to adapt
+ * @return Adapted {@link Graph} covering the <em>default graph</em>
+ */
+ public Graph asGraph(RDFDataset rdfDataSet) {
+ return new JsonLdGraph(rdfDataSet);
+ }
+
public Node asJsonLdNode(RDFTerm term) {
if (term instanceof JsonLdTerm) {
// Return original Node
@@ -78,46 +111,9 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
literal.getLanguageTag().orElse(null));
}
throw new IllegalArgumentException("RDFTerm not instanceof IRI, BlankNode or Literal: " + term);
- }
-
- RDFDataset.Quad createJsonLdQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- return new RDFDataset.Quad(asJsonLdNode(subject), asJsonLdNode(predicate), asJsonLdNode(object), asJsonLdString(graphName));
- }
-
- String asJsonLdString(BlankNodeOrIRI blankNodeOrIRI) {
- if (blankNodeOrIRI == null) {
- return null;
- }
- if (blankNodeOrIRI instanceof IRI) {
- return ((IRI)blankNodeOrIRI).getIRIString();
- } else if (blankNodeOrIRI instanceof BlankNode) {
- BlankNode blankNode = (BlankNode) blankNodeOrIRI;
- String ref = blankNode.uniqueReference();
- if (ref.startsWith(bnodePrefix)) {
- // One of ours (but possibly not a JsonLdBlankNode) -
- // we can use the suffix directly
- return ref.replace(bnodePrefix, "_:");
- } else {
- // Map to unique bnode identifier, e.g. _:0dbd92ee-ab1a-45e7-bba2-7ade54f87ec5
- UUID uuid = UUID.nameUUIDFromBytes(ref.getBytes(StandardCharsets.UTF_8));
- return "_:"+ uuid;
- }
- } else {
- throw new IllegalArgumentException("Expected a BlankNode or IRI, not: " + blankNodeOrIRI);
- }
}
/**
- * Adapt a Commons RDF {@link Triple} as a JsonLd {@link RDFDataset.Quad}.
- *
- * @param triple Commons RDF {@link Triple} to adapt
- * @return Adapted JsonLd {@link RDFDataset.Quad}
- */
- public RDFDataset.Quad asJsonLdQuad(Triple triple) {
- return createJsonLdQuad(null, triple.getSubject(), triple.getPredicate(), triple.getObject());
- }
-
- /**
* Adapt a Commons RDF {@link org.apache.commons.rdf.api.Quad} as a JsonLd {@link RDFDataset.Quad}.
*
* @param quad Commons RDF {@link org.apache.commons.rdf.api.Quad} to adapt
@@ -127,56 +123,59 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
BlankNodeOrIRI g = quad.getGraphName().orElse(null);
return createJsonLdQuad(g, quad.getSubject(), quad.getPredicate(), quad.getObject());
}
-
- @Override
- public JsonLdBlankNode createBlankNode() {
- String id = "_:" + UUID.randomUUID().toString();
- return new JsonLdBlankNodeImpl(new RDFDataset.BlankNode(id), bnodePrefix);
- }
-
- @Override
- public JsonLdBlankNode createBlankNode(String name) {
- String id = "_:" + name;
- // TODO: Check if name is valid JSON-LD BlankNode identifier
- return new JsonLdBlankNodeImpl(new RDFDataset.BlankNode(id), bnodePrefix);
+
+ /**
+ * Adapt a Commons RDF {@link Triple} as a JsonLd {@link RDFDataset.Quad}.
+ *
+ * @param triple Commons RDF {@link Triple} to adapt
+ * @return Adapted JsonLd {@link RDFDataset.Quad}
+ */
+ public RDFDataset.Quad asJsonLdQuad(Triple triple) {
+ return createJsonLdQuad(null, triple.getSubject(), triple.getPredicate(), triple.getObject());
}
- @Override
- public Dataset createDataset() {
- return new JsonLdDataset(bnodePrefix);
+ /**
+ * Adapt a JsonLd {@link RDFDataset.Quad} as a Commons RDF
+ * {@link org.apache.commons.rdf.api.Quad}.
+ * <p>
+ * The underlying JsonLd quad can be retrieved with
+ * {@link JsonLdQuad#asJsonLdQuad()}.
+ *
+ * @param quad
+ * A JsonLd {@link RDFDataset.Quad} to adapt
+ * @return Adapted {@link JsonLdQuad}
+ */
+ public JsonLdQuad asQuad(final RDFDataset.Quad quad) {
+ return new JsonLdQuadImpl(quad, bnodePrefix);
}
/**
- * Adapt a JsonLd {@link RDFDataset} as a Commons RDF {@link Dataset}.
+ * Adapt a JsonLd {@link RDFDataset.Node} as a Commons RDF {@link RDFTerm}.
* <p>
- * Changes to the Commons RDF {@link Dataset} are reflected in the JsonLd
- * {@link RDFDataset} and vice versa.
+ * The underlying node can be retrieved with
+ * {@link JsonLdTerm#asJsonLdNode()}.
*
- * @see #asGraph(RDFDataset)
- * @param rdfDataSet JsonLd {@link RDFDataset} to adapt
- * @return Adapted {@link Dataset}
+ * @param node
+ * A JsonLd {@link Node} to adapt
+ * @return Adapted {@link JsonLdTerm}
*/
- public Dataset asDataset(RDFDataset rdfDataSet) {
- return new JsonLdDataset(rdfDataSet);
+ public JsonLdTerm asRDFTerm(final Node node) {
+ return asRDFTerm(node, bnodePrefix);
}
/**
- * Adapt a JsonLd {@link RDFDataset} as a Commons RDF {@link Graph}.
- * <p>
- * Only triples in the <em>default graph</em> are included. To retrieve
- * any other graph, {@link #asDataset(RDFDataset)} together with
- * {@link Dataset#getGraph(BlankNodeOrIRI)}.
+ * Adapt a JsonLd {@link RDFDataset.Quad} as a Commons RDF
+ * {@link org.apache.commons.rdf.api.Triple}.
* <p>
- * Changes to the Commons RDF {@link Graph} are reflected in the JsonLd
- * {@link RDFDataset} and vice versa.
+ * The underlying JsonLd quad can be retrieved with
+ * {@link JsonLdTriple#asJsonLdQuad()}.
*
- * @see #asDataset(RDFDataset)
- * @see #asUnionGraph(RDFDataset)
- * @param rdfDataSet JsonLd {@link RDFDataset} to adapt
- * @return Adapted {@link Graph} covering the <em>default graph</em>
- */
- public Graph asGraph(RDFDataset rdfDataSet) {
- return new JsonLdGraph(rdfDataSet);
+ * @param quad
+ * A JsonLd {@link RDFDataset.Quad} to adapt
+ * @return Adapted {@link JsonLdTriple}
+ */
+ public JsonLdTriple asTriple(final RDFDataset.Quad quad) {
+ return new JsonLdTripleImpl(quad, bnodePrefix);
}
/**
@@ -202,6 +201,24 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
}
@Override
+ public JsonLdBlankNode createBlankNode() {
+ String id = "_:" + UUID.randomUUID().toString();
+ return new JsonLdBlankNodeImpl(new RDFDataset.BlankNode(id), bnodePrefix);
+ }
+
+ @Override
+ public JsonLdBlankNode createBlankNode(String name) {
+ String id = "_:" + name;
+ // TODO: Check if name is valid JSON-LD BlankNode identifier
+ return new JsonLdBlankNodeImpl(new RDFDataset.BlankNode(id), bnodePrefix);
+ }
+
+ @Override
+ public Dataset createDataset() {
+ return new JsonLdDataset(bnodePrefix);
+ }
+
+ @Override
public Graph createGraph() {
return new JsonLdGraph(bnodePrefix);
}
@@ -232,53 +249,32 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
return new JsonLdQuadImpl(createJsonLdQuad(graphName, subject, predicate, object), bnodePrefix);
}
- /**
- * Adapt a JsonLd {@link RDFDataset.Quad} as a Commons RDF
- * {@link org.apache.commons.rdf.api.Quad}.
- * <p>
- * The underlying JsonLd quad can be retrieved with
- * {@link JsonLdQuad#asJsonLdQuad()}.
- *
- * @param quad
- * A JsonLd {@link RDFDataset.Quad} to adapt
- * @return Adapted {@link JsonLdQuad}
- */
- public JsonLdQuad asQuad(final RDFDataset.Quad quad) {
- return new JsonLdQuadImpl(quad, bnodePrefix);
- }
-
@Override
public JsonLdTriple createTriple(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
return new JsonLdTripleImpl(createJsonLdQuad(null, subject, predicate, object), bnodePrefix);
}
- /**
- * Adapt a JsonLd {@link RDFDataset.Quad} as a Commons RDF
- * {@link org.apache.commons.rdf.api.Triple}.
- * <p>
- * The underlying JsonLd quad can be retrieved with
- * {@link JsonLdTriple#asJsonLdQuad()}.
- *
- * @param quad
- * A JsonLd {@link RDFDataset.Quad} to adapt
- * @return Adapted {@link JsonLdTriple}
- */
- public JsonLdTriple asTriple(final RDFDataset.Quad quad) {
- return new JsonLdTripleImpl(quad, bnodePrefix);
- }
-
- /**
- * Adapt a JsonLd {@link RDFDataset.Node} as a Commons RDF {@link RDFTerm}.
- * <p>
- * The underlying node can be retrieved with
- * {@link JsonLdTerm#asJsonLdNode()}.
- *
- * @param node
- * A JsonLd {@link Node} to adapt
- * @return Adapted {@link JsonLdTerm}
- */
- public JsonLdTerm asRDFTerm(final Node node) {
- return asRDFTerm(node, bnodePrefix);
+ String asJsonLdString(BlankNodeOrIRI blankNodeOrIRI) {
+ if (blankNodeOrIRI == null) {
+ return null;
+ }
+ if (blankNodeOrIRI instanceof IRI) {
+ return ((IRI)blankNodeOrIRI).getIRIString();
+ } else if (blankNodeOrIRI instanceof BlankNode) {
+ BlankNode blankNode = (BlankNode) blankNodeOrIRI;
+ String ref = blankNode.uniqueReference();
+ if (ref.startsWith(bnodePrefix)) {
+ // One of ours (but possibly not a JsonLdBlankNode) -
+ // we can use the suffix directly
+ return ref.replace(bnodePrefix, "_:");
+ } else {
+ // Map to unique bnode identifier, e.g. _:0dbd92ee-ab1a-45e7-bba2-7ade54f87ec5
+ UUID uuid = UUID.nameUUIDFromBytes(ref.getBytes(StandardCharsets.UTF_8));
+ return "_:"+ uuid;
+ }
+ } else {
+ throw new IllegalArgumentException("Expected a BlankNode or IRI, not: " + blankNodeOrIRI);
+ }
}
JsonLdTerm asRDFTerm(final Node node, String blankNodePrefix) {
@@ -301,4 +297,8 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
}
}
+ RDFDataset.Quad createJsonLdQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ return new RDFDataset.Quad(asJsonLdNode(subject), asJsonLdNode(predicate), asJsonLdNode(object), asJsonLdString(graphName));
+ }
+
}
\ No newline at end of file
[46/50] incubator-commonsrdf git commit: COMMONSRDF-36 JsonLd*Impl
made package protected
Posted by st...@apache.org.
COMMONSRDF-36 JsonLd*Impl made package protected
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/492ea230
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/492ea230
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/492ea230
Branch: refs/heads/master
Commit: 492ea2302fe8503a07fd2fbf1cf115234945e315
Parents: 043a061
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Sep 28 14:47:32 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Sep 28 14:47:32 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jsonldjava/JsonLdBlankNode.java | 2 +-
.../commons/rdf/jsonldjava/JsonLdDataset.java | 15 ++++++-----
.../commons/rdf/jsonldjava/JsonLdGraph.java | 12 ++++++---
.../commons/rdf/jsonldjava/JsonLdGraphLike.java | 22 +++++++++++----
.../commons/rdf/jsonldjava/JsonLdIRI.java | 3 +--
.../commons/rdf/jsonldjava/JsonLdLiteral.java | 3 +--
.../commons/rdf/jsonldjava/JsonLdQuad.java | 7 ++---
.../commons/rdf/jsonldjava/JsonLdQuadLike.java | 2 +-
.../rdf/jsonldjava/JsonLdRDFTermFactory.java | 28 +++++++++-----------
.../commons/rdf/jsonldjava/JsonLdTerm.java | 3 ++-
.../commons/rdf/jsonldjava/JsonLdTriple.java | 5 ++--
.../rdf/jsonldjava/JsonLdUnionGraph.java | 12 +++++----
12 files changed, 65 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNode.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNode.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNode.java
index e54c894..b079c14 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNode.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNode.java
@@ -22,6 +22,7 @@ import org.apache.commons.rdf.api.BlankNode;
import com.github.jsonldjava.core.RDFDataset.Node;
public interface JsonLdBlankNode extends JsonLdTerm, BlankNode {
+}
final class JsonLdBlankNodeImpl extends JsonLdTermImpl implements JsonLdBlankNode {
private String blankNodePrefix;
@@ -59,4 +60,3 @@ public interface JsonLdBlankNode extends JsonLdTerm, BlankNode {
}
}
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
index 55b9f3c..8774cdc 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
@@ -32,17 +32,20 @@ import org.apache.commons.rdf.api.RDFTerm;
import com.github.jsonldjava.core.RDFDataset;
-public class JsonLdDataset extends JsonLdGraphLike<org.apache.commons.rdf.api.Quad> implements Dataset {
+public interface JsonLdDataset extends JsonLdGraphLike<org.apache.commons.rdf.api.Quad>, Dataset {
+}
+
+class JsonLdDatasetImpl extends AbstractJsonLdGraphLike<org.apache.commons.rdf.api.Quad> implements JsonLdDataset {
- JsonLdDataset(RDFDataset rdfDataSet) {
+ JsonLdDatasetImpl(RDFDataset rdfDataSet) {
super(rdfDataSet);
}
- JsonLdDataset(RDFDataset rdfDataset, String bnodePrefix) {
+ JsonLdDatasetImpl(RDFDataset rdfDataset, String bnodePrefix) {
super(rdfDataset, bnodePrefix);
}
- JsonLdDataset(String bnodePrefix) {
+ JsonLdDatasetImpl(String bnodePrefix) {
super(bnodePrefix);
}
@@ -58,7 +61,7 @@ public class JsonLdDataset extends JsonLdGraphLike<org.apache.commons.rdf.api.Qu
@Override
public Graph getGraph() {
- return new JsonLdGraph(rdfDataSet, Optional.empty(), bnodePrefix);
+ return new JsonLdGraphImpl(rdfDataSet, Optional.empty(), bnodePrefix);
}
@Override
@@ -67,7 +70,7 @@ public class JsonLdDataset extends JsonLdGraphLike<org.apache.commons.rdf.api.Qu
return Optional.of(getGraph());
}
return getGraphNames()
- .map(g -> (Graph)new JsonLdGraph(rdfDataSet, Optional.of(g), bnodePrefix))
+ .map(g -> (Graph)new JsonLdGraphImpl(rdfDataSet, Optional.of(g), bnodePrefix))
.findAny();
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
index 206c82a..0a59cc3 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
@@ -34,21 +34,25 @@ import com.github.jsonldjava.core.RDFDataset;
* A {@link Graph} view of a JsonLd {@link RDFDataset}.
*
*/
-public class JsonLdGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Triple> implements Graph {
+public interface JsonLdGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Triple>, Graph {
+}
+
+class JsonLdGraphImpl extends AbstractJsonLdGraphLike<org.apache.commons.rdf.api.Triple>
+ implements JsonLdGraph {
private final Optional<BlankNodeOrIRI> graphName;
- JsonLdGraph(RDFDataset rdfDataSet) {
+ JsonLdGraphImpl(RDFDataset rdfDataSet) {
super(rdfDataSet);
this.graphName = Optional.empty();
}
- JsonLdGraph(RDFDataset rdfDataSet, Optional<BlankNodeOrIRI> graphName, String bnodePrefix) {
+ JsonLdGraphImpl(RDFDataset rdfDataSet, Optional<BlankNodeOrIRI> graphName, String bnodePrefix) {
super(rdfDataSet, bnodePrefix);
this.graphName = Objects.requireNonNull(graphName);
}
- JsonLdGraph(String bnodePrefix) {
+ JsonLdGraphImpl(String bnodePrefix) {
super(bnodePrefix);
this.graphName = Optional.empty();
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
index cb8e568..dced9cc 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
@@ -43,8 +43,20 @@ import com.github.jsonldjava.core.RDFDataset.Node;
*
* @param <T> specialisation of {@link TripleLike}, e.g. {@link Triple} or {@link Quad}
*/
-abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm>>
- implements GraphLike<T, BlankNodeOrIRI, IRI, RDFTerm> {
+public interface JsonLdGraphLike <T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm>>
+ extends GraphLike<T, BlankNodeOrIRI, IRI, RDFTerm> {
+ /**
+ * Return the underlying JSONLD-Java {@link RDFDataset}.
+ * <p>
+ * Changes in the JSONLD-Java dataset is reflected in this class and vice
+ * versa.
+ *
+ */
+ public RDFDataset getRdfDataSet();
+}
+
+abstract class AbstractJsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm>>
+ implements JsonLdGraphLike<T> {
/**
* Used by {@link #bnodePrefix()} to get a unique UUID per JVM run
@@ -66,17 +78,17 @@ abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm
*/
RDFDataset rdfDataSet;
- JsonLdGraphLike(RDFDataset rdfDataSet) {
+ AbstractJsonLdGraphLike(RDFDataset rdfDataSet) {
this(rdfDataSet, "urn:uuid:" + SALT + "#" + "g"+ System.identityHashCode(rdfDataSet));
}
- JsonLdGraphLike(RDFDataset rdfDataSet, String bnodePrefix) {
+ AbstractJsonLdGraphLike(RDFDataset rdfDataSet, String bnodePrefix) {
this.rdfDataSet = Objects.requireNonNull(rdfDataSet);
this.bnodePrefix = Objects.requireNonNull(bnodePrefix);
this.factory = new JsonLdRDFTermFactory(bnodePrefix);
}
- JsonLdGraphLike(String bnodePrefix) {
+ AbstractJsonLdGraphLike(String bnodePrefix) {
this(new RDFDataset(), bnodePrefix);
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdIRI.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdIRI.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdIRI.java
index aac13e6..dc94401 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdIRI.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdIRI.java
@@ -23,6 +23,7 @@ import com.github.jsonldjava.core.RDFDataset;
import com.github.jsonldjava.core.RDFDataset.Node;
public interface JsonLdIRI extends JsonLdTerm, IRI {
+}
final class JsonLdIRIImpl extends JsonLdTermImpl implements JsonLdIRI {
@@ -61,5 +62,3 @@ public interface JsonLdIRI extends JsonLdTerm, IRI {
return node.getValue().equals(other.getIRIString());
}
}
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
index 8eba6e7..01dff6f 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
@@ -23,11 +23,11 @@ import java.util.Optional;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.Literal;
import org.apache.commons.rdf.simple.Types;
-import org.apache.commons.rdf.jsonldjava.JsonLdIRI.JsonLdIRIImpl;
import com.github.jsonldjava.core.RDFDataset.Node;
public interface JsonLdLiteral extends JsonLdTerm, Literal {
+}
class JsonLdLiteralImpl extends JsonLdTermImpl implements JsonLdLiteral {
@@ -97,4 +97,3 @@ public interface JsonLdLiteral extends JsonLdTerm, Literal {
}
}
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java
index 524f43c..d9a26b3 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java
@@ -23,17 +23,19 @@ import org.apache.commons.rdf.api.BlankNodeOrIRI;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.RDFTerm;
// Note: To avoid confusion - don't import either Quad
-import org.apache.commons.rdf.jsonldjava.JsonLdQuadLike.JsonLdQuadLikeImpl;
public interface JsonLdQuad extends org.apache.commons.rdf.api.Quad {
+
/**
* Return the underlying JsonLD {@link com.github.jsonldjava.core.RDFDataset.Quad}
*
* @return The JsonLD {@link com.github.jsonldjava.core.RDFDataset.Quad}
*/
public com.github.jsonldjava.core.RDFDataset.Quad asJsonLdQuad();
-
+
+}
+
final class JsonLdQuadImpl extends JsonLdQuadLikeImpl<BlankNodeOrIRI,IRI,RDFTerm,BlankNodeOrIRI>
implements JsonLdQuad {
@@ -62,4 +64,3 @@ public interface JsonLdQuad extends org.apache.commons.rdf.api.Quad {
}
}
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
index 224dc30..12fb95d 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
@@ -27,6 +27,7 @@ import com.github.jsonldjava.core.RDFDataset.Quad;
public interface JsonLdQuadLike<S extends RDFTerm, P extends RDFTerm, O extends RDFTerm, G extends RDFTerm> extends QuadLike<S,P,O,G> {
public Quad asJsonLdQuad();
+}
class JsonLdQuadLikeImpl<S extends RDFTerm, P extends RDFTerm, O extends RDFTerm, G extends RDFTerm> implements JsonLdQuadLike<S,P,O,G> {
@@ -72,4 +73,3 @@ public interface JsonLdQuadLike<S extends RDFTerm, P extends RDFTerm, O extends
}
}
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
index 310fd24..2e586f9 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
@@ -30,10 +30,6 @@ import org.apache.commons.rdf.api.Literal;
import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.RDFTermFactory;
import org.apache.commons.rdf.api.Triple;
-import org.apache.commons.rdf.jsonldjava.JsonLdBlankNode.JsonLdBlankNodeImpl;
-import org.apache.commons.rdf.jsonldjava.JsonLdLiteral.JsonLdLiteralImpl;
-import org.apache.commons.rdf.jsonldjava.JsonLdQuad.JsonLdQuadImpl;
-import org.apache.commons.rdf.jsonldjava.JsonLdTriple.JsonLdTripleImpl;
import org.apache.commons.rdf.simple.Types;
import com.github.jsonldjava.core.RDFDataset;
@@ -62,8 +58,8 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
* @param rdfDataSet JsonLd {@link RDFDataset} to adapt
* @return Adapted {@link Dataset}
*/
- public Dataset asDataset(RDFDataset rdfDataSet) {
- return new JsonLdDataset(rdfDataSet);
+ public JsonLdDataset asDataset(RDFDataset rdfDataSet) {
+ return new JsonLdDatasetImpl(rdfDataSet);
}
/**
@@ -81,8 +77,8 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
* @param rdfDataSet JsonLd {@link RDFDataset} to adapt
* @return Adapted {@link Graph} covering the <em>default graph</em>
*/
- public Graph asGraph(RDFDataset rdfDataSet) {
- return new JsonLdGraph(rdfDataSet);
+ public JsonLdGraph asGraph(RDFDataset rdfDataSet) {
+ return new JsonLdGraphImpl(rdfDataSet);
}
public Node asJsonLdNode(RDFTerm term) {
@@ -202,8 +198,8 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
* @param rdfDataSet JsonLd {@link RDFDataset} to adapt
* @return Adapted {@link Dataset}
*/
- public Graph asUnionGraph(RDFDataset rdfDataSet) {
- return new JsonLdUnionGraph(rdfDataSet);
+ public JsonLdUnionGraph asUnionGraph(RDFDataset rdfDataSet) {
+ return new JsonLdUnionGraphImpl(rdfDataSet);
}
@Override
@@ -220,18 +216,18 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
}
@Override
- public Dataset createDataset() {
- return new JsonLdDataset(bnodePrefix);
+ public JsonLdDataset createDataset() {
+ return new JsonLdDatasetImpl(bnodePrefix);
}
@Override
- public Graph createGraph() {
- return new JsonLdGraph(bnodePrefix);
+ public JsonLdGraph createGraph() {
+ return new JsonLdGraphImpl(bnodePrefix);
}
@Override
public JsonLdIRI createIRI(String iri) {
- return new JsonLdIRI.JsonLdIRIImpl(iri);
+ return new JsonLdIRIImpl(iri);
}
@Override
@@ -288,7 +284,7 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
return null; // e.g. default graph
}
if (node.isIRI()) {
- return new JsonLdIRI.JsonLdIRIImpl(node);
+ return new JsonLdIRIImpl(node);
} else if (node.isBlankNode()) {
return new JsonLdBlankNodeImpl(node, blankNodePrefix);
} else if (node.isLiteral()) {
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
index 2f250b9..62138d2 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
@@ -29,6 +29,7 @@ public interface JsonLdTerm extends RDFTerm {
* @return JsonLd {@link Node}
*/
Node asJsonLdNode();
+}
abstract class JsonLdTermImpl implements JsonLdTerm {
final Node node;
@@ -40,4 +41,4 @@ public interface JsonLdTerm extends RDFTerm {
}
}
-}
+
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java
index 18e271c..68fe9c0 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java
@@ -23,7 +23,6 @@ import org.apache.commons.rdf.api.BlankNodeOrIRI;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.Triple;
-import org.apache.commons.rdf.jsonldjava.JsonLdQuadLike.JsonLdQuadLikeImpl;
import com.github.jsonldjava.core.RDFDataset.Quad;
@@ -35,7 +34,8 @@ public interface JsonLdTriple extends Triple {
* @return The JsonLD {@link com.github.jsonldjava.core.RDFDataset.Quad}
*/
public com.github.jsonldjava.core.RDFDataset.Quad asJsonLdQuad();
-
+}
+
final class JsonLdTripleImpl extends JsonLdQuadLikeImpl<BlankNodeOrIRI, IRI, RDFTerm, RDFTerm>
implements JsonLdTriple {
@@ -59,4 +59,3 @@ public interface JsonLdTriple extends Triple {
return Objects.hash(getSubject(), getPredicate(), getObject());
}
}
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/492ea230/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
index 46598ed..81b669a 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
@@ -46,17 +46,20 @@ import com.github.jsonldjava.core.RDFDataset;
* inefficient as they skip any duplicate triples from multiple
* graphs.
*/
-class JsonLdUnionGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Triple> implements Graph {
+public interface JsonLdUnionGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Triple>, Graph {
+}
+
+class JsonLdUnionGraphImpl extends AbstractJsonLdGraphLike<org.apache.commons.rdf.api.Triple> implements JsonLdUnionGraph {
- JsonLdUnionGraph(String bnodePrefix) {
+ JsonLdUnionGraphImpl(String bnodePrefix) {
super(bnodePrefix);
}
- JsonLdUnionGraph(RDFDataset rdfDataSet) {
+ JsonLdUnionGraphImpl(RDFDataset rdfDataSet) {
super(rdfDataSet);
}
- JsonLdUnionGraph(RDFDataset rdfDataSet, String bnodePrefix) {
+ JsonLdUnionGraphImpl(RDFDataset rdfDataSet, String bnodePrefix) {
super(rdfDataSet, bnodePrefix);
}
@@ -111,6 +114,5 @@ class JsonLdUnionGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Triple
// Note: Our specialized stream() already removes duplicates using .distinct()
return stream().count();
}
-
}
[18/50] incubator-commonsrdf git commit: getTriples() -> stream()
Posted by st...@apache.org.
getTriples() -> stream()
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/f8b6594d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/f8b6594d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/f8b6594d
Branch: refs/heads/master
Commit: f8b6594d224bba664345c084bde8ca0c95069e95
Parents: 06a44b9
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Sep 8 15:34:33 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Sep 8 15:34:33 2016 +0100
----------------------------------------------------------------------
.../org/apache/commons/rdf/jsonldjava/JsonLdGraph.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/f8b6594d/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
index 0fe3690..c31ad71 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
@@ -126,12 +126,12 @@ public class JsonLdGraph implements Graph {
@Override
public boolean contains(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- return getTriples(subject, predicate, object).findAny().isPresent();
+ return stream(subject, predicate, object).findAny().isPresent();
}
@Override
public boolean contains(Triple triple) {
- return getTriples().anyMatch(Predicate.isEqual(triple));
+ return stream().anyMatch(Predicate.isEqual(triple));
}
public RDFTermFactory getContext() {
@@ -145,7 +145,7 @@ public class JsonLdGraph implements Graph {
}
@Override
- public Stream<? extends Triple> getTriples() {
+ public Stream<? extends Triple> stream() {
if (! unionGraph) {
return rdfDataSet.getQuads("@default").parallelStream().map(this::asTriple);
}
@@ -153,9 +153,9 @@ public class JsonLdGraph implements Graph {
}
@Override
- public Stream<? extends Triple> getTriples(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ public Stream<? extends Triple> stream(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
// RDFDataSet has no optimizations to help us, so we'll dispatch to filter()
- return getTriples().filter(t -> {
+ return stream().filter(t -> {
if (subject != null && !t.getSubject().equals(subject)) {
return false;
}
[28/50] incubator-commonsrdf git commit: Added JsonLdUnionGraph
Posted by st...@apache.org.
Added JsonLdUnionGraph
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/ea48c83e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/ea48c83e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/ea48c83e
Branch: refs/heads/master
Commit: ea48c83efc02f0908868398742a4c90c903ab98c
Parents: 1330627
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Sep 9 14:32:15 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Sep 9 14:32:15 2016 +0100
----------------------------------------------------------------------
.../rdf/jsonldjava/JsonLdUnionGraph.java | 80 ++++++++++++++++++++
1 file changed, 80 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/ea48c83e/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
new file mode 100644
index 0000000..ce164c6
--- /dev/null
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.rdf.jsonldjava;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.apache.commons.rdf.api.BlankNodeOrIRI;
+import org.apache.commons.rdf.api.Graph;
+import org.apache.commons.rdf.api.IRI;
+import org.apache.commons.rdf.api.RDFTerm;
+
+import com.github.jsonldjava.core.RDFDataset;
+
+public class JsonLdUnionGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Triple> implements Graph {
+
+ JsonLdUnionGraph(String bnodePrefix) {
+ super(bnodePrefix);
+ }
+
+ public JsonLdUnionGraph(RDFDataset rdfDataSet) {
+ super(rdfDataSet);
+ }
+
+ JsonLdUnionGraph(RDFDataset rdfDataSet, String bnodePrefix) {
+ super(rdfDataSet, bnodePrefix);
+ }
+
+
+ @Override
+ public void add(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ super.add(null, subject, predicate, object);
+ }
+
+ @Override
+ public boolean contains(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ return super.contains(null, subject, predicate, object);
+ }
+
+ @Override
+ public void remove(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ super.remove(null, subject, predicate, object);
+ }
+
+ @Override
+ public Stream<JsonLdTriple> stream(BlankNodeOrIRI subject, IRI predicate,
+ RDFTerm object) {
+ return filteredGraphs(null)
+ .flatMap(List::stream)
+ .filter(quadFilter(subject, predicate, object))
+ .map(factory::createTriple);
+ }
+
+ @Override
+ JsonLdTriple asTripleOrQuad(com.github.jsonldjava.core.RDFDataset.Quad jsonldQuad) {
+ return factory.createTriple(jsonldQuad);
+ }
+
+ @Override
+ public long size() {
+ // NOTE: Inefficient as we'll have remove duplicate triples :-(
+ return stream().distinct().count();
+ }
+}
+
[03/50] incubator-commonsrdf git commit: Sorted members
Posted by st...@apache.org.
Sorted members
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/fe7ed279
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/fe7ed279
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/fe7ed279
Branch: refs/heads/master
Commit: fe7ed279f7448e04f4381aaf8533f6a0bd66bb11
Parents: e98a963
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Apr 4 16:33:03 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Apr 4 16:33:31 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jsonldjava/JsonLdGraph.java | 216 +++++++++----------
1 file changed, 108 insertions(+), 108 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/fe7ed279/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
index 14990d3..4df85e2 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
@@ -44,36 +44,13 @@ public class JsonLdGraph implements Graph {
*/
private static UUID SALT = UUID.randomUUID();
- private JsonLdRDFTermFactory rdfTermFactory;
-
- public JsonLdGraph() {
- this(new RDFDataset(), false);
- }
-
- public JsonLdGraph(RDFDataset rdfDataset) {
- this(rdfDataset, false);
- }
-
- public JsonLdGraph(RDFDataset rdfDataset, boolean unionGraph) {
- this.rdfDataSet = rdfDataset;
- this.unionGraph = unionGraph;
- }
-
- public RDFTermFactory getContext() {
- // Note: This does not need to be synchronized, it's OK
- // if you get a few accidental copies as the
- // same bnodePrefix() is passed to each
- if (rdfTermFactory == null) {
- rdfTermFactory = new JsonLdRDFTermFactory(bnodePrefix());
- }
- return rdfTermFactory;
- }
-
/**
* The underlying JSON-LD {@link RDFDataset}.
*/
private RDFDataset rdfDataSet;
+ private JsonLdRDFTermFactory rdfTermFactory;
+
/**
* If true, include all Quad statements as Triples. If false,
* only Quads in the default graph (<code>null</code>) are
@@ -81,47 +58,17 @@ public class JsonLdGraph implements Graph {
*/
private boolean unionGraph = false;
- @Override
- public void close() throws Exception {
- // Drop the memory reference, but don't clear it
- rdfDataSet = null;
- }
-
- @Override
- public void add(Triple triple) {
- // Quad q = asJsonLdQuad(triple);
- // rdfDataSet.addQuad(q);
-
- add(triple.getSubject(), triple.getPredicate(), triple.getObject());
- }
- private Triple asTriple(final RDFDataset.Quad quad) {
- return new JsonLdTriple(quad, bnodePrefix());
+ public JsonLdGraph() {
+ this(new RDFDataset(), false);
}
- private String bnodePrefix() {
- return "urn:uuid:" + SALT + "#" + "g"+ System.identityHashCode(rdfDataSet);
+ public JsonLdGraph(RDFDataset rdfDataset) {
+ this(rdfDataset, false);
}
- private Node asJsonLdNode(RDFTerm term) {
- if (term instanceof IRI) {
- return new RDFDataset.IRI( ((IRI)term).getIRIString() );
- }
- if (term instanceof BlankNode) {
-
- String uniqueReference = ((BlankNode)term).uniqueReference();
- if (uniqueReference.startsWith(bnodePrefix())) {
- // one of our own
- // TODO: Retrieve the original BlankNode
- return new RDFDataset.BlankNode(term.ntriplesString());
- }
- return new RDFDataset.BlankNode( "_:" + uniqueReference );
- }
- if (term instanceof Literal) {
- Literal literal = (Literal) term;
- return new RDFDataset.Literal(literal.getLexicalForm(), literal.getDatatype().getIRIString(),
- literal.getLanguageTag().orElse(null));
- }
- throw new IllegalArgumentException("RDFTerm not instanceof IRI, BlankNode or Literal: " + term);
+ public JsonLdGraph(RDFDataset rdfDataset, boolean unionGraph) {
+ this.rdfDataSet = rdfDataset;
+ this.unionGraph = unionGraph;
}
@Override
@@ -150,47 +97,11 @@ public class JsonLdGraph implements Graph {
}
@Override
- public boolean contains(Triple triple) {
- return getTriples().anyMatch(Predicate.isEqual(triple));
- }
-
- @Override
- public boolean contains(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- return getTriples(subject, predicate, object).findAny().isPresent();
- }
-
- @Override
- public void remove(Triple triple) {
- remove(triple.getSubject(), triple.getPredicate(), triple.getObject());
- }
-
- @Override
- public void remove(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- Predicate<? super Quad> filter = quadFilter(subject, predicate, object);
- if (! unionGraph) {
- rdfDataSet.getQuads("@default").removeIf(filter);
- } else {
- rdfDataSet.graphNames().parallelStream().map(rdfDataSet::getQuads).map(t -> t.removeIf(filter));
- }
- }
-
- private Predicate<? super Quad> quadFilter(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- Optional<Node> subjectNode = Optional.ofNullable(subject).map(this::asJsonLdNode);
- Optional<Node> predicateNode = Optional.ofNullable(predicate).map(this::asJsonLdNode);
- Optional<Node> objectNode = Optional.ofNullable(object).map(this::asJsonLdNode);
+ public void add(Triple triple) {
+ // Quad q = asJsonLdQuad(triple);
+ // rdfDataSet.addQuad(q);
- return q -> {
- if (subjectNode.isPresent() && subjectNode.get().compareTo(q.getSubject()) != 0) {
- return false;
- }
- if (predicateNode.isPresent() && predicateNode.get().compareTo(q.getPredicate()) != 0) {
- return false;
- }
- if (objectNode.isPresent() && objectNode.get().compareTo(q.getObject()) != 0) {
- return false;
- }
- return true;
- };
+ add(triple.getSubject(), triple.getPredicate(), triple.getObject());
}
@Override
@@ -203,15 +114,30 @@ public class JsonLdGraph implements Graph {
rdfDataSet.getQuads("@default").clear();
}
}
+ @Override
+ public void close() throws Exception {
+ // Drop the memory reference, but don't clear it
+ rdfDataSet = null;
+ }
+
+ @Override
+ public boolean contains(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ return getTriples(subject, predicate, object).findAny().isPresent();
+ }
@Override
- public long size() {
- if (! unionGraph) {
- return rdfDataSet.getQuads("@default").size();
- } else {
- // Summarize graph.size() for all graphs
- return rdfDataSet.graphNames().parallelStream().map(rdfDataSet::getQuads).collect(Collectors.summingLong(List::size));
+ public boolean contains(Triple triple) {
+ return getTriples().anyMatch(Predicate.isEqual(triple));
+ }
+
+ public RDFTermFactory getContext() {
+ // Note: This does not need to be synchronized, it's OK
+ // if you get a few accidental copies as the
+ // same bnodePrefix() is passed to each
+ if (rdfTermFactory == null) {
+ rdfTermFactory = new JsonLdRDFTermFactory(bnodePrefix());
}
+ return rdfTermFactory;
}
@Override
@@ -238,4 +164,78 @@ public class JsonLdGraph implements Graph {
return true;
});
}
+
+ @Override
+ public void remove(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ Predicate<? super Quad> filter = quadFilter(subject, predicate, object);
+ if (! unionGraph) {
+ rdfDataSet.getQuads("@default").removeIf(filter);
+ } else {
+ rdfDataSet.graphNames().parallelStream().map(rdfDataSet::getQuads).map(t -> t.removeIf(filter));
+ }
+ }
+
+ @Override
+ public void remove(Triple triple) {
+ remove(triple.getSubject(), triple.getPredicate(), triple.getObject());
+ }
+
+ @Override
+ public long size() {
+ if (! unionGraph) {
+ return rdfDataSet.getQuads("@default").size();
+ } else {
+ // Summarize graph.size() for all graphs
+ return rdfDataSet.graphNames().parallelStream().map(rdfDataSet::getQuads).collect(Collectors.summingLong(List::size));
+ }
+ }
+
+ private Node asJsonLdNode(RDFTerm term) {
+ if (term instanceof IRI) {
+ return new RDFDataset.IRI( ((IRI)term).getIRIString() );
+ }
+ if (term instanceof BlankNode) {
+
+ String uniqueReference = ((BlankNode)term).uniqueReference();
+ if (uniqueReference.startsWith(bnodePrefix())) {
+ // one of our own
+ // TODO: Retrieve the original BlankNode
+ return new RDFDataset.BlankNode(term.ntriplesString());
+ }
+ return new RDFDataset.BlankNode( "_:" + uniqueReference );
+ }
+ if (term instanceof Literal) {
+ Literal literal = (Literal) term;
+ return new RDFDataset.Literal(literal.getLexicalForm(), literal.getDatatype().getIRIString(),
+ literal.getLanguageTag().orElse(null));
+ }
+ throw new IllegalArgumentException("RDFTerm not instanceof IRI, BlankNode or Literal: " + term);
+ }
+
+ private Triple asTriple(final RDFDataset.Quad quad) {
+ return new JsonLdTriple(quad, bnodePrefix());
+ }
+
+ private String bnodePrefix() {
+ return "urn:uuid:" + SALT + "#" + "g"+ System.identityHashCode(rdfDataSet);
+ }
+
+ private Predicate<? super Quad> quadFilter(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ Optional<Node> subjectNode = Optional.ofNullable(subject).map(this::asJsonLdNode);
+ Optional<Node> predicateNode = Optional.ofNullable(predicate).map(this::asJsonLdNode);
+ Optional<Node> objectNode = Optional.ofNullable(object).map(this::asJsonLdNode);
+
+ return q -> {
+ if (subjectNode.isPresent() && subjectNode.get().compareTo(q.getSubject()) != 0) {
+ return false;
+ }
+ if (predicateNode.isPresent() && predicateNode.get().compareTo(q.getPredicate()) != 0) {
+ return false;
+ }
+ if (objectNode.isPresent() && objectNode.get().compareTo(q.getObject()) != 0) {
+ return false;
+ }
+ return true;
+ };
+ }
}
[23/50] incubator-commonsrdf git commit: Graph uses factory
Posted by st...@apache.org.
Graph uses factory
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/dde5abac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/dde5abac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/dde5abac
Branch: refs/heads/master
Commit: dde5abac27983ace5ebbdc1b37c35d65a0df3dc0
Parents: 80ad999
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Sep 8 17:10:31 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Sep 8 17:10:31 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jsonldjava/JsonLdGraph.java | 79 ++++++--------------
.../rdf/jsonldjava/JsonLdRDFTermFactory.java | 7 +-
2 files changed, 30 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/dde5abac/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
index c31ad71..30c13a8 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
@@ -49,21 +49,22 @@ public class JsonLdGraph implements Graph {
*/
private RDFDataset rdfDataSet;
- public RDFDataset getRdfDataSet() {
- return rdfDataSet;
- }
-
- private JsonLdRDFTermFactory rdfTermFactory;
-
/**
* If true, include all Quad statements as Triples. If false,
* only Quads in the default graph (<code>null</code>) are
* included.
*/
- private boolean unionGraph = false;
+ private final boolean unionGraph;
+
+ /**
+ * Prefix to use in blank node identifiers
+ */
+ private final String bnodePrefix;
+ private JsonLdRDFTermFactory factory;
+
public JsonLdGraph() {
- this(new RDFDataset(), false);
+ this(new RDFDataset(), false);
}
public JsonLdGraph(RDFDataset rdfDataset) {
@@ -73,8 +74,16 @@ public class JsonLdGraph implements Graph {
public JsonLdGraph(RDFDataset rdfDataset, boolean unionGraph) {
this.rdfDataSet = rdfDataset;
this.unionGraph = unionGraph;
+ this.bnodePrefix = "urn:uuid:" + SALT + "#" + "g"+ System.identityHashCode(rdfDataSet);
+ this.factory = new JsonLdRDFTermFactory(bnodePrefix);
}
+
+ public RDFDataset getRdfDataSet() {
+ return rdfDataSet;
+ }
+
+
@Override
public void add(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
String subjectStr;
@@ -121,7 +130,7 @@ public class JsonLdGraph implements Graph {
@Override
public void close() {
// Drop the memory reference, but don't clear it
- rdfDataSet = null;
+ rdfDataSet = null;
}
@Override
@@ -134,22 +143,12 @@ public class JsonLdGraph implements Graph {
return stream().anyMatch(Predicate.isEqual(triple));
}
- public RDFTermFactory getContext() {
- // Note: This does not need to be synchronized, it's OK
- // if you get a few accidental copies as the
- // same bnodePrefix() is passed to each
- if (rdfTermFactory == null) {
- rdfTermFactory = new JsonLdRDFTermFactory(bnodePrefix());
- }
- return rdfTermFactory;
- }
-
@Override
public Stream<? extends Triple> stream() {
if (! unionGraph) {
- return rdfDataSet.getQuads("@default").parallelStream().map(this::asTriple);
+ return rdfDataSet.getQuads("@default").parallelStream().map(factory::asTriple);
}
- return rdfDataSet.graphNames().parallelStream().map(rdfDataSet::getQuads).flatMap(List<Quad>::parallelStream).map(this::asTriple);
+ return rdfDataSet.graphNames().parallelStream().map(rdfDataSet::getQuads).flatMap(List<Quad>::parallelStream).map(factory::asTriple);
}
@Override
@@ -193,41 +192,11 @@ public class JsonLdGraph implements Graph {
return rdfDataSet.graphNames().parallelStream().map(rdfDataSet::getQuads).collect(Collectors.summingLong(List::size));
}
}
-
- private Node asJsonLdNode(RDFTerm term) {
- if (term instanceof IRI) {
- return new RDFDataset.IRI( ((IRI)term).getIRIString() );
- }
- if (term instanceof BlankNode) {
-
- String uniqueReference = ((BlankNode)term).uniqueReference();
- if (uniqueReference.startsWith(bnodePrefix())) {
- // one of our own
- // TODO: Retrieve the original BlankNode
- return new RDFDataset.BlankNode(term.ntriplesString());
- }
- return new RDFDataset.BlankNode( "_:" + uniqueReference );
- }
- if (term instanceof Literal) {
- Literal literal = (Literal) term;
- return new RDFDataset.Literal(literal.getLexicalForm(), literal.getDatatype().getIRIString(),
- literal.getLanguageTag().orElse(null));
- }
- throw new IllegalArgumentException("RDFTerm not instanceof IRI, BlankNode or Literal: " + term);
- }
-
- private Triple asTriple(final RDFDataset.Quad quad) {
- return new JsonLdTriple(quad, bnodePrefix());
- }
-
- public String bnodePrefix() {
- return "urn:uuid:" + SALT + "#" + "g"+ System.identityHashCode(rdfDataSet);
- }
-
+
private Predicate<? super Quad> quadFilter(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- Optional<Node> subjectNode = Optional.ofNullable(subject).map(this::asJsonLdNode);
- Optional<Node> predicateNode = Optional.ofNullable(predicate).map(this::asJsonLdNode);
- Optional<Node> objectNode = Optional.ofNullable(object).map(this::asJsonLdNode);
+ Optional<Node> subjectNode = Optional.ofNullable(subject).map(factory::asJsonLdNode);
+ Optional<Node> predicateNode = Optional.ofNullable(predicate).map(factory::asJsonLdNode);
+ Optional<Node> objectNode = Optional.ofNullable(object).map(factory::asJsonLdNode);
return q -> {
if (subjectNode.isPresent() && subjectNode.get().compareTo(q.getSubject()) != 0) {
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/dde5abac/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
index 5ac360a..12ab13d 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
@@ -27,6 +27,7 @@ import org.apache.commons.rdf.api.Literal;
import org.apache.commons.rdf.api.QuadLike;
import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.RDFTermFactory;
+import org.apache.commons.rdf.api.Triple;
import org.apache.commons.rdf.api.TripleLike;
import org.apache.commons.rdf.simple.Types;
@@ -74,6 +75,10 @@ final class JsonLdRDFTermFactory implements RDFTermFactory {
return new JsonLdTriple.JsonLdTripleImpl(asJsonLdQuad(subject, predicate, object), bnodePrefix);
}
+ public Triple asTriple(final RDFDataset.Quad quad) {
+ return new JsonLdTriple.JsonLdTripleImpl(quad, bnodePrefix);
+ }
+
@Override
public JsonLdQuad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object)
throws IllegalArgumentException, UnsupportedOperationException {
@@ -93,7 +98,7 @@ final class JsonLdRDFTermFactory implements RDFTermFactory {
}
- private Node asJsonLdNode(RDFTerm term) {
+ public Node asJsonLdNode(RDFTerm term) {
if (term instanceof JsonLdTerm) {
// Return original Node
return ((JsonLdTerm)term).asNode();
[41/50] incubator-commonsrdf git commit: also map JsonLdBlankNode
from other unique prefixes
Posted by st...@apache.org.
also map JsonLdBlankNode from other unique prefixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/be7bfc82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/be7bfc82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/be7bfc82
Branch: refs/heads/master
Commit: be7bfc82845d5b79d27f8348e8c021d17d6882e8
Parents: 0928ddb
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Sep 23 17:56:30 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Sep 23 17:56:30 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jsonldjava/JsonLdRDFTermFactory.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/be7bfc82/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
index 88b9bef..310fd24 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
@@ -86,8 +86,14 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
}
public Node asJsonLdNode(RDFTerm term) {
- if (term instanceof JsonLdTerm) {
- // Return original Node
+ if (term instanceof JsonLdBlankNode) {
+ JsonLdBlankNode jsonLdBlankNode = (JsonLdBlankNode) term;
+ if (jsonLdBlankNode.uniqueReference().startsWith(bnodePrefix)) {
+ // Only return blank nodes 'as is' if they have the same prefix
+ return jsonLdBlankNode.asJsonLdNode();
+ }
+ } else if (term instanceof JsonLdTerm) {
+ // non-Bnodes can always be return as-is
return ((JsonLdTerm) term).asJsonLdNode();
}
if (term instanceof IRI) {
[24/50] incubator-commonsrdf git commit: organized imports
Posted by st...@apache.org.
organized imports
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/fe6c2289
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/fe6c2289
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/fe6c2289
Branch: refs/heads/master
Commit: fe6c22899593a62cdbf0e1b1316a29e7ed3bef13
Parents: dde5aba
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Sep 9 09:33:26 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Sep 9 09:33:26 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java | 1 -
.../java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java | 1 -
2 files changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/fe6c2289/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
index 30c13a8..c7c3491 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
@@ -30,7 +30,6 @@ import org.apache.commons.rdf.api.Graph;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.Literal;
import org.apache.commons.rdf.api.RDFTerm;
-import org.apache.commons.rdf.api.RDFTermFactory;
import org.apache.commons.rdf.api.Triple;
import com.github.jsonldjava.core.RDFDataset;
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/fe6c2289/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
index 246e76e..4b6edfe 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
@@ -32,7 +32,6 @@ import org.apache.commons.rdf.api.RDFParserBuilder;
import org.apache.commons.rdf.api.RDFSyntax;
import org.apache.commons.rdf.api.RDFTermFactory;
import org.apache.commons.rdf.simple.AbstractRDFParserBuilder;
-import org.apache.commons.rdf.simple.AbstractRDFParserBuilder.RDFParseException;
import com.github.jsonldjava.core.JsonLdError;
import com.github.jsonldjava.core.JsonLdOptions;
[10/50] incubator-commonsrdf git commit: incomplete
JsonLdParserBuilder
Posted by st...@apache.org.
incomplete JsonLdParserBuilder
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/d51975f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/d51975f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/d51975f0
Branch: refs/heads/master
Commit: d51975f090ad067e59b73579ca1b57bfc09cabfa
Parents: b2aacd2
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Apr 8 12:00:00 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Apr 8 12:00:00 2016 +0100
----------------------------------------------------------------------
.../rdf/jsonldjava/JsonLdParserBuilder.java | 112 +++++++++++++++++++
1 file changed, 112 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/d51975f0/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
new file mode 100644
index 0000000..aeb3af2
--- /dev/null
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
@@ -0,0 +1,112 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.rdf.jsonldjava;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.text.ParseException;
+import java.util.Optional;
+import java.util.function.Predicate;
+
+import org.apache.commons.rdf.api.IRI;
+import org.apache.commons.rdf.api.RDFParserBuilder;
+import org.apache.commons.rdf.api.RDFSyntax;
+import org.apache.commons.rdf.api.RDFTermFactory;
+import org.apache.commons.rdf.simple.AbstractRDFParserBuilder;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.github.jsonldjava.utils.JsonUtils;
+
+public class JsonLdParserBuilder extends AbstractRDFParserBuilder {
+
+ @Override
+ protected RDFTermFactory createRDFTermFactory() {
+ if (getIntoGraph().map(x -> x instanceof JsonLdGraph).orElse(true)) {
+ JsonLdGraph graph = (JsonLdGraph) getIntoGraph().get();
+ return new JsonLdRDFTermFactory(graph.bnodePrefix());
+ } else {
+ // other kind of intoGraph - we'll let SimpleRDFTermFactory
+ // do the job slightly more efficiently instead
+ return super.createRDFTermFactory();
+ }
+ }
+
+ @Override
+ public RDFParserBuilder contentType(RDFSyntax rdfSyntax) throws IllegalArgumentException {
+ if (rdfSyntax != null && rdfSyntax != RDFSyntax.JSONLD) {
+ throw new IllegalArgumentException("Unsupported contentType: " + rdfSyntax);
+ }
+ return super.contentType(rdfSyntax);
+ }
+
+ @Override
+ public RDFParserBuilder contentType(String contentType) throws IllegalArgumentException {
+ JsonLdParserBuilder c = (JsonLdParserBuilder) super.contentType(contentType);
+ if (c.getContentType().filter(Predicate.isEqual(RDFSyntax.JSONLD).negate()).isPresent()) {
+ throw new IllegalArgumentException("Unsupported contentType: " + contentType);
+ }
+ return c;
+ }
+
+ private static URL asURL(IRI iri) throws IllegalStateException {
+ try {
+ return new URI(iri.getIRIString()).toURL();
+ } catch (MalformedURLException | URISyntaxException e) {
+ throw new IllegalStateException("Invalid URL: " + iri.getIRIString());
+ }
+ }
+
+ @Override
+ protected void checkSource() throws IOException {
+ super.checkSource();
+ // Might throw IllegalStateException if invalid
+ getSourceIri().map(JsonLdParserBuilder::asURL);
+ }
+
+ @Override
+ protected void parseSynchronusly() throws IOException, ParseException {
+ Object json = readSource();
+ }
+
+ private Object readSource() throws IOException, ParseException {
+ // Due to checked IOException we can't easily
+ // do this with .map and .orElseGet()
+
+ if (getSourceInputStream().isPresent()) {
+ return JsonUtils.fromInputStream(getSourceInputStream().get());
+ }
+ if (getSourceIri().isPresent()) {
+ return JsonUtils.fromURL(asURL(getSourceIri().get()),
+ JsonUtils.getDefaultHttpClient());
+ }
+ if (getSourceFile().isPresent()) {
+ try (InputStream inputStream = Files.newInputStream(getSourceFile().get())){
+ return JsonUtils.fromInputStream(inputStream);
+ }
+ }
+ throw new IllegalStateException("No known source found");
+ }
+
+}
+
[39/50] incubator-commonsrdf git commit: corrected javadoc
syntax/links
Posted by st...@apache.org.
corrected javadoc syntax/links
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/ccc47778
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/ccc47778
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/ccc47778
Branch: refs/heads/master
Commit: ccc47778581556201ffb33486dc2a62c317d0bce
Parents: fa5580c
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Sep 13 00:08:34 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Sep 13 00:11:02 2016 +0100
----------------------------------------------------------------------
.../rdf/jsonldjava/JsonLdRDFTermFactory.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/ccc47778/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
index 4a05724..88b9bef 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
@@ -114,10 +114,10 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
}
/**
- * Adapt a Commons RDF {@link org.apache.commons.rdf.api.Quad} as a JsonLd {@link RDFDataset.Quad}.
+ * Adapt a Commons RDF {@link org.apache.commons.rdf.api.Quad} as a JsonLd {@link com.github.jsonldjava.core.RDFDataset.Quad}.
*
* @param quad Commons RDF {@link org.apache.commons.rdf.api.Quad} to adapt
- * @return Adapted JsonLd {@link RDFDataset.Quad}
+ * @return Adapted JsonLd {@link com.github.jsonldjava.core.RDFDataset.Quad}
*/
public RDFDataset.Quad asJsonLdQuad(org.apache.commons.rdf.api.Quad quad) {
BlankNodeOrIRI g = quad.getGraphName().orElse(null);
@@ -125,24 +125,24 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
}
/**
- * Adapt a Commons RDF {@link Triple} as a JsonLd {@link RDFDataset.Quad}.
+ * Adapt a Commons RDF {@link Triple} as a JsonLd {@link com.github.jsonldjava.core.RDFDataset.Quad}.
*
* @param triple Commons RDF {@link Triple} to adapt
- * @return Adapted JsonLd {@link RDFDataset.Quad}
+ * @return Adapted JsonLd {@link com.github.jsonldjava.core.RDFDataset.Quad}
*/
public RDFDataset.Quad asJsonLdQuad(Triple triple) {
return createJsonLdQuad(null, triple.getSubject(), triple.getPredicate(), triple.getObject());
}
/**
- * Adapt a JsonLd {@link RDFDataset.Quad} as a Commons RDF
+ * Adapt a JsonLd {@link com.github.jsonldjava.core.RDFDataset.Quad} as a Commons RDF
* {@link org.apache.commons.rdf.api.Quad}.
* <p>
* The underlying JsonLd quad can be retrieved with
* {@link JsonLdQuad#asJsonLdQuad()}.
*
* @param quad
- * A JsonLd {@link RDFDataset.Quad} to adapt
+ * A JsonLd {@link com.github.jsonldjava.core.RDFDataset.Quad} to adapt
* @return Adapted {@link JsonLdQuad}
*/
public JsonLdQuad asQuad(final RDFDataset.Quad quad) {
@@ -150,7 +150,7 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
}
/**
- * Adapt a JsonLd {@link RDFDataset.Node} as a Commons RDF {@link RDFTerm}.
+ * Adapt a JsonLd {@link Node} as a Commons RDF {@link RDFTerm}.
* <p>
* The underlying node can be retrieved with
* {@link JsonLdTerm#asJsonLdNode()}.
@@ -164,14 +164,14 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
}
/**
- * Adapt a JsonLd {@link RDFDataset.Quad} as a Commons RDF
+ * Adapt a JsonLd {@link com.github.jsonldjava.core.RDFDataset.Quad} as a Commons RDF
* {@link org.apache.commons.rdf.api.Triple}.
* <p>
* The underlying JsonLd quad can be retrieved with
* {@link JsonLdTriple#asJsonLdQuad()}.
*
* @param quad
- * A JsonLd {@link RDFDataset.Quad} to adapt
+ * A JsonLd {@link com.github.jsonldjava.core.RDFDataset.Quad} to adapt
* @return Adapted {@link JsonLdTriple}
*/
public JsonLdTriple asTriple(final RDFDataset.Quad quad) {
[02/50] incubator-commonsrdf git commit: Move some converters to
JsonLdRDFTermFactory
Posted by st...@apache.org.
Move some converters to JsonLdRDFTermFactory
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/e98a9635
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/e98a9635
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/e98a9635
Branch: refs/heads/master
Commit: e98a9635f7f95c55eef48f98cf6ae7050c8235f3
Parents: 4da1bae
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Apr 4 16:32:31 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Apr 4 16:32:31 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jsonldjava/JsonLdGraph.java | 69 +++++++------
.../rdf/jsonldjava/JsonLdRDFTermFactory.java | 102 +++++++++++++++++++
.../commons/rdf/jsonldjava/JsonLdTriple.java | 8 +-
3 files changed, 141 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/e98a9635/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
index 730191c..14990d3 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
@@ -32,7 +32,6 @@ import org.apache.commons.rdf.api.Literal;
import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.RDFTermFactory;
import org.apache.commons.rdf.api.Triple;
-import org.apache.commons.rdf.simple.SimpleRDFTermFactory;
import com.github.jsonldjava.core.RDFDataset;
import com.github.jsonldjava.core.RDFDataset.Node;
@@ -40,9 +39,40 @@ import com.github.jsonldjava.core.RDFDataset.Quad;
public class JsonLdGraph implements Graph {
- private static UUID SALT = UUID.randomUUID();
+ /**
+ * Used by {@link #bnodePrefix()} to get a unique UUID per JVM run
+ */
+ private static UUID SALT = UUID.randomUUID();
- private RDFDataset rdfDataSet = new RDFDataset();
+ private JsonLdRDFTermFactory rdfTermFactory;
+
+ public JsonLdGraph() {
+ this(new RDFDataset(), false);
+ }
+
+ public JsonLdGraph(RDFDataset rdfDataset) {
+ this(rdfDataset, false);
+ }
+
+ public JsonLdGraph(RDFDataset rdfDataset, boolean unionGraph) {
+ this.rdfDataSet = rdfDataset;
+ this.unionGraph = unionGraph;
+ }
+
+ public RDFTermFactory getContext() {
+ // Note: This does not need to be synchronized, it's OK
+ // if you get a few accidental copies as the
+ // same bnodePrefix() is passed to each
+ if (rdfTermFactory == null) {
+ rdfTermFactory = new JsonLdRDFTermFactory(bnodePrefix());
+ }
+ return rdfTermFactory;
+ }
+
+ /**
+ * The underlying JSON-LD {@link RDFDataset}.
+ */
+ private RDFDataset rdfDataSet;
/**
* If true, include all Quad statements as Triples. If false,
@@ -53,6 +83,7 @@ public class JsonLdGraph implements Graph {
@Override
public void close() throws Exception {
+ // Drop the memory reference, but don't clear it
rdfDataSet = null;
}
@@ -63,8 +94,6 @@ public class JsonLdGraph implements Graph {
add(triple.getSubject(), triple.getPredicate(), triple.getObject());
}
- private static RDFTermFactory rdfTermFactory = new SimpleRDFTermFactory();
-
private Triple asTriple(final RDFDataset.Quad quad) {
return new JsonLdTriple(quad, bnodePrefix());
}
@@ -72,36 +101,6 @@ public class JsonLdGraph implements Graph {
private String bnodePrefix() {
return "urn:uuid:" + SALT + "#" + "g"+ System.identityHashCode(rdfDataSet);
}
-
- static RDFTerm asTerm(final Node node, String blankNodePrefix) {
- if (node.isIRI()) {
- return new JsonLdIRI(node);
- } else if (node.isBlankNode()) {
- return new JsonLdBlankNode(node, blankNodePrefix);
- } else if (node.isLiteral()) {
- // TODO: Our own JsonLdLiteral
- if (node.getLanguage() != null) {
- return rdfTermFactory.createLiteral(node.getValue(), node.getLanguage());
- } else {
- return rdfTermFactory.createLiteral(node.getValue(), rdfTermFactory.createIRI(node.getDatatype()));
- }
- } else {
- throw new IllegalArgumentException("Node is neither IRI, BlankNode nor Literal: " + node);
- }
- }
-
- private RDFDataset.Quad asJsonLdQuad(Triple triple) {
- Node subject = asJsonLdNode(triple.getSubject());
- Node predicate = asJsonLdNode(triple.getPredicate());
- Node object = asJsonLdNode(triple.getObject());
- String graph = null;
- // TODO: Add Quad to commons-rdf
-// if (triple instanceof Quad) {
-// String graph = triple.getGraph().getIRIString();
-// }
- return new RDFDataset.Quad(subject, predicate, object, graph);
-
- }
private Node asJsonLdNode(RDFTerm term) {
if (term instanceof IRI) {
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/e98a9635/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
index e2ee429..99927ad 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
@@ -17,12 +17,114 @@
*/
package org.apache.commons.rdf.jsonldjava;
+import java.util.UUID;
+
+import org.apache.commons.rdf.api.BlankNode;
+import org.apache.commons.rdf.api.BlankNodeOrIRI;
import org.apache.commons.rdf.api.Graph;
+import org.apache.commons.rdf.api.IRI;
+import org.apache.commons.rdf.api.Literal;
+import org.apache.commons.rdf.api.RDFTerm;
+import org.apache.commons.rdf.api.Triple;
import org.apache.commons.rdf.simple.SimpleRDFTermFactory;
+import com.github.jsonldjava.core.RDFDataset;
+import com.github.jsonldjava.core.RDFDataset.Node;
+
final class JsonLdRDFTermFactory extends SimpleRDFTermFactory {
+
+ public JsonLdRDFTermFactory() {
+ // An "outside Graph" bnodePrefix
+ this("urn:uuid:" + UUID.randomUUID() + "#b");
+ }
+
+ JsonLdRDFTermFactory(String bnodePrefix) {
+ this.bnodePrefix = bnodePrefix;
+ }
+
+ String bnodePrefix;
+
@Override
public Graph createGraph() throws UnsupportedOperationException {
return new JsonLdGraph();
}
+
+ @Override
+ public IRI createIRI(String iri) {
+ return new JsonLdIRI(new RDFDataset.IRI(iri));
+ }
+
+ @Override
+ public BlankNode createBlankNode() {
+ String id = "_:" + UUID.randomUUID().toString();
+ return new JsonLdBlankNode(new RDFDataset.BlankNode(id), bnodePrefix);
+ }
+
+ @Override
+ public BlankNode createBlankNode(String name) {
+ String id = "_:" + name;
+ // TODO: Check if name is valid JSON-LD BlankNode identifier
+ return new JsonLdBlankNode(new RDFDataset.BlankNode(id), bnodePrefix);
+ }
+
+ @Override
+ public Triple createTriple(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ return super.createTriple(subject, predicate, object);
+ }
+
+
+ private Node asJsonLdNode(RDFTerm term) {
+ if (term instanceof IRI) {
+ return new RDFDataset.IRI( ((IRI)term).getIRIString() );
+ }
+ if (term instanceof BlankNode) {
+
+ String uniqueReference = ((BlankNode)term).uniqueReference();
+ if (uniqueReference.startsWith(bnodePrefix)) {
+ // one of our own
+ // TODO: Retrieve the original BlankNode
+ return new RDFDataset.BlankNode(term.ntriplesString());
+ }
+ return new RDFDataset.BlankNode( "_:" + uniqueReference );
+ }
+ if (term instanceof Literal) {
+ Literal literal = (Literal) term;
+ return new RDFDataset.Literal(literal.getLexicalForm(), literal.getDatatype().getIRIString(),
+ literal.getLanguageTag().orElse(null));
+ }
+ throw new IllegalArgumentException("RDFTerm not instanceof IRI, BlankNode or Literal: " + term);
+ }
+
+
+ public RDFDataset.Quad asJsonLdQuad(Triple triple) {
+ Node subject = asJsonLdNode(triple.getSubject());
+ Node predicate = asJsonLdNode(triple.getPredicate());
+ Node object = asJsonLdNode(triple.getObject());
+ String graph = null;
+ // TODO: Add Quad to commons-rdf
+// if (triple instanceof Quad) {
+// String graph = triple.getGraph().getIRIString();
+// }
+ return new RDFDataset.Quad(subject, predicate, object, graph);
+
+ }
+
+ RDFTerm asTerm(final Node node, String blankNodePrefix) {
+ if (node.isIRI()) {
+ return new JsonLdIRI(node);
+ } else if (node.isBlankNode()) {
+ return new JsonLdBlankNode(node, blankNodePrefix);
+ } else if (node.isLiteral()) {
+ // TODO: Our own JsonLdLiteral
+ if (node.getLanguage() != null) {
+ return createLiteral(node.getValue(), node.getLanguage());
+ } else {
+ return createLiteral(node.getValue(), createIRI(node.getDatatype()));
+ }
+ } else {
+ throw new IllegalArgumentException("Node is neither IRI, BlankNode nor Literal: " + node);
+ }
+ }
+
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/e98a9635/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java
index 1a2dd91..49e95e3 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java
@@ -30,6 +30,8 @@ final class JsonLdTriple implements Triple {
private final Quad quad;
private String blankNodePrefix;
+ private static JsonLdRDFTermFactory rdfTermFactory = new JsonLdRDFTermFactory();
+
JsonLdTriple(Quad quad, String blankNodePrefix) {
this.quad = quad;
this.blankNodePrefix = blankNodePrefix;
@@ -37,17 +39,17 @@ final class JsonLdTriple implements Triple {
@Override
public BlankNodeOrIRI getSubject() {
- return (BlankNodeOrIRI) JsonLdGraph.asTerm(quad.getSubject(), blankNodePrefix);
+ return (BlankNodeOrIRI) rdfTermFactory.asTerm(quad.getSubject(), blankNodePrefix);
}
@Override
public IRI getPredicate() {
- return (IRI) JsonLdGraph.asTerm(quad.getPredicate(), blankNodePrefix);
+ return (IRI) rdfTermFactory.asTerm(quad.getPredicate(), blankNodePrefix);
}
@Override
public RDFTerm getObject() {
- return JsonLdGraph.asTerm(quad.getObject(), blankNodePrefix);
+ return rdfTermFactory.asTerm(quad.getObject(), blankNodePrefix);
}
@Override
[05/50] incubator-commonsrdf git commit: Added
JsonLdRDFTermFactoryTest
Posted by st...@apache.org.
Added JsonLdRDFTermFactoryTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/ce658d27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/ce658d27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/ce658d27
Branch: refs/heads/master
Commit: ce658d27ccb6988f6ff85352641675eea161cf8e
Parents: 286813c
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Apr 4 17:00:17 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Apr 4 17:00:17 2016 +0100
----------------------------------------------------------------------
.../jsonldjava/JsonLdRDFTermFactoryTest.java | 29 ++++++++++++++++++++
1 file changed, 29 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/ce658d27/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactoryTest.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactoryTest.java b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactoryTest.java
new file mode 100644
index 0000000..6017dd9
--- /dev/null
+++ b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactoryTest.java
@@ -0,0 +1,29 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.rdf.jsonldjava;
+
+import org.apache.commons.rdf.api.AbstractRDFTermFactoryTest;
+import org.apache.commons.rdf.api.RDFTermFactory;
+
+public class JsonLdRDFTermFactoryTest extends AbstractRDFTermFactoryTest {
+
+ @Override
+ public RDFTermFactory createFactory() {
+ return new JsonLdRDFTermFactory();
+ }
+}
[44/50] incubator-commonsrdf git commit: duplicate .gitignore removed
Posted by st...@apache.org.
duplicate .gitignore removed
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/0e79b6f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/0e79b6f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/0e79b6f3
Branch: refs/heads/master
Commit: 0e79b6f3e047d71e4833d4e801813c485197f652
Parents: 1412edd
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Sep 28 14:33:02 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Sep 28 14:33:02 2016 +0100
----------------------------------------------------------------------
jsonld-java/.gitignore | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/0e79b6f3/jsonld-java/.gitignore
----------------------------------------------------------------------
diff --git a/jsonld-java/.gitignore b/jsonld-java/.gitignore
deleted file mode 100644
index b83d222..0000000
--- a/jsonld-java/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target/
[40/50] incubator-commonsrdf git commit: Merge branch
'parser-with-quads' into jsonld-java
Posted by st...@apache.org.
Merge branch 'parser-with-quads' into jsonld-java
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/0928ddba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/0928ddba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/0928ddba
Branch: refs/heads/master
Commit: 0928ddbaa5380cb9fc6b7f5799cfb09f50aa3c6f
Parents: ccc4777 bfcead4
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Sep 13 00:11:34 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Sep 13 00:11:34 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/api/RDFParserBuilder.java | 21 +++++++++++++-------
.../rdf/simple/AbstractRDFParserBuilder.java | 6 +-----
2 files changed, 15 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
[29/50] incubator-commonsrdf git commit: code cleanup
Posted by st...@apache.org.
code cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/ca11a42b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/ca11a42b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/ca11a42b
Branch: refs/heads/master
Commit: ca11a42bc8e5022181d725fb53cdc4a7aa4dd8a3
Parents: ea48c83
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Sep 9 14:40:39 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Sep 9 14:40:39 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jsonldjava/JsonLdDataset.java | 20 +--
.../commons/rdf/jsonldjava/JsonLdGraph.java | 26 ++--
.../commons/rdf/jsonldjava/JsonLdGraphLike.java | 149 ++++++++++---------
.../rdf/jsonldjava/JsonLdRDFTermFactory.java | 120 +++++++--------
.../commons/rdf/jsonldjava/package-info.java | 4 +-
5 files changed, 164 insertions(+), 155 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/ca11a42b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
index e18dfaf..0e9422f 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
@@ -33,16 +33,16 @@ import com.github.jsonldjava.core.RDFDataset;
public class JsonLdDataset extends JsonLdGraphLike<org.apache.commons.rdf.api.Quad> implements Dataset {
- JsonLdDataset(String bnodePrefix) {
- super(bnodePrefix);
+ public JsonLdDataset(RDFDataset rdfDataSet) {
+ super(rdfDataSet);
}
JsonLdDataset(RDFDataset rdfDataset, String bnodePrefix) {
super(rdfDataset, bnodePrefix);
}
- public JsonLdDataset(RDFDataset rdfDataSet) {
- super(rdfDataSet);
+ JsonLdDataset(String bnodePrefix) {
+ super(bnodePrefix);
}
@Override
@@ -56,14 +56,9 @@ public class JsonLdDataset extends JsonLdGraphLike<org.apache.commons.rdf.api.Qu
}
@Override
- public void remove(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- super.remove(graphName, subject, predicate, object);
- }
-
- @Override
public Graph getGraph() {
return new JsonLdGraph(rdfDataSet, Optional.empty(), bnodePrefix);
- }
+ }
@Override
public Optional<Graph> getGraph(BlankNodeOrIRI graphName) {
@@ -83,6 +78,11 @@ public class JsonLdDataset extends JsonLdGraphLike<org.apache.commons.rdf.api.Qu
}
@Override
+ public void remove(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ super.remove(graphName, subject, predicate, object);
+ }
+
+ @Override
public Stream<? extends Quad> stream(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate,
RDFTerm object) {
return filteredGraphs(graphName)
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/ca11a42b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
index 22d5291..b8dc869 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
@@ -32,11 +32,6 @@ public class JsonLdGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Trip
private final Optional<BlankNodeOrIRI> graphName;
- JsonLdGraph(String bnodePrefix) {
- super(bnodePrefix);
- this.graphName = Optional.empty();
- }
-
public JsonLdGraph(RDFDataset rdfDataSet) {
super(rdfDataSet);
this.graphName = Optional.empty();
@@ -46,6 +41,11 @@ public class JsonLdGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Trip
super(rdfDataSet, bnodePrefix);
this.graphName = graphName;
}
+
+ JsonLdGraph(String bnodePrefix) {
+ super(bnodePrefix);
+ this.graphName = Optional.empty();
+ }
@Override
@@ -64,6 +64,13 @@ public class JsonLdGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Trip
}
@Override
+ public long size() {
+ String g = graphName.map(this::asJsonLdString).orElse("@default");
+ return Optional.ofNullable(rdfDataSet.getQuads(g))
+ .map(List::size).orElse(0);
+ }
+
+ @Override
public Stream<JsonLdTriple> stream(BlankNodeOrIRI subject, IRI predicate,
RDFTerm object) {
return filteredGraphs(graphName)
@@ -71,17 +78,10 @@ public class JsonLdGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Trip
.filter(quadFilter(subject, predicate, object))
.map(factory::createTriple);
}
-
+
@Override
JsonLdTriple asTripleOrQuad(com.github.jsonldjava.core.RDFDataset.Quad jsonldQuad) {
return factory.createTriple(jsonldQuad);
}
-
- @Override
- public long size() {
- String g = graphName.map(this::asJsonLdString).orElse("@default");
- return Optional.ofNullable(rdfDataSet.getQuads(g))
- .map(List::size).orElse(0);
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/ca11a42b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
index 1da7506..2047a6e 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
@@ -39,6 +39,13 @@ import com.github.jsonldjava.core.RDFDataset;
import com.github.jsonldjava.core.RDFDataset.Node;
import com.github.jsonldjava.core.RDFDataset.Quad;
+/**
+ * Common abstract {@link GraphLike}.
+ * <p>
+ * Specialised by {@link JsonLdGraph}, {@link JsonLdUnionGraph} and {@link JsonLdDataset}.
+ *
+ * @param <T> specialisation of {@link TripleLike}, e.g. {@link Triple} or {@link Quad}
+ */
abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm>>
implements GraphLike<T, BlankNodeOrIRI, IRI, RDFTerm> {
@@ -48,35 +55,34 @@ abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm
private static UUID SALT = UUID.randomUUID();
/**
- * The underlying JSON-LD {@link RDFDataset}.
- */
- RDFDataset rdfDataSet;
-
- /**
* Prefix to use in blank node identifiers
*/
final String bnodePrefix;
- protected JsonLdRDFTermFactory factory;
-
- JsonLdGraphLike(String bnodePrefix) {
- this(new RDFDataset(), bnodePrefix);
- }
+ final JsonLdRDFTermFactory factory;
+ /**
+ * The underlying JSON-LD {@link RDFDataset}.
+ * <p>
+ * Note: This is NOT final as it is reset to <code>null</code> by {@link #close()}
+ * (to free memory).
+ */
+ RDFDataset rdfDataSet;
+
JsonLdGraphLike(RDFDataset rdfDataSet) {
this(rdfDataSet, "urn:uuid:" + SALT + "#" + "g"+ System.identityHashCode(rdfDataSet));
}
-
+
JsonLdGraphLike(RDFDataset rdfDataset, String bnodePrefix) {
rdfDataSet = rdfDataset;
this.bnodePrefix = bnodePrefix;
this.factory = new JsonLdRDFTermFactory(bnodePrefix);
}
- public RDFDataset getRdfDataSet() {
- return rdfDataSet;
+ JsonLdGraphLike(String bnodePrefix) {
+ this(new RDFDataset(), bnodePrefix);
}
-
+
@Override
public void add(T tripleOrQuad) {
String g = graphNameAsJsonLdString(tripleOrQuad);
@@ -94,6 +100,48 @@ abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm
rdfDataSet.addQuad(s,p,literal.getLexicalForm(), datatype, language, g);
}
}
+
+ @Override
+ public void clear() {
+ rdfDataSet.clear();
+ }
+
+ public void close() {
+ // Drop the memory reference, but don't clear it
+ rdfDataSet = null;
+ }
+
+ @Override
+ public boolean contains(T tripleOrQuad) {
+ return stream().anyMatch(Predicate.isEqual(tripleOrQuad));
+ }
+
+ public RDFDataset getRdfDataSet() {
+ return rdfDataSet;
+ }
+
+ @Override
+ public void remove(T t) {
+ if (t instanceof org.apache.commons.rdf.api.Quad) {
+ org.apache.commons.rdf.api.Quad q = (org.apache.commons.rdf.api.Quad) t;
+ remove(q.getGraphName(), q.getSubject(), q.getPredicate(), q.getObject());
+ } else {
+ remove(Optional.empty(), t.getSubject(), t.getPredicate(), t.getObject());
+ }
+ }
+
+ @Override
+ public long size() {
+ return rdfDataSet.graphNames().parallelStream().map(rdfDataSet::getQuads).collect(Collectors.summingLong(List::size));
+ }
+
+ @Override
+ public Stream<? extends T> stream() {
+ return rdfDataSet.graphNames().parallelStream()
+ .map(rdfDataSet::getQuads)
+ .flatMap(List<RDFDataset.Quad>::parallelStream)
+ .map(this::asTripleOrQuad);
+ }
void add(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
String g = asJsonLdString(graphName);
@@ -109,17 +157,8 @@ abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm
rdfDataSet.addQuad(s,p,literal.getLexicalForm(), datatype, language, g);
}
}
-
- private String graphNameAsJsonLdString(T tripleOrQuad) {
- if (tripleOrQuad instanceof org.apache.commons.rdf.api.Quad) {
- org.apache.commons.rdf.api.Quad quad = (org.apache.commons.rdf.api.Quad)tripleOrQuad;
- return quad.getGraphName().map(this::asJsonLdString).orElse("@default");
- }
- return "@default";
- }
-
- protected String asJsonLdString(BlankNodeOrIRI blankNodeOrIRI) {
+ String asJsonLdString(BlankNodeOrIRI blankNodeOrIRI) {
if (blankNodeOrIRI == null) {
return null;
}
@@ -142,28 +181,6 @@ abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm
}
}
- @Override
- public void clear() {
- rdfDataSet.clear();
- }
-
- public void close() {
- // Drop the memory reference, but don't clear it
- rdfDataSet = null;
- }
-
- @Override
- public boolean contains(T tripleOrQuad) {
- return stream().anyMatch(Predicate.isEqual(tripleOrQuad));
- }
-
-
- // This will be made public in JsonLdDataset
- // and is used by the other methods.
- boolean contains(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI s, IRI p, RDFTerm o) {
- return filteredGraphs(graphName).flatMap(List::stream).anyMatch(quadFilter(s,p,o));
- }
-
/**
* Convert JsonLd Quad to a Commons RDF {@link Triple} or {@link org.apache.commons.rdf.api.Quad}
*
@@ -174,30 +191,11 @@ abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm
* @return converted {@link TripleLike}
*/
abstract T asTripleOrQuad(RDFDataset.Quad jsonldQuad);
-
- @Override
- public Stream<? extends T> stream() {
- return rdfDataSet.graphNames().parallelStream()
- .map(rdfDataSet::getQuads)
- .flatMap(List<RDFDataset.Quad>::parallelStream)
- .map(this::asTripleOrQuad);
- }
-
- @Override
- public void remove(T t) {
- if (t instanceof org.apache.commons.rdf.api.Quad) {
- org.apache.commons.rdf.api.Quad q = (org.apache.commons.rdf.api.Quad) t;
- remove(q.getGraphName(), q.getSubject(), q.getPredicate(), q.getObject());
- } else {
- remove(Optional.empty(), t.getSubject(), t.getPredicate(), t.getObject());
- }
- }
// This will be made public in JsonLdDataset
- // and is used by the other remove methods.
- void remove(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- // remove the quads which match our filter (which could have nulls as wildcards)
- filteredGraphs(graphName).forEach(t -> t.removeIf(quadFilter(subject, predicate, object)));
+ // and is used by the other methods.
+ boolean contains(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI s, IRI p, RDFTerm o) {
+ return filteredGraphs(graphName).flatMap(List::stream).anyMatch(quadFilter(s,p,o));
}
Stream<List<Quad>> filteredGraphs(Optional<BlankNodeOrIRI> graphName) {
@@ -210,6 +208,14 @@ abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm
// remove the quads which match our filter (which could have nulls as wildcards)
.map(rdfDataSet::getQuads);
}
+
+ String graphNameAsJsonLdString(T tripleOrQuad) {
+ if (tripleOrQuad instanceof org.apache.commons.rdf.api.Quad) {
+ org.apache.commons.rdf.api.Quad quad = (org.apache.commons.rdf.api.Quad)tripleOrQuad;
+ return quad.getGraphName().map(this::asJsonLdString).orElse("@default");
+ }
+ return "@default";
+ }
Predicate<RDFDataset.Quad> quadFilter(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
@@ -231,9 +237,10 @@ abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm
};
}
- @Override
- public long size() {
- return rdfDataSet.graphNames().parallelStream().map(rdfDataSet::getQuads).collect(Collectors.summingLong(List::size));
+ // NOTE: This is made public in JsonLdDataset and is used by the other remove methods.
+ void remove(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ // remove the quads which match our filter (which could have nulls as wildcards)
+ filteredGraphs(graphName).forEach(t -> t.removeIf(quadFilter(subject, predicate, object)));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/ca11a42b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
index be271ea..15bc466 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
@@ -52,19 +52,52 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
this.bnodePrefix = bnodePrefix;
}
- @Override
- public Graph createGraph() throws UnsupportedOperationException {
- return new JsonLdGraph(bnodePrefix);
+ public Node asJsonLdNode(RDFTerm term) {
+ if (term instanceof JsonLdTerm) {
+ // Return original Node
+ return ((JsonLdTerm)term).asNode();
+ }
+ if (term instanceof IRI) {
+ return new RDFDataset.IRI( ((IRI)term).getIRIString() );
+ }
+ if (term instanceof BlankNode) {
+
+ String ref = ((BlankNode)term).uniqueReference();
+ if (ref.startsWith(bnodePrefix)) {
+ // one of our own (but no longer a JsonLdBlankNode),
+ // we can recover the label after our unique prefix
+ return new RDFDataset.BlankNode(ref.replace(bnodePrefix, ""));
+ }
+ // The "foreign" unique reference might not be a valid bnode string,
+ // we'll convert to a UUID
+ UUID uuid = UUID.nameUUIDFromBytes(ref.getBytes(StandardCharsets.UTF_8));
+ return new RDFDataset.BlankNode( "_:" + uuid );
+ }
+ if (term instanceof Literal) {
+ Literal literal = (Literal) term;
+ return new RDFDataset.Literal(literal.getLexicalForm(), literal.getDatatype().getIRIString(),
+ literal.getLanguageTag().orElse(null));
+ }
+ throw new IllegalArgumentException("RDFTerm not instanceof IRI, BlankNode or Literal: " + term);
}
- @Override
- public Dataset createDataset() throws UnsupportedOperationException {
- return new JsonLdDataset(bnodePrefix);
+ public RDFDataset.Quad asJsonLdQuad(RDFTerm subject, RDFTerm predicate, RDFTerm object) {
+ return asJsonLdQuad(null, subject, predicate, object);
}
- @Override
- public JsonLdIRI createIRI(String iri) {
- return new JsonLdIRI.JsonLdIRIImpl(iri);
+ public RDFDataset.Quad asJsonLdQuad(RDFTerm graphName, RDFTerm subject, RDFTerm predicate, RDFTerm object) {
+ String graph = null;
+ return new RDFDataset.Quad(asJsonLdNode(subject), asJsonLdNode(predicate), asJsonLdNode(object), graph);
+ }
+
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ public RDFDataset.Quad asJsonLdQuad(TripleLike tripleOrQuad) {
+ RDFTerm g = null;
+ if (tripleOrQuad instanceof QuadLike) {
+ QuadLike quadLike = (QuadLike) tripleOrQuad;
+ g = (RDFTerm) quadLike.getGraphName().orElse(null);
+ }
+ return asJsonLdQuad(g, tripleOrQuad.getSubject(), tripleOrQuad.getPredicate(), tripleOrQuad.getObject());
}
@Override
@@ -81,22 +114,18 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
}
@Override
- public JsonLdTriple createTriple(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- return new JsonLdTripleImpl(asJsonLdQuad(subject, predicate, object), bnodePrefix);
- }
-
- public JsonLdTriple createTriple(final RDFDataset.Quad quad) {
- return new JsonLdTripleImpl(quad, bnodePrefix);
+ public Dataset createDataset() throws UnsupportedOperationException {
+ return new JsonLdDataset(bnodePrefix);
}
- public JsonLdQuad createQuad(final RDFDataset.Quad quad) {
- return new JsonLdQuadImpl(quad, bnodePrefix);
+ @Override
+ public Graph createGraph() throws UnsupportedOperationException {
+ return new JsonLdGraph(bnodePrefix);
}
@Override
- public JsonLdQuad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object)
- throws IllegalArgumentException, UnsupportedOperationException {
- return new JsonLdQuadImpl(asJsonLdQuad(graphName, subject, predicate, object), bnodePrefix);
+ public JsonLdIRI createIRI(String iri) {
+ return new JsonLdIRI.JsonLdIRIImpl(iri);
}
@Override
@@ -114,53 +143,24 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
return new JsonLdLiteralImpl(new RDFDataset.Literal(literal, Types.RDF_LANGSTRING.getIRIString(), language));
}
- public Node asJsonLdNode(RDFTerm term) {
- if (term instanceof JsonLdTerm) {
- // Return original Node
- return ((JsonLdTerm)term).asNode();
- }
- if (term instanceof IRI) {
- return new RDFDataset.IRI( ((IRI)term).getIRIString() );
- }
- if (term instanceof BlankNode) {
-
- String ref = ((BlankNode)term).uniqueReference();
- if (ref.startsWith(bnodePrefix)) {
- // one of our own (but no longer a JsonLdBlankNode),
- // we can recover the label after our unique prefix
- return new RDFDataset.BlankNode(ref.replace(bnodePrefix, ""));
- }
- // The "foreign" unique reference might not be a valid bnode string,
- // we'll convert to a UUID
- UUID uuid = UUID.nameUUIDFromBytes(ref.getBytes(StandardCharsets.UTF_8));
- return new RDFDataset.BlankNode( "_:" + uuid );
- }
- if (term instanceof Literal) {
- Literal literal = (Literal) term;
- return new RDFDataset.Literal(literal.getLexicalForm(), literal.getDatatype().getIRIString(),
- literal.getLanguageTag().orElse(null));
- }
- throw new IllegalArgumentException("RDFTerm not instanceof IRI, BlankNode or Literal: " + term);
+ @Override
+ public JsonLdQuad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object)
+ throws IllegalArgumentException, UnsupportedOperationException {
+ return new JsonLdQuadImpl(asJsonLdQuad(graphName, subject, predicate, object), bnodePrefix);
}
- public RDFDataset.Quad asJsonLdQuad(RDFTerm subject, RDFTerm predicate, RDFTerm object) {
- return asJsonLdQuad(null, subject, predicate, object);
+ public JsonLdQuad createQuad(final RDFDataset.Quad quad) {
+ return new JsonLdQuadImpl(quad, bnodePrefix);
}
- public RDFDataset.Quad asJsonLdQuad(RDFTerm graphName, RDFTerm subject, RDFTerm predicate, RDFTerm object) {
- String graph = null;
- return new RDFDataset.Quad(asJsonLdNode(subject), asJsonLdNode(predicate), asJsonLdNode(object), graph);
+ @Override
+ public JsonLdTriple createTriple(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ return new JsonLdTripleImpl(asJsonLdQuad(subject, predicate, object), bnodePrefix);
}
- @SuppressWarnings({ "rawtypes", "unchecked" })
- public RDFDataset.Quad asJsonLdQuad(TripleLike tripleOrQuad) {
- RDFTerm g = null;
- if (tripleOrQuad instanceof QuadLike) {
- QuadLike quadLike = (QuadLike) tripleOrQuad;
- g = (RDFTerm) quadLike.getGraphName().orElse(null);
- }
- return asJsonLdQuad(g, tripleOrQuad.getSubject(), tripleOrQuad.getPredicate(), tripleOrQuad.getObject());
+ public JsonLdTriple createTriple(final RDFDataset.Quad quad) {
+ return new JsonLdTripleImpl(quad, bnodePrefix);
}
JsonLdTerm asTerm(final Node node, String blankNodePrefix) {
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/ca11a42b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/package-info.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/package-info.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/package-info.java
index 760ccd4..b9b4acb 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/package-info.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/package-info.java
@@ -18,8 +18,10 @@
/**
* Integration with jsonld-java
*
- * @see org.apache.commons.rdf.jsonldjava.JsonLdGraph
* @see org.apache.commons.rdf.jsonldjava.JsonLdRDFTermFactory
+ * @see org.apache.commons.rdf.jsonldjava.JsonLdGraph
+ * @see org.apache.commons.rdf.jsonldjava.JsonLdUnionGraph
+ * @see org.apache.commons.rdf.jsonldjava.JsonLdDataset
*
*/
package org.apache.commons.rdf.jsonldjava;
\ No newline at end of file
[16/50] incubator-commonsrdf git commit: only use putAll if intoGraph
is empty
Posted by st...@apache.org.
only use putAll if intoGraph is empty
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/a2e482fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/a2e482fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/a2e482fb
Branch: refs/heads/master
Commit: a2e482fbc647b06ffaf6a5b6833f149731c10fad
Parents: 21b68ee
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Apr 13 03:23:04 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Apr 13 03:23:04 2016 +0100
----------------------------------------------------------------------
.../org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/a2e482fb/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
index 0eeeeba..4b6edfe 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
@@ -95,8 +95,8 @@ public class JsonLdParserBuilder extends AbstractRDFParserBuilder {
}
Graph intoGraph = getIntoGraph().get();
- if (intoGraph instanceof JsonLdGraph) {
- // We can just move over the map content directly:
+ if (intoGraph instanceof JsonLdGraph && ! intoGraph.contains(null, null, null)) {
+ // Empty graph, we can just move over the map content directly:
JsonLdGraph jsonLdGraph = (JsonLdGraph) intoGraph;
jsonLdGraph.getRdfDataSet().putAll(rdfDataset);
} else {
[47/50] incubator-commonsrdf git commit: COMMONSRDF-36 syntax improve
Javadoc syntax
Posted by st...@apache.org.
COMMONSRDF-36 syntax improve Javadoc syntax
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/63da05c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/63da05c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/63da05c0
Branch: refs/heads/master
Commit: 63da05c09673305f24ccc7fd8654681a7e505ab4
Parents: 492ea23
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Sep 28 18:23:20 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Sep 28 18:23:20 2016 +0100
----------------------------------------------------------------------
.../apache/commons/rdf/jsonldjava/JsonLdGraphLike.java | 8 ++++++--
.../apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java | 2 +-
.../rdf/jsonldjava/experimental/package-info.java | 12 ++++++------
.../commons/rdf/jsonldjava/JsonLdBlankNodeTest.java | 1 -
4 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/63da05c0/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
index dced9cc..1e3df61 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
@@ -39,9 +39,12 @@ import com.github.jsonldjava.core.RDFDataset.Node;
/**
* Common abstract {@link GraphLike}.
* <p>
- * Specialised by {@link JsonLdGraph}, {@link JsonLdUnionGraph} and {@link JsonLdDataset}.
+ * Specialised by {@link JsonLdGraph}, {@link JsonLdUnionGraph} and
+ * {@link JsonLdDataset}.
*
- * @param <T> specialisation of {@link TripleLike}, e.g. {@link Triple} or {@link Quad}
+ * @param <T>
+ * specialisation of {@link TripleLike}, e.g. {@link Triple} or
+ * {@link org.apache.commons.rdf.api.Quad}
*/
public interface JsonLdGraphLike <T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm>>
extends GraphLike<T, BlankNodeOrIRI, IRI, RDFTerm> {
@@ -51,6 +54,7 @@ public interface JsonLdGraphLike <T extends TripleLike<BlankNodeOrIRI, IRI, RDFT
* Changes in the JSONLD-Java dataset is reflected in this class and vice
* versa.
*
+ * @return The underlying JSONLD-JAva RDFDataset
*/
public RDFDataset getRdfDataSet();
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/63da05c0/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
index 81b669a..b27e66a 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
@@ -29,7 +29,7 @@ import org.apache.commons.rdf.api.Triple;
import com.github.jsonldjava.core.RDFDataset;
/**
- * A <strong>union graph</em> representation of a JsonLd {@link RDFDataset}.
+ * A <strong>union graph</strong> representation of a JsonLd {@link RDFDataset}.
* <p>
* A union graph contains all the triples of the dataset, irregardless of their
* graph names.
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/63da05c0/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/package-info.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/package-info.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/package-info.java
index fbd595e..67de964 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/package-info.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/experimental/package-info.java
@@ -16,19 +16,19 @@
* limitations under the License.
*/
/**
- * Experimental Commons RDF RDF4J implementations.
+ * Experimental Commons RDF JSONLD-Java implementations.
* <p>
* Classes in this package should be considered <strong>at
* risk</strong>; they might change or be removed in the next minor update of
* Commons RDF.
* <p>
* When a class has stabilized, it will move to the
- * {@link org.apache.commons.rdf.rdf4j} package.
- * <p>
+ * {@link org.apache.commons.rdf.jsonldjava} package.
* <ul>
- * <li>{@link RDF4JParser} - an RDF4J-backed
- * implementations of
- * {@link org.apache.commons.rdf.api.experimental.RDFParser}.</li>
+ * <li>{@link JsonLdParser} - an JSONLD-Java-backed
+ * implementations of
+ * {@link org.apache.commons.rdf.experimental.RDFParser}.
+ * </li>
* </ul>
*/
package org.apache.commons.rdf.jsonldjava.experimental;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/63da05c0/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
index 5bc83e7..0bf8fb6 100644
--- a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
+++ b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
@@ -4,7 +4,6 @@ import java.util.UUID;
import org.apache.commons.rdf.api.AbstractBlankNodeTest;
import org.apache.commons.rdf.api.BlankNode;
-import org.apache.commons.rdf.jsonldjava.JsonLdBlankNode.JsonLdBlankNodeImpl;
import com.github.jsonldjava.core.RDFDataset;
[32/50] incubator-commonsrdf git commit: Remove generalized
triple/quad support in factory
Posted by st...@apache.org.
Remove generalized triple/quad support in factory
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/02db403b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/02db403b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/02db403b
Branch: refs/heads/master
Commit: 02db403b7d1fe638cf9881df5bfc07d0d72f4275
Parents: fd8dcef
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Sep 9 16:14:25 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Sep 9 16:14:25 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jsonldjava/JsonLdLiteral.java | 2 +-
.../rdf/jsonldjava/JsonLdRDFTermFactory.java | 193 ++++++++++++++-----
.../commons/rdf/jsonldjava/JsonLdTerm.java | 4 +-
3 files changed, 150 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/02db403b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
index befc410..8eba6e7 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
@@ -85,7 +85,7 @@ public interface JsonLdLiteral extends JsonLdTerm, Literal {
public boolean equals(Object obj) {
if (obj instanceof JsonLdLiteral) {
JsonLdLiteral other = (JsonLdLiteral) obj;
- return asNode().compareTo(other.asNode()) == 0;
+ return asJsonLdNode().compareTo(other.asJsonLdNode()) == 0;
}
if (obj instanceof Literal) {
Literal other = (Literal) obj;
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/02db403b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
index 6d490b8..d436434 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
@@ -27,10 +27,9 @@ import org.apache.commons.rdf.api.Dataset;
import org.apache.commons.rdf.api.Graph;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.Literal;
-import org.apache.commons.rdf.api.QuadLike;
import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.RDFTermFactory;
-import org.apache.commons.rdf.api.TripleLike;
+import org.apache.commons.rdf.api.Triple;
import org.apache.commons.rdf.jsonldjava.JsonLdBlankNode.JsonLdBlankNodeImpl;
import org.apache.commons.rdf.jsonldjava.JsonLdLiteral.JsonLdLiteralImpl;
import org.apache.commons.rdf.jsonldjava.JsonLdQuad.JsonLdQuadImpl;
@@ -41,75 +40,104 @@ import com.github.jsonldjava.core.RDFDataset;
import com.github.jsonldjava.core.RDFDataset.Node;
public final class JsonLdRDFTermFactory implements RDFTermFactory {
-
+
private final String bnodePrefix;
-
+
public JsonLdRDFTermFactory() {
// An "outside Graph" bnodePrefix
this("urn:uuid:" + UUID.randomUUID() + "#b");
}
-
+
JsonLdRDFTermFactory(String bnodePrefix) {
this.bnodePrefix = Objects.requireNonNull(bnodePrefix);
}
-
+
public Node asJsonLdNode(RDFTerm term) {
if (term instanceof JsonLdTerm) {
// Return original Node
- return ((JsonLdTerm)term).asNode();
+ return ((JsonLdTerm) term).asJsonLdNode();
}
if (term instanceof IRI) {
- return new RDFDataset.IRI( ((IRI)term).getIRIString() );
+ return new RDFDataset.IRI(((IRI) term).getIRIString());
}
- if (term instanceof BlankNode) {
- String ref = ((BlankNode)term).uniqueReference();
+ if (term instanceof BlankNode) {
+ String ref = ((BlankNode) term).uniqueReference();
if (ref.startsWith(bnodePrefix)) {
// one of our own (but no longer a JsonLdBlankNode),
// we can recover the label after our unique prefix
return new RDFDataset.BlankNode(ref.replace(bnodePrefix, ""));
- }
- // The "foreign" unique reference might not be a valid bnode string,
+ }
+ // The "foreign" unique reference might not be a valid bnode string,
// we'll convert to a UUID
UUID uuid = UUID.nameUUIDFromBytes(ref.getBytes(StandardCharsets.UTF_8));
- return new RDFDataset.BlankNode( "_:" + uuid );
+ return new RDFDataset.BlankNode("_:" + uuid);
}
if (term instanceof Literal) {
Literal literal = (Literal) term;
- return new RDFDataset.Literal(literal.getLexicalForm(), literal.getDatatype().getIRIString(),
+ return new RDFDataset.Literal(literal.getLexicalForm(), literal.getDatatype().getIRIString(),
literal.getLanguageTag().orElse(null));
}
throw new IllegalArgumentException("RDFTerm not instanceof IRI, BlankNode or Literal: " + term);
}
-
- public RDFDataset.Quad asJsonLdQuad(RDFTerm subject, RDFTerm predicate, RDFTerm object) {
- return asJsonLdQuad(null, subject, predicate, object);
+
+ RDFDataset.Quad createJsonLdQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ return new RDFDataset.Quad(asJsonLdNode(subject), asJsonLdNode(predicate), asJsonLdNode(object), asJsonLdString(graphName));
}
-
- public RDFDataset.Quad asJsonLdQuad(RDFTerm graphName, RDFTerm subject, RDFTerm predicate, RDFTerm object) {
- String graph = null;
- return new RDFDataset.Quad(asJsonLdNode(subject), asJsonLdNode(predicate), asJsonLdNode(object), graph);
+
+ String asJsonLdString(BlankNodeOrIRI blankNodeOrIRI) {
+ if (blankNodeOrIRI == null) {
+ return null;
+ }
+ if (blankNodeOrIRI instanceof IRI) {
+ return ((IRI)blankNodeOrIRI).getIRIString();
+ } else if (blankNodeOrIRI instanceof BlankNode) {
+ BlankNode blankNode = (BlankNode) blankNodeOrIRI;
+ String ref = blankNode.uniqueReference();
+ if (ref.startsWith(bnodePrefix)) {
+ // One of ours (but possibly not a JsonLdBlankNode) -
+ // we can use the suffix directly
+ return ref.replace(bnodePrefix, "_:");
+ } else {
+ // Map to unique bnode identifier, e.g. _:0dbd92ee-ab1a-45e7-bba2-7ade54f87ec5
+ UUID uuid = UUID.nameUUIDFromBytes(ref.getBytes(StandardCharsets.UTF_8));
+ return "_:"+ uuid;
+ }
+ } else {
+ throw new IllegalArgumentException("Expected a BlankNode or IRI, not: " + blankNodeOrIRI);
+ }
+ }
+
+ /**
+ * Adapt a Commons RDF {@link Triple} as a JsonLd {@link RDFDataset.Quad}.
+ *
+ * @param triple Commons RDF {@link Triple} to adapt
+ * @return Adapted JsonLd {@link RDFDataset.Quad}
+ */
+ public RDFDataset.Quad asJsonLdQuad(Triple triple) {
+ return createJsonLdQuad(null, triple.getSubject(), triple.getPredicate(), triple.getObject());
}
- @SuppressWarnings({ "rawtypes", "unchecked" })
- public RDFDataset.Quad asJsonLdQuad(TripleLike tripleOrQuad) {
- RDFTerm g = null;
- if (tripleOrQuad instanceof QuadLike) {
- QuadLike quadLike = (QuadLike) tripleOrQuad;
- g = (RDFTerm) quadLike.getGraphName().orElse(null);
- }
- return asJsonLdQuad(g, tripleOrQuad.getSubject(), tripleOrQuad.getPredicate(), tripleOrQuad.getObject());
+ /**
+ * Adapt a Commons RDF {@link org.apache.commons.rdf.api.Quad} as a JsonLd {@link RDFDataset.Quad}.
+ *
+ * @param quad Commons RDF {@link org.apache.commons.rdf.api.Quad} to adapt
+ * @return Adapted JsonLd {@link RDFDataset.Quad}
+ */
+ public RDFDataset.Quad asJsonLdQuad(org.apache.commons.rdf.api.Quad quad) {
+ BlankNodeOrIRI g = quad.getGraphName().orElse(null);
+ return createJsonLdQuad(g, quad.getSubject(), quad.getPredicate(), quad.getObject());
}
-
+
@Override
public JsonLdBlankNode createBlankNode() {
String id = "_:" + UUID.randomUUID().toString();
return new JsonLdBlankNodeImpl(new RDFDataset.BlankNode(id), bnodePrefix);
}
-
+
@Override
public JsonLdBlankNode createBlankNode(String name) {
String id = "_:" + name;
- // TODO: Check if name is valid JSON-LD BlankNode identifier
+ // TODO: Check if name is valid JSON-LD BlankNode identifier
return new JsonLdBlankNodeImpl(new RDFDataset.BlankNode(id), bnodePrefix);
}
@@ -117,29 +145,72 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
public Dataset createDataset() {
return new JsonLdDataset(bnodePrefix);
}
-
+
+ /**
+ * Adapt a JsonLd {@link RDFDataset} as a Commons RDF {@link Dataset}.
+ * <p>
+ * Changes to the Commons RDF {@link Dataset} are reflected in the JsonLd
+ * {@link RDFDataset} and vice versa.
+ *
+ * @see #asGraph(RDFDataset)
+ * @param rdfDataSet JsonLd {@link RDFDataset} to adapt
+ * @return Adapted {@link Dataset}
+ */
public Dataset asDataset(RDFDataset rdfDataSet) {
return new JsonLdDataset(rdfDataSet);
}
+ /**
+ * Adapt a JsonLd {@link RDFDataset} as a Commons RDF {@link Graph}.
+ * <p>
+ * Only triples in the <em>default graph</em> are included. To retrieve
+ * any other graph, {@link #asDataset(RDFDataset)} together with
+ * {@link Dataset#getGraph(BlankNodeOrIRI)}.
+ * <p>
+ * Changes to the Commons RDF {@link Graph} are reflected in the JsonLd
+ * {@link RDFDataset} and vice versa.
+ *
+ * @see #asDataset(RDFDataset)
+ * @see #asUnionGraph(RDFDataset)
+ * @param rdfDataSet JsonLd {@link RDFDataset} to adapt
+ * @return Adapted {@link Graph} covering the <em>default graph</em>
+ */
public Graph asGraph(RDFDataset rdfDataSet) {
return new JsonLdGraph(rdfDataSet);
}
+ /**
+ * Adapt a JsonLd {@link RDFDataset} as a Commons RDF {@link Graph}.
+ * <p>
+ * The graph can be seen as a <em>union graph</em> as it will contains all the
+ * triples across all the graphs of the underlying {@link RDFDataset}.
+ * <p>
+ * Note that some triple operations on a union graph
+ * can be inefficient as they need to remove any duplicate
+ * triples across the graphs.
+ * <p>
+ * Changes to the Commons RDF {@link Graph} are reflected in the JsonLd
+ * {@link RDFDataset} and vice versa. Triples removed from the graph are
+ * removed from <strong>all</strong> graphs, while triples added
+ * are added to the <em>default graph</em>.
+ *
+ * @param rdfDataSet JsonLd {@link RDFDataset} to adapt
+ * @return Adapted {@link Dataset}
+ */
public Graph asUnionGraph(RDFDataset rdfDataSet) {
return new JsonLdUnionGraph(rdfDataSet);
}
-
+
@Override
public Graph createGraph() {
return new JsonLdGraph(bnodePrefix);
}
-
+
@Override
public JsonLdIRI createIRI(String iri) {
return new JsonLdIRI.JsonLdIRIImpl(iri);
}
-
+
@Override
public JsonLdLiteral createLiteral(String literal) {
return new JsonLdLiteralImpl(new RDFDataset.Literal(literal, null, null));
@@ -158,28 +229,59 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
@Override
public JsonLdQuad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object)
throws IllegalArgumentException, UnsupportedOperationException {
- return new JsonLdQuadImpl(asJsonLdQuad(graphName, subject, predicate, object), bnodePrefix);
+ return new JsonLdQuadImpl(createJsonLdQuad(graphName, subject, predicate, object), bnodePrefix);
}
-
+ /**
+ * Adapt a JsonLd {@link RDFDataset.Quad} as a Commons RDF
+ * {@link org.apache.commons.rdf.api.Quad}.
+ * <p>
+ * The underlying JsonLd quad can be retrieved with
+ * {@link JsonLdQuad#asJsonLdQuad()}.
+ *
+ * @param quad
+ * A JsonLd {@link RDFDataset.Quad} to adapt
+ * @return Adapted {@link JsonLdQuad}
+ */
public JsonLdQuad asQuad(final RDFDataset.Quad quad) {
return new JsonLdQuadImpl(quad, bnodePrefix);
}
@Override
public JsonLdTriple createTriple(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- return new JsonLdTripleImpl(asJsonLdQuad(subject, predicate, object), bnodePrefix);
+ return new JsonLdTripleImpl(createJsonLdQuad(null, subject, predicate, object), bnodePrefix);
}
-
+
+ /**
+ * Adapt a JsonLd {@link RDFDataset.Quad} as a Commons RDF
+ * {@link org.apache.commons.rdf.api.Triple}.
+ * <p>
+ * The underlying JsonLd quad can be retrieved with
+ * {@link JsonLdTriple#asJsonLdQuad()}.
+ *
+ * @param quad
+ * A JsonLd {@link RDFDataset.Quad} to adapt
+ * @return Adapted {@link JsonLdTriple}
+ */
public JsonLdTriple asTriple(final RDFDataset.Quad quad) {
return new JsonLdTripleImpl(quad, bnodePrefix);
}
-
+
+ /**
+ * Adapt a JsonLd {@link RDFDataset.Node} as a Commons RDF {@link RDFTerm}.
+ * <p>
+ * The underlying node can be retrieved with
+ * {@link JsonLdTerm#asJsonLdNode()}.
+ *
+ * @param node
+ * A JsonLd {@link Node} to adapt
+ * @return Adapted {@link JsonLdTerm}
+ */
public JsonLdTerm asRDFTerm(final Node node) {
return asRDFTerm(node, bnodePrefix);
}
-
- JsonLdTerm asRDFTerm(final Node node, String blankNodePrefix) {
+
+ JsonLdTerm asRDFTerm(final Node node, String blankNodePrefix) {
if (node == null) {
return null; // e.g. default graph
}
@@ -197,7 +299,6 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
} else {
throw new IllegalArgumentException("Node is neither IRI, BlankNode nor Literal: " + node);
}
- }
-
-
+ }
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/02db403b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
index 80a7b56..2f250b9 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
@@ -28,14 +28,14 @@ public interface JsonLdTerm extends RDFTerm {
*
* @return JsonLd {@link Node}
*/
- Node asNode();
+ Node asJsonLdNode();
abstract class JsonLdTermImpl implements JsonLdTerm {
final Node node;
JsonLdTermImpl(Node node) {
this.node = node;
}
- public Node asNode() {
+ public Node asJsonLdNode() {
return node;
}
}
[19/50] incubator-commonsrdf git commit: 0.3.0-incubating
Posted by st...@apache.org.
0.3.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/e5345984
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/e5345984
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/e5345984
Branch: refs/heads/master
Commit: e5345984cded1e90dffd059307d776afa0747bb2
Parents: f8b6594
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Sep 8 15:37:05 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Sep 8 15:37:31 2016 +0100
----------------------------------------------------------------------
jsonld-java/pom.xml | 4 ++--
.../org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/e5345984/jsonld-java/pom.xml
----------------------------------------------------------------------
diff --git a/jsonld-java/pom.xml b/jsonld-java/pom.xml
index 1c7ff41..6a4826c 100644
--- a/jsonld-java/pom.xml
+++ b/jsonld-java/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rdf-parent</artifactId>
- <version>0.2.0-incubating-SNAPSHOT</version>
+ <version>0.3.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>commons-rdf-jsonld-java</artifactId>
@@ -50,7 +50,7 @@
<groupId>${project.parent.groupId}</groupId>
<artifactId>commons-rdf-simple</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>com.github.jsonld-java</groupId>
<artifactId>jsonld-java</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/e5345984/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
index 4b6edfe..246e76e 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
@@ -32,6 +32,7 @@ import org.apache.commons.rdf.api.RDFParserBuilder;
import org.apache.commons.rdf.api.RDFSyntax;
import org.apache.commons.rdf.api.RDFTermFactory;
import org.apache.commons.rdf.simple.AbstractRDFParserBuilder;
+import org.apache.commons.rdf.simple.AbstractRDFParserBuilder.RDFParseException;
import com.github.jsonldjava.core.JsonLdError;
import com.github.jsonldjava.core.JsonLdOptions;
[30/50] incubator-commonsrdf git commit: ensure Graph works on the
correct graph names
Posted by st...@apache.org.
ensure Graph works on the correct graph names
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/e3a4fbaa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/e3a4fbaa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/e3a4fbaa
Branch: refs/heads/master
Commit: e3a4fbaa5b871ce83045d50d2929534ed21d8f09
Parents: ca11a42
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Sep 9 15:24:03 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Sep 9 15:24:03 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jsonldjava/JsonLdDataset.java | 13 ++++++
.../commons/rdf/jsonldjava/JsonLdGraph.java | 25 ++++++++++-
.../commons/rdf/jsonldjava/JsonLdGraphLike.java | 44 ++++++++------------
.../rdf/jsonldjava/JsonLdRDFTermFactory.java | 3 +-
.../rdf/jsonldjava/JsonLdUnionGraph.java | 44 ++++++++++++++++++--
5 files changed, 96 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/e3a4fbaa/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
index 0e9422f..569180e 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
@@ -20,6 +20,7 @@ package org.apache.commons.rdf.jsonldjava;
import java.util.List;
import java.util.Optional;
import java.util.function.Predicate;
+import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.commons.rdf.api.BlankNodeOrIRI;
@@ -82,6 +83,12 @@ public class JsonLdDataset extends JsonLdGraphLike<org.apache.commons.rdf.api.Qu
super.remove(graphName, subject, predicate, object);
}
+
+ @Override
+ public void remove(Quad q) {
+ remove(q.getGraphName(), q.getSubject(), q.getPredicate(), q.getObject());
+ }
+
@Override
public Stream<? extends Quad> stream(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate,
RDFTerm object) {
@@ -92,8 +99,14 @@ public class JsonLdDataset extends JsonLdGraphLike<org.apache.commons.rdf.api.Qu
}
@Override
+ public long size() {
+ return rdfDataSet.graphNames().parallelStream().map(rdfDataSet::getQuads).collect(Collectors.summingLong(List::size));
+ }
+
+ @Override
Quad asTripleOrQuad(com.github.jsonldjava.core.RDFDataset.Quad jsonldQuad) {
return factory.createQuad(jsonldQuad);
}
+
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/e3a4fbaa/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
index b8dc869..5e13a4e 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
@@ -18,6 +18,7 @@
package org.apache.commons.rdf.jsonldjava;
import java.util.List;
+import java.util.Objects;
import java.util.Optional;
import java.util.stream.Stream;
@@ -25,6 +26,7 @@ import org.apache.commons.rdf.api.BlankNodeOrIRI;
import org.apache.commons.rdf.api.Graph;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.RDFTerm;
+import org.apache.commons.rdf.api.Triple;
import com.github.jsonldjava.core.RDFDataset;
@@ -39,7 +41,7 @@ public class JsonLdGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Trip
JsonLdGraph(RDFDataset rdfDataSet, Optional<BlankNodeOrIRI> graphName, String bnodePrefix) {
super(rdfDataSet, bnodePrefix);
- this.graphName = graphName;
+ this.graphName = Objects.requireNonNull(graphName);
}
JsonLdGraph(String bnodePrefix) {
@@ -47,8 +49,18 @@ public class JsonLdGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Trip
this.graphName = Optional.empty();
}
+ @Override
+ public void clear() {
+ filteredGraphs(graphName).forEach(l -> l.clear());
+ }
@Override
+ public void add(Triple t) {
+ // Ensure it's added in the correct graph
+ super.add(graphName.orElse(null), t.getSubject(), t.getPredicate(), t.getObject());
+ }
+
+ @Override
public void add(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
super.add(graphName.orElse(null), subject, predicate, object);
}
@@ -59,9 +71,20 @@ public class JsonLdGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Trip
}
@Override
+ public boolean contains(Triple t) {
+ return contains(graphName, t.getSubject(), t.getPredicate(), t.getObject());
+ }
+
+ @Override
public void remove(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
super.remove(graphName, subject, predicate, object);
}
+
+ @Override
+ public void remove(Triple t) {
+ // Only remove from the particular graph
+ remove(graphName, t.getSubject(), t.getPredicate(), t.getObject());
+ }
@Override
public long size() {
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/e3a4fbaa/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
index 2047a6e..ad2cc23 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
@@ -19,10 +19,10 @@ package org.apache.commons.rdf.jsonldjava;
import java.nio.charset.StandardCharsets;
import java.util.List;
+import java.util.Objects;
import java.util.Optional;
import java.util.UUID;
import java.util.function.Predicate;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.apache.commons.rdf.api.BlankNode;
@@ -73,9 +73,9 @@ abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm
this(rdfDataSet, "urn:uuid:" + SALT + "#" + "g"+ System.identityHashCode(rdfDataSet));
}
- JsonLdGraphLike(RDFDataset rdfDataset, String bnodePrefix) {
- rdfDataSet = rdfDataset;
- this.bnodePrefix = bnodePrefix;
+ JsonLdGraphLike(RDFDataset rdfDataSet, String bnodePrefix) {
+ this.rdfDataSet = Objects.requireNonNull(rdfDataSet);
+ this.bnodePrefix = Objects.requireNonNull(bnodePrefix);
this.factory = new JsonLdRDFTermFactory(bnodePrefix);
}
@@ -86,7 +86,6 @@ abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm
@Override
public void add(T tripleOrQuad) {
String g = graphNameAsJsonLdString(tripleOrQuad);
-
String s = asJsonLdString(tripleOrQuad.getSubject());
String p = asJsonLdString(tripleOrQuad.getPredicate());
@@ -100,11 +99,6 @@ abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm
rdfDataSet.addQuad(s,p,literal.getLexicalForm(), datatype, language, g);
}
}
-
- @Override
- public void clear() {
- rdfDataSet.clear();
- }
public void close() {
// Drop the memory reference, but don't clear it
@@ -112,6 +106,16 @@ abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm
}
@Override
+ public void clear() {
+ filteredGraphs(null).forEach(s -> s.clear());
+ // In theory we could use
+ //rdfDataSet.clear();
+ // but then we would need to also do
+ //rdfDataSet.put("@default", new ArrayList());
+ // .. both of which seems to be touching too much on JsonLd-Java's internal structure
+ }
+
+ @Override
public boolean contains(T tripleOrQuad) {
return stream().anyMatch(Predicate.isEqual(tripleOrQuad));
}
@@ -119,21 +123,7 @@ abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm
public RDFDataset getRdfDataSet() {
return rdfDataSet;
}
-
- @Override
- public void remove(T t) {
- if (t instanceof org.apache.commons.rdf.api.Quad) {
- org.apache.commons.rdf.api.Quad q = (org.apache.commons.rdf.api.Quad) t;
- remove(q.getGraphName(), q.getSubject(), q.getPredicate(), q.getObject());
- } else {
- remove(Optional.empty(), t.getSubject(), t.getPredicate(), t.getObject());
- }
- }
-
- @Override
- public long size() {
- return rdfDataSet.graphNames().parallelStream().map(rdfDataSet::getQuads).collect(Collectors.summingLong(List::size));
- }
+
@Override
public Stream<? extends T> stream() {
@@ -209,11 +199,11 @@ abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm
.map(rdfDataSet::getQuads);
}
- String graphNameAsJsonLdString(T tripleOrQuad) {
+ String graphNameAsJsonLdString(T tripleOrQuad) {
if (tripleOrQuad instanceof org.apache.commons.rdf.api.Quad) {
org.apache.commons.rdf.api.Quad quad = (org.apache.commons.rdf.api.Quad)tripleOrQuad;
return quad.getGraphName().map(this::asJsonLdString).orElse("@default");
- }
+ }
return "@default";
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/e3a4fbaa/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
index 15bc466..1dff9fb 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
@@ -18,6 +18,7 @@
package org.apache.commons.rdf.jsonldjava;
import java.nio.charset.StandardCharsets;
+import java.util.Objects;
import java.util.UUID;
import org.apache.commons.rdf.api.BlankNode;
@@ -49,7 +50,7 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
}
JsonLdRDFTermFactory(String bnodePrefix) {
- this.bnodePrefix = bnodePrefix;
+ this.bnodePrefix = Objects.requireNonNull(bnodePrefix);
}
public Node asJsonLdNode(RDFTerm term) {
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/e3a4fbaa/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
index ce164c6..6b32f8c 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdUnionGraph.java
@@ -24,9 +24,28 @@ import org.apache.commons.rdf.api.BlankNodeOrIRI;
import org.apache.commons.rdf.api.Graph;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.RDFTerm;
+import org.apache.commons.rdf.api.Triple;
import com.github.jsonldjava.core.RDFDataset;
+/**
+ * A <strong>union graph</em> representation of a JsonLd {@link RDFDataset}.
+ * <p>
+ * A union graph contains all the triples of the dataset, irregardless of their
+ * graph names.
+ * <p>
+ * {@link #add(Triple)} and {@link #add(BlankNodeOrIRI, IRI, RDFTerm)}
+ * will add the triple to the default graph
+ * (e.g. <code>@default</code> in JSON-LD), while
+ * the remaining methods (including
+ * {@link #remove(Triple)} or {@link #remove(BlankNodeOrIRI, IRI, RDFTerm)})
+ * relate to triples from <strong>all</strong> graphs.
+ * <p>
+ * <strong>Note:</strong>
+ * Some operations like {@link #stream()} and {@link #size()} are
+ * inefficient as they skip any duplicate triples from multiple
+ * graphs.
+ */
public class JsonLdUnionGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Triple> implements Graph {
JsonLdUnionGraph(String bnodePrefix) {
@@ -58,12 +77,28 @@ public class JsonLdUnionGraph extends JsonLdGraphLike<org.apache.commons.rdf.api
}
@Override
+ public void remove(Triple t) {
+ // Remove from ALL graphs, not just default graph
+ super.remove(null, t.getSubject(), t.getPredicate(), t.getObject());
+ }
+
+ @Override
public Stream<JsonLdTriple> stream(BlankNodeOrIRI subject, IRI predicate,
- RDFTerm object) {
+ RDFTerm object) {
return filteredGraphs(null)
.flatMap(List::stream)
.filter(quadFilter(subject, predicate, object))
- .map(factory::createTriple);
+ .map(factory::createTriple)
+ // Make sure we don't have duplicate triples
+ // NOTE: This can be quite inefficient
+ .distinct();
+ }
+
+ @Override
+ public Stream<? extends Triple> stream() {
+ // NOTE: inefficient as we have to remove duplicate triples
+ // in different graphs :-(
+ return super.stream().distinct();
}
@Override
@@ -73,8 +108,9 @@ public class JsonLdUnionGraph extends JsonLdGraphLike<org.apache.commons.rdf.api
@Override
public long size() {
- // NOTE: Inefficient as we'll have remove duplicate triples :-(
- return stream().distinct().count();
+ // Note: Our specialized stream() already removes duplicates using .distinct()
+ return stream().count();
}
+
}
[21/50] incubator-commonsrdf git commit: Common superclass
JsonLdQuadLike
Posted by st...@apache.org.
Common superclass JsonLdQuadLike
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/44031f37
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/44031f37
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/44031f37
Branch: refs/heads/master
Commit: 44031f3752ae41dd08e390ef180f851e9d62842e
Parents: a118697
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Sep 8 16:03:40 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Sep 8 16:04:08 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jsonldjava/JsonLdQuad.java | 33 +---------
.../commons/rdf/jsonldjava/JsonLdQuadLike.java | 64 ++++++++++++++++++++
.../commons/rdf/jsonldjava/JsonLdTriple.java | 25 +-------
3 files changed, 70 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/44031f37/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java
index e8dbfbd..ce2cb09 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java
@@ -18,47 +18,20 @@
package org.apache.commons.rdf.jsonldjava;
import java.util.Objects;
-import java.util.Optional;
import org.apache.commons.rdf.api.BlankNodeOrIRI;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.Quad;
import org.apache.commons.rdf.api.RDFTerm;
-final class JsonLdQuad implements org.apache.commons.rdf.api.Quad {
- private final com.github.jsonldjava.core.RDFDataset.Quad quad;
- private String blankNodePrefix;
-
- private static JsonLdRDFTermFactory rdfTermFactory = new JsonLdRDFTermFactory();
+final class JsonLdQuad extends JsonLdQuadLike<BlankNodeOrIRI,IRI,RDFTerm,BlankNodeOrIRI>
+ implements org.apache.commons.rdf.api.Quad {
JsonLdQuad(com.github.jsonldjava.core.RDFDataset.Quad quad, String blankNodePrefix) {
- this.quad = quad;
- this.blankNodePrefix = blankNodePrefix;
- }
-
- @Override
- public BlankNodeOrIRI getSubject() {
- return (BlankNodeOrIRI) rdfTermFactory.asTerm(quad.getSubject(), blankNodePrefix);
- }
-
- @Override
- public IRI getPredicate() {
- return (IRI) rdfTermFactory.asTerm(quad.getPredicate(), blankNodePrefix);
+ super(quad, blankNodePrefix);
}
@Override
- public RDFTerm getObject() {
- return rdfTermFactory.asTerm(quad.getObject(), blankNodePrefix);
- }
-
- @Override
- public Optional<BlankNodeOrIRI> getGraphName() {
- BlankNodeOrIRI g = (BlankNodeOrIRI) rdfTermFactory.asTerm(quad.getGraph(),
- blankNodePrefix);
- return Optional.ofNullable(g);
- }
-
- @Override
public boolean equals(Object obj) {
if (obj == this) {
return true;
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/44031f37/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
new file mode 100644
index 0000000..6290812
--- /dev/null
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
@@ -0,0 +1,64 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.rdf.jsonldjava;
+
+import java.util.Optional;
+
+import org.apache.commons.rdf.api.QuadLike;
+import org.apache.commons.rdf.api.RDFTerm;
+
+import com.github.jsonldjava.core.RDFDataset.Quad;
+
+class JsonLdQuadLike<S extends RDFTerm, P extends RDFTerm, O extends RDFTerm, G extends RDFTerm> implements QuadLike<S,P,O,G> {
+
+ private final Quad quad;
+ private String blankNodePrefix;
+
+ private static JsonLdRDFTermFactory rdfTermFactory = new JsonLdRDFTermFactory();
+
+ JsonLdQuadLike(Quad jsonldQuad, String blankNodePrefix) {
+ this.quad = jsonldQuad;
+ this.blankNodePrefix = blankNodePrefix;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public Optional<G> getGraphName() {
+ G g = (G) rdfTermFactory.asTerm(quad.getGraph(), blankNodePrefix);
+ return Optional.ofNullable(g);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public S getSubject() {
+ return (S) rdfTermFactory.asTerm(quad.getSubject(), blankNodePrefix);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public P getPredicate() {
+ return (P) rdfTermFactory.asTerm(quad.getPredicate(), blankNodePrefix);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public O getObject() {
+ return (O) rdfTermFactory.asTerm(quad.getObject(), blankNodePrefix);
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/44031f37/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java
index 49e95e3..a14dbb4 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java
@@ -26,30 +26,11 @@ import org.apache.commons.rdf.api.Triple;
import com.github.jsonldjava.core.RDFDataset.Quad;
-final class JsonLdTriple implements Triple {
- private final Quad quad;
- private String blankNodePrefix;
-
- private static JsonLdRDFTermFactory rdfTermFactory = new JsonLdRDFTermFactory();
+final class JsonLdTriple extends JsonLdQuadLike<BlankNodeOrIRI, IRI, RDFTerm, RDFTerm>
+ implements Triple {
JsonLdTriple(Quad quad, String blankNodePrefix) {
- this.quad = quad;
- this.blankNodePrefix = blankNodePrefix;
- }
-
- @Override
- public BlankNodeOrIRI getSubject() {
- return (BlankNodeOrIRI) rdfTermFactory.asTerm(quad.getSubject(), blankNodePrefix);
- }
-
- @Override
- public IRI getPredicate() {
- return (IRI) rdfTermFactory.asTerm(quad.getPredicate(), blankNodePrefix);
- }
-
- @Override
- public RDFTerm getObject() {
- return rdfTermFactory.asTerm(quad.getObject(), blankNodePrefix);
+ super(quad, blankNodePrefix);
}
@Override
[22/50] incubator-commonsrdf git commit: Hide implementations -
expose JsonLd* interfaces
Posted by st...@apache.org.
Hide implementations - expose JsonLd* interfaces
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/80ad999d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/80ad999d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/80ad999d
Branch: refs/heads/master
Commit: 80ad999d72217d4aeb6375bbe7a78e2427f41df5
Parents: 44031f3
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Sep 8 16:27:45 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Sep 8 16:31:12 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jsonldjava/JsonLdBlankNode.java | 64 +++++-----
.../commons/rdf/jsonldjava/JsonLdIRI.java | 68 +++++-----
.../commons/rdf/jsonldjava/JsonLdLiteral.java | 128 ++++++++++---------
.../commons/rdf/jsonldjava/JsonLdQuad.java | 61 +++++----
.../commons/rdf/jsonldjava/JsonLdQuadLike.java | 73 ++++++-----
.../rdf/jsonldjava/JsonLdRDFTermFactory.java | 42 +++---
.../commons/rdf/jsonldjava/JsonLdTerm.java | 26 +++-
.../commons/rdf/jsonldjava/JsonLdTriple.java | 49 ++++---
8 files changed, 281 insertions(+), 230 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/80ad999d/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNode.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNode.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNode.java
index f93d3b4..e54c894 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNode.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNode.java
@@ -21,38 +21,42 @@ import org.apache.commons.rdf.api.BlankNode;
import com.github.jsonldjava.core.RDFDataset.Node;
-final class JsonLdBlankNode extends JsonLdTerm implements BlankNode {
- private String blankNodePrefix;
-
- JsonLdBlankNode(Node node, String blankNodePrefix) {
- super(node);
- this.blankNodePrefix = blankNodePrefix;
- if (! node.isBlankNode()) {
- throw new IllegalArgumentException("Node is not a BlankNode:" + node);
+public interface JsonLdBlankNode extends JsonLdTerm, BlankNode {
+
+ final class JsonLdBlankNodeImpl extends JsonLdTermImpl implements JsonLdBlankNode {
+ private String blankNodePrefix;
+
+ JsonLdBlankNodeImpl(Node node, String blankNodePrefix) {
+ super(node);
+ this.blankNodePrefix = blankNodePrefix;
+ if (! node.isBlankNode()) {
+ throw new IllegalArgumentException("Node is not a BlankNode:" + node);
+ }
}
- }
-
- @Override
- public String ntriplesString() {
- return node.getValue();
- }
-
- @Override
- public String uniqueReference() {
- return blankNodePrefix + node.getValue();
- }
-
- @Override
- public boolean equals(Object obj) {
- if (! ( obj instanceof BlankNode)) {
- return false;
+
+ @Override
+ public String ntriplesString() {
+ return node.getValue();
+ }
+
+ @Override
+ public String uniqueReference() {
+ return blankNodePrefix + node.getValue();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (! ( obj instanceof BlankNode)) {
+ return false;
+ }
+ BlankNode other = (BlankNode) obj;
+ return uniqueReference().equals(other.uniqueReference());
+ }
+
+ @Override
+ public int hashCode() {
+ return uniqueReference().hashCode();
}
- BlankNode other = (BlankNode) obj;
- return uniqueReference().equals(other.uniqueReference());
}
- @Override
- public int hashCode() {
- return uniqueReference().hashCode();
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/80ad999d/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdIRI.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdIRI.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdIRI.java
index e21f55c..aac13e6 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdIRI.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdIRI.java
@@ -22,40 +22,44 @@ import org.apache.commons.rdf.api.IRI;
import com.github.jsonldjava.core.RDFDataset;
import com.github.jsonldjava.core.RDFDataset.Node;
-final class JsonLdIRI extends JsonLdTerm implements IRI {
+public interface JsonLdIRI extends JsonLdTerm, IRI {
- JsonLdIRI(Node node) {
- super(node);
- if (! node.isIRI()) {
- throw new IllegalArgumentException("Node is not an IRI:" + node);
+ final class JsonLdIRIImpl extends JsonLdTermImpl implements JsonLdIRI {
+
+ JsonLdIRIImpl(Node node) {
+ super(node);
+ if (! node.isIRI()) {
+ throw new IllegalArgumentException("Node is not an IRI:" + node);
+ }
+ }
+
+ JsonLdIRIImpl(String iri) {
+ super(new RDFDataset.IRI(iri));
+ }
+
+ @Override
+ public String ntriplesString() {
+ return "<" + node.getValue() + ">";
+ }
+
+ @Override
+ public String getIRIString() {
+ return node.getValue();
+ }
+
+ @Override
+ public int hashCode() {
+ return node.getValue().hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (! (obj instanceof IRI)) {
+ return false;
+ }
+ IRI other = (IRI) obj;
+ return node.getValue().equals(other.getIRIString());
}
}
- public JsonLdIRI(String iri) {
- super(new RDFDataset.IRI(iri));
- }
-
- @Override
- public String ntriplesString() {
- return "<" + node.getValue() + ">";
- }
-
- @Override
- public String getIRIString() {
- return node.getValue();
- }
-
- @Override
- public int hashCode() {
- return node.getValue().hashCode();
- }
-
- @Override
- public boolean equals(Object obj) {
- if (! (obj instanceof IRI)) {
- return false;
- }
- IRI other = (IRI) obj;
- return node.getValue().equals(other.getIRIString());
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/80ad999d/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
index e492486..025128e 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
@@ -26,72 +26,74 @@ import org.apache.commons.rdf.simple.Types;
import com.github.jsonldjava.core.RDFDataset.Node;
-public class JsonLdLiteral extends JsonLdTerm implements Literal {
-
- JsonLdLiteral(Node node) {
- super(node);
- if (! node.isLiteral()) {
- throw new IllegalArgumentException("Node is not a Literal:" + node);
+public interface JsonLdLiteral extends JsonLdTerm, Literal {
+
+ class JsonLdLiteralImpl extends JsonLdTermImpl implements JsonLdLiteral {
+
+ JsonLdLiteralImpl(Node node) {
+ super(node);
+ if (! node.isLiteral()) {
+ throw new IllegalArgumentException("Node is not a Literal:" + node);
+ }
}
- }
-
- @Override
- public String ntriplesString() {
- StringBuilder sb = new StringBuilder();
- sb.append('"');
- // Escape special characters
- sb.append(getLexicalForm().replace("\\", "\\\\"). // escaped to \\
- replace("\"", "\\\""). // escaped to \"
- replace("\r", "\\r"). // escaped to \r
- replace("\n", "\\n")); // escaped to \n
- sb.append('"');
-
- if (getLanguageTag().isPresent()) {
- sb.append("@");
- sb.append(getLanguageTag().get());
- } else if (!getDatatype().equals(Types.XSD_STRING)) {
- sb.append("^^");
- sb.append(getDatatype().ntriplesString());
- }
- return sb.toString();
- }
-
- @Override
- public String getLexicalForm() {
- return node.getValue();
- }
-
- @Override
- public IRI getDatatype() {
- return new JsonLdIRI(node.getDatatype());
- }
-
- @Override
- public Optional<String> getLanguageTag() {
- return Optional.ofNullable(node.getLanguage());
- }
-
- @Override
- public int hashCode() {
- // Should be the same as
- // Objects.hash(getLexicalForm(), getDatatype(), getLanguageTag());
- return Objects.hash(node.getValue(), node.getDatatype(), node.getLanguage());
- }
- @Override
- public boolean equals(Object obj) {
- if (obj instanceof JsonLdLiteral) {
- JsonLdLiteral other = (JsonLdLiteral) obj;
- return asNode().compareTo(other.asNode()) == 0;
+ @Override
+ public String ntriplesString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append('"');
+ // Escape special characters
+ sb.append(getLexicalForm().replace("\\", "\\\\"). // escaped to \\
+ replace("\"", "\\\""). // escaped to \"
+ replace("\r", "\\r"). // escaped to \r
+ replace("\n", "\\n")); // escaped to \n
+ sb.append('"');
+
+ if (getLanguageTag().isPresent()) {
+ sb.append("@");
+ sb.append(getLanguageTag().get());
+ } else if (!getDatatype().equals(Types.XSD_STRING)) {
+ sb.append("^^");
+ sb.append(getDatatype().ntriplesString());
+ }
+ return sb.toString();
+ }
+
+ @Override
+ public String getLexicalForm() {
+ return node.getValue();
}
- if (obj instanceof Literal) {
- Literal other = (Literal) obj;
- return getLexicalForm().equals(other.getLexicalForm()) &&
- getDatatype().equals(other.getDatatype()) &&
- getLanguageTag().equals(other.getLanguageTag());
+
+ @Override
+ public IRI getDatatype() {
+ return new JsonLdIRI.JsonLdIRIImpl(node.getDatatype());
+ }
+
+ @Override
+ public Optional<String> getLanguageTag() {
+ return Optional.ofNullable(node.getLanguage());
+ }
+
+ @Override
+ public int hashCode() {
+ // Should be the same as
+ // Objects.hash(getLexicalForm(), getDatatype(), getLanguageTag());
+ return Objects.hash(node.getValue(), node.getDatatype(), node.getLanguage());
}
- return false;
+ @Override
+ public boolean equals(Object obj) {
+ if (obj instanceof JsonLdLiteral) {
+ JsonLdLiteral other = (JsonLdLiteral) obj;
+ return asNode().compareTo(other.asNode()) == 0;
+ }
+ if (obj instanceof Literal) {
+ Literal other = (Literal) obj;
+ return getLexicalForm().equals(other.getLexicalForm()) &&
+ getDatatype().equals(other.getDatatype()) &&
+ getLanguageTag().equals(other.getLanguageTag());
+ }
+ return false;
+
+ }
}
-
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/80ad999d/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java
index ce2cb09..524f43c 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java
@@ -21,34 +21,45 @@ import java.util.Objects;
import org.apache.commons.rdf.api.BlankNodeOrIRI;
import org.apache.commons.rdf.api.IRI;
-import org.apache.commons.rdf.api.Quad;
import org.apache.commons.rdf.api.RDFTerm;
+// Note: To avoid confusion - don't import either Quad
+import org.apache.commons.rdf.jsonldjava.JsonLdQuadLike.JsonLdQuadLikeImpl;
-final class JsonLdQuad extends JsonLdQuadLike<BlankNodeOrIRI,IRI,RDFTerm,BlankNodeOrIRI>
- implements org.apache.commons.rdf.api.Quad {
-
- JsonLdQuad(com.github.jsonldjava.core.RDFDataset.Quad quad, String blankNodePrefix) {
- super(quad, blankNodePrefix);
- }
+public interface JsonLdQuad extends org.apache.commons.rdf.api.Quad {
- @Override
- public boolean equals(Object obj) {
- if (obj == this) {
- return true;
+ /**
+ * Return the underlying JsonLD {@link com.github.jsonldjava.core.RDFDataset.Quad}
+ *
+ * @return The JsonLD {@link com.github.jsonldjava.core.RDFDataset.Quad}
+ */
+ public com.github.jsonldjava.core.RDFDataset.Quad asJsonLdQuad();
+
+ final class JsonLdQuadImpl extends JsonLdQuadLikeImpl<BlankNodeOrIRI,IRI,RDFTerm,BlankNodeOrIRI>
+ implements JsonLdQuad {
+
+ JsonLdQuadImpl(com.github.jsonldjava.core.RDFDataset.Quad quad, String blankNodePrefix) {
+ super(quad, blankNodePrefix);
}
- if (! (obj instanceof Quad)) {
- return false;
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (! (obj instanceof org.apache.commons.rdf.api.Quad)) {
+ return false;
+ }
+ org.apache.commons.rdf.api.Quad other = (org.apache.commons.rdf.api.Quad) obj;
+ return getGraphName().equals(other.getGraphName()) &&
+ getSubject().equals(other.getSubject()) &&
+ getPredicate().equals(other.getPredicate()) &&
+ getObject().equals(other.getObject());
}
- Quad other = (Quad) obj;
- return getGraphName().equals(other.getGraphName()) &&
- getSubject().equals(other.getSubject()) &&
- getPredicate().equals(other.getPredicate()) &&
- getObject().equals(other.getObject());
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(getGraphName(), getSubject(), getPredicate(), getObject());
- }
-
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(getGraphName(), getSubject(), getPredicate(), getObject());
+ }
+ }
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/80ad999d/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
index 6290812..753e332 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuadLike.java
@@ -24,41 +24,50 @@ import org.apache.commons.rdf.api.RDFTerm;
import com.github.jsonldjava.core.RDFDataset.Quad;
-class JsonLdQuadLike<S extends RDFTerm, P extends RDFTerm, O extends RDFTerm, G extends RDFTerm> implements QuadLike<S,P,O,G> {
+public interface JsonLdQuadLike<S extends RDFTerm, P extends RDFTerm, O extends RDFTerm, G extends RDFTerm> extends QuadLike<S,P,O,G> {
- private final Quad quad;
- private String blankNodePrefix;
-
- private static JsonLdRDFTermFactory rdfTermFactory = new JsonLdRDFTermFactory();
+ public Quad asJsonLdQuad();
- JsonLdQuadLike(Quad jsonldQuad, String blankNodePrefix) {
- this.quad = jsonldQuad;
- this.blankNodePrefix = blankNodePrefix;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public Optional<G> getGraphName() {
- G g = (G) rdfTermFactory.asTerm(quad.getGraph(), blankNodePrefix);
- return Optional.ofNullable(g);
- }
+ class JsonLdQuadLikeImpl<S extends RDFTerm, P extends RDFTerm, O extends RDFTerm, G extends RDFTerm> implements JsonLdQuadLike<S,P,O,G> {
+
+ private static JsonLdRDFTermFactory rdfTermFactory = new JsonLdRDFTermFactory();
+
+ private final Quad quad;
+ private String blankNodePrefix;
+
+ JsonLdQuadLikeImpl(Quad jsonldQuad, String blankNodePrefix) {
+ this.quad = jsonldQuad;
+ this.blankNodePrefix = blankNodePrefix;
+ }
- @SuppressWarnings("unchecked")
- @Override
- public S getSubject() {
- return (S) rdfTermFactory.asTerm(quad.getSubject(), blankNodePrefix);
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public P getPredicate() {
- return (P) rdfTermFactory.asTerm(quad.getPredicate(), blankNodePrefix);
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public O getObject() {
- return (O) rdfTermFactory.asTerm(quad.getObject(), blankNodePrefix);
+ @SuppressWarnings("unchecked")
+ @Override
+ public Optional<G> getGraphName() {
+ G g = (G) rdfTermFactory.asTerm(quad.getGraph(), blankNodePrefix);
+ return Optional.ofNullable(g);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public S getSubject() {
+ return (S) rdfTermFactory.asTerm(quad.getSubject(), blankNodePrefix);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public P getPredicate() {
+ return (P) rdfTermFactory.asTerm(quad.getPredicate(), blankNodePrefix);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public O getObject() {
+ return (O) rdfTermFactory.asTerm(quad.getObject(), blankNodePrefix);
+ }
+
+ public Quad asJsonLdQuad() {
+ return quad;
+ }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/80ad999d/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
index f57eb86..5ac360a 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
@@ -24,11 +24,9 @@ import org.apache.commons.rdf.api.BlankNodeOrIRI;
import org.apache.commons.rdf.api.Graph;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.Literal;
-import org.apache.commons.rdf.api.Quad;
import org.apache.commons.rdf.api.QuadLike;
import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.RDFTermFactory;
-import org.apache.commons.rdf.api.Triple;
import org.apache.commons.rdf.api.TripleLike;
import org.apache.commons.rdf.simple.Types;
@@ -54,44 +52,44 @@ final class JsonLdRDFTermFactory implements RDFTermFactory {
}
@Override
- public IRI createIRI(String iri) {
- return new JsonLdIRI(iri);
+ public JsonLdIRI createIRI(String iri) {
+ return new JsonLdIRI.JsonLdIRIImpl(iri);
}
@Override
- public BlankNode createBlankNode() {
+ public JsonLdBlankNode createBlankNode() {
String id = "_:" + UUID.randomUUID().toString();
- return new JsonLdBlankNode(new RDFDataset.BlankNode(id), bnodePrefix);
+ return new JsonLdBlankNode.JsonLdBlankNodeImpl(new RDFDataset.BlankNode(id), bnodePrefix);
}
@Override
- public BlankNode createBlankNode(String name) {
+ public JsonLdBlankNode createBlankNode(String name) {
String id = "_:" + name;
// TODO: Check if name is valid JSON-LD BlankNode identifier
- return new JsonLdBlankNode(new RDFDataset.BlankNode(id), bnodePrefix);
+ return new JsonLdBlankNode.JsonLdBlankNodeImpl(new RDFDataset.BlankNode(id), bnodePrefix);
}
@Override
- public Triple createTriple(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- return new JsonLdTriple(asJsonLdQuad(subject, predicate, object), bnodePrefix);
+ public JsonLdTriple createTriple(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ return new JsonLdTriple.JsonLdTripleImpl(asJsonLdQuad(subject, predicate, object), bnodePrefix);
}
@Override
- public Quad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object)
+ public JsonLdQuad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object)
throws IllegalArgumentException, UnsupportedOperationException {
- return new JsonLdQuad(asJsonLdQuad(graphName, subject, predicate, object), bnodePrefix);
+ return new JsonLdQuad.JsonLdQuadImpl(asJsonLdQuad(graphName, subject, predicate, object), bnodePrefix);
}
@Override
- public Literal createLiteral(String literal) {
- return new JsonLdLiteral(new RDFDataset.Literal(literal, null, null));
+ public JsonLdLiteral createLiteral(String literal) {
+ return new JsonLdLiteral.JsonLdLiteralImpl(new RDFDataset.Literal(literal, null, null));
}
@Override
- public Literal createLiteral(String literal, IRI dataType) {
- return new JsonLdLiteral(new RDFDataset.Literal(literal, dataType.getIRIString(), null)); }
+ public JsonLdLiteral createLiteral(String literal, IRI dataType) {
+ return new JsonLdLiteral.JsonLdLiteralImpl(new RDFDataset.Literal(literal, dataType.getIRIString(), null)); }
@Override
- public Literal createLiteral(String literal, String language) {
- return new JsonLdLiteral(new RDFDataset.Literal(literal, Types.RDF_LANGSTRING.getIRIString(), language));
+ public JsonLdLiteral createLiteral(String literal, String language) {
+ return new JsonLdLiteral.JsonLdLiteralImpl(new RDFDataset.Literal(literal, Types.RDF_LANGSTRING.getIRIString(), language));
}
@@ -131,7 +129,7 @@ final class JsonLdRDFTermFactory implements RDFTermFactory {
return new RDFDataset.Quad(asJsonLdNode(subject), asJsonLdNode(predicate), asJsonLdNode(object), graph);
}
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({ "rawtypes", "unchecked" })
public RDFDataset.Quad asJsonLdQuad(TripleLike tripleOrQuad) {
RDFTerm g = null;
if (tripleOrQuad instanceof QuadLike) {
@@ -141,14 +139,14 @@ final class JsonLdRDFTermFactory implements RDFTermFactory {
return asJsonLdQuad(g, tripleOrQuad.getSubject(), tripleOrQuad.getPredicate(), tripleOrQuad.getObject());
}
- RDFTerm asTerm(final Node node, String blankNodePrefix) {
+ JsonLdTerm asTerm(final Node node, String blankNodePrefix) {
if (node == null) {
return null; // e.g. default graph
}
if (node.isIRI()) {
- return new JsonLdIRI(node);
+ return new JsonLdIRI.JsonLdIRIImpl(node);
} else if (node.isBlankNode()) {
- return new JsonLdBlankNode(node, blankNodePrefix);
+ return new JsonLdBlankNode.JsonLdBlankNodeImpl(node, blankNodePrefix);
} else if (node.isLiteral()) {
// TODO: Our own JsonLdLiteral
if (node.getLanguage() != null) {
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/80ad999d/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
index 39ef1a6..80a7b56 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java
@@ -17,15 +17,27 @@
*/
package org.apache.commons.rdf.jsonldjava;
+import org.apache.commons.rdf.api.RDFTerm;
+
import com.github.jsonldjava.core.RDFDataset.Node;
-public abstract class JsonLdTerm {
- final Node node;
- JsonLdTerm(Node node) {
- this.node = node;
- }
- public Node asNode() {
- return node;
+public interface JsonLdTerm extends RDFTerm {
+
+ /**
+ * Return the underlying JsonLd {@link Node}.
+ *
+ * @return JsonLd {@link Node}
+ */
+ Node asNode();
+
+ abstract class JsonLdTermImpl implements JsonLdTerm {
+ final Node node;
+ JsonLdTermImpl(Node node) {
+ this.node = node;
+ }
+ public Node asNode() {
+ return node;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/80ad999d/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java
index a14dbb4..18e271c 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdTriple.java
@@ -23,29 +23,40 @@ import org.apache.commons.rdf.api.BlankNodeOrIRI;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.Triple;
+import org.apache.commons.rdf.jsonldjava.JsonLdQuadLike.JsonLdQuadLikeImpl;
import com.github.jsonldjava.core.RDFDataset.Quad;
-final class JsonLdTriple extends JsonLdQuadLike<BlankNodeOrIRI, IRI, RDFTerm, RDFTerm>
- implements Triple {
-
- JsonLdTriple(Quad quad, String blankNodePrefix) {
- super(quad, blankNodePrefix);
- }
+public interface JsonLdTriple extends Triple {
- @Override
- public boolean equals(Object obj) {
- if (! (obj instanceof Triple)) {
- return false;
- }
- Triple other = (Triple) obj;
- return getSubject().equals(other.getSubject()) &&
- getPredicate().equals(other.getPredicate()) &&
- getObject().equals(other.getObject());
- }
+ /**
+ * Return the underlying JsonLD {@link com.github.jsonldjava.core.RDFDataset.Quad}
+ *
+ * @return The JsonLD {@link com.github.jsonldjava.core.RDFDataset.Quad}
+ */
+ public com.github.jsonldjava.core.RDFDataset.Quad asJsonLdQuad();
- @Override
- public int hashCode() {
- return Objects.hash(getSubject(), getPredicate(), getObject());
+ final class JsonLdTripleImpl extends JsonLdQuadLikeImpl<BlankNodeOrIRI, IRI, RDFTerm, RDFTerm>
+ implements JsonLdTriple {
+
+ JsonLdTripleImpl(Quad quad, String blankNodePrefix) {
+ super(quad, blankNodePrefix);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (! (obj instanceof Triple)) {
+ return false;
+ }
+ Triple other = (Triple) obj;
+ return getSubject().equals(other.getSubject()) &&
+ getPredicate().equals(other.getPredicate()) &&
+ getObject().equals(other.getObject());
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(getSubject(), getPredicate(), getObject());
+ }
}
}
\ No newline at end of file
[49/50] incubator-commonsrdf git commit: Merge branch 'master' into
jsonld-java
Posted by st...@apache.org.
Merge branch 'master' into jsonld-java
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/11a6a332
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/11a6a332
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/11a6a332
Branch: refs/heads/master
Commit: 11a6a3323c38a3adab5f405e92d30d2ec9afbc66
Parents: 3262b54 5afd0bd
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Sep 28 23:31:57 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Sep 28 23:31:57 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/commons/rdf/api/Graph.java | 5 ++
.../java/org/apache/commons/rdf/api/Quad.java | 4 +-
.../commons/rdf/experimental/RDFParser.java | 8 +--
.../commons/rdf/experimental/package-info.java | 1 -
pom.xml | 4 +-
.../simple/experimental/AbstractRDFParser.java | 54 +++++++++++++-------
.../rdf/simple/experimental/package-info.java | 11 ++--
7 files changed, 53 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/11a6a332/pom.xml
----------------------------------------------------------------------
[25/50] incubator-commonsrdf git commit: Use JsonBlankNodeImpl
Posted by st...@apache.org.
Use JsonBlankNodeImpl
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/a87270a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/a87270a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/a87270a3
Branch: refs/heads/master
Commit: a87270a3c5799b156e34349319a4f3176bc4291d
Parents: fe6c228
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Sep 9 09:44:24 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Sep 9 09:44:24 2016 +0100
----------------------------------------------------------------------
.../org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/a87270a3/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
index 7687e2c..5bc83e7 100644
--- a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
+++ b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdBlankNodeTest.java
@@ -4,6 +4,7 @@ import java.util.UUID;
import org.apache.commons.rdf.api.AbstractBlankNodeTest;
import org.apache.commons.rdf.api.BlankNode;
+import org.apache.commons.rdf.jsonldjava.JsonLdBlankNode.JsonLdBlankNodeImpl;
import com.github.jsonldjava.core.RDFDataset;
@@ -18,7 +19,7 @@ public class JsonLdBlankNodeTest extends AbstractBlankNodeTest {
@Override
protected BlankNode getBlankNode(String identifier) {
- return new JsonLdBlankNode(new RDFDataset.BlankNode("_:" + identifier), fixedPrefix);
+ return new JsonLdBlankNodeImpl(new RDFDataset.BlankNode("_:" + identifier), fixedPrefix);
}
}
[45/50] incubator-commonsrdf git commit: COMMONSRDF-36 JsonLd*
interfaces for Graph/Dataset
Posted by st...@apache.org.
COMMONSRDF-36 JsonLd* interfaces for Graph/Dataset
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/043a061a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/043a061a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/043a061a
Branch: refs/heads/master
Commit: 043a061a37c8107500943d092d5b4e2b19476d5b
Parents: 0e79b6f
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Sep 28 14:33:21 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Sep 28 14:42:05 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java | 2 +-
.../main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/043a061a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
index 1ab4b11..55b9f3c 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
@@ -32,7 +32,7 @@ import org.apache.commons.rdf.api.RDFTerm;
import com.github.jsonldjava.core.RDFDataset;
-class JsonLdDataset extends JsonLdGraphLike<org.apache.commons.rdf.api.Quad> implements Dataset {
+public class JsonLdDataset extends JsonLdGraphLike<org.apache.commons.rdf.api.Quad> implements Dataset {
JsonLdDataset(RDFDataset rdfDataSet) {
super(rdfDataSet);
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/043a061a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
index 3b35c76..206c82a 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
@@ -34,7 +34,7 @@ import com.github.jsonldjava.core.RDFDataset;
* A {@link Graph} view of a JsonLd {@link RDFDataset}.
*
*/
-class JsonLdGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Triple> implements Graph {
+public class JsonLdGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Triple> implements Graph {
private final Optional<BlankNodeOrIRI> graphName;
[13/50] incubator-commonsrdf git commit: parse into JsonLdGraph,
or copy into new graph
Posted by st...@apache.org.
parse into JsonLdGraph, or copy into new graph
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/7cb7ecba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/7cb7ecba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/7cb7ecba
Branch: refs/heads/master
Commit: 7cb7ecbab590a6826bdaddac99adf0e0236c07cb
Parents: 5bb0369
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Apr 12 09:16:17 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Apr 12 09:16:17 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jsonldjava/JsonLdGraph.java | 6 ++-
.../rdf/jsonldjava/JsonLdParserBuilder.java | 41 ++++++++++++++++----
2 files changed, 39 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/7cb7ecba/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
index 194479c..0fe3690 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
@@ -49,6 +49,10 @@ public class JsonLdGraph implements Graph {
*/
private RDFDataset rdfDataSet;
+ public RDFDataset getRdfDataSet() {
+ return rdfDataSet;
+ }
+
private JsonLdRDFTermFactory rdfTermFactory;
/**
@@ -115,7 +119,7 @@ public class JsonLdGraph implements Graph {
}
}
@Override
- public void close() throws Exception {
+ public void close() {
// Drop the memory reference, but don't clear it
rdfDataSet = null;
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/7cb7ecba/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
index aeb3af2..ff9131e 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
@@ -24,18 +24,19 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.nio.file.Files;
-import java.nio.file.Path;
-import java.text.ParseException;
-import java.util.Optional;
import java.util.function.Predicate;
+import org.apache.commons.rdf.api.Graph;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.RDFParserBuilder;
import org.apache.commons.rdf.api.RDFSyntax;
import org.apache.commons.rdf.api.RDFTermFactory;
import org.apache.commons.rdf.simple.AbstractRDFParserBuilder;
-import com.fasterxml.jackson.core.JsonParseException;
+import com.github.jsonldjava.core.JsonLdError;
+import com.github.jsonldjava.core.JsonLdOptions;
+import com.github.jsonldjava.core.JsonLdProcessor;
+import com.github.jsonldjava.core.RDFDataset;
import com.github.jsonldjava.utils.JsonUtils;
public class JsonLdParserBuilder extends AbstractRDFParserBuilder {
@@ -85,11 +86,36 @@ public class JsonLdParserBuilder extends AbstractRDFParserBuilder {
}
@Override
- protected void parseSynchronusly() throws IOException, ParseException {
+ protected void parseSynchronusly() throws IOException, RDFParseException {
Object json = readSource();
- }
+ JsonLdOptions options = new JsonLdOptions();
+ getBase().map(IRI::getIRIString).ifPresent(options::setBase);
+ // TODO: base from readSource() (after redirection and Content-Location header)
+ // should be forwarded
+
+ // TODO: Modify JsonLdProcessor to accept the target RDFDataset
+ RDFDataset rdfDataset;
+ try {
+ rdfDataset = (RDFDataset) JsonLdProcessor.toRDF(json, options);
+ } catch (JsonLdError e) {
+ throw new RDFParseException(e);
+ }
- private Object readSource() throws IOException, ParseException {
+ Graph intoGraph = getIntoGraph().get();
+ if (intoGraph instanceof JsonLdGraph) {
+ // We can just move over the map content directly:
+ JsonLdGraph jsonLdGraph = (JsonLdGraph) intoGraph;
+ jsonLdGraph.getRdfDataSet().putAll(rdfDataset);
+ } else {
+ // TODO: Modify JsonLdProcessor to have an actual triple callback
+ try (JsonLdGraph parsedGraph = new JsonLdGraph(rdfDataset)) {
+ // sequential() as we don't know if intoGraph is thread safe :-/
+ parsedGraph.getTriples().sequential().forEach(intoGraph::add);
+ }
+ }
+ }
+
+ private Object readSource() throws IOException, RDFParseException {
// Due to checked IOException we can't easily
// do this with .map and .orElseGet()
@@ -97,6 +123,7 @@ public class JsonLdParserBuilder extends AbstractRDFParserBuilder {
return JsonUtils.fromInputStream(getSourceInputStream().get());
}
if (getSourceIri().isPresent()) {
+ // TODO: propagate @base from content
return JsonUtils.fromURL(asURL(getSourceIri().get()),
JsonUtils.getDefaultHttpClient());
}
[48/50] incubator-commonsrdf git commit: Corrected javadoc
Posted by st...@apache.org.
Corrected javadoc
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/3262b542
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/3262b542
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/3262b542
Branch: refs/heads/master
Commit: 3262b542501b7bb89887f87f9443cafd78c4a734
Parents: 63da05c
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Sep 28 18:24:19 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Sep 28 18:24:19 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/commons/rdf/experimental/RDFParser.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/3262b542/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java b/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
index dd6bcf0..8a9acf6 100644
--- a/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
+++ b/api/src/main/java/org/apache/commons/rdf/experimental/RDFParser.java
@@ -72,7 +72,7 @@ import org.apache.commons.rdf.api.Triple;
* or a cloned builder with the modified settings applied.
* Implementations are however encouraged to be immutable,
* thread-safe and document this. As an example starting point, see
- * {@link org.apache.commons.rdf.simple.AbstractRDFParserBuilder}.
+ * {@link org.apache.commons.rdf.simple.AbstractRDFParser}.
* <p>
* Example usage:
* </p>
[11/50] incubator-commonsrdf git commit: Merge branch
'parser-writer-interface' into jsonld-java
Posted by st...@apache.org.
Merge branch 'parser-writer-interface' into jsonld-java
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/82471ec2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/82471ec2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/82471ec2
Branch: refs/heads/master
Commit: 82471ec222910071447f0b67fd5601f3598e0b52
Parents: d51975f 1b5f316
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Apr 8 12:01:33 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Apr 8 12:01:33 2016 +0100
----------------------------------------------------------------------
.../org/apache/commons/rdf/api/RDFParserBuilder.java | 2 +-
.../commons/rdf/simple/AbstractRDFParserBuilder.java | 14 +++++++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[20/50] incubator-commonsrdf git commit: Support for Quad
Posted by st...@apache.org.
Support for Quad
and somewhat generalized Quad
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/a1186976
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/a1186976
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/a1186976
Branch: refs/heads/master
Commit: a1186976eee3d1a46028b9e80eea275ad56e2fea
Parents: e534598
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Sep 8 15:53:50 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Sep 8 15:53:50 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jsonldjava/JsonLdQuad.java | 81 ++++++++++++++++++++
.../rdf/jsonldjava/JsonLdRDFTermFactory.java | 38 ++++++---
2 files changed, 108 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/a1186976/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java
new file mode 100644
index 0000000..e8dbfbd
--- /dev/null
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdQuad.java
@@ -0,0 +1,81 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.rdf.jsonldjava;
+
+import java.util.Objects;
+import java.util.Optional;
+
+import org.apache.commons.rdf.api.BlankNodeOrIRI;
+import org.apache.commons.rdf.api.IRI;
+import org.apache.commons.rdf.api.Quad;
+import org.apache.commons.rdf.api.RDFTerm;
+
+final class JsonLdQuad implements org.apache.commons.rdf.api.Quad {
+ private final com.github.jsonldjava.core.RDFDataset.Quad quad;
+ private String blankNodePrefix;
+
+ private static JsonLdRDFTermFactory rdfTermFactory = new JsonLdRDFTermFactory();
+
+ JsonLdQuad(com.github.jsonldjava.core.RDFDataset.Quad quad, String blankNodePrefix) {
+ this.quad = quad;
+ this.blankNodePrefix = blankNodePrefix;
+ }
+
+ @Override
+ public BlankNodeOrIRI getSubject() {
+ return (BlankNodeOrIRI) rdfTermFactory.asTerm(quad.getSubject(), blankNodePrefix);
+ }
+
+ @Override
+ public IRI getPredicate() {
+ return (IRI) rdfTermFactory.asTerm(quad.getPredicate(), blankNodePrefix);
+ }
+
+ @Override
+ public RDFTerm getObject() {
+ return rdfTermFactory.asTerm(quad.getObject(), blankNodePrefix);
+ }
+
+ @Override
+ public Optional<BlankNodeOrIRI> getGraphName() {
+ BlankNodeOrIRI g = (BlankNodeOrIRI) rdfTermFactory.asTerm(quad.getGraph(),
+ blankNodePrefix);
+ return Optional.ofNullable(g);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (! (obj instanceof Quad)) {
+ return false;
+ }
+ Quad other = (Quad) obj;
+ return getGraphName().equals(other.getGraphName()) &&
+ getSubject().equals(other.getSubject()) &&
+ getPredicate().equals(other.getPredicate()) &&
+ getObject().equals(other.getObject());
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(getGraphName(), getSubject(), getPredicate(), getObject());
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/a1186976/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
index e07cbae..f57eb86 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
@@ -24,9 +24,12 @@ import org.apache.commons.rdf.api.BlankNodeOrIRI;
import org.apache.commons.rdf.api.Graph;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.Literal;
+import org.apache.commons.rdf.api.Quad;
+import org.apache.commons.rdf.api.QuadLike;
import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.RDFTermFactory;
import org.apache.commons.rdf.api.Triple;
+import org.apache.commons.rdf.api.TripleLike;
import org.apache.commons.rdf.simple.Types;
import com.github.jsonldjava.core.RDFDataset;
@@ -74,6 +77,12 @@ final class JsonLdRDFTermFactory implements RDFTermFactory {
}
@Override
+ public Quad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object)
+ throws IllegalArgumentException, UnsupportedOperationException {
+ return new JsonLdQuad(asJsonLdQuad(graphName, subject, predicate, object), bnodePrefix);
+ }
+
+ @Override
public Literal createLiteral(String literal) {
return new JsonLdLiteral(new RDFDataset.Literal(literal, null, null));
}
@@ -113,22 +122,29 @@ final class JsonLdRDFTermFactory implements RDFTermFactory {
}
- public RDFDataset.Quad asJsonLdQuad(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ public RDFDataset.Quad asJsonLdQuad(RDFTerm subject, RDFTerm predicate, RDFTerm object) {
+ return asJsonLdQuad(null, subject, predicate, object);
+ }
+
+ public RDFDataset.Quad asJsonLdQuad(RDFTerm graphName, RDFTerm subject, RDFTerm predicate, RDFTerm object) {
String graph = null;
- // TODO: Add Quad to commons-rdf
-// if (triple instanceof Quad) {
-// String graph = triple.getGraph().getIRIString();
-// }
return new RDFDataset.Quad(asJsonLdNode(subject), asJsonLdNode(predicate), asJsonLdNode(object), graph);
}
-
-
- public RDFDataset.Quad asJsonLdQuad(Triple triple) {
- return asJsonLdQuad(triple.getSubject(), triple.getPredicate(), triple.getObject());
+ @SuppressWarnings("rawtypes")
+ public RDFDataset.Quad asJsonLdQuad(TripleLike tripleOrQuad) {
+ RDFTerm g = null;
+ if (tripleOrQuad instanceof QuadLike) {
+ QuadLike quadLike = (QuadLike) tripleOrQuad;
+ g = (RDFTerm) quadLike.getGraphName().orElse(null);
+ }
+ return asJsonLdQuad(g, tripleOrQuad.getSubject(), tripleOrQuad.getPredicate(), tripleOrQuad.getObject());
}
-
- RDFTerm asTerm(final Node node, String blankNodePrefix) {
+
+ RDFTerm asTerm(final Node node, String blankNodePrefix) {
+ if (node == null) {
+ return null; // e.g. default graph
+ }
if (node.isIRI()) {
return new JsonLdIRI(node);
} else if (node.isBlankNode()) {
[12/50] incubator-commonsrdf git commit: Merge branch
'parser-writer-interface' into jsonld-java
Posted by st...@apache.org.
Merge branch 'parser-writer-interface' into jsonld-java
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/5bb03698
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/5bb03698
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/5bb03698
Branch: refs/heads/master
Commit: 5bb03698aa2368ee8715c23dfa028f367846c337
Parents: 82471ec d153b4c
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Apr 12 09:12:27 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Apr 12 09:12:27 2016 +0100
----------------------------------------------------------------------
.../rdf/simple/AbstractRDFParserBuilder.java | 24 +++++++++++++++++---
.../rdf/simple/DummyRDFParserBuilder.java | 2 +-
2 files changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[15/50] incubator-commonsrdf git commit: test json-ld parse by
URL/Path/InputStream
Posted by st...@apache.org.
test json-ld parse by URL/Path/InputStream
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/21b68eea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/21b68eea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/21b68eea
Branch: refs/heads/master
Commit: 21b68eeab8d2b148dd05f0947d7c11e6a126c068
Parents: 0d6a0f8
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Apr 13 02:45:25 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Apr 13 02:52:11 2016 +0100
----------------------------------------------------------------------
.../rdf/jsonldjava/JsonLdParserBuilderTest.java | 88 +++++++++++++++++++-
1 file changed, 84 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/21b68eea/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
index df8511c..d3eae2b 100644
--- a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
+++ b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
@@ -17,20 +17,100 @@
*/
package org.apache.commons.rdf.jsonldjava;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.InputStream;
import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
import java.util.concurrent.TimeUnit;
import org.apache.commons.rdf.api.Graph;
import org.apache.commons.rdf.api.IRI;
+import org.apache.commons.rdf.api.Literal;
import org.apache.commons.rdf.api.RDFSyntax;
+import org.apache.commons.rdf.simple.Types;
import org.junit.Test;
public class JsonLdParserBuilderTest {
+
+ private static final String TEST_JSONLD = "/test.jsonld";
+ static JsonLdRDFTermFactory factory = new JsonLdRDFTermFactory();
+ IRI test = factory.createIRI("http://example.com/test");
+ IRI Type = factory.createIRI("http://example.com/Type");
+ IRI type = factory.createIRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
+ IRI pred1 = factory.createIRI("http://example.com/pred1");
+ IRI pred2 = factory.createIRI("http://example.com/pred2");
+ IRI pred3 = factory.createIRI("http://example.com/pred3");
+ IRI pred4 = factory.createIRI("http://example.com/pred4");
+ IRI other = factory.createIRI("http://example.com/other");
+ IRI graph = factory.createIRI("http://example.com/graph");
+
+
+
@Test
public void parseByUrl() throws Exception {
- URL url = getClass().getResource("/test.jsonld");
- IRI iri = new JsonLdRDFTermFactory().createIRI(url.toString());
- Graph g = new JsonLdParserBuilder().contentType(RDFSyntax.JSONLD).source(iri).parse().get(10, TimeUnit.SECONDS);
- System.out.println(g);
+ URL url = getClass().getResource(TEST_JSONLD);
+ assertNotNull("Test resource not found: " + TEST_JSONLD, url);
+ IRI iri = factory.createIRI(url.toString());
+ Graph g = new JsonLdParserBuilder()
+ .contentType(RDFSyntax.JSONLD).source(iri).parse()
+ .get(10, TimeUnit.SECONDS);
+ checkGraph(g);
+ }
+
+ @Test
+ public void parseByPath() throws Exception {
+ Path path = Files.createTempFile("test", ".jsonld");
+ path.toFile().deleteOnExit();
+ try (InputStream is = getClass().getResourceAsStream(TEST_JSONLD)) {
+ assertNotNull("Test resource not found: " + TEST_JSONLD, is);
+ Files.copy(is, path, StandardCopyOption.REPLACE_EXISTING);
+ }
+ Graph g = new JsonLdParserBuilder()
+ .contentType(RDFSyntax.JSONLD).source(path).parse()
+ .get(10, TimeUnit.SECONDS);
+ checkGraph(g);
+ }
+
+ @Test
+ public void parseByStream() throws Exception {
+ Graph g;
+ try (InputStream is = getClass().getResourceAsStream(TEST_JSONLD)) {
+ assertNotNull("Test resource not found: " + TEST_JSONLD, is);
+ g = new JsonLdParserBuilder()
+ .base("http://example.com/base/")
+ .contentType(RDFSyntax.JSONLD).source(is).parse()
+ .get(10, TimeUnit.SECONDS);
+ }
+ checkGraph(g);
+ }
+
+
+ private void checkGraph(Graph g) {
+ assertTrue(g.contains(test, type, Type));
+ // Should not include statements from the named graph
+
+ assertEquals(1, g.getTriples(test, pred1, null).count());
+ assertEquals(1, g.getTriples(test, pred2, null).count());
+
+ assertEquals("Hello",
+ ((Literal) g.getTriples(test, pred1, null)
+ .findFirst().get().getObject() ).getLexicalForm());
+ assertTrue(g.contains(test, pred2, other));
+
+ assertEquals("1337",
+ ((Literal) g.getTriples(test, pred3, null)
+ .findFirst().get().getObject() ).getLexicalForm());
+ assertEquals(Types.XSD_INTEGER,
+ ((Literal) g.getTriples(test, pred3, null)
+ .findFirst().get().getObject() ).getDatatype());
+
+ // While the named graph 'graph' is not included, the relationship
+ // to that @id is included.
+ assertTrue(g.contains(test, pred4, graph));
}
}
[26/50] incubator-commonsrdf git commit: import of JsonLd*Impl
Posted by st...@apache.org.
import of JsonLd*Impl
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/f2bcb3d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/f2bcb3d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/f2bcb3d2
Branch: refs/heads/master
Commit: f2bcb3d23079b5b3eeeb2889d4346142ea2772c7
Parents: a87270a
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Sep 9 09:48:37 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Sep 9 09:48:37 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jsonldjava/JsonLdLiteral.java | 3 ++-
.../rdf/jsonldjava/JsonLdRDFTermFactory.java | 25 ++++++++++++--------
2 files changed, 17 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/f2bcb3d2/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
index 025128e..befc410 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdLiteral.java
@@ -23,6 +23,7 @@ import java.util.Optional;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.Literal;
import org.apache.commons.rdf.simple.Types;
+import org.apache.commons.rdf.jsonldjava.JsonLdIRI.JsonLdIRIImpl;
import com.github.jsonldjava.core.RDFDataset.Node;
@@ -65,7 +66,7 @@ public interface JsonLdLiteral extends JsonLdTerm, Literal {
@Override
public IRI getDatatype() {
- return new JsonLdIRI.JsonLdIRIImpl(node.getDatatype());
+ return new JsonLdIRIImpl(node.getDatatype());
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/f2bcb3d2/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
index 12ab13d..607e319 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
@@ -30,11 +30,16 @@ import org.apache.commons.rdf.api.RDFTermFactory;
import org.apache.commons.rdf.api.Triple;
import org.apache.commons.rdf.api.TripleLike;
import org.apache.commons.rdf.simple.Types;
+import org.apache.commons.rdf.jsonldjava.JsonLdBlankNode.JsonLdBlankNodeImpl;
+import org.apache.commons.rdf.jsonldjava.JsonLdTriple.JsonLdTripleImpl;
+import org.apache.commons.rdf.jsonldjava.JsonLdQuad.JsonLdQuadImpl;
+import org.apache.commons.rdf.jsonldjava.JsonLdLiteral.JsonLdLiteralImpl;
import com.github.jsonldjava.core.RDFDataset;
import com.github.jsonldjava.core.RDFDataset.Node;
-final class JsonLdRDFTermFactory implements RDFTermFactory {
+
+public final class JsonLdRDFTermFactory implements RDFTermFactory {
public JsonLdRDFTermFactory() {
// An "outside Graph" bnodePrefix
@@ -60,41 +65,41 @@ final class JsonLdRDFTermFactory implements RDFTermFactory {
@Override
public JsonLdBlankNode createBlankNode() {
String id = "_:" + UUID.randomUUID().toString();
- return new JsonLdBlankNode.JsonLdBlankNodeImpl(new RDFDataset.BlankNode(id), bnodePrefix);
+ return new JsonLdBlankNodeImpl(new RDFDataset.BlankNode(id), bnodePrefix);
}
@Override
public JsonLdBlankNode createBlankNode(String name) {
String id = "_:" + name;
// TODO: Check if name is valid JSON-LD BlankNode identifier
- return new JsonLdBlankNode.JsonLdBlankNodeImpl(new RDFDataset.BlankNode(id), bnodePrefix);
+ return new JsonLdBlankNodeImpl(new RDFDataset.BlankNode(id), bnodePrefix);
}
@Override
public JsonLdTriple createTriple(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- return new JsonLdTriple.JsonLdTripleImpl(asJsonLdQuad(subject, predicate, object), bnodePrefix);
+ return new JsonLdTripleImpl(asJsonLdQuad(subject, predicate, object), bnodePrefix);
}
public Triple asTriple(final RDFDataset.Quad quad) {
- return new JsonLdTriple.JsonLdTripleImpl(quad, bnodePrefix);
+ return new JsonLdTripleImpl(quad, bnodePrefix);
}
@Override
public JsonLdQuad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object)
throws IllegalArgumentException, UnsupportedOperationException {
- return new JsonLdQuad.JsonLdQuadImpl(asJsonLdQuad(graphName, subject, predicate, object), bnodePrefix);
+ return new JsonLdQuadImpl(asJsonLdQuad(graphName, subject, predicate, object), bnodePrefix);
}
@Override
public JsonLdLiteral createLiteral(String literal) {
- return new JsonLdLiteral.JsonLdLiteralImpl(new RDFDataset.Literal(literal, null, null));
+ return new JsonLdLiteralImpl(new RDFDataset.Literal(literal, null, null));
}
@Override
public JsonLdLiteral createLiteral(String literal, IRI dataType) {
- return new JsonLdLiteral.JsonLdLiteralImpl(new RDFDataset.Literal(literal, dataType.getIRIString(), null)); }
+ return new JsonLdLiteralImpl(new RDFDataset.Literal(literal, dataType.getIRIString(), null)); }
@Override
public JsonLdLiteral createLiteral(String literal, String language) {
- return new JsonLdLiteral.JsonLdLiteralImpl(new RDFDataset.Literal(literal, Types.RDF_LANGSTRING.getIRIString(), language));
+ return new JsonLdLiteralImpl(new RDFDataset.Literal(literal, Types.RDF_LANGSTRING.getIRIString(), language));
}
@@ -151,7 +156,7 @@ final class JsonLdRDFTermFactory implements RDFTermFactory {
if (node.isIRI()) {
return new JsonLdIRI.JsonLdIRIImpl(node);
} else if (node.isBlankNode()) {
- return new JsonLdBlankNode.JsonLdBlankNodeImpl(node, blankNodePrefix);
+ return new JsonLdBlankNodeImpl(node, blankNodePrefix);
} else if (node.isLiteral()) {
// TODO: Our own JsonLdLiteral
if (node.getLanguage() != null) {
[27/50] incubator-commonsrdf git commit: Added JsonLdDataset,
JsonLdGraphLike
Posted by st...@apache.org.
Added JsonLdDataset, JsonLdGraphLike
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/1330627e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/1330627e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/1330627e
Branch: refs/heads/master
Commit: 1330627e7d0c133b06dcc04c8581b11ba8ea7f2c
Parents: f2bcb3d
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Sep 9 14:28:47 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Sep 9 14:28:47 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jsonldjava/JsonLdDataset.java | 99 ++++++++
.../commons/rdf/jsonldjava/JsonLdGraph.java | 184 +++-----------
.../commons/rdf/jsonldjava/JsonLdGraphLike.java | 239 +++++++++++++++++++
.../rdf/jsonldjava/JsonLdRDFTermFactory.java | 54 +++--
4 files changed, 401 insertions(+), 175 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/1330627e/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
new file mode 100644
index 0000000..e18dfaf
--- /dev/null
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java
@@ -0,0 +1,99 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.rdf.jsonldjava;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+import org.apache.commons.rdf.api.BlankNodeOrIRI;
+import org.apache.commons.rdf.api.Dataset;
+import org.apache.commons.rdf.api.Graph;
+import org.apache.commons.rdf.api.IRI;
+import org.apache.commons.rdf.api.Quad;
+import org.apache.commons.rdf.api.RDFTerm;
+
+import com.github.jsonldjava.core.RDFDataset;
+
+public class JsonLdDataset extends JsonLdGraphLike<org.apache.commons.rdf.api.Quad> implements Dataset {
+
+ JsonLdDataset(String bnodePrefix) {
+ super(bnodePrefix);
+ }
+
+ JsonLdDataset(RDFDataset rdfDataset, String bnodePrefix) {
+ super(rdfDataset, bnodePrefix);
+ }
+
+ public JsonLdDataset(RDFDataset rdfDataSet) {
+ super(rdfDataSet);
+ }
+
+ @Override
+ public void add(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ super.add(graphName, subject, predicate, object);
+ }
+
+ @Override
+ public boolean contains(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ return super.contains(graphName, subject, predicate, object);
+ }
+
+ @Override
+ public void remove(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ super.remove(graphName, subject, predicate, object);
+ }
+
+ @Override
+ public Graph getGraph() {
+ return new JsonLdGraph(rdfDataSet, Optional.empty(), bnodePrefix);
+ }
+
+ @Override
+ public Optional<Graph> getGraph(BlankNodeOrIRI graphName) {
+ if (graphName == null) {
+ return Optional.of(getGraph());
+ }
+ return getGraphNames()
+ .map(g -> (Graph)new JsonLdGraph(rdfDataSet, Optional.of(g), bnodePrefix))
+ .findAny();
+ }
+
+ @Override
+ public Stream<BlankNodeOrIRI> getGraphNames() {
+ return rdfDataSet.graphNames().parallelStream().filter(Predicate.isEqual("@default").negate())
+ .map(s -> s.startsWith("_:") ? new RDFDataset.BlankNode(s) : new RDFDataset.IRI(s))
+ .map(n -> (BlankNodeOrIRI) factory.asTerm(n, bnodePrefix));
+ }
+
+ @Override
+ public Stream<? extends Quad> stream(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate,
+ RDFTerm object) {
+ return filteredGraphs(graphName)
+ .flatMap(List::stream)
+ .filter(quadFilter(subject, predicate, object))
+ .map(factory::createQuad);
+ }
+
+ @Override
+ Quad asTripleOrQuad(com.github.jsonldjava.core.RDFDataset.Quad jsonldQuad) {
+ return factory.createQuad(jsonldQuad);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/1330627e/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
index c7c3491..22d5291 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
@@ -19,195 +19,69 @@ package org.apache.commons.rdf.jsonldjava;
import java.util.List;
import java.util.Optional;
-import java.util.UUID;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.commons.rdf.api.BlankNode;
import org.apache.commons.rdf.api.BlankNodeOrIRI;
import org.apache.commons.rdf.api.Graph;
import org.apache.commons.rdf.api.IRI;
-import org.apache.commons.rdf.api.Literal;
import org.apache.commons.rdf.api.RDFTerm;
-import org.apache.commons.rdf.api.Triple;
import com.github.jsonldjava.core.RDFDataset;
-import com.github.jsonldjava.core.RDFDataset.Node;
-import com.github.jsonldjava.core.RDFDataset.Quad;
-public class JsonLdGraph implements Graph {
-
- /**
- * Used by {@link #bnodePrefix()} to get a unique UUID per JVM run
- */
- private static UUID SALT = UUID.randomUUID();
-
- /**
- * The underlying JSON-LD {@link RDFDataset}.
- */
- private RDFDataset rdfDataSet;
+public class JsonLdGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Triple> implements Graph {
- /**
- * If true, include all Quad statements as Triples. If false,
- * only Quads in the default graph (<code>null</code>) are
- * included.
- */
- private final boolean unionGraph;
+ private final Optional<BlankNodeOrIRI> graphName;
- /**
- * Prefix to use in blank node identifiers
- */
- private final String bnodePrefix;
-
- private JsonLdRDFTermFactory factory;
-
- public JsonLdGraph() {
- this(new RDFDataset(), false);
+ JsonLdGraph(String bnodePrefix) {
+ super(bnodePrefix);
+ this.graphName = Optional.empty();
}
- public JsonLdGraph(RDFDataset rdfDataset) {
- this(rdfDataset, false);
+ public JsonLdGraph(RDFDataset rdfDataSet) {
+ super(rdfDataSet);
+ this.graphName = Optional.empty();
}
-
- public JsonLdGraph(RDFDataset rdfDataset, boolean unionGraph) {
- this.rdfDataSet = rdfDataset;
- this.unionGraph = unionGraph;
- this.bnodePrefix = "urn:uuid:" + SALT + "#" + "g"+ System.identityHashCode(rdfDataSet);
- this.factory = new JsonLdRDFTermFactory(bnodePrefix);
- }
-
- public RDFDataset getRdfDataSet() {
- return rdfDataSet;
+ JsonLdGraph(RDFDataset rdfDataSet, Optional<BlankNodeOrIRI> graphName, String bnodePrefix) {
+ super(rdfDataSet, bnodePrefix);
+ this.graphName = graphName;
}
@Override
public void add(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- String subjectStr;
- if (subject instanceof BlankNode) {
- subjectStr = subject.ntriplesString();
- } else if (subject instanceof IRI){
- subjectStr = ((IRI)subject).getIRIString();
- } else {
- throw new IllegalStateException("Subject was neither IRI or BlankNode: " + subject);
- }
-
- String predicateStr = predicate.getIRIString();
-
- if (object instanceof Literal) {
- Literal literal = (Literal) object;
- rdfDataSet.addTriple(subjectStr, predicateStr, literal.getLexicalForm(), literal.getDatatype().getIRIString(), literal.getLanguageTag().orElse(null));
- } else if (object instanceof BlankNode) {
- rdfDataSet.addTriple(subjectStr, predicateStr, object.ntriplesString());
- } else if (object instanceof IRI) {
- rdfDataSet.addTriple(subjectStr, predicateStr, ((IRI)object).getIRIString());
- } else {
- throw new IllegalStateException("Object was neither IRI, BlankNode nor Literal: " + object);
- }
+ super.add(graphName.orElse(null), subject, predicate, object);
}
@Override
- public void add(Triple triple) {
- // Quad q = asJsonLdQuad(triple);
- // rdfDataSet.addQuad(q);
-
- add(triple.getSubject(), triple.getPredicate(), triple.getObject());
- }
-
- @Override
- public void clear() {
- if (unionGraph) {
- // Delete all quads
- rdfDataSet.clear();
- } else {
- // Only the @default quads removed
- rdfDataSet.getQuads("@default").clear();
- }
- }
- @Override
- public void close() {
- // Drop the memory reference, but don't clear it
- rdfDataSet = null;
- }
-
- @Override
public boolean contains(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- return stream(subject, predicate, object).findAny().isPresent();
- }
-
- @Override
- public boolean contains(Triple triple) {
- return stream().anyMatch(Predicate.isEqual(triple));
- }
-
- @Override
- public Stream<? extends Triple> stream() {
- if (! unionGraph) {
- return rdfDataSet.getQuads("@default").parallelStream().map(factory::asTriple);
- }
- return rdfDataSet.graphNames().parallelStream().map(rdfDataSet::getQuads).flatMap(List<Quad>::parallelStream).map(factory::asTriple);
+ return super.contains(graphName, subject, predicate, object);
}
-
+
@Override
- public Stream<? extends Triple> stream(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- // RDFDataSet has no optimizations to help us, so we'll dispatch to filter()
- return stream().filter(t -> {
- if (subject != null && !t.getSubject().equals(subject)) {
- return false;
- }
- if (predicate != null && !t.getPredicate().equals(predicate)) {
- return false;
- }
- if (object != null && !t.getObject().equals(object)) {
- return false;
- }
- return true;
- });
+ public void remove(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ super.remove(graphName, subject, predicate, object);
}
@Override
- public void remove(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- Predicate<? super Quad> filter = quadFilter(subject, predicate, object);
- if (! unionGraph) {
- rdfDataSet.getQuads("@default").removeIf(filter);
- } else {
- rdfDataSet.graphNames().parallelStream().map(rdfDataSet::getQuads).map(t -> t.removeIf(filter));
- }
+ public Stream<JsonLdTriple> stream(BlankNodeOrIRI subject, IRI predicate,
+ RDFTerm object) {
+ return filteredGraphs(graphName)
+ .flatMap(List::stream)
+ .filter(quadFilter(subject, predicate, object))
+ .map(factory::createTriple);
}
@Override
- public void remove(Triple triple) {
- remove(triple.getSubject(), triple.getPredicate(), triple.getObject());
+ JsonLdTriple asTripleOrQuad(com.github.jsonldjava.core.RDFDataset.Quad jsonldQuad) {
+ return factory.createTriple(jsonldQuad);
}
-
+
@Override
public long size() {
- if (! unionGraph) {
- return rdfDataSet.getQuads("@default").size();
- } else {
- // Summarize graph.size() for all graphs
- return rdfDataSet.graphNames().parallelStream().map(rdfDataSet::getQuads).collect(Collectors.summingLong(List::size));
- }
- }
-
- private Predicate<? super Quad> quadFilter(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- Optional<Node> subjectNode = Optional.ofNullable(subject).map(factory::asJsonLdNode);
- Optional<Node> predicateNode = Optional.ofNullable(predicate).map(factory::asJsonLdNode);
- Optional<Node> objectNode = Optional.ofNullable(object).map(factory::asJsonLdNode);
-
- return q -> {
- if (subjectNode.isPresent() && subjectNode.get().compareTo(q.getSubject()) != 0) {
- return false;
- }
- if (predicateNode.isPresent() && predicateNode.get().compareTo(q.getPredicate()) != 0) {
- return false;
- }
- if (objectNode.isPresent() && objectNode.get().compareTo(q.getObject()) != 0) {
- return false;
- }
- return true;
- };
+ String g = graphName.map(this::asJsonLdString).orElse("@default");
+ return Optional.ofNullable(rdfDataSet.getQuads(g))
+ .map(List::size).orElse(0);
}
}
+
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/1330627e/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
new file mode 100644
index 0000000..1da7506
--- /dev/null
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
@@ -0,0 +1,239 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.rdf.jsonldjava;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.commons.rdf.api.BlankNode;
+import org.apache.commons.rdf.api.BlankNodeOrIRI;
+import org.apache.commons.rdf.api.GraphLike;
+import org.apache.commons.rdf.api.IRI;
+import org.apache.commons.rdf.api.Literal;
+import org.apache.commons.rdf.api.RDFTerm;
+// NOTE: To avod confusion, don't importing either of the Quad
+import org.apache.commons.rdf.api.Triple;
+import org.apache.commons.rdf.api.TripleLike;
+
+import com.github.jsonldjava.core.RDFDataset;
+import com.github.jsonldjava.core.RDFDataset.Node;
+import com.github.jsonldjava.core.RDFDataset.Quad;
+
+abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm>>
+ implements GraphLike<T, BlankNodeOrIRI, IRI, RDFTerm> {
+
+ /**
+ * Used by {@link #bnodePrefix()} to get a unique UUID per JVM run
+ */
+ private static UUID SALT = UUID.randomUUID();
+
+ /**
+ * The underlying JSON-LD {@link RDFDataset}.
+ */
+ RDFDataset rdfDataSet;
+
+ /**
+ * Prefix to use in blank node identifiers
+ */
+ final String bnodePrefix;
+
+ protected JsonLdRDFTermFactory factory;
+
+ JsonLdGraphLike(String bnodePrefix) {
+ this(new RDFDataset(), bnodePrefix);
+ }
+
+ JsonLdGraphLike(RDFDataset rdfDataSet) {
+ this(rdfDataSet, "urn:uuid:" + SALT + "#" + "g"+ System.identityHashCode(rdfDataSet));
+ }
+
+ JsonLdGraphLike(RDFDataset rdfDataset, String bnodePrefix) {
+ rdfDataSet = rdfDataset;
+ this.bnodePrefix = bnodePrefix;
+ this.factory = new JsonLdRDFTermFactory(bnodePrefix);
+ }
+
+ public RDFDataset getRdfDataSet() {
+ return rdfDataSet;
+ }
+
+ @Override
+ public void add(T tripleOrQuad) {
+ String g = graphNameAsJsonLdString(tripleOrQuad);
+
+ String s = asJsonLdString(tripleOrQuad.getSubject());
+ String p = asJsonLdString(tripleOrQuad.getPredicate());
+
+ if (tripleOrQuad.getObject() instanceof BlankNodeOrIRI) {
+ String o = asJsonLdString((BlankNodeOrIRI)tripleOrQuad.getObject());
+ rdfDataSet.addQuad(s,p,o,g);
+ } else if(tripleOrQuad.getObject() instanceof Literal) {
+ Literal literal = (Literal) tripleOrQuad.getObject();
+ String language = literal.getLanguageTag().orElse(null);
+ String datatype = literal.getDatatype().getIRIString();
+ rdfDataSet.addQuad(s,p,literal.getLexicalForm(), datatype, language, g);
+ }
+ }
+
+ void add(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ String g = asJsonLdString(graphName);
+ String s = asJsonLdString(subject);
+ String p = asJsonLdString(predicate);
+ if (object instanceof BlankNodeOrIRI) {
+ String o = asJsonLdString((BlankNodeOrIRI)object);
+ rdfDataSet.addQuad(s,p,o,g);
+ } else if(object instanceof Literal) {
+ Literal literal = (Literal) object;
+ String language = literal.getLanguageTag().orElse(null);
+ String datatype = literal.getDatatype().getIRIString();
+ rdfDataSet.addQuad(s,p,literal.getLexicalForm(), datatype, language, g);
+ }
+ }
+
+
+ private String graphNameAsJsonLdString(T tripleOrQuad) {
+ if (tripleOrQuad instanceof org.apache.commons.rdf.api.Quad) {
+ org.apache.commons.rdf.api.Quad quad = (org.apache.commons.rdf.api.Quad)tripleOrQuad;
+ return quad.getGraphName().map(this::asJsonLdString).orElse("@default");
+ }
+ return "@default";
+ }
+
+ protected String asJsonLdString(BlankNodeOrIRI blankNodeOrIRI) {
+ if (blankNodeOrIRI == null) {
+ return null;
+ }
+ if (blankNodeOrIRI instanceof IRI) {
+ return ((IRI)blankNodeOrIRI).getIRIString();
+ } else if (blankNodeOrIRI instanceof BlankNode) {
+ BlankNode blankNode = (BlankNode) blankNodeOrIRI;
+ String ref = blankNode.uniqueReference();
+ if (ref.startsWith(bnodePrefix)) {
+ // One of ours (but possibly not a JsonLdBlankNode) -
+ // we can use the suffix directly
+ return ref.replace(bnodePrefix, "_:");
+ } else {
+ // Map to unique bnode identifier, e.g. _:0dbd92ee-ab1a-45e7-bba2-7ade54f87ec5
+ UUID uuid = UUID.nameUUIDFromBytes(ref.getBytes(StandardCharsets.UTF_8));
+ return "_:"+ uuid;
+ }
+ } else {
+ throw new IllegalArgumentException("Expected a BlankNode or IRI, not: " + blankNodeOrIRI);
+ }
+ }
+
+ @Override
+ public void clear() {
+ rdfDataSet.clear();
+ }
+
+ public void close() {
+ // Drop the memory reference, but don't clear it
+ rdfDataSet = null;
+ }
+
+ @Override
+ public boolean contains(T tripleOrQuad) {
+ return stream().anyMatch(Predicate.isEqual(tripleOrQuad));
+ }
+
+
+ // This will be made public in JsonLdDataset
+ // and is used by the other methods.
+ boolean contains(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI s, IRI p, RDFTerm o) {
+ return filteredGraphs(graphName).flatMap(List::stream).anyMatch(quadFilter(s,p,o));
+ }
+
+ /**
+ * Convert JsonLd Quad to a Commons RDF {@link Triple} or {@link org.apache.commons.rdf.api.Quad}
+ *
+ *
+ * @see JsonLdRDFTermFactory#createTriple(Quad)
+ * @see JsonLdRDFTermFactory#createQuad(Quad)
+ * @param jsonldQuad jsonld quad to convert
+ * @return converted {@link TripleLike}
+ */
+ abstract T asTripleOrQuad(RDFDataset.Quad jsonldQuad);
+
+ @Override
+ public Stream<? extends T> stream() {
+ return rdfDataSet.graphNames().parallelStream()
+ .map(rdfDataSet::getQuads)
+ .flatMap(List<RDFDataset.Quad>::parallelStream)
+ .map(this::asTripleOrQuad);
+ }
+
+ @Override
+ public void remove(T t) {
+ if (t instanceof org.apache.commons.rdf.api.Quad) {
+ org.apache.commons.rdf.api.Quad q = (org.apache.commons.rdf.api.Quad) t;
+ remove(q.getGraphName(), q.getSubject(), q.getPredicate(), q.getObject());
+ } else {
+ remove(Optional.empty(), t.getSubject(), t.getPredicate(), t.getObject());
+ }
+ }
+
+ // This will be made public in JsonLdDataset
+ // and is used by the other remove methods.
+ void remove(Optional<BlankNodeOrIRI> graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ // remove the quads which match our filter (which could have nulls as wildcards)
+ filteredGraphs(graphName).forEach(t -> t.removeIf(quadFilter(subject, predicate, object)));
+ }
+
+ Stream<List<Quad>> filteredGraphs(Optional<BlankNodeOrIRI> graphName) {
+ return rdfDataSet.graphNames().parallelStream()
+ // if graphName == null (wildcard), select all graphs,
+ // otherwise check its jsonld string
+ // (including @default for default graph)
+ .filter(g -> graphName == null ||
+ g.equals(graphName.map(this::asJsonLdString).orElse("@default")))
+ // remove the quads which match our filter (which could have nulls as wildcards)
+ .map(rdfDataSet::getQuads);
+ }
+
+
+ Predicate<RDFDataset.Quad> quadFilter(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ Optional<Node> subjectNode = Optional.ofNullable(subject).map(factory::asJsonLdNode);
+ Optional<Node> predicateNode = Optional.ofNullable(predicate).map(factory::asJsonLdNode);
+ Optional<Node> objectNode = Optional.ofNullable(object).map(factory::asJsonLdNode);
+
+ return q -> {
+ if (subjectNode.isPresent() && subjectNode.get().compareTo(q.getSubject()) != 0) {
+ return false;
+ }
+ if (predicateNode.isPresent() && predicateNode.get().compareTo(q.getPredicate()) != 0) {
+ return false;
+ }
+ if (objectNode.isPresent() && objectNode.get().compareTo(q.getObject()) != 0) {
+ return false;
+ }
+ return true;
+ };
+ }
+
+ @Override
+ public long size() {
+ return rdfDataSet.graphNames().parallelStream().map(rdfDataSet::getQuads).collect(Collectors.summingLong(List::size));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/1330627e/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
index 607e319..be271ea 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
@@ -17,30 +17,32 @@
*/
package org.apache.commons.rdf.jsonldjava;
+import java.nio.charset.StandardCharsets;
import java.util.UUID;
import org.apache.commons.rdf.api.BlankNode;
import org.apache.commons.rdf.api.BlankNodeOrIRI;
+import org.apache.commons.rdf.api.Dataset;
import org.apache.commons.rdf.api.Graph;
import org.apache.commons.rdf.api.IRI;
import org.apache.commons.rdf.api.Literal;
import org.apache.commons.rdf.api.QuadLike;
import org.apache.commons.rdf.api.RDFTerm;
import org.apache.commons.rdf.api.RDFTermFactory;
-import org.apache.commons.rdf.api.Triple;
import org.apache.commons.rdf.api.TripleLike;
-import org.apache.commons.rdf.simple.Types;
import org.apache.commons.rdf.jsonldjava.JsonLdBlankNode.JsonLdBlankNodeImpl;
-import org.apache.commons.rdf.jsonldjava.JsonLdTriple.JsonLdTripleImpl;
-import org.apache.commons.rdf.jsonldjava.JsonLdQuad.JsonLdQuadImpl;
import org.apache.commons.rdf.jsonldjava.JsonLdLiteral.JsonLdLiteralImpl;
+import org.apache.commons.rdf.jsonldjava.JsonLdQuad.JsonLdQuadImpl;
+import org.apache.commons.rdf.jsonldjava.JsonLdTriple.JsonLdTripleImpl;
+import org.apache.commons.rdf.simple.Types;
import com.github.jsonldjava.core.RDFDataset;
import com.github.jsonldjava.core.RDFDataset.Node;
-
public final class JsonLdRDFTermFactory implements RDFTermFactory {
+ private final String bnodePrefix;
+
public JsonLdRDFTermFactory() {
// An "outside Graph" bnodePrefix
this("urn:uuid:" + UUID.randomUUID() + "#b");
@@ -50,11 +52,14 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
this.bnodePrefix = bnodePrefix;
}
- String bnodePrefix;
-
@Override
public Graph createGraph() throws UnsupportedOperationException {
- return new JsonLdGraph();
+ return new JsonLdGraph(bnodePrefix);
+ }
+
+ @Override
+ public Dataset createDataset() throws UnsupportedOperationException {
+ return new JsonLdDataset(bnodePrefix);
}
@Override
@@ -71,7 +76,7 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
@Override
public JsonLdBlankNode createBlankNode(String name) {
String id = "_:" + name;
- // TODO: Check if name is valid JSON-LD BlankNode identifier
+ // TODO: Check if name is valid JSON-LD BlankNode identifier
return new JsonLdBlankNodeImpl(new RDFDataset.BlankNode(id), bnodePrefix);
}
@@ -80,10 +85,14 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
return new JsonLdTripleImpl(asJsonLdQuad(subject, predicate, object), bnodePrefix);
}
- public Triple asTriple(final RDFDataset.Quad quad) {
+ public JsonLdTriple createTriple(final RDFDataset.Quad quad) {
return new JsonLdTripleImpl(quad, bnodePrefix);
}
+ public JsonLdQuad createQuad(final RDFDataset.Quad quad) {
+ return new JsonLdQuadImpl(quad, bnodePrefix);
+ }
+
@Override
public JsonLdQuad createQuad(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object)
throws IllegalArgumentException, UnsupportedOperationException {
@@ -91,18 +100,20 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
}
@Override
- public JsonLdLiteral createLiteral(String literal) {
+ public JsonLdLiteral createLiteral(String literal) {
return new JsonLdLiteralImpl(new RDFDataset.Literal(literal, null, null));
}
+
@Override
public JsonLdLiteral createLiteral(String literal, IRI dataType) {
- return new JsonLdLiteralImpl(new RDFDataset.Literal(literal, dataType.getIRIString(), null)); }
+ return new JsonLdLiteralImpl(new RDFDataset.Literal(literal, dataType.getIRIString(), null));
+ }
+
@Override
public JsonLdLiteral createLiteral(String literal, String language) {
- return new JsonLdLiteralImpl(new RDFDataset.Literal(literal, Types.RDF_LANGSTRING.getIRIString(), language));
+ return new JsonLdLiteralImpl(new RDFDataset.Literal(literal, Types.RDF_LANGSTRING.getIRIString(), language));
}
-
public Node asJsonLdNode(RDFTerm term) {
if (term instanceof JsonLdTerm) {
// Return original Node
@@ -113,13 +124,16 @@ public final class JsonLdRDFTermFactory implements RDFTermFactory {
}
if (term instanceof BlankNode) {
- String uniqueReference = ((BlankNode)term).uniqueReference();
- if (uniqueReference.startsWith(bnodePrefix)) {
- // one of our own
- // TODO: Retrieve the original BlankNode
- return new RDFDataset.BlankNode(term.ntriplesString());
+ String ref = ((BlankNode)term).uniqueReference();
+ if (ref.startsWith(bnodePrefix)) {
+ // one of our own (but no longer a JsonLdBlankNode),
+ // we can recover the label after our unique prefix
+ return new RDFDataset.BlankNode(ref.replace(bnodePrefix, ""));
}
- return new RDFDataset.BlankNode( "_:" + uniqueReference );
+ // The "foreign" unique reference might not be a valid bnode string,
+ // we'll convert to a UUID
+ UUID uuid = UUID.nameUUIDFromBytes(ref.getBytes(StandardCharsets.UTF_8));
+ return new RDFDataset.BlankNode( "_:" + uuid );
}
if (term instanceof Literal) {
Literal literal = (Literal) term;
[37/50] incubator-commonsrdf git commit: Updated for latest
RDFPArserBuilder
Posted by st...@apache.org.
Updated for latest RDFPArserBuilder
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/3d63a0e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/3d63a0e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/3d63a0e0
Branch: refs/heads/master
Commit: 3d63a0e0fdd50843c342e516514a528bc3316874
Parents: 7010541
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Sep 9 17:14:26 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Sep 9 17:14:26 2016 +0100
----------------------------------------------------------------------
.../rdf/jsonldjava/JsonLdParserBuilder.java | 66 ++++++++++++++------
.../rdf/jsonldjava/JsonLdRDFTermFactory.java | 2 +-
2 files changed, 47 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/3d63a0e0/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
index d609aa8..e38af2c 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
@@ -26,11 +26,10 @@ import java.net.URL;
import java.nio.file.Files;
import java.util.function.Predicate;
+import org.apache.commons.rdf.api.Dataset;
import org.apache.commons.rdf.api.Graph;
import org.apache.commons.rdf.api.IRI;
-import org.apache.commons.rdf.api.RDFParserBuilder;
import org.apache.commons.rdf.api.RDFSyntax;
-import org.apache.commons.rdf.api.RDFTermFactory;
import org.apache.commons.rdf.simple.AbstractRDFParserBuilder;
import com.github.jsonldjava.core.JsonLdError;
@@ -39,15 +38,15 @@ import com.github.jsonldjava.core.JsonLdProcessor;
import com.github.jsonldjava.core.RDFDataset;
import com.github.jsonldjava.utils.JsonUtils;
-public class JsonLdParserBuilder extends AbstractRDFParserBuilder {
+public class JsonLdParserBuilder extends AbstractRDFParserBuilder<JsonLdParserBuilder> {
@Override
- protected RDFTermFactory createRDFTermFactory() {
+ protected JsonLdRDFTermFactory createRDFTermFactory() {
return new JsonLdRDFTermFactory();
}
@Override
- public RDFParserBuilder contentType(RDFSyntax rdfSyntax) throws IllegalArgumentException {
+ public JsonLdParserBuilder contentType(RDFSyntax rdfSyntax) throws IllegalArgumentException {
if (rdfSyntax != null && rdfSyntax != RDFSyntax.JSONLD) {
throw new IllegalArgumentException("Unsupported contentType: " + rdfSyntax);
}
@@ -55,7 +54,7 @@ public class JsonLdParserBuilder extends AbstractRDFParserBuilder {
}
@Override
- public RDFParserBuilder contentType(String contentType) throws IllegalArgumentException {
+ public JsonLdParserBuilder contentType(String contentType) throws IllegalArgumentException {
JsonLdParserBuilder c = (JsonLdParserBuilder) super.contentType(contentType);
if (c.getContentType().filter(Predicate.isEqual(RDFSyntax.JSONLD).negate()).isPresent()) {
throw new IllegalArgumentException("Unsupported contentType: " + contentType);
@@ -79,7 +78,7 @@ public class JsonLdParserBuilder extends AbstractRDFParserBuilder {
}
@Override
- protected void parseSynchronusly() throws IOException, RDFParseException {
+ protected void parseSynchronusly() throws IOException {
Object json = readSource();
JsonLdOptions options = new JsonLdOptions();
getBase().map(IRI::getIRIString).ifPresent(options::setBase);
@@ -91,23 +90,50 @@ public class JsonLdParserBuilder extends AbstractRDFParserBuilder {
try {
rdfDataset = (RDFDataset) JsonLdProcessor.toRDF(json, options);
} catch (JsonLdError e) {
- throw new RDFParseException(e);
- }
- Graph intoGraph = getIntoGraph().get();
- if (intoGraph instanceof JsonLdGraph && ! intoGraph.contains(null, null, null)) {
- // Empty graph, we can just move over the map content directly:
- JsonLdGraph jsonLdGraph = (JsonLdGraph) intoGraph;
- jsonLdGraph.getRdfDataSet().putAll(rdfDataset);
- } else {
+ throw new IOException("Could not parse Json-LD", e);
+ }
+ if (getTargetGraph().isPresent()) {
+ Graph intoGraph = getTargetGraph().get();
+ if (intoGraph instanceof JsonLdGraph && ! intoGraph.contains(null, null, null)) {
+ // Empty graph, we can just move over the map content directly:
+ JsonLdGraph jsonLdGraph = (JsonLdGraph) intoGraph;
+ jsonLdGraph.getRdfDataSet().putAll(rdfDataset);
+ return;
+ // otherwise we have to merge as normal
+ }
// TODO: Modify JsonLdProcessor to have an actual triple callback
- try (JsonLdGraph parsedGraph = new JsonLdGraph(rdfDataset)) {
- // sequential() as we don't know if intoGraph is thread safe :-/
- parsedGraph.stream().sequential().forEach(intoGraph::add);
- }
+ Graph parsedGraph = getJsonLdRDFTermFactory().asGraph(rdfDataset);
+ // sequential() as we don't know if destination is thread safe :-/
+ parsedGraph.stream().sequential().forEach(intoGraph::add);
+ } else if (getTargetDataset().isPresent()) {
+ Dataset intoDataset = getTargetDataset().get();
+ if (intoDataset instanceof JsonLdDataset &&
+ ! intoDataset.contains(null, null, null, null)) {
+ JsonLdDataset jsonLdDataset = (JsonLdDataset) intoDataset;
+ // Empty - we can just do a brave replace!
+ jsonLdDataset.getRdfDataSet().putAll(rdfDataset);
+ return;
+ // otherwise we have to merge.. but also avoid duplicate triples,
+ // map blank nodes etc, so we'll fall back to normal Dataset appending.
+ }
+ Dataset fromDataset = getJsonLdRDFTermFactory().asDataset(rdfDataset);
+ // .sequential() as we don't know if destination is thread-safe :-/
+ fromDataset.stream().sequential().forEach(intoDataset::add);
+ } else {
+ Dataset fromDataset = getJsonLdRDFTermFactory().asDataset(rdfDataset);
+ // No need for .sequential() here
+ fromDataset.stream().forEach(getTarget());
}
}
- private Object readSource() throws IOException, RDFParseException {
+ private JsonLdRDFTermFactory getJsonLdRDFTermFactory() {
+ if (getRdfTermFactory().isPresent() && getRdfTermFactory().get() instanceof JsonLdRDFTermFactory) {
+ return (JsonLdRDFTermFactory) getRdfTermFactory().get();
+ }
+ return createRDFTermFactory();
+ }
+
+ private Object readSource() throws IOException {
// Due to checked IOException we can't easily
// do this with .map and .orElseGet()
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/3d63a0e0/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
index fa60213..4a05724 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDFTermFactory.java
@@ -41,7 +41,7 @@ import com.github.jsonldjava.core.RDFDataset.Node;
public final class JsonLdRDFTermFactory implements RDFTermFactory {
- private final String bnodePrefix;
+ final String bnodePrefix;
public JsonLdRDFTermFactory() {
// An "outside Graph" bnodePrefix
[50/50] incubator-commonsrdf git commit: COMMONSRDF-36 add
jsonld-java support
Posted by st...@apache.org.
COMMONSRDF-36 add jsonld-java support
Merge branch 'jsonld-java'
This closes #22
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/0beee9d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/0beee9d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/0beee9d8
Branch: refs/heads/master
Commit: 0beee9d853a29a8ef6df58163b404650f698d40b
Parents: e9b52eb 11a6a33
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Oct 3 14:51:13 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Oct 3 14:51:13 2016 +0100
----------------------------------------------------------------------
jsonld-java/pom.xml | 67 ++++
.../commons/rdf/jsonldjava/JsonLdBlankNode.java | 62 ++++
.../commons/rdf/jsonldjava/JsonLdDataset.java | 115 +++++++
.../commons/rdf/jsonldjava/JsonLdGraph.java | 118 +++++++
.../commons/rdf/jsonldjava/JsonLdGraphLike.java | 220 +++++++++++++
.../commons/rdf/jsonldjava/JsonLdIRI.java | 64 ++++
.../commons/rdf/jsonldjava/JsonLdLiteral.java | 99 ++++++
.../commons/rdf/jsonldjava/JsonLdQuad.java | 66 ++++
.../commons/rdf/jsonldjava/JsonLdQuadLike.java | 75 +++++
.../rdf/jsonldjava/JsonLdRDFTermFactory.java | 306 +++++++++++++++++++
.../commons/rdf/jsonldjava/JsonLdTerm.java | 44 +++
.../commons/rdf/jsonldjava/JsonLdTriple.java | 61 ++++
.../rdf/jsonldjava/JsonLdUnionGraph.java | 118 +++++++
.../jsonldjava/experimental/JsonLdParser.java | 160 ++++++++++
.../jsonldjava/experimental/package-info.java | 34 +++
.../commons/rdf/jsonldjava/package-info.java | 27 ++
.../org.apache.commons.rdf.api.RDFTermFactory | 1 +
jsonld-java/src/main/resources/test.jsonld | 26 ++
.../rdf/jsonldjava/JsonLdBlankNodeTest.java | 24 ++
.../commons/rdf/jsonldjava/JsonLdGraphTest.java | 31 ++
.../rdf/jsonldjava/JsonLdParserBuilderTest.java | 127 ++++++++
.../jsonldjava/JsonLdRDFTermFactoryTest.java | 54 ++++
pom.xml | 14 +
23 files changed, 1913 insertions(+)
----------------------------------------------------------------------
[09/50] incubator-commonsrdf git commit: make bnodePrefix public
Posted by st...@apache.org.
make bnodePrefix public
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/b2aacd2a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/b2aacd2a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/b2aacd2a
Branch: refs/heads/master
Commit: b2aacd2aefc508dd904a9d2b3aa94de43acd3792
Parents: 0ce530f
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Apr 8 11:59:48 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Apr 8 11:59:48 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/b2aacd2a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
index 4df85e2..194479c 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
@@ -216,7 +216,7 @@ public class JsonLdGraph implements Graph {
return new JsonLdTriple(quad, bnodePrefix());
}
- private String bnodePrefix() {
+ public String bnodePrefix() {
return "urn:uuid:" + SALT + "#" + "g"+ System.identityHashCode(rdfDataSet);
}
[33/50] incubator-commonsrdf git commit: asJsonLdString moved to
JsonLdRDFTermFactory
Posted by st...@apache.org.
asJsonLdString moved to JsonLdRDFTermFactory
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/44a40d32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/44a40d32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/44a40d32
Branch: refs/heads/master
Commit: 44a40d3252ff5bc0b4f8733e7f9f33431243805c
Parents: 02db403
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Sep 9 16:22:11 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Sep 9 16:22:11 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jsonldjava/JsonLdGraph.java | 2 +-
.../commons/rdf/jsonldjava/JsonLdGraphLike.java | 78 ++++++--------------
2 files changed, 24 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/44a40d32/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
index a07f9b1..3b35c76 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraph.java
@@ -92,7 +92,7 @@ class JsonLdGraph extends JsonLdGraphLike<org.apache.commons.rdf.api.Triple> imp
@Override
public long size() {
- String g = graphName.map(this::asJsonLdString).orElse("@default");
+ String g = graphName.map(factory::asJsonLdString).orElse("@default");
return Optional.ofNullable(rdfDataSet.getQuads(g))
.map(List::size).orElse(0);
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/44a40d32/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
index 81f2ee7..cb8e568 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdGraphLike.java
@@ -17,7 +17,6 @@
*/
package org.apache.commons.rdf.jsonldjava;
-import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
@@ -25,7 +24,6 @@ import java.util.UUID;
import java.util.function.Predicate;
import java.util.stream.Stream;
-import org.apache.commons.rdf.api.BlankNode;
import org.apache.commons.rdf.api.BlankNodeOrIRI;
import org.apache.commons.rdf.api.GraphLike;
import org.apache.commons.rdf.api.IRI;
@@ -37,7 +35,6 @@ import org.apache.commons.rdf.api.TripleLike;
import com.github.jsonldjava.core.RDFDataset;
import com.github.jsonldjava.core.RDFDataset.Node;
-import com.github.jsonldjava.core.RDFDataset.Quad;
/**
* Common abstract {@link GraphLike}.
@@ -84,22 +81,31 @@ abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm
}
@Override
- public void add(T tripleOrQuad) {
- String g = graphNameAsJsonLdString(tripleOrQuad);
- String s = asJsonLdString(tripleOrQuad.getSubject());
- String p = asJsonLdString(tripleOrQuad.getPredicate());
-
- if (tripleOrQuad.getObject() instanceof BlankNodeOrIRI) {
- String o = asJsonLdString((BlankNodeOrIRI)tripleOrQuad.getObject());
+ public void add(T t) {
+ // add triples to default graph by default
+ BlankNodeOrIRI graphName = null;
+ if (t instanceof org.apache.commons.rdf.api.Quad) {
+ org.apache.commons.rdf.api.Quad q = (org.apache.commons.rdf.api.Quad)t;
+ graphName = q.getGraphName().orElse(null);
+ }
+ add(graphName, t.getSubject(), t.getPredicate(), t.getObject());
+ }
+
+ void add(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
+ String g = factory.asJsonLdString(graphName);
+ String s = factory.asJsonLdString(subject);
+ String p = factory.asJsonLdString(predicate);
+ if (object instanceof BlankNodeOrIRI) {
+ String o = factory.asJsonLdString((BlankNodeOrIRI)object);
rdfDataSet.addQuad(s,p,o,g);
- } else if(tripleOrQuad.getObject() instanceof Literal) {
- Literal literal = (Literal) tripleOrQuad.getObject();
+ } else if(object instanceof Literal) {
+ Literal literal = (Literal) object;
String language = literal.getLanguageTag().orElse(null);
String datatype = literal.getDatatype().getIRIString();
rdfDataSet.addQuad(s,p,literal.getLexicalForm(), datatype, language, g);
- }
+ }
}
-
+
public void close() {
// Drop the memory reference, but don't clear it
rdfDataSet = null;
@@ -133,44 +139,6 @@ abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm
.map(this::asTripleOrQuad);
}
- void add(BlankNodeOrIRI graphName, BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- String g = asJsonLdString(graphName);
- String s = asJsonLdString(subject);
- String p = asJsonLdString(predicate);
- if (object instanceof BlankNodeOrIRI) {
- String o = asJsonLdString((BlankNodeOrIRI)object);
- rdfDataSet.addQuad(s,p,o,g);
- } else if(object instanceof Literal) {
- Literal literal = (Literal) object;
- String language = literal.getLanguageTag().orElse(null);
- String datatype = literal.getDatatype().getIRIString();
- rdfDataSet.addQuad(s,p,literal.getLexicalForm(), datatype, language, g);
- }
- }
-
- String asJsonLdString(BlankNodeOrIRI blankNodeOrIRI) {
- if (blankNodeOrIRI == null) {
- return null;
- }
- if (blankNodeOrIRI instanceof IRI) {
- return ((IRI)blankNodeOrIRI).getIRIString();
- } else if (blankNodeOrIRI instanceof BlankNode) {
- BlankNode blankNode = (BlankNode) blankNodeOrIRI;
- String ref = blankNode.uniqueReference();
- if (ref.startsWith(bnodePrefix)) {
- // One of ours (but possibly not a JsonLdBlankNode) -
- // we can use the suffix directly
- return ref.replace(bnodePrefix, "_:");
- } else {
- // Map to unique bnode identifier, e.g. _:0dbd92ee-ab1a-45e7-bba2-7ade54f87ec5
- UUID uuid = UUID.nameUUIDFromBytes(ref.getBytes(StandardCharsets.UTF_8));
- return "_:"+ uuid;
- }
- } else {
- throw new IllegalArgumentException("Expected a BlankNode or IRI, not: " + blankNodeOrIRI);
- }
- }
-
/**
* Convert JsonLd Quad to a Commons RDF {@link Triple} or {@link org.apache.commons.rdf.api.Quad}
*
@@ -188,13 +156,13 @@ abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm
return filteredGraphs(graphName).flatMap(List::stream).anyMatch(quadFilter(s,p,o));
}
- Stream<List<Quad>> filteredGraphs(Optional<BlankNodeOrIRI> graphName) {
+ Stream<List<RDFDataset.Quad>> filteredGraphs(Optional<BlankNodeOrIRI> graphName) {
return rdfDataSet.graphNames().parallelStream()
// if graphName == null (wildcard), select all graphs,
// otherwise check its jsonld string
// (including @default for default graph)
.filter(g -> graphName == null ||
- g.equals(graphName.map(this::asJsonLdString).orElse("@default")))
+ g.equals(graphName.map(factory::asJsonLdString).orElse("@default")))
// remove the quads which match our filter (which could have nulls as wildcards)
.map(rdfDataSet::getQuads);
}
@@ -202,7 +170,7 @@ abstract class JsonLdGraphLike<T extends TripleLike<BlankNodeOrIRI, IRI, RDFTerm
String graphNameAsJsonLdString(T tripleOrQuad) {
if (tripleOrQuad instanceof org.apache.commons.rdf.api.Quad) {
org.apache.commons.rdf.api.Quad quad = (org.apache.commons.rdf.api.Quad)tripleOrQuad;
- return quad.getGraphName().map(this::asJsonLdString).orElse("@default");
+ return quad.getGraphName().map(factory::asJsonLdString).orElse("@default");
}
return "@default";
}
[14/50] incubator-commonsrdf git commit: Test jsonld parser
Posted by st...@apache.org.
Test jsonld parser
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/0d6a0f82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/0d6a0f82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/0d6a0f82
Branch: refs/heads/master
Commit: 0d6a0f8285d1cb8c4aafdcfb7519bcad246685b8
Parents: 7cb7ecb
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Apr 12 17:17:18 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Apr 12 17:20:23 2016 +0100
----------------------------------------------------------------------
.../rdf/jsonldjava/JsonLdParserBuilder.java | 9 +----
jsonld-java/src/main/resources/test.jsonld | 26 ++++++++++++++
.../rdf/jsonldjava/JsonLdParserBuilderTest.java | 36 ++++++++++++++++++++
3 files changed, 63 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/0d6a0f82/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
index ff9131e..0eeeeba 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilder.java
@@ -43,14 +43,7 @@ public class JsonLdParserBuilder extends AbstractRDFParserBuilder {
@Override
protected RDFTermFactory createRDFTermFactory() {
- if (getIntoGraph().map(x -> x instanceof JsonLdGraph).orElse(true)) {
- JsonLdGraph graph = (JsonLdGraph) getIntoGraph().get();
- return new JsonLdRDFTermFactory(graph.bnodePrefix());
- } else {
- // other kind of intoGraph - we'll let SimpleRDFTermFactory
- // do the job slightly more efficiently instead
- return super.createRDFTermFactory();
- }
+ return new JsonLdRDFTermFactory();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/0d6a0f82/jsonld-java/src/main/resources/test.jsonld
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/resources/test.jsonld b/jsonld-java/src/main/resources/test.jsonld
new file mode 100644
index 0000000..cc10bdb
--- /dev/null
+++ b/jsonld-java/src/main/resources/test.jsonld
@@ -0,0 +1,26 @@
+{ "http://purl.org/dc/elements/1.1/rights": "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the 'License'); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ",
+ "@context": {
+ "xsd": "http://www.w3.org/2001/XMLSchema#",
+ "pred1": "http://example.com/pred1",
+ "pred2": { "@id": "http://example.com/pred2",
+ "@type": "@id" },
+ "pred3": { "@id": "http://example.com/pred3",
+ "@type": "xsd:integer" },
+ "pred4": { "@id": "http://example.com/pred4",
+ "@type": "@id" },
+ "Type": "http://example.com/Type"
+ } ,
+ "@id": "http://example.com/test",
+ "@type": "Type",
+ "pred1": "Hello",
+ "pred2": "http://example.com/other",
+ "pred3": 1337,
+ "pred4": { "@id": "http://example.com/graph",
+ "@graph": [
+ { "@id": "http://example.com/test",
+ "pred1": "Other value",
+ "pred2": "http://example.com/graph"
+ }
+ ]
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/0d6a0f82/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
new file mode 100644
index 0000000..df8511c
--- /dev/null
+++ b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdParserBuilderTest.java
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.rdf.jsonldjava;
+
+import java.net.URL;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.commons.rdf.api.Graph;
+import org.apache.commons.rdf.api.IRI;
+import org.apache.commons.rdf.api.RDFSyntax;
+import org.junit.Test;
+
+public class JsonLdParserBuilderTest {
+ @Test
+ public void parseByUrl() throws Exception {
+ URL url = getClass().getResource("/test.jsonld");
+ IRI iri = new JsonLdRDFTermFactory().createIRI(url.toString());
+ Graph g = new JsonLdParserBuilder().contentType(RDFSyntax.JSONLD).source(iri).parse().get(10, TimeUnit.SECONDS);
+ System.out.println(g);
+ }
+}