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/04/04 16:27:54 UTC
[1/2] incubator-commonsrdf git commit: graphToString is specific for
SimpleGraph
Repository: incubator-commonsrdf
Updated Branches:
refs/heads/jsonld-java 7e4cb373e -> 6c72b27a3
graphToString is specific for SimpleGraph
Also expose the test variables to subclasses
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/56617279
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/56617279
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/56617279
Branch: refs/heads/jsonld-java
Commit: 566172795f9b744e0bacb94677de124133db2e86
Parents: 7e4cb37
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Apr 4 15:26:53 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Apr 4 15:26:53 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/api/AbstractGraphTest.java | 42 +++++++-------------
.../commons/rdf/simple/SimpleGraphTest.java | 17 ++++++++
2 files changed, 32 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56617279/api/src/test/java/org/apache/commons/rdf/api/AbstractGraphTest.java
----------------------------------------------------------------------
diff --git a/api/src/test/java/org/apache/commons/rdf/api/AbstractGraphTest.java b/api/src/test/java/org/apache/commons/rdf/api/AbstractGraphTest.java
index eff542e..9029cc4 100644
--- a/api/src/test/java/org/apache/commons/rdf/api/AbstractGraphTest.java
+++ b/api/src/test/java/org/apache/commons/rdf/api/AbstractGraphTest.java
@@ -43,20 +43,20 @@ import org.junit.Test;
*/
public abstract class AbstractGraphTest {
- private RDFTermFactory factory;
- private Graph graph;
- private IRI alice;
- private IRI bob;
- private IRI name;
- private IRI knows;
- private IRI member;
- private BlankNode bnode1;
- private BlankNode bnode2;
- private Literal aliceName;
- private Literal bobName;
- private Literal secretClubName;
- private Literal companyName;
- private Triple bobNameTriple;
+ protected RDFTermFactory factory;
+ protected Graph graph;
+ protected IRI alice;
+ protected IRI bob;
+ protected IRI name;
+ protected IRI knows;
+ protected IRI member;
+ protected BlankNode bnode1;
+ protected BlankNode bnode2;
+ protected Literal aliceName;
+ protected Literal bobName;
+ protected Literal secretClubName;
+ protected Literal companyName;
+ protected Triple bobNameTriple;
public abstract RDFTermFactory createFactory();
@@ -116,19 +116,7 @@ public abstract class AbstractGraphTest {
}
}
- @Test
- public void graphToString() {
- Assume.assumeNotNull(aliceName, companyName);
- //System.out.println(graph);
- assertTrue(graph
- .toString()
- .contains(
- "<http://example.com/alice> <http://xmlns.com/foaf/0.1/name> \"Alice\" ."));
- assertTrue(graph.toString().contains(
- " <http://xmlns.com/foaf/0.1/name> \"A company\" ."));
-
- }
-
+
@Test
public void size() throws Exception {
assertTrue(graph.size() > 0);
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/56617279/simple/src/test/java/org/apache/commons/rdf/simple/SimpleGraphTest.java
----------------------------------------------------------------------
diff --git a/simple/src/test/java/org/apache/commons/rdf/simple/SimpleGraphTest.java b/simple/src/test/java/org/apache/commons/rdf/simple/SimpleGraphTest.java
index 0951942..14f14a6 100644
--- a/simple/src/test/java/org/apache/commons/rdf/simple/SimpleGraphTest.java
+++ b/simple/src/test/java/org/apache/commons/rdf/simple/SimpleGraphTest.java
@@ -17,8 +17,12 @@
*/
package org.apache.commons.rdf.simple;
+import static org.junit.Assert.assertTrue;
+
import org.apache.commons.rdf.api.AbstractGraphTest;
import org.apache.commons.rdf.api.RDFTermFactory;
+import org.junit.Assume;
+import org.junit.Test;
/**
* Test SimpleRDFTermFactory with AbstractGraphTest
@@ -30,4 +34,17 @@ public class SimpleGraphTest extends AbstractGraphTest {
return new SimpleRDFTermFactory();
}
+ @Test
+ public void graphToString() {
+ Assume.assumeNotNull(aliceName, companyName);
+ System.out.println(graph);
+ assertTrue(graph
+ .toString()
+ .contains(
+ "<http://example.com/alice> <http://xmlns.com/foaf/0.1/name> \"Alice\" ."));
+ assertTrue(graph.toString().contains(
+ " <http://xmlns.com/foaf/0.1/name> \"A company\" ."));
+
+ }
+
}
[2/2] incubator-commonsrdf git commit: inner classes for BlankNode
and IRI
Posted by st...@apache.org.
inner classes for BlankNode and IRI
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/6c72b27a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/6c72b27a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/6c72b27a
Branch: refs/heads/jsonld-java
Commit: 6c72b27a3c1dbb3149e581bb3c378be75f34b751
Parents: 5661727
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Apr 4 15:27:29 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Apr 4 15:27:29 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jsonldjava/JsonLDGraph.java | 194 +++++++++++--------
1 file changed, 108 insertions(+), 86 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/6c72b27a/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 7b9fed7..a58f358 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
@@ -41,6 +41,109 @@ import com.github.jsonldjava.core.RDFDataset.Quad;
public class JsonLDGraph implements Graph {
+ private final class JsonLdBlankNode implements BlankNode {
+ private final Node node;
+
+ private JsonLdBlankNode(Node node) {
+ this.node = node;
+ }
+
+ @Override
+ public String ntriplesString() {
+ return node.getValue();
+ }
+
+ @Override
+ public String uniqueReference() {
+ return bnodePrefix() + 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();
+ }
+ }
+
+ private final class JsonLdIRI implements IRI {
+ private final Node node;
+
+ private JsonLdIRI(Node node) {
+ this.node = node;
+ }
+
+ @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());
+ }
+ }
+
+ private final class JsonLdTriple implements Triple {
+ private final Quad quad;
+
+ private JsonLdTriple(Quad quad) {
+ this.quad = quad;
+ }
+
+ @Override
+ public BlankNodeOrIRI getSubject() {
+ return (BlankNodeOrIRI) asTerm(quad.getSubject());
+ }
+
+ @Override
+ public IRI getPredicate() {
+ return (IRI) asTerm(quad.getPredicate());
+ }
+
+ @Override
+ public RDFTerm getObject() {
+ return asTerm(quad.getObject());
+ }
+
+ @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());
+ }
+ }
+
private static UUID SALT = UUID.randomUUID();
private RDFDataset rdfDataSet = new RDFDataset();
@@ -67,41 +170,7 @@ public class JsonLDGraph implements Graph {
private static RDFTermFactory rdfTermFactory = new SimpleRDFTermFactory();
private Triple asTriple(final RDFDataset.Quad quad) {
- return new Triple() {
-
- @Override
- public BlankNodeOrIRI getSubject() {
- return (BlankNodeOrIRI) asTerm(quad.getSubject());
- }
-
- @Override
- public IRI getPredicate() {
- return (IRI) asTerm(quad.getPredicate());
- }
-
- @Override
- public RDFTerm getObject() {
- return asTerm(quad.getObject());
- }
-
- @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());
- }
-
- };
+ return new JsonLdTriple(quad);
}
private String bnodePrefix() {
@@ -110,58 +179,11 @@ public class JsonLDGraph implements Graph {
private RDFTerm asTerm(final Node node) {
if (node.isIRI()) {
- return new 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());
- }
- };
+ return new JsonLdIRI(node);
} else if (node.isBlankNode()) {
- return new BlankNode() {
- @Override
- public String ntriplesString() {
- return node.getValue();
- }
-
- @Override
- public String uniqueReference() {
- return bnodePrefix() + 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();
- }
- };
- } else if (node.isLiteral()) {
+ return new JsonLdBlankNode(node);
+ } else if (node.isLiteral()) {
+ // TODO: Our own JsonLdLiteral
if (node.getLanguage() != null) {
return rdfTermFactory.createLiteral(node.getValue(), node.getLanguage());
} else {