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/11/04 09:02:01 UTC
[1/5] incubator-commonsrdf git commit: Avoid concurrency issues in
JsonLdDataset.size()
Repository: incubator-commonsrdf
Updated Branches:
refs/heads/master 89f532838 -> c6fe35a03
Avoid concurrency issues in JsonLdDataset.size()
Added JsonLdDatasetTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/ecdcd231
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/ecdcd231
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/ecdcd231
Branch: refs/heads/master
Commit: ecdcd23169d983ec19d592a7925268984993197d
Parents: 89f5328
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Nov 4 09:21:21 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Nov 4 09:22:29 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jsonldjava/JsonLdDataset.java | 2 +-
.../rdf/jsonldjava/JsonLdDatasetTest.java | 30 ++++++++++++++++++++
2 files changed, 31 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/ecdcd231/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 72aadc2..b191745 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
@@ -98,7 +98,7 @@ class JsonLdDatasetImpl extends AbstractJsonLdGraphLike<org.apache.commons.rdf.a
@Override
public long size() {
- return rdfDataSet.graphNames().parallelStream().map(rdfDataSet::getQuads)
+ return rdfDataSet.graphNames().stream().map(rdfDataSet::getQuads)
.collect(Collectors.summingLong(List::size));
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/ecdcd231/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdDatasetTest.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdDatasetTest.java b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdDatasetTest.java
new file mode 100644
index 0000000..d5e6309
--- /dev/null
+++ b/jsonld-java/src/test/java/org/apache/commons/rdf/jsonldjava/JsonLdDatasetTest.java
@@ -0,0 +1,30 @@
+/**
+ * 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.AbstractDatasetTest;
+import org.apache.commons.rdf.api.RDF;
+
+public class JsonLdDatasetTest extends AbstractDatasetTest {
+
+ @Override
+ public RDF createFactory() {
+ return new JsonLdRDF();
+ }
+
+}
[4/5] incubator-commonsrdf git commit: JsonLdDataset - Correct
getGraph()
Posted by st...@apache.org.
JsonLdDataset - Correct getGraph()
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/5cd68e67
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/5cd68e67
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/5cd68e67
Branch: refs/heads/master
Commit: 5cd68e6742e906e0681466082bbcae9399d32cb5
Parents: 2e5cf8f
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Nov 4 10:01:29 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Nov 4 10:01:29 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/commons/rdf/jsonldjava/JsonLdDataset.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/5cd68e67/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 b191745..6b65ab5 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
@@ -69,7 +69,8 @@ class JsonLdDatasetImpl extends AbstractJsonLdGraphLike<org.apache.commons.rdf.a
if (graphName == null) {
return Optional.of(getGraph());
}
- return getGraphNames().map(g -> (Graph) new JsonLdGraphImpl(rdfDataSet, Optional.of(g), bnodePrefix)).findAny();
+
+ return Optional.of(new JsonLdGraphImpl(rdfDataSet, Optional.of(graphName), bnodePrefix));
}
@Override
[3/5] incubator-commonsrdf git commit: JsonLdTerm.toString()
Posted by st...@apache.org.
JsonLdTerm.toString()
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/2e5cf8f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/2e5cf8f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/2e5cf8f5
Branch: refs/heads/master
Commit: 2e5cf8f5a8df6beb73f80474e894978451e37569
Parents: 3abb1ab
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Nov 4 10:01:15 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Nov 4 10:01:15 2016 +0100
----------------------------------------------------------------------
.../org/apache/commons/rdf/jsonldjava/JsonLdBlankNode.java | 5 +++++
.../java/org/apache/commons/rdf/jsonldjava/JsonLdTerm.java | 6 ++++++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/2e5cf8f5/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 d3ac1f0..66c8cba 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
@@ -59,4 +59,9 @@ final class JsonLdBlankNodeImpl extends JsonLdTermImpl implements JsonLdBlankNod
public int hashCode() {
return uniqueReference().hashCode();
}
+
+ @Override
+ public String toString() {
+ return ntriplesString() + " [" + uniqueReference() + "]";
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/2e5cf8f5/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 722f440..ac279a5 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
@@ -41,4 +41,10 @@ abstract class JsonLdTermImpl implements JsonLdTerm {
public Node asJsonLdNode() {
return node;
}
+
+ @Override
+ public String toString() {
+ return ntriplesString();
+ }
+
}
[5/5] incubator-commonsrdf git commit: Avoid duplicate _:_:
Posted by st...@apache.org.
Avoid duplicate _:_:
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/c6fe35a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/c6fe35a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/c6fe35a0
Branch: refs/heads/master
Commit: c6fe35a035646612ab1025d78ba1250a9e925afc
Parents: 5cd68e6
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Nov 4 10:01:47 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Nov 4 10:01:47 2016 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/c6fe35a0/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java
----------------------------------------------------------------------
diff --git a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java
index 213f412..66b9f4b 100644
--- a/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java
+++ b/jsonld-java/src/main/java/org/apache/commons/rdf/jsonldjava/JsonLdRDF.java
@@ -279,7 +279,7 @@ public final class JsonLdRDF implements RDF {
if (ref.startsWith(bnodePrefix)) {
// One of ours (but possibly not a JsonLdBlankNode) -
// we can use the suffix directly
- return ref.replace(bnodePrefix, "_:");
+ return ref.replace(bnodePrefix, "");
} else {
// Map to unique bnode identifier, e.g.
// _:0dbd92ee-ab1a-45e7-bba2-7ade54f87ec5
[2/5] incubator-commonsrdf git commit: Avoid too much BlankNode
assumptions
Posted by st...@apache.org.
Avoid too much BlankNode assumptions
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/3abb1ab5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/3abb1ab5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/3abb1ab5
Branch: refs/heads/master
Commit: 3abb1ab52479f2855e4c778157f964af9b694f46
Parents: ecdcd23
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Nov 4 09:58:26 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Nov 4 09:58:26 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/api/AbstractDatasetTest.java | 22 ++++++++++++--------
1 file changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/3abb1ab5/api/src/test/java/org/apache/commons/rdf/api/AbstractDatasetTest.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org/apache/commons/rdf/api/AbstractDatasetTest.java b/api/src/test/java/org/apache/commons/rdf/api/AbstractDatasetTest.java
index 7f9219d..d4375f6 100644
--- a/api/src/test/java/org/apache/commons/rdf/api/AbstractDatasetTest.java
+++ b/api/src/test/java/org/apache/commons/rdf/api/AbstractDatasetTest.java
@@ -473,12 +473,12 @@ public abstract class AbstractDatasetTest {
public void getGraphNames() throws Exception {
Set<BlankNodeOrIRI> names = dataset.getGraphNames().collect(Collectors.toSet());
assertTrue("Can't find graph name " + graph1, names.contains(graph1));
+ assertTrue("Found no quads in graph1", dataset.contains(Optional.of(graph1), null, null, null));
Optional<BlankNodeOrIRI> graphName2 = dataset.getGraphNames().filter(BlankNode.class::isInstance).findAny();
assertTrue("Could not find graph2-like BlankNode", graphName2.isPresent());
- Graph g = dataset.getGraph(graphName2.get()).get();
- assertEquals(4, g.size());
-
+ assertTrue("Found no quads in graph2", dataset.contains(graphName2, null, null, null));
+
// Some implementations like Virtuoso might have additional internal graphs,
// so we can't assume this:
//assertEquals(2, names.size());
@@ -491,7 +491,7 @@ public abstract class AbstractDatasetTest {
assertEquals(2, defaultGraph.size());
assertTrue(defaultGraph.contains(alice, isPrimaryTopicOf, graph1));
// NOTE: graph2 is a BlankNode
- assertTrue(defaultGraph.contains(bob, isPrimaryTopicOf, graph2));
+ assertTrue(defaultGraph.contains(bob, isPrimaryTopicOf, null));
}
@@ -502,8 +502,8 @@ public abstract class AbstractDatasetTest {
// TODO: Can we assume the default graph was empty before our new triples?
assertEquals(2, defaultGraph.size());
assertTrue(defaultGraph.contains(alice, isPrimaryTopicOf, graph1));
- // NOTE: graph2 is a BlankNode
- assertTrue(defaultGraph.contains(bob, isPrimaryTopicOf, graph2));
+ // NOTE: wildcard as graph2 is a (potentially mapped) BlankNode
+ assertTrue(defaultGraph.contains(bob, isPrimaryTopicOf, null));
}
@@ -515,14 +515,18 @@ public abstract class AbstractDatasetTest {
assertTrue(g1.contains(alice, name, aliceName));
assertTrue(g1.contains(alice, knows, bob));
- assertTrue(g1.contains(alice, member, bnode1));
- assertTrue(g1.contains(bnode1, name, secretClubName));
+ assertTrue(g1.contains(alice, member, null));
+ assertTrue(g1.contains(null, name, secretClubName));
}
@Test
public void getGraph2() throws Exception {
// graph2 should be present, even if is named by a BlankNode
- Graph g2 = dataset.getGraph(graph2).get();
+ // We'll look up the potentially mapped graph2 blanknode
+ BlankNodeOrIRI graph2Name = (BlankNodeOrIRI) dataset.stream(Optional.empty(), bob, isPrimaryTopicOf, null)
+ .map(Quad::getObject).findAny().get();
+
+ Graph g2 = dataset.getGraph(graph2Name).get();
assertEquals(4, g2.size());
Triple bobNameTriple = bobNameQuad.asTriple();
assertTrue(g2.contains(bobNameTriple));