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/07/04 15:56:18 UTC
[1/6] incubator-commonsrdf git commit: getTriple() -> asJenaTriple()
etc
Repository: incubator-commonsrdf
Updated Branches:
refs/heads/jena 4675e77f1 -> f3b377cd9
getTriple() -> asJenaTriple() etc
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/535d6246
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/535d6246
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/535d6246
Branch: refs/heads/jena
Commit: 535d6246b4a1ba8a992880e469cd29cc964d3d3d
Parents: 4675e77
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Jul 4 15:21:21 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Jul 4 15:21:21 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/commons/rdf/jena/JenaCommonsRDF.java | 6 +++---
jena/src/main/java/org/apache/commons/rdf/jena/JenaGraph.java | 2 +-
jena/src/main/java/org/apache/commons/rdf/jena/JenaNode.java | 2 +-
jena/src/main/java/org/apache/commons/rdf/jena/JenaQuad.java | 2 +-
.../java/org/apache/commons/rdf/jena/JenaRDFParserBuilder.java | 2 +-
jena/src/main/java/org/apache/commons/rdf/jena/JenaTriple.java | 2 +-
.../java/org/apache/commons/rdf/jena/impl/AbstractRDFTerm.java | 2 +-
.../java/org/apache/commons/rdf/jena/impl/BlankNodeImpl.java | 2 +-
.../main/java/org/apache/commons/rdf/jena/impl/GraphImpl.java | 2 +-
.../main/java/org/apache/commons/rdf/jena/impl/IRIImpl.java | 2 +-
.../java/org/apache/commons/rdf/jena/impl/LiteralImpl.java | 6 +++---
.../main/java/org/apache/commons/rdf/jena/impl/QuadImpl.java | 2 +-
.../main/java/org/apache/commons/rdf/jena/impl/TripleImpl.java | 2 +-
13 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/JenaCommonsRDF.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaCommonsRDF.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaCommonsRDF.java
index 80941b0..6fc280c 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaCommonsRDF.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaCommonsRDF.java
@@ -59,7 +59,7 @@ public class JenaCommonsRDF {
*/
public static Node toJena(RDFTerm term) {
if ( term instanceof JenaNode )
- return ((JenaNode)term).getNode() ;
+ return ((JenaNode)term).asJenaNode() ;
if ( term instanceof IRI )
return NodeFactory.createURI(((IRI)term).getIRIString()) ;
@@ -85,7 +85,7 @@ public class JenaCommonsRDF {
*/
public static org.apache.jena.graph.Triple toJena(Triple triple) {
if ( triple instanceof JenaTriple )
- return ((JenaTriple)triple).getTriple() ;
+ return ((JenaTriple)triple).asJenaTriple() ;
return new org.apache.jena.graph.Triple(toJena(triple.getSubject()), toJena(triple.getPredicate()), toJena(triple.getObject()) ) ;
}
@@ -95,7 +95,7 @@ public class JenaCommonsRDF {
*/
public static org.apache.jena.graph.Graph toJena(Graph graph) {
if ( graph instanceof JenaGraph )
- return ((JenaGraph)graph).getGraph() ;
+ return ((JenaGraph)graph).asJenaGraph() ;
org.apache.jena.graph.Graph g = GraphFactory.createGraphMem() ;
graph.stream().forEach(t->g.add(toJena(t))) ;
return g ;
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/JenaGraph.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaGraph.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaGraph.java
index 0760f77..a101da4 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaGraph.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaGraph.java
@@ -22,5 +22,5 @@ import org.apache.jena.graph.Graph ;
/** Access the Jena graph backing this object */
public interface JenaGraph extends org.apache.commons.rdf.api.Graph {
- public Graph getGraph() ;
+ public Graph asJenaGraph() ;
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/JenaNode.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaNode.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaNode.java
index 23085b6..0a47d9f 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaNode.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaNode.java
@@ -23,5 +23,5 @@ import org.apache.jena.graph.Node ;
/** Access the Jena node backing this object */
public interface JenaNode extends RDFTerm {
- public Node getNode() ;
+ public Node asJenaNode() ;
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/JenaQuad.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaQuad.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaQuad.java
index 532f481..a9c4f05 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaQuad.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaQuad.java
@@ -22,5 +22,5 @@ import org.apache.jena.sparql.core.Quad;
/** Access the Jena quad backing this object */
public interface JenaQuad extends org.apache.commons.rdf.api.Quad {
- public Quad getQuad() ;
+ public Quad asJenaQuad() ;
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFParserBuilder.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFParserBuilder.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFParserBuilder.java
index d999861..bc73e55 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFParserBuilder.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaRDFParserBuilder.java
@@ -43,7 +43,7 @@ public class JenaRDFParserBuilder extends AbstractRDFParserBuilder<JenaRDFParser
protected void parseSynchronusly() throws IOException {
StreamRDF dest;
if (getTargetGraph().isPresent() && getTargetGraph().get() instanceof JenaGraph) {
- Graph jenaGraph = ((JenaGraph)getTargetGraph().get()).getGraph();
+ Graph jenaGraph = ((JenaGraph)getTargetGraph().get()).asJenaGraph();
dest = StreamRDFLib.graph(jenaGraph);
} else {
dest = JenaCommonsRDF.streamJenaToCommonsRDF(getRdfTermFactory().get(), getTarget());
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/JenaTriple.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaTriple.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaTriple.java
index 8800887..f8e93ed 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaTriple.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaTriple.java
@@ -22,5 +22,5 @@ import org.apache.jena.graph.Triple ;
/** Access the Jena triple backing this object */
public interface JenaTriple extends org.apache.commons.rdf.api.Triple {
- public Triple getTriple() ;
+ public Triple asJenaTriple() ;
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractRDFTerm.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractRDFTerm.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractRDFTerm.java
index 4df9e6d..347ebf9 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractRDFTerm.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/AbstractRDFTerm.java
@@ -34,7 +34,7 @@ class AbstractRDFTerm implements JenaNode, RDFTerm {
}
@Override
- public Node getNode() {
+ public Node asJenaNode() {
return node ;
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/impl/BlankNodeImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/BlankNodeImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/BlankNodeImpl.java
index 195e99c..c443092 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/BlankNodeImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/BlankNodeImpl.java
@@ -28,7 +28,7 @@ public class BlankNodeImpl extends AbstractRDFTerm implements BlankNode, JenaNod
@Override
public String uniqueReference() {
- return getNode().getBlankNodeLabel() ;
+ return asJenaNode().getBlankNodeLabel() ;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/impl/GraphImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/GraphImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/GraphImpl.java
index 282e93d..ab684c5 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/GraphImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/GraphImpl.java
@@ -42,7 +42,7 @@ public class GraphImpl implements Graph, JenaGraph {
}
@Override
- public org.apache.jena.graph.Graph getGraph() {
+ public org.apache.jena.graph.Graph asJenaGraph() {
return graph ;
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/impl/IRIImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/IRIImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/IRIImpl.java
index 5f073a6..0716e8d 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/IRIImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/IRIImpl.java
@@ -36,7 +36,7 @@ public class IRIImpl extends AbstractRDFTerm implements IRI, JenaNode {
@Override
public String getIRIString() {
- return getNode().getURI() ;
+ return asJenaNode().getURI() ;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/impl/LiteralImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/LiteralImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/LiteralImpl.java
index 91584c4..345532d 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/LiteralImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/LiteralImpl.java
@@ -33,17 +33,17 @@ public class LiteralImpl extends AbstractRDFTerm implements Literal {
@Override
public String getLexicalForm() {
- return getNode().getLiteralLexicalForm() ;
+ return asJenaNode().getLiteralLexicalForm() ;
}
@Override
public IRI getDatatype() {
- return JenaFactory.createIRI(getNode().getLiteralDatatype().getURI()) ;
+ return JenaFactory.createIRI(asJenaNode().getLiteralDatatype().getURI()) ;
}
@Override
public Optional<String> getLanguageTag() {
- String x = getNode().getLiteralLanguage() ;
+ String x = asJenaNode().getLiteralLanguage() ;
if ( x == null || x.isEmpty() )
return Optional.empty() ;
return Optional.of(x) ;
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/impl/QuadImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/QuadImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/QuadImpl.java
index a3546ce..905e47b 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/QuadImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/QuadImpl.java
@@ -53,7 +53,7 @@ public class QuadImpl implements Quad, JenaQuad {
}
@Override
- public org.apache.jena.sparql.core.Quad getQuad() {
+ public org.apache.jena.sparql.core.Quad asJenaQuad() {
if ( quad == null ) {
quad = org.apache.jena.sparql.core.Quad.create(
JenaCommonsRDF.toJena(graphName.orElse(null)),
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/535d6246/jena/src/main/java/org/apache/commons/rdf/jena/impl/TripleImpl.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/impl/TripleImpl.java b/jena/src/main/java/org/apache/commons/rdf/jena/impl/TripleImpl.java
index c77e594..fba7304 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/impl/TripleImpl.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/impl/TripleImpl.java
@@ -44,7 +44,7 @@ public class TripleImpl implements Triple, JenaTriple {
}
@Override
- public org.apache.jena.graph.Triple getTriple() {
+ public org.apache.jena.graph.Triple asJenaTriple() {
if ( triple == null )
triple = org.apache.jena.graph.Triple.create(JenaCommonsRDF.toJena(subject), JenaCommonsRDF.toJena(predicate), JenaCommonsRDF.toJena(object)) ;
return triple ;
[3/6] incubator-commonsrdf git commit: handle null as null
Posted by st...@apache.org.
handle null as null
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/e355e187
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/e355e187
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/e355e187
Branch: refs/heads/jena
Commit: e355e187019aaba12e4a1046ad404f8401a9322a
Parents: 42e36d0
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Jul 4 16:55:10 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Jul 4 16:55:10 2016 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/commons/rdf/jena/JenaCommonsRDF.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/e355e187/jena/src/main/java/org/apache/commons/rdf/jena/JenaCommonsRDF.java
----------------------------------------------------------------------
diff --git a/jena/src/main/java/org/apache/commons/rdf/jena/JenaCommonsRDF.java b/jena/src/main/java/org/apache/commons/rdf/jena/JenaCommonsRDF.java
index 6fc280c..b3999ec 100644
--- a/jena/src/main/java/org/apache/commons/rdf/jena/JenaCommonsRDF.java
+++ b/jena/src/main/java/org/apache/commons/rdf/jena/JenaCommonsRDF.java
@@ -58,6 +58,9 @@ public class JenaCommonsRDF {
* create a copy using Jena objects.
*/
public static Node toJena(RDFTerm term) {
+ if (term == null) {
+ return null;
+ }
if ( term instanceof JenaNode )
return ((JenaNode)term).asJenaNode() ;
[5/6] incubator-commonsrdf git commit: Test B.ttl from
src/test/resources
Posted by st...@apache.org.
Test B.ttl from src/test/resources
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/a5277214
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/a5277214
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/a5277214
Branch: refs/heads/jena
Commit: a52772146eb66ad59e8505971b8266918a0bea85
Parents: 8ea8bb0
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Jul 4 16:55:37 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Jul 4 16:55:37 2016 +0100
----------------------------------------------------------------------
.../commons/rdf/jena/TestBlankNodeJena.java | 2 ++
.../apache/commons/rdf/jena/TestGraphJena.java | 1 -
.../jena/TestJenaGraphToCommonsRDFGraph.java | 27 +++++++++++++++---
.../commons/rdf/jena/TestRDFParserBuilder.java | 30 ++++++++++++++++----
.../rdf/jena/TestRDFTermFactoryJena.java | 3 +-
5 files changed, 51 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/a5277214/jena/src/test/java/org/apache/commons/rdf/jena/TestBlankNodeJena.java
----------------------------------------------------------------------
diff --git a/jena/src/test/java/org/apache/commons/rdf/jena/TestBlankNodeJena.java b/jena/src/test/java/org/apache/commons/rdf/jena/TestBlankNodeJena.java
index cd5d264..764ee70 100644
--- a/jena/src/test/java/org/apache/commons/rdf/jena/TestBlankNodeJena.java
+++ b/jena/src/test/java/org/apache/commons/rdf/jena/TestBlankNodeJena.java
@@ -23,6 +23,8 @@ import org.apache.commons.rdf.api.BlankNode ;
import org.apache.commons.rdf.jena.impl.JenaFactory;
public class TestBlankNodeJena extends AbstractBlankNodeTest {
+
+
@Override
protected BlankNode getBlankNode() {
return JenaFactory.createBlankNode() ;
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/a5277214/jena/src/test/java/org/apache/commons/rdf/jena/TestGraphJena.java
----------------------------------------------------------------------
diff --git a/jena/src/test/java/org/apache/commons/rdf/jena/TestGraphJena.java b/jena/src/test/java/org/apache/commons/rdf/jena/TestGraphJena.java
index 3535952..973b7b1 100644
--- a/jena/src/test/java/org/apache/commons/rdf/jena/TestGraphJena.java
+++ b/jena/src/test/java/org/apache/commons/rdf/jena/TestGraphJena.java
@@ -20,7 +20,6 @@ package org.apache.commons.rdf.jena;
import org.apache.commons.rdf.api.AbstractGraphTest ;
import org.apache.commons.rdf.api.RDFTermFactory ;
-import org.apache.commons.rdf.jena.RDFTermFactoryJena;
public class TestGraphJena extends AbstractGraphTest {
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/a5277214/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
----------------------------------------------------------------------
diff --git a/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java b/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
index fcc2f51..cfe5642 100644
--- a/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
+++ b/jena/src/test/java/org/apache/commons/rdf/jena/TestJenaGraphToCommonsRDFGraph.java
@@ -18,23 +18,42 @@
package org.apache.commons.rdf.jena;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+
import org.apache.commons.rdf.api.Graph ;
import org.apache.commons.rdf.api.RDFTermFactory ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.sparql.graph.GraphFactory ;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
/** Adapt a Jena Graph after parsing data into it */
public class TestJenaGraphToCommonsRDFGraph {
- static {
- //LogCtl.setCmdLogging();
+ private Path turtleFile;
+
+
+ @Before
+ public void preparePath() throws IOException {
+ turtleFile = Files.createTempFile("commonsrdf", "test.ttl");
+ Files.copy(getClass().getResourceAsStream("/D.ttl"), turtleFile, StandardCopyOption.REPLACE_EXISTING);
+ }
+
+ @After
+ public void deletePath() throws IOException {
+ if (turtleFile != null) {
+ Files.deleteIfExists(turtleFile);
+ }
}
@Test
public void jenaToCommonsRDF() throws Exception {
- org.apache.jena.graph.Graph jGraph = GraphFactory.createGraphMem() ;
- RDFDataMgr.read(jGraph, "D.ttl") ;
+ org.apache.jena.graph.Graph jGraph = GraphFactory.createGraphMem() ;
+ RDFDataMgr.read(jGraph, turtleFile.toUri().toString()) ;
// "graph" is a CommonsRDF graph
Graph graph = JenaCommonsRDF.fromJena(jGraph) ;
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/a5277214/jena/src/test/java/org/apache/commons/rdf/jena/TestRDFParserBuilder.java
----------------------------------------------------------------------
diff --git a/jena/src/test/java/org/apache/commons/rdf/jena/TestRDFParserBuilder.java b/jena/src/test/java/org/apache/commons/rdf/jena/TestRDFParserBuilder.java
index f8e9616..f230bdd 100644
--- a/jena/src/test/java/org/apache/commons/rdf/jena/TestRDFParserBuilder.java
+++ b/jena/src/test/java/org/apache/commons/rdf/jena/TestRDFParserBuilder.java
@@ -18,24 +18,44 @@
package org.apache.commons.rdf.jena;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import java.io.IOException;
+import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import org.apache.commons.rdf.api.Graph;
import org.apache.commons.rdf.api.RDFParserBuilder.ParseResult;
import org.apache.commons.rdf.api.RDFSyntax;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
public class TestRDFParserBuilder {
+
+ private Path turtleFile;
+
+ @Before
+ public void preparePath() throws IOException {
+ turtleFile = Files.createTempFile("commonsrdf", "test.ttl");
+ Files.copy(getClass().getResourceAsStream("/D.ttl"), turtleFile, StandardCopyOption.REPLACE_EXISTING);
+ }
+
+ @After
+ public void deletePath() throws IOException {
+ if (turtleFile != null) {
+ Files.deleteIfExists(turtleFile);
+ }
+ }
+
@Test
public void parseTurtle() throws Exception {
- Path d = Paths.get("D.ttl");
- Graph g = new RDFTermFactoryJena().createGraph();
- Future<ParseResult> gFuture = new JenaRDFParserBuilder().contentType(RDFSyntax.TURTLE).source(d).target(g).parse();
+ Graph g = new RDFTermFactoryJena().createGraph();
+ Future<ParseResult> gFuture = new JenaRDFParserBuilder().contentType(RDFSyntax.TURTLE).source(turtleFile)
+ .target(g).parse();
gFuture.get(5, TimeUnit.SECONDS);
assertEquals(3, g.size());
}
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/a5277214/jena/src/test/java/org/apache/commons/rdf/jena/TestRDFTermFactoryJena.java
----------------------------------------------------------------------
diff --git a/jena/src/test/java/org/apache/commons/rdf/jena/TestRDFTermFactoryJena.java b/jena/src/test/java/org/apache/commons/rdf/jena/TestRDFTermFactoryJena.java
index 464908f..6aa153f 100644
--- a/jena/src/test/java/org/apache/commons/rdf/jena/TestRDFTermFactoryJena.java
+++ b/jena/src/test/java/org/apache/commons/rdf/jena/TestRDFTermFactoryJena.java
@@ -20,10 +20,9 @@ package org.apache.commons.rdf.jena;
import org.apache.commons.rdf.api.AbstractRDFTermFactoryTest ;
import org.apache.commons.rdf.api.RDFTermFactory ;
-import org.apache.commons.rdf.jena.RDFTermFactoryJena;
public class TestRDFTermFactoryJena extends AbstractRDFTermFactoryTest {
-
+
@Override
public RDFTermFactory createFactory() {
return new RDFTermFactoryJena() ;
[2/6] incubator-commonsrdf git commit: jena-osgi dependencies
Posted by st...@apache.org.
jena-osgi dependencies
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/42e36d0f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/42e36d0f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/42e36d0f
Branch: refs/heads/jena
Commit: 42e36d0f8dc7ce74bb94ceb3a7956cb980ab5190
Parents: 535d624
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Jul 4 16:54:50 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Jul 4 16:54:50 2016 +0100
----------------------------------------------------------------------
jena/pom.xml | 110 +++++++++++++++++++++++++++++-------------------------
1 file changed, 59 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/42e36d0f/jena/pom.xml
----------------------------------------------------------------------
diff --git a/jena/pom.xml b/jena/pom.xml
index de1c647..11b3e0e 100644
--- a/jena/pom.xml
+++ b/jena/pom.xml
@@ -18,61 +18,69 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-rdf-parent</artifactId>
- <version>0.3.0-incubating-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-rdf-parent</artifactId>
+ <version>0.3.0-incubating-SNAPSHOT</version>
+ </parent>
- <artifactId>commons-rdf-jena</artifactId>
- <packaging>jar</packaging>
+ <artifactId>commons-rdf-jena</artifactId>
+ <packaging>jar</packaging>
- <name>Commons RDF: Integration: Apache Jena</name>
- <description>Apache Jena implementation of Commons RDF API</description>
+ <name>Commons RDF: Integration: Apache Jena</name>
+ <description>Apache Jena implementation of Commons RDF API</description>
- <dependencies>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>commons-rdf-api</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependencies>
<dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>commons-rdf-simple</artifactId>
- <version>${project.version}</version>
- </dependency>
-<!-- Uncomment below to use instead of jena-osgi to access Jena source code
- -->
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>apache-jena-libs</artifactId>
- <version>${ver.jena}</version>
- <type>pom</type>
- <scope>optional</scope>
- </dependency>
- <!--
- As commons-rdf-jena is an OSGi bundle, we'll use the Jena OSGi bundle
- -->
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-osgi</artifactId>
- <version>${ver.jena}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>commons-rdf-api</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>commons-rdf-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>commons-rdf-simple</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- Uncomment below to use instead of jena-osgi to access Jena source
+ code <dependency> <groupId>org.apache.jena</groupId> <artifactId>apache-jena-libs</artifactId>
+ <version>${ver.jena}</version> <type>pom</type> <scope>optional</scope> </dependency> -->
+
+ <!-- As commons-rdf-jena is an OSGi bundle, we'll use the Jena OSGi bundle -->
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-osgi</artifactId>
+ <version>${ver.jena}</version>
+ </dependency>
+
+ <!-- Additional bundles needed by jena-osgi -->
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xerces</artifactId>
+ <version>${servicemix.xerces.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.andrewoma.dexx</groupId>
+ <artifactId>collection</artifactId>
+ <version>${dexx.collection.version}</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>commons-rdf-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
[4/6] incubator-commonsrdf git commit: ASF license header
Posted by st...@apache.org.
ASF license header
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/8ea8bb02
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/8ea8bb02
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/8ea8bb02
Branch: refs/heads/jena
Commit: 8ea8bb02b2137d23bb73d22760d43cc2cb770364
Parents: e355e18
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Jul 4 16:55:28 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Jul 4 16:55:28 2016 +0100
----------------------------------------------------------------------
jena/src/test/resources/D.ttl | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/8ea8bb02/jena/src/test/resources/D.ttl
----------------------------------------------------------------------
diff --git a/jena/src/test/resources/D.ttl b/jena/src/test/resources/D.ttl
index d37081c..b713bf9 100644
--- a/jena/src/test/resources/D.ttl
+++ b/jena/src/test/resources/D.ttl
@@ -1,4 +1,20 @@
-prefix : <http://example/>
+# 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.
+
+prefix : <http://example.com/>
:s :p 123 .
[ :p1 [ :q "r"@en ] ] .
[6/6] incubator-commonsrdf git commit: versions for jena-osgi
dependencies
Posted by st...@apache.org.
versions for jena-osgi dependencies
Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/f3b377cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/f3b377cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/f3b377cd
Branch: refs/heads/jena
Commit: f3b377cd9da1cf51bb227366628fa3f34fb73e94
Parents: a527721
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Jul 4 16:56:04 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Jul 4 16:56:04 2016 +0100
----------------------------------------------------------------------
pom.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/f3b377cd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f514215..6dcdb54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,9 @@
<commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commonsrdf/content/</commons.scmPubUrl>
<commons.scmPubCheckoutDirectory>${project.build.directory}/site-content</commons.scmPubCheckoutDirectory>
<commons.javadoc.java.link>http://docs.oracle.com/javase/8/docs/api/</commons.javadoc.java.link>
- <ver.jena>3.1.0</ver.jena>
+ <ver.jena>3.1.0</ver.jena>
+ <dexx.collection.version>0.6</dexx.collection.version>
+ <servicemix.xerces.version>2.11.0_1</servicemix.xerces.version>
</properties>
<scm>