You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2015/04/14 15:13:50 UTC
[75/87] [abbrv] clerezza git commit: CLEREZZA-983: Adapted to new
casing of rdf-core (part 1)
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java
----------------------------------------------------------------------
diff --git a/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java b/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java
index 40c29f2..1382189 100644
--- a/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java
+++ b/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java
@@ -35,7 +35,7 @@ import java.util.logging.Logger;
import org.osgi.service.component.ComponentContext;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.EntityAlreadyExistsException;
import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
@@ -47,7 +47,7 @@ import org.apache.clerezza.rdf.core.serializedform.Serializer;
* The <code>FileTcProvider</code> is a <code>WeightedTcProvider</code> that
* stores <code>Graph</code>S in the file system. <code>ImmutableGraph</code>S are not
* supported.
- * The <code>Iri</code> of a Graph is location of the file in the file system
+ * The <code>IRI</code> of a Graph is location of the file in the file system
* (e.g. "file:///home/user/myGraph.rdf"). The format of the rdf data in the file
* depends on the file ending, for example ".rdf" or ".ttl".
* <code>FileTcProvider</code> uses
@@ -74,8 +74,8 @@ public class FileTcProvider implements WeightedTcProvider {
*/
private Serializer serializer;
- private Map<Iri, FileGraph> uriRef2GraphMap =
- new HashMap<Iri, FileGraph>();
+ private Map<IRI, FileGraph> uriRef2GraphMap =
+ new HashMap<IRI, FileGraph>();
protected static File dataFile = new File("data");
@@ -101,7 +101,7 @@ public class FileTcProvider implements WeightedTcProvider {
}
@Override
- public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
+ public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
throw new NoSuchEntityException(name);
}
@@ -116,7 +116,7 @@ public class FileTcProvider implements WeightedTcProvider {
* with the specified name or the file didn't exist.
*/
@Override
- public Graph getMGraph(Iri name) throws NoSuchEntityException {
+ public Graph getMGraph(IRI name) throws NoSuchEntityException {
initialize();
Graph mGraph = uriRef2GraphMap.get(name);
if (mGraph == null) {
@@ -135,29 +135,29 @@ public class FileTcProvider implements WeightedTcProvider {
}
@Override
- public Graph getGraph(Iri name) throws NoSuchEntityException {
+ public Graph getGraph(IRI name) throws NoSuchEntityException {
return getMGraph(name);
}
@Override
- public Set<Iri> listImmutableGraphs() {
+ public Set<IRI> listImmutableGraphs() {
throw new UnsupportedOperationException("Not supported.");
}
@Override
- public Set<Iri> listMGraphs() {
+ public Set<IRI> listMGraphs() {
initialize();
return uriRef2GraphMap.keySet();
}
@Override
- public Set<Iri> listGraphs() {
+ public Set<IRI> listGraphs() {
return listMGraphs();
}
@Override
- public Graph createGraph(Iri name) throws
+ public Graph createGraph(IRI name) throws
UnsupportedOperationException, EntityAlreadyExistsException {
initialize();
if (uriRef2GraphMap.containsKey(name)) {
@@ -170,13 +170,13 @@ public class FileTcProvider implements WeightedTcProvider {
}
@Override
- public ImmutableGraph createImmutableGraph(Iri name, Graph triples) throws
+ public ImmutableGraph createImmutableGraph(IRI name, Graph triples) throws
UnsupportedOperationException, EntityAlreadyExistsException {
throw new UnsupportedOperationException("Not supported.");
}
@Override
- public void deleteGraph(Iri name) throws
+ public void deleteGraph(IRI name) throws
UnsupportedOperationException, NoSuchEntityException, EntityUndeletableException {
initialize();
FileGraph mGraph = (FileGraph)getGraph(name);
@@ -186,7 +186,7 @@ public class FileTcProvider implements WeightedTcProvider {
}
@Override
- public Set<Iri> getNames(ImmutableGraph graph) {
+ public Set<IRI> getNames(ImmutableGraph graph) {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -205,7 +205,7 @@ public class FileTcProvider implements WeightedTcProvider {
BufferedReader br = new BufferedReader(new InputStreamReader(in));
String strLine;
while ((strLine = br.readLine()) != null) {
- Iri uriRef = new Iri(strLine);
+ IRI uriRef = new IRI(strLine);
uriRef2GraphMap.put(uriRef, new FileGraph(uriRef, parser, serializer));
}
in.close();
@@ -221,7 +221,7 @@ public class FileTcProvider implements WeightedTcProvider {
FileOutputStream fout = null;
try {
fout = new FileOutputStream(dataFile);
- for (Iri uri : uriRef2GraphMap.keySet()) {
+ for (IRI uri : uriRef2GraphMap.keySet()) {
fout.write((uri.getUnicodeString() + "\n").getBytes());
}
} catch (FileNotFoundException ex) {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java
----------------------------------------------------------------------
diff --git a/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java b/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java
index 86f4a41..048e976 100644
--- a/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java
+++ b/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileGraphTest.java
@@ -29,7 +29,7 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.clerezza.commons.rdf.Triple;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
@@ -48,9 +48,9 @@ public class FileGraphTest {
protected static final String RDF_FILE_NAME = "test-04.rdf";
protected static final String TURTLE_FILE_NAME = "test-04.ttl";
- private static final Iri uriA = new Iri("http://example.com/a");
- private static final Iri uriB = new Iri("http://example.com/b");
- private static final Iri uriC = new Iri("http://example.com/c");
+ private static final IRI uriA = new IRI("http://example.com/a");
+ private static final IRI uriB = new IRI("http://example.com/b");
+ private static final IRI uriC = new IRI("http://example.com/c");
@BeforeClass
@@ -91,15 +91,15 @@ public class FileGraphTest {
@Test
public void testReadingFromFile() {
- FileGraph mGraph = new FileGraph(new Iri(getTempFileUri(RDF_FILE_NAME)),
+ FileGraph mGraph = new FileGraph(new IRI(getTempFileUri(RDF_FILE_NAME)),
Parser.getInstance(), Serializer.getInstance());
assertEquals(2, mGraph.size());
- mGraph = new FileGraph(new Iri(getTempFileUri(TURTLE_FILE_NAME)),
+ mGraph = new FileGraph(new IRI(getTempFileUri(TURTLE_FILE_NAME)),
Parser.getInstance(), Serializer.getInstance());
assertEquals(2, mGraph.size());
- mGraph = new FileGraph(new Iri(getTempFileUri(NT_FILE_NAME)),
+ mGraph = new FileGraph(new IRI(getTempFileUri(NT_FILE_NAME)),
Parser.getInstance(), Serializer.getInstance());
assertEquals(2, mGraph.size());
}
@@ -107,13 +107,13 @@ public class FileGraphTest {
@Test
public void testFilter() throws IOException {
String fileName = "filter.rdf";
- FileGraph mGraph = new FileGraph(new Iri(getTempFileUri(fileName)),
+ FileGraph mGraph = new FileGraph(new IRI(getTempFileUri(fileName)),
Parser.getInstance(), Serializer.getInstance());
mGraph.add(new TripleImpl(uriA, uriB, uriC));
mGraph.add(new TripleImpl(uriC, uriB, uriA));
- mGraph = new FileGraph(new Iri(getTempFileUri(fileName)),
+ mGraph = new FileGraph(new IRI(getTempFileUri(fileName)),
Parser.getInstance(), Serializer.getInstance());
@@ -124,7 +124,7 @@ public class FileGraphTest {
iterator.remove();
assertEquals(1, mGraph.size());
- mGraph = new FileGraph(new Iri(getTempFileUri(fileName)),
+ mGraph = new FileGraph(new IRI(getTempFileUri(fileName)),
Parser.getInstance(), Serializer.getInstance());
assertEquals(1, mGraph.size());
deleteTempFile(fileName);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileTcProviderTest.java
----------------------------------------------------------------------
diff --git a/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileTcProviderTest.java b/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileTcProviderTest.java
index 7d9c9c4..6eb60c2 100644
--- a/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileTcProviderTest.java
+++ b/rdf/file.storage/src/test/java/org/apache/clerezza/rdf/file/storage/FileTcProviderTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.commons.rdf.Triple;
import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcProvider;
@@ -54,10 +54,10 @@ public class FileTcProviderTest extends TcProviderTest {
@Override
- protected Iri generateUri(String name) {
+ protected IRI generateUri(String name) {
String prefix = testDir.startsWith("/") ? FILE_PROTOCOL : FILE_PROTOCOL +"/";
String path = prefix + testDir.replace('\\', '/') + "/";
- return new Iri(path + name + ".rdf");
+ return new IRI(path + name + ".rdf");
}
@Before
@@ -208,7 +208,7 @@ public class FileTcProviderTest extends TcProviderTest {
public void testAutoGraphCreationFromExistingFile() throws Exception{
FileGraphTest.setup();
TcProvider provider = getInstance();
- Graph mGraph = provider.getGraph(new Iri(
+ Graph mGraph = provider.getGraph(new IRI(
FileGraphTest.getTempFileUri(FileGraphTest.RDF_FILE_NAME)));
assertEquals(2 ,mGraph.size());
FileGraphTest.cleanUp();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Jena2TriaUtil.java
----------------------------------------------------------------------
diff --git a/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Jena2TriaUtil.java b/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Jena2TriaUtil.java
index 9a94c75..1be13fe 100644
--- a/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Jena2TriaUtil.java
+++ b/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Jena2TriaUtil.java
@@ -21,11 +21,11 @@ package org.apache.clerezza.rdf.jena.commons;
import com.hp.hpl.jena.graph.Node;
import java.util.Map;
import org.apache.clerezza.commons.rdf.BlankNode;
-import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.commons.rdf.Language;
import org.apache.clerezza.commons.rdf.Literal;
-import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.RDFTerm;
import org.apache.clerezza.commons.rdf.Triple;
import org.apache.clerezza.commons.rdf.impl.utils.LiteralImpl;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
@@ -64,33 +64,33 @@ public class Jena2TriaUtil {
if ((languageTag != null) && !languageTag.equals("")) {
language = new Language(languageTag);
}
- Iri dataType = null;
+ IRI dataType = null;
if (datatypeString != null) {
- dataType = new Iri(datatypeString);
+ dataType = new IRI(datatypeString);
} else {
- dataType = new Iri("http://www.w3.org/2001/XMLSchema#string");
+ dataType = new IRI("http://www.w3.org/2001/XMLSchema#string");
}
return new LiteralImpl(lexicalForm, dataType, language);
}
/**
- * Converts a URI in jena node to a Iri
+ * Converts a URI in jena node to a IRI
* @param node
- * @return Iri
+ * @return IRI
*/
- public Iri convertJenaUri2UriRef(Node node) {
+ public IRI convertJenaUri2UriRef(Node node) {
if (node == null) {
throw new IllegalArgumentException("null argument not allowed");
}
- return new Iri(node.getURI());
+ return new IRI(node.getURI());
}
/**
* Converts a jena node to a resource
* @param node
- * @return BlankNode if it is a Blank Node, Iri if it is a URI and Literal if it is a literal.
+ * @return BlankNode if it is a Blank Node, IRI if it is a URI and Literal if it is a literal.
*/
- public RdfTerm convertJenaNode2Resource(Node node) {
+ public RDFTerm convertJenaNode2Resource(Node node) {
if (node == null) {
throw new IllegalArgumentException("null argument not allowed");
}
@@ -107,14 +107,14 @@ public class Jena2TriaUtil {
}
/**
- * Converts a node to a BlankNode if it is a Blank Node otherwise to a Iri.
+ * Converts a node to a BlankNode if it is a Blank Node otherwise to a IRI.
* If node is a BlankNode and no mapping to a Blank Node exists, then null is
* returned, otherwise the existing mapping.
*
* @param node
- * @return BlankNode if it is a Blank Node otherwise a Iri
+ * @return BlankNode if it is a Blank Node otherwise a IRI
*/
- public BlankNodeOrIri convertNonLiteral(Node node) {
+ public BlankNodeOrIRI convertNonLiteral(Node node) {
if (node == null) {
throw new IllegalArgumentException("null argument not allowed");
}
@@ -128,9 +128,9 @@ public class Jena2TriaUtil {
}
public Triple convertTriple(com.hp.hpl.jena.graph.Triple triple) {
- BlankNodeOrIri subject = convertNonLiteral(triple.getSubject());
- Iri predicate = convertJenaUri2UriRef(triple.getPredicate());
- RdfTerm object = convertJenaNode2Resource(triple.getObject());
+ BlankNodeOrIRI subject = convertNonLiteral(triple.getSubject());
+ IRI predicate = convertJenaUri2UriRef(triple.getPredicate());
+ RDFTerm object = convertJenaNode2Resource(triple.getObject());
if (subject == null || object == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java
----------------------------------------------------------------------
diff --git a/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java b/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java
index c84a1a8..7031e02 100644
--- a/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java
+++ b/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java
@@ -22,10 +22,10 @@ import com.hp.hpl.jena.datatypes.TypeMapper;
import com.hp.hpl.jena.graph.Node;
import java.util.Map;
import org.apache.clerezza.commons.rdf.BlankNode;
-import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.commons.rdf.Literal;
-import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.RDFTerm;
import org.apache.clerezza.commons.rdf.Triple;
@@ -40,9 +40,9 @@ public class Tria2JenaUtil {
this.tria2JenaBNodes = tria2JenaBNodes;
}
- public Node convert2JenaNode(BlankNodeOrIri nonLiteral, boolean createBlankNode) {
- if (nonLiteral instanceof Iri) {
- return convert2JenaNode((Iri)nonLiteral);
+ public Node convert2JenaNode(BlankNodeOrIRI nonLiteral, boolean createBlankNode) {
+ if (nonLiteral instanceof IRI) {
+ return convert2JenaNode((IRI)nonLiteral);
} else {
return convert2JenaNode((BlankNode)nonLiteral, createBlankNode);
}
@@ -60,18 +60,18 @@ public class Tria2JenaUtil {
literal.getDataType().getUnicodeString()));
}
- public Node convert2JenaNode(RdfTerm resource) {
+ public Node convert2JenaNode(RDFTerm resource) {
return convert2JenaNode(resource, false);
}
- public Node convert2JenaNode(RdfTerm resource, boolean createBlankNode) {
- if (resource instanceof BlankNodeOrIri) {
- return convert2JenaNode((BlankNodeOrIri)resource, createBlankNode);
+ public Node convert2JenaNode(RDFTerm resource, boolean createBlankNode) {
+ if (resource instanceof BlankNodeOrIRI) {
+ return convert2JenaNode((BlankNodeOrIRI)resource, createBlankNode);
}
return convert2JenaNode((Literal)resource);
}
- public Node convert2JenaNode(Iri uriRef) {
+ public Node convert2JenaNode(IRI uriRef) {
if (uriRef == null) {
throw new IllegalArgumentException("null argument not allowed");
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/facade/src/main/java/org/apache/clerezza/rdf/jena/facade/JenaGraph.java
----------------------------------------------------------------------
diff --git a/rdf/jena/facade/src/main/java/org/apache/clerezza/rdf/jena/facade/JenaGraph.java b/rdf/jena/facade/src/main/java/org/apache/clerezza/rdf/jena/facade/JenaGraph.java
index f59342c..8403004 100644
--- a/rdf/jena/facade/src/main/java/org/apache/clerezza/rdf/jena/facade/JenaGraph.java
+++ b/rdf/jena/facade/src/main/java/org/apache/clerezza/rdf/jena/facade/JenaGraph.java
@@ -28,9 +28,9 @@ import java.util.HashSet;
import java.util.Iterator;
import org.apache.clerezza.commons.rdf.BlankNode;
-import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
-import org.apache.clerezza.commons.rdf.Iri;
-import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
+import org.apache.clerezza.commons.rdf.IRI;
+import org.apache.clerezza.commons.rdf.RDFTerm;
import org.apache.clerezza.commons.rdf.Triple;
import org.apache.clerezza.rdf.jena.commons.Jena2TriaUtil;
import org.apache.clerezza.rdf.jena.commons.Tria2JenaUtil;
@@ -113,9 +113,9 @@ public class JenaGraph extends GraphBase implements com.hp.hpl.jena.graph.Graph
* @return TripleCollection
*/
private Iterator<Triple> filter(TripleMatch m) {
- BlankNodeOrIri subject = null;
- Iri predicate = null;
- RdfTerm object = null;
+ BlankNodeOrIRI subject = null;
+ IRI predicate = null;
+ RDFTerm object = null;
if (m.getMatchSubject() != null) {
if (m.getMatchSubject().isLiteral()) {
return Collections.EMPTY_SET.iterator();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/facade/src/test/java/org/apache/clerezza/rdf/facade/blackbox/TestBasics.java
----------------------------------------------------------------------
diff --git a/rdf/jena/facade/src/test/java/org/apache/clerezza/rdf/facade/blackbox/TestBasics.java b/rdf/jena/facade/src/test/java/org/apache/clerezza/rdf/facade/blackbox/TestBasics.java
index 7896aa6..73914b3 100644
--- a/rdf/jena/facade/src/test/java/org/apache/clerezza/rdf/facade/blackbox/TestBasics.java
+++ b/rdf/jena/facade/src/test/java/org/apache/clerezza/rdf/facade/blackbox/TestBasics.java
@@ -34,7 +34,7 @@ import com.hp.hpl.jena.vocabulary.RDF;
import com.hp.hpl.jena.vocabulary.RDFS;
import java.io.StringWriter;
import org.junit.Test;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.jena.facade.JenaGraph;
import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
@@ -50,7 +50,7 @@ public class TestBasics {
@Test
public void serializeGraph() {
final String uriString = "http://example.org/foo#bar";
- Iri uri = new Iri(uriString);
+ IRI uri = new IRI(uriString);
Graph mGraph = new SimpleGraph();
mGraph.add(new TripleImpl(uri, uri, new PlainLiteralImpl("bla bla")));
com.hp.hpl.jena.graph.Graph graph = new JenaGraph(mGraph);
@@ -62,7 +62,7 @@ public class TestBasics {
@Test
public void graphSize() {
- Iri uri = new Iri("http://example.org/foo#bar");
+ IRI uri = new IRI("http://example.org/foo#bar");
Graph mGraph = new SimpleGraph();
mGraph.add(new TripleImpl(uri, uri, new PlainLiteralImpl("bla bla")));
com.hp.hpl.jena.graph.Graph graph = new JenaGraph(mGraph);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/parser/src/main/java/org/apache/clerezza/rdf/jena/parser/JenaParserProvider.java
----------------------------------------------------------------------
diff --git a/rdf/jena/parser/src/main/java/org/apache/clerezza/rdf/jena/parser/JenaParserProvider.java b/rdf/jena/parser/src/main/java/org/apache/clerezza/rdf/jena/parser/JenaParserProvider.java
index 6adfc8b..7ca6c45 100644
--- a/rdf/jena/parser/src/main/java/org/apache/clerezza/rdf/jena/parser/JenaParserProvider.java
+++ b/rdf/jena/parser/src/main/java/org/apache/clerezza/rdf/jena/parser/JenaParserProvider.java
@@ -30,12 +30,11 @@ import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
import org.apache.clerezza.rdf.core.serializedform.UnsupportedParsingFormatException;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
/**
* A {@link org.apache.clerezza.rdf.core.serializedform.ParsingProvider} based on Jena
*
* @author reto, mir
- */
/*
* see http://jena.sourceforge.net/IO/iohowto.html
@@ -51,7 +50,7 @@ import org.apache.clerezza.commons.rdf.Iri;
public class JenaParserProvider implements ParsingProvider {
@Override
- public void parse(org.apache.clerezza.commons.rdf.Graph target, InputStream serializedGraph, String formatIdentifier, Iri baseUri) {
+ public void parse(org.apache.clerezza.commons.rdf.Graph target, InputStream serializedGraph, String formatIdentifier, IRI baseUri) {
String jenaFormat = getJenaFormat(formatIdentifier);
com.hp.hpl.jena.graph.Graph graph = new JenaGraph(target);
Model model = ModelFactory.createModelForGraph(graph);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/parser/src/test/java/org/apache/clerezza/rdf/jena/parser/JenaParserProviderTest.java
----------------------------------------------------------------------
diff --git a/rdf/jena/parser/src/test/java/org/apache/clerezza/rdf/jena/parser/JenaParserProviderTest.java b/rdf/jena/parser/src/test/java/org/apache/clerezza/rdf/jena/parser/JenaParserProviderTest.java
index 6c48057..219c54e 100644
--- a/rdf/jena/parser/src/test/java/org/apache/clerezza/rdf/jena/parser/JenaParserProviderTest.java
+++ b/rdf/jena/parser/src/test/java/org/apache/clerezza/rdf/jena/parser/JenaParserProviderTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import org.apache.clerezza.rdf.core.serializedform.ParsingProvider;
import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
@@ -73,7 +73,7 @@ public class JenaParserProviderTest {
Assert.assertEquals(graphFromNTriples, graphFromTurtle);
}
- private ImmutableGraph parse(ParsingProvider parsingProvider, InputStream in, String type, Iri base) {
+ private ImmutableGraph parse(ParsingProvider parsingProvider, InputStream in, String type, IRI base) {
Graph simpleMGraph = new SimpleGraph();
parsingProvider.parse(simpleMGraph, in, type, base);
return simpleMGraph.getImmutableGraph();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java
----------------------------------------------------------------------
diff --git a/rdf/jena/serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java b/rdf/jena/serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java
index 6bf0f75..67f2efa 100644
--- a/rdf/jena/serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java
+++ b/rdf/jena/serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java
@@ -35,7 +35,7 @@ import com.hp.hpl.jena.rdf.model.ModelFactory;
import org.apache.clerezza.rdf.core.LiteralFactory;
import org.apache.clerezza.commons.rdf.BlankNode;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
/**
@@ -60,15 +60,15 @@ public class TestJenaSerializerProvider {
model.createResource().addProperty(
model.createProperty(URI + "E"), "F").addProperty(
model.createProperty(URI + "G"), "H"));
- mGraph.add(new TripleImpl(new Iri("http://foo/bar"),
- new Iri("http://foo/bar"),
+ mGraph.add(new TripleImpl(new IRI("http://foo/bar"),
+ new IRI("http://foo/bar"),
LiteralFactory.getInstance().createTypedLiteral("foo")));
- mGraph.add(new TripleImpl(new Iri("http://foo/bar"),
- new Iri("http://foo/bar"),
+ mGraph.add(new TripleImpl(new IRI("http://foo/bar"),
+ new IRI("http://foo/bar"),
LiteralFactory.getInstance().createTypedLiteral(54675)));
mGraph.add(new TripleImpl(new BlankNode(),
- new Iri("http://foo/bar"),
- new Iri("http://foo/bar")));
+ new IRI("http://foo/bar"),
+ new IRI("http://foo/bar")));
}
/*
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/HashMapSolutionMapping.java
----------------------------------------------------------------------
diff --git a/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/HashMapSolutionMapping.java b/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/HashMapSolutionMapping.java
index f43b596..f7d4431 100644
--- a/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/HashMapSolutionMapping.java
+++ b/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/HashMapSolutionMapping.java
@@ -24,7 +24,7 @@ import com.hp.hpl.jena.rdf.model.RDFNode;
import java.util.HashMap;
import java.util.Iterator;
import org.apache.clerezza.commons.rdf.BlankNode;
-import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.RDFTerm;
import org.apache.clerezza.rdf.core.sparql.SolutionMapping;
import org.apache.clerezza.rdf.core.sparql.query.Variable;
import org.apache.clerezza.rdf.jena.commons.Jena2TriaUtil;
@@ -33,7 +33,7 @@ import org.apache.clerezza.rdf.jena.commons.Jena2TriaUtil;
*
* @author rbn
*/
-class HashMapSolutionMapping extends HashMap<Variable, RdfTerm> implements SolutionMapping {
+class HashMapSolutionMapping extends HashMap<Variable, RDFTerm> implements SolutionMapping {
transient Jena2TriaUtil convertor = new Jena2TriaUtil(new HashMap<Node,BlankNode>());
public HashMapSolutionMapping(QuerySolution querySolution) {
@@ -44,11 +44,11 @@ class HashMapSolutionMapping extends HashMap<Variable, RdfTerm> implements Solut
}
}
@Override
- public RdfTerm get(String name) {
+ public RDFTerm get(String name) {
return get(new Variable(name));
}
- private RdfTerm toRdfTerm(RDFNode node) {
+ private RDFTerm toRdfTerm(RDFNode node) {
return convertor.convertJenaNode2Resource(node.asNode());
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java
----------------------------------------------------------------------
diff --git a/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java b/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java
index 96ddf7d..4e3eb8c 100644
--- a/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java
+++ b/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java
@@ -43,7 +43,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.concurrent.locks.Lock;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.ParseException;
import org.apache.clerezza.rdf.core.sparql.SparqlPreParser;
import org.apache.clerezza.commons.rdf.Graph;
@@ -67,14 +67,14 @@ public class JenaSparqlEngine implements QueryEngine {
public Object execute(TcManager tcManager, Graph defaultGraph,
final String query) {
final SparqlPreParser sparqlPreParser = new SparqlPreParser(tcManager);
- final Iri defaultGraphName = new Iri("http://fake-default.uri/879872");
- Set<Iri> referencedGraphs;
+ final IRI defaultGraphName = new IRI("http://fake-default.uri/879872");
+ Set<IRI> referencedGraphs;
try {
referencedGraphs = sparqlPreParser.getReferredGraphs(query, defaultGraphName);
} catch (ParseException ex) {
throw new RuntimeException(ex);
}
- Set<Iri> graphsToLock = referencedGraphs != null ? referencedGraphs : tcManager.listGraphs();
+ Set<IRI> graphsToLock = referencedGraphs != null ? referencedGraphs : tcManager.listGraphs();
final DatasetGraph datasetGraph = new TcDatasetGraph(tcManager, defaultGraph);
final Dataset dataset = DatasetFactory.create(datasetGraph);
@@ -108,7 +108,7 @@ public class JenaSparqlEngine implements QueryEngine {
return executeUpdate(dataset, query);
}
List<Lock> locks = new ArrayList<Lock>(graphsToLock.size());
- for (Iri uriRef : graphsToLock) {
+ for (IRI uriRef : graphsToLock) {
Graph tc;
if (uriRef.equals(defaultGraphName)) {
tc = defaultGraph;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDatasetGraph.java
----------------------------------------------------------------------
diff --git a/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDatasetGraph.java b/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDatasetGraph.java
index e56b7ae..59a0a24 100644
--- a/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDatasetGraph.java
+++ b/rdf/jena/sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/TcDatasetGraph.java
@@ -26,7 +26,7 @@ import com.hp.hpl.jena.sparql.core.Quad;
import com.hp.hpl.jena.sparql.util.Context;
import java.util.Iterator;
import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.jena.facade.JenaGraph;
@@ -55,14 +55,14 @@ class TcDatasetGraph implements DatasetGraph {
@Override
public com.hp.hpl.jena.graph.Graph getGraph(Node node) {
final JenaGraph jenaGraph = new JenaGraph(
- tcManager.getGraph(new Iri(node.getURI())));
+ tcManager.getGraph(new IRI(node.getURI())));
return jenaGraph;
}
@Override
public boolean containsGraph(Node node) {
try {
- tcManager.getGraph(new Iri(node.getURI()));
+ tcManager.getGraph(new IRI(node.getURI()));
return true;
} catch (NoSuchEntityException e) {
return false;
@@ -71,7 +71,7 @@ class TcDatasetGraph implements DatasetGraph {
@Override
public Iterator<Node> listGraphNodes() {
- final Iterator<Iri> graphsIter = tcManager.listGraphs().iterator();
+ final Iterator<IRI> graphsIter = tcManager.listGraphs().iterator();
return new Iterator<Node>() {
@Override
@@ -81,7 +81,7 @@ class TcDatasetGraph implements DatasetGraph {
@Override
public Node next() {
- Iri uriRef = graphsIter.next();
+ IRI uriRef = graphsIter.next();
if (uriRef == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/sparql/src/test/java/org/apache/clerezza/rdf/jena/sparql/SimpleTest.java
----------------------------------------------------------------------
diff --git a/rdf/jena/sparql/src/test/java/org/apache/clerezza/rdf/jena/sparql/SimpleTest.java b/rdf/jena/sparql/src/test/java/org/apache/clerezza/rdf/jena/sparql/SimpleTest.java
index 76d762b..e02b730 100644
--- a/rdf/jena/sparql/src/test/java/org/apache/clerezza/rdf/jena/sparql/SimpleTest.java
+++ b/rdf/jena/sparql/src/test/java/org/apache/clerezza/rdf/jena/sparql/SimpleTest.java
@@ -24,7 +24,7 @@ import org.junit.Assert;
import org.junit.Test;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.clerezza.commons.rdf.Literal;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
@@ -44,7 +44,7 @@ public class SimpleTest {
public void simpleStringQuery() throws ParseException {
SimpleGraph data = new SimpleGraph();
final String titleValue = "SPARQL Tutorial";
- data.add(new TripleImpl(new Iri("http://example.org/book/book1"),
+ data.add(new TripleImpl(new IRI("http://example.org/book/book1"),
DC.title, new PlainLiteralImpl(titleValue)));
String query = "SELECT ?title WHERE" + "{"
+ " <http://example.org/book/book1> <"
@@ -63,7 +63,7 @@ public class SimpleTest {
public void simpleSelectQuery() throws ParseException {
SimpleGraph data = new SimpleGraph();
final String titleValue = "SPARQL Tutorial";
- data.add(new TripleImpl(new Iri("http://example.org/book/book1"),
+ data.add(new TripleImpl(new IRI("http://example.org/book/book1"),
DC.title, new PlainLiteralImpl(titleValue)));
String query = "SELECT ?title WHERE" + "{"
+ " <http://example.org/book/book1> <"
@@ -79,7 +79,7 @@ public class SimpleTest {
public void simpleAskQuery() throws ParseException {
SimpleGraph data = new SimpleGraph();
final String titleValue = "SPARQL Tutorial";
- data.add(new TripleImpl(new Iri("http://example.org/book/book1"),
+ data.add(new TripleImpl(new IRI("http://example.org/book/book1"),
DC.title, new PlainLiteralImpl(titleValue)));
String query = "ASK WHERE" + "{"
+ " <http://example.org/book/book1> <"
@@ -96,7 +96,7 @@ public class SimpleTest {
public void simpleDescribe() throws ParseException {
SimpleGraph data = new SimpleGraph();
final String titleValue = "SPARQL Tutorial";
- data.add(new TripleImpl(new Iri("http://example.org/book/book1"),
+ data.add(new TripleImpl(new IRI("http://example.org/book/book1"),
DC.title, new PlainLiteralImpl(titleValue)));
String query = "DESCRIBE " + " <http://example.org/book/book1>";
Assert.assertEquals(
@@ -109,7 +109,7 @@ public class SimpleTest {
public void simpleConstruct() throws ParseException {
SimpleGraph data = new SimpleGraph();
final String titleValue = "SPARQL Tutorial";
- data.add(new TripleImpl(new Iri("http://example.org/book/book1"),
+ data.add(new TripleImpl(new IRI("http://example.org/book/book1"),
DC.title, new PlainLiteralImpl(titleValue)));
String query = "PREFIX foaf: <http://xmlns.com/foaf/0.1/> "
+ "CONSTRUCT { <http://foo/bar> foaf:name ?title } WHERE" + "{"
@@ -126,7 +126,7 @@ public class SimpleTest {
public void simpleInsert() throws ParseException {
SimpleGraph data = new SimpleGraph();
final String titleValue = "SPARQL Tutorial";
- data.add(new TripleImpl(new Iri("http://example.org/book/book1"),
+ data.add(new TripleImpl(new IRI("http://example.org/book/book1"),
DC.title, new PlainLiteralImpl(titleValue)));
String query = "PREFIX foaf: <http://xmlns.com/foaf/0.1/> "
@@ -139,7 +139,7 @@ public class SimpleTest {
public void simpleDrop() throws ParseException {
SimpleGraph data = new SimpleGraph();
final String titleValue = "SPARQL Tutorial";
- data.add(new TripleImpl(new Iri("http://example.org/book/book1"),
+ data.add(new TripleImpl(new IRI("http://example.org/book/book1"),
DC.title, new PlainLiteralImpl(titleValue)));
String query = "DROP ALL";
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java
----------------------------------------------------------------------
diff --git a/rdf/jena/storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java b/rdf/jena/storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java
index bf40c66..3f782e5 100644
--- a/rdf/jena/storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java
+++ b/rdf/jena/storage/src/main/java/org/apache/clerezza/rdf/jena/storage/JenaGraphAdaptor.java
@@ -26,10 +26,10 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.concurrent.locks.ReadWriteLock;
import org.apache.clerezza.commons.rdf.BlankNode;
-import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
-import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
+import org.apache.clerezza.commons.rdf.RDFTerm;
import org.apache.clerezza.commons.rdf.Triple;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.jena.commons.Jena2TriaUtil;
import org.apache.clerezza.rdf.jena.commons.Tria2JenaUtil;
import org.apache.clerezza.commons.rdf.impl.utils.AbstractGraph;
@@ -75,7 +75,7 @@ public class JenaGraphAdaptor extends AbstractGraph {
}
@Override
- public Iterator<Triple> performFilter(BlankNodeOrIri subject, Iri predicate, RdfTerm object) {
+ public Iterator<Triple> performFilter(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
Node jenaSubject = null;
Node jenaPredicate = null;
Node jenaObject = null;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/IriSet.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/IriSet.java b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/IriSet.java
index 5f23953..3e5b2a2 100644
--- a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/IriSet.java
+++ b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/IriSet.java
@@ -4,18 +4,18 @@ import java.util.AbstractSet;
import java.util.Iterator;
import org.apache.clerezza.commons.rdf.Triple;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.ontologies.RDF;
/**
* Represents a set of uri ref Set<Iri>
* @author Minto van der Sluis
*/
-public class IriSet extends AbstractSet<Iri> {
+public class IriSet extends AbstractSet<IRI> {
private ModelGraph graphNameIndex;
- private Iri graphType;
+ private IRI graphType;
- public IriSet(ModelGraph index, Iri object) {
+ public IriSet(ModelGraph index, IRI object) {
graphNameIndex = index;
graphType = object;
}
@@ -27,17 +27,17 @@ public class IriSet extends AbstractSet<Iri> {
}
@Override
- public Iterator<Iri> iterator() {
+ public Iterator<IRI> iterator() {
final Iterator<Triple> indexIter = graphNameIndex.getGraph().filter( null, RDF.type, graphType );
- return new Iterator<Iri>() {
+ return new Iterator<IRI>() {
@Override
public boolean hasNext() {
return indexIter.hasNext();
}
@Override
- public Iri next() {
- return Iri.class.cast(indexIter.next().getSubject());
+ public IRI next() {
+ return IRI.class.cast(indexIter.next().getSubject());
}
@Override
@@ -48,14 +48,14 @@ public class IriSet extends AbstractSet<Iri> {
}
@Override
- public boolean add(Iri o) {
+ public boolean add(IRI o) {
throw new UnsupportedOperationException();
}
@Override
public boolean contains(Object o) {
- if (o instanceof Iri) {
- return graphNameIndex.getGraph().filter(Iri.class.cast(o), RDF.type, graphType).hasNext();
+ if (o instanceof IRI) {
+ return graphNameIndex.getGraph().filter(IRI.class.cast(o), RDF.type, graphType).hasNext();
}
return false;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/ModelGraph.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/ModelGraph.java b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/ModelGraph.java
index 80a5210..4a8258d 100644
--- a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/ModelGraph.java
+++ b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/ModelGraph.java
@@ -5,7 +5,7 @@ import java.util.concurrent.locks.ReadWriteLock;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.core.impl.util.PrivilegedGraphWrapper;
import org.apache.clerezza.rdf.core.impl.util.PrivilegedGraphWrapper;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/Symbols.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/Symbols.java b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/Symbols.java
index 0afa3fa..cd882a2 100644
--- a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/Symbols.java
+++ b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/Symbols.java
@@ -1,6 +1,6 @@
package org.apache.clerezza.rdf.jena.tdb.internals;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
/**
* Provides static methods in order to represent classes used to
@@ -11,12 +11,12 @@ import org.apache.clerezza.commons.rdf.Iri;
*/
public class Symbols {
- public static Iri Index = new Iri("http://clerezza.apache.org/storage/Index");
+ public static IRI Index = new IRI("http://clerezza.apache.org/storage/Index");
- public static Iri Default = new Iri("http://clerezza.apache.org/storage/Default");
+ public static IRI Default = new IRI("http://clerezza.apache.org/storage/Default");
- public static Iri ImmutableGraph = new Iri("http://clerezza.apache.org/storage/ImmutableGraph");
+ public static IRI ImmutableGraph = new IRI("http://clerezza.apache.org/storage/ImmutableGraph");
- public static Iri Graph = new Iri("http://clerezza.apache.org/storage/Graph");
+ public static IRI Graph = new IRI("http://clerezza.apache.org/storage/Graph");
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/BaseTdbTcProvider.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/BaseTdbTcProvider.java b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/BaseTdbTcProvider.java
index 8c05d7b..5f3e0bc 100644
--- a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/BaseTdbTcProvider.java
+++ b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/BaseTdbTcProvider.java
@@ -18,7 +18,7 @@ import com.hp.hpl.jena.query.QueryFactory;
import com.hp.hpl.jena.update.GraphStore;
import com.hp.hpl.jena.update.GraphStoreFactory;
import com.hp.hpl.jena.update.UpdateAction;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
abstract class BaseTdbTcProvider implements QueryableTcProvider{
@@ -33,7 +33,7 @@ abstract class BaseTdbTcProvider implements QueryableTcProvider{
// ------------------------------------------------------------------------
@Override
- public Object executeSparqlQuery(final String query, Iri defaultGraph) {
+ public Object executeSparqlQuery(final String query, IRI defaultGraph) {
// Missing permission (java.lang.RuntimePermission getClassLoader)
// when calling QueryFactory.create causes ExceptionInInitializerError
// to be thrown.
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java
index 4264c2d..0e84390 100644
--- a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java
+++ b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProvider.java
@@ -17,7 +17,7 @@ import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.commons.rdf.Triple;
import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.EntityAlreadyExistsException;
import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
@@ -109,10 +109,10 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
private SyncThread syncThread;
private final ReadWriteLock datasetLock = new ReentrantReadWriteLock();;
- private Iri defaultGraphName;
+ private IRI defaultGraphName;
// Ensure that models not yet garbage collected get properly synced.
- private final ConcurrentMap<Iri, ModelGraph> syncModels = new MapMaker().weakValues().makeMap();
+ private final ConcurrentMap<IRI, ModelGraph> syncModels = new MapMaker().weakValues().makeMap();
/**
* This background thread ensures that changes to {@link Model}s are
@@ -167,7 +167,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
* <li> {@link #TDB_DIR} (required): The directory used by Jena TDB. Property
* substitution "${property-name}" with {@link System#getProperties()} is
* supported.
- * <li> {@link #DEFAULT_GRAPH_NAME}: The name ({@link Iri}) of the
+ * <li> {@link #DEFAULT_GRAPH_NAME}: The name ({@link IRI}) of the
* {@link ImmutableGraph} that exports the union graph. This graph allows to query
* triples in any named model managed by this {@link TcProvider}.
* <li> {@link #SYNC_INTERVAL}: The sync interval that
@@ -257,7 +257,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
if(value != null && !value.toString().isEmpty()){
try {
new URI(value.toString());
- defaultGraphName = new Iri(value.toString());
+ defaultGraphName = new IRI(value.toString());
} catch (URISyntaxException e) {
throw new ConfigurationException(DEFAULT_GRAPH_NAME, "The parsed name '"
+ value + "'for the default graph (union over all "
@@ -368,7 +368,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
* @throws NoSuchEntityException If <code>create == false</code> and no
* {@link Model} for the parsed <code>name</code> exists.
*/
- private ModelGraph getModelGraph(Iri name, boolean readWrite,boolean create) throws NoSuchEntityException {
+ private ModelGraph getModelGraph(IRI name, boolean readWrite,boolean create) throws NoSuchEntityException {
ModelGraph modelGraph = null;
datasetLock.readLock().lock();
try {
@@ -396,10 +396,10 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
/*
* (non-Javadoc)
- * @see org.apache.clerezza.rdf.core.access.TcProvider#getGraph(org.apache.clerezza.commons.rdf.Iri)
+ * @see org.apache.clerezza.rdf.core.access.TcProvider#getGraph(org.apache.clerezza.commons.rdf.IRI)
*/
@Override
- public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
+ public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
if(name == null){
throw new IllegalArgumentException("The parsed ImmutableGraph Iri MUST NOT be NULL!");
}
@@ -417,10 +417,10 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
/*
* (non-Javadoc)
- * @see org.apache.clerezza.rdf.core.access.TcProvider#getGraph(org.apache.clerezza.commons.rdf.Iri)
+ * @see org.apache.clerezza.rdf.core.access.TcProvider#getGraph(org.apache.clerezza.commons.rdf.IRI)
*/
@Override
- public Graph getMGraph(Iri name) throws NoSuchEntityException {
+ public Graph getMGraph(IRI name) throws NoSuchEntityException {
if(name == null){
throw new IllegalArgumentException("The parsed ImmutableGraph Iri MUST NOT be NULL!");
}
@@ -438,10 +438,10 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
/*
* (non-Javadoc)
- * @see org.apache.clerezza.rdf.core.access.TcProvider#getTriples(org.apache.clerezza.commons.rdf.Iri)
+ * @see org.apache.clerezza.rdf.core.access.TcProvider#getTriples(org.apache.clerezza.commons.rdf.IRI)
*/
@Override
- public Graph getGraph(Iri name) throws NoSuchEntityException {
+ public Graph getGraph(IRI name) throws NoSuchEntityException {
if(name == null){
throw new IllegalArgumentException("The parsed ImmutableGraph Iri MUST NOT be NULL!");
}
@@ -464,7 +464,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
* @see org.apache.clerezza.rdf.core.access.TcProvider#listGraphs()
*/
@Override
- public Set<Iri> listImmutableGraphs() {
+ public Set<IRI> listImmutableGraphs() {
datasetLock.readLock().lock();
try {
return new HashSet(new IriSet( graphNameIndex, Symbols.ImmutableGraph ));
@@ -478,7 +478,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
* @see org.apache.clerezza.rdf.core.access.TcProvider#listGraphs()
*/
@Override
- public Set<Iri> listMGraphs() {
+ public Set<IRI> listMGraphs() {
datasetLock.readLock().lock();
try {
return new HashSet(new IriSet( graphNameIndex, Symbols.Graph ));
@@ -492,7 +492,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
* @see org.apache.clerezza.rdf.core.access.TcProvider#listGraphs()
*/
@Override
- public Set<Iri> listGraphs() {
+ public Set<IRI> listGraphs() {
datasetLock.readLock().lock();
try {
return new HashSet(new IriSet( graphNameIndex, null ));
@@ -503,10 +503,10 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
/*
* (non-Javadoc)
- * @see org.apache.clerezza.rdf.core.access.TcProvider#createGraph(org.apache.clerezza.commons.rdf.Iri)
+ * @see org.apache.clerezza.rdf.core.access.TcProvider#createGraph(org.apache.clerezza.commons.rdf.IRI)
*/
@Override
- public Graph createGraph(Iri name) throws UnsupportedOperationException,
+ public Graph createGraph(IRI name) throws UnsupportedOperationException,
EntityAlreadyExistsException {
if(name == null){
throw new IllegalArgumentException("The parsed MGrpah name MUST NOT be NULL!");
@@ -526,10 +526,10 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
/*
* (non-Javadoc)
- * @see org.apache.clerezza.rdf.core.access.TcProvider#createGraph(org.apache.clerezza.commons.rdf.Iri, org.apache.clerezza.commons.rdf.Graph)
+ * @see org.apache.clerezza.rdf.core.access.TcProvider#createGraph(org.apache.clerezza.commons.rdf.IRI, org.apache.clerezza.commons.rdf.Graph)
*/
@Override
- public ImmutableGraph createImmutableGraph(Iri name, Graph triples) throws UnsupportedOperationException,
+ public ImmutableGraph createImmutableGraph(IRI name, Graph triples) throws UnsupportedOperationException,
EntityAlreadyExistsException {
if(name == null){
throw new IllegalArgumentException("The parsed Grpah name MUST NOT be NULL!");
@@ -556,10 +556,10 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
/*
* (non-Javadoc)
- * @see org.apache.clerezza.rdf.core.access.TcProvider#deleteGraph(org.apache.clerezza.commons.rdf.Iri)
+ * @see org.apache.clerezza.rdf.core.access.TcProvider#deleteGraph(org.apache.clerezza.commons.rdf.IRI)
*/
@Override
- public void deleteGraph(Iri name) throws UnsupportedOperationException,
+ public void deleteGraph(IRI name) throws UnsupportedOperationException,
NoSuchEntityException,
EntityUndeletableException {
if(name == null){
@@ -590,13 +590,13 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
* @see org.apache.clerezza.rdf.core.access.TcProvider#getNames(org.apache.clerezza.commons.rdf.ImmutableGraph)
*/
@Override
- public Set<Iri> getNames(ImmutableGraph graph) {
+ public Set<IRI> getNames(ImmutableGraph graph) {
//TODO: this method would require to compare the triples within the graph
// because an equals check will not work with BlankNodes.
- Set<Iri> graphNames = new HashSet<Iri>();
+ Set<IRI> graphNames = new HashSet<IRI>();
for( Iterator<Triple> iterator = graphNameIndex.getGraph().iterator(); iterator.hasNext(); ) {
Triple triple = iterator.next();
- Iri graphName = new Iri(triple.getSubject().toString());
+ IRI graphName = new IRI(triple.getSubject().toString());
ImmutableGraph currentGraph = getModelGraph(graphName, false, false).getImmutableGraph();
if(graph.equals(currentGraph)){
graphNames.add(graphName);
@@ -666,7 +666,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
* @param graphType the resource type
* @return true if a resource with the given name and type already exists, false otherwise.
*/
- private boolean isExistingGraphName(Iri graphName, Iri graphType) {
+ private boolean isExistingGraphName(IRI graphName, IRI graphType) {
return graphNameIndex.getGraph().filter(graphName, RDF.type, graphType).hasNext();
}
@@ -675,7 +675,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
* @param graphName the graph name
* @return true if a graph or mgraph with the given name already exists, false otherwise.
*/
- private boolean isExistingGraphName(Iri graphName) {
+ private boolean isExistingGraphName(IRI graphName) {
return isExistingGraphName(graphName, null);
}
@@ -684,7 +684,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
* @param graphName name of the graph
* @param graphType resourcetype for the graph to add.
*/
- private void addToIndex(Iri graphName, Iri graphType) {
+ private void addToIndex(IRI graphName, IRI graphType) {
graphNameIndex.getGraph().add(new TripleImpl(graphName, RDF.type, graphType));
graphNameIndex.sync();
}
@@ -694,7 +694,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
* @param graphName name of the graph to remove
* @param graphType resource type of the graph to remove.
*/
- private void removeFromIndex(Iri graphName, Iri graphType) {
+ private void removeFromIndex(IRI graphName, IRI graphType) {
Graph index = graphNameIndex.getGraph();
Iterator<Triple> triplesToRemove = index.filter(graphName, RDF.type, graphType);
for( ; triplesToRemove.hasNext(); ) {
@@ -710,7 +710,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
for( ; triplesToRemove.hasNext(); ) {
Triple triple = triplesToRemove.next();
triplesToRemove.remove();
- removeFromIndex( Iri.class.cast(triple.getSubject()), Symbols.ImmutableGraph );
+ removeFromIndex(IRI.class.cast(triple.getSubject()), Symbols.ImmutableGraph );
}
graphNameIndex.sync();
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbTcProvider.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbTcProvider.java b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbTcProvider.java
index 6c7578b..5ae3a2e 100644
--- a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbTcProvider.java
+++ b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbTcProvider.java
@@ -40,7 +40,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.EntityAlreadyExistsException;
import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
@@ -86,8 +86,8 @@ public class TdbTcProvider implements WeightedTcProvider {
*/
private static final String DATA_PATH_NAME = "tdb-data/";
private String dataPathString = DATA_PATH_NAME;
- private Map<Iri, Graph> mGraphMap = new HashMap<Iri, Graph>();
- private Map<Iri, ImmutableGraph> graphMap = new HashMap<Iri, ImmutableGraph>();
+ private Map<IRI, Graph> mGraphMap = new HashMap<IRI, Graph>();
+ private Map<IRI, ImmutableGraph> graphMap = new HashMap<IRI, ImmutableGraph>();
private Map<File, com.hp.hpl.jena.graph.Graph> dir2JenaGraphMap = new HashMap<File, com.hp.hpl.jena.graph.Graph>();
private Map<File, Lock> dir2Lock = new HashMap<File, Lock>();
private final Map<File, Dataset> dir2Dataset = new HashMap<File, Dataset>();
@@ -160,7 +160,7 @@ public class TdbTcProvider implements WeightedTcProvider {
}
@Override
- public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
+ public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
if (!graphMap.containsKey(name)) {
throw new NoSuchEntityException(name);
}
@@ -168,7 +168,7 @@ public class TdbTcProvider implements WeightedTcProvider {
}
@Override
- public synchronized Graph getMGraph(Iri name) throws NoSuchEntityException {
+ public synchronized Graph getMGraph(IRI name) throws NoSuchEntityException {
if (!mGraphMap.containsKey(name)) {
throw new NoSuchEntityException(name);
}
@@ -176,7 +176,7 @@ public class TdbTcProvider implements WeightedTcProvider {
}
@Override
- public Graph getGraph(Iri name) throws NoSuchEntityException {
+ public Graph getGraph(IRI name) throws NoSuchEntityException {
try {
return getMGraph(name);
} catch (NoSuchEntityException e) {
@@ -185,7 +185,7 @@ public class TdbTcProvider implements WeightedTcProvider {
}
@Override
- public synchronized Graph createGraph(Iri name)
+ public synchronized Graph createGraph(IRI name)
throws UnsupportedOperationException, EntityAlreadyExistsException {
File tcDir = getGraphDir(name);
if (tcDir.exists()) {
@@ -205,7 +205,7 @@ public class TdbTcProvider implements WeightedTcProvider {
}
@Override
- public ImmutableGraph createImmutableGraph(Iri name, Graph triples)
+ public ImmutableGraph createImmutableGraph(IRI name, Graph triples)
throws UnsupportedOperationException, EntityAlreadyExistsException {
File tcDir = getImmutableGraphDir(name);
if (tcDir.exists()) {
@@ -231,7 +231,7 @@ public class TdbTcProvider implements WeightedTcProvider {
}
@Override
- public void deleteGraph(Iri name)
+ public void deleteGraph(IRI name)
throws UnsupportedOperationException, NoSuchEntityException,
EntityUndeletableException {
syncWithFileSystem();
@@ -309,11 +309,11 @@ public class TdbTcProvider implements WeightedTcProvider {
}
@Override
- public Set<Iri> getNames(ImmutableGraph graph) {
+ public Set<IRI> getNames(ImmutableGraph graph) {
//this could be done more efficiently with an index, could be done with
//a MultiBidiMap (BidiMap allowing multiple keys for the same value)
- Set<Iri> result = new HashSet<Iri>();
- for (Iri name : listGraphs()) {
+ Set<IRI> result = new HashSet<IRI>();
+ for (IRI name : listGraphs()) {
if (getGraph(name).equals(graph)) {
result.add(name);
}
@@ -322,20 +322,20 @@ public class TdbTcProvider implements WeightedTcProvider {
}
@Override
- public Set<Iri> listGraphs() {
- Set<Iri> result = new HashSet<Iri>();
+ public Set<IRI> listGraphs() {
+ Set<IRI> result = new HashSet<IRI>();
result.addAll(listMGraphs());
result.addAll(listImmutableGraphs());
return result;
}
@Override
- public Set<Iri> listMGraphs() {
+ public Set<IRI> listMGraphs() {
return graphMap.keySet();
}
@Override
- public Set<Iri> listImmutableGraphs() {
+ public Set<IRI> listImmutableGraphs() {
return mGraphMap.keySet();
}
@@ -343,7 +343,7 @@ public class TdbTcProvider implements WeightedTcProvider {
return getGraph(tcDir).getImmutableGraph();
}
- private File getImmutableGraphDir(Iri name) {
+ private File getImmutableGraphDir(IRI name) {
File base = new File(dataPathString);
return getTcDir(new File(base, "graph"), name);
}
@@ -361,12 +361,12 @@ public class TdbTcProvider implements WeightedTcProvider {
return new PrivilegedGraphWrapper(new JenaGraphAdaptor(jenaGraph));
}
- private File getGraphDir(Iri name) {
+ private File getGraphDir(IRI name) {
File base = new File(dataPathString);
return getTcDir(new File(base, "mgraph"), name);
}
- private File getTcDir(File directory, Iri name) {
+ private File getTcDir(File directory, IRI name) {
try {
String subDirName = URLEncoder.encode(name.getUnicodeString(), "utf-8");
return new File(directory, subDirName);
@@ -380,7 +380,7 @@ public class TdbTcProvider implements WeightedTcProvider {
if (graphsDir.exists()) {
for (String graphDirName : graphsDir.list()) {
try {
- Iri uri = new Iri(URLDecoder.decode(graphDirName, "utf-8"));
+ IRI uri = new IRI(URLDecoder.decode(graphDirName, "utf-8"));
log.info("loading: " + graphDirName);
graphMap.put(uri, getImmutableGraph(new File(graphsDir, graphDirName)));
} catch (UnsupportedEncodingException ex) {
@@ -397,7 +397,7 @@ public class TdbTcProvider implements WeightedTcProvider {
if (mGraphsDir.exists()) {
for (String mGraphDirName : mGraphsDir.list()) {
try {
- Iri uri = new Iri(URLDecoder.decode(mGraphDirName, "utf-8"));
+ IRI uri = new IRI(URLDecoder.decode(mGraphDirName, "utf-8"));
log.info("loading: " + mGraphDirName);
final File tcDir = new File(mGraphsDir, mGraphDirName);
final Graph lockableGraph = getGraph(tcDir);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedSingleTdbDatasetTest.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedSingleTdbDatasetTest.java b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedSingleTdbDatasetTest.java
index d348532..98d467a 100644
--- a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedSingleTdbDatasetTest.java
+++ b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedSingleTdbDatasetTest.java
@@ -37,7 +37,7 @@ import org.apache.clerezza.commons.rdf.BlankNode;
import org.apache.clerezza.commons.rdf.Literal;
import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.commons.rdf.Triple;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.junit.AfterClass;
@@ -101,7 +101,7 @@ public class MultiThreadedSingleTdbDatasetTest {
num = graphNum[0];
graphNum[0]++;
}
- graph = provider.createGraph(new Iri(TEST_GRAPH_URI_PREFIX+num));
+ graph = provider.createGraph(new IRI(TEST_GRAPH_URI_PREFIX+num));
log.info(" ... creating the {}. Grpah", num+1);
testTriples = new HashSet<Triple>();
synchronized (mGraphs) {
@@ -116,7 +116,7 @@ public class MultiThreadedSingleTdbDatasetTest {
}
}
Literal randomLiteral = new PlainLiteralImpl(Util.createRandomString(22));
- Triple triple = new TripleImpl(new BlankNode(), new Iri("http://example.com/property"), randomLiteral);
+ Triple triple = new TripleImpl(new BlankNode(), new IRI("http://example.com/property"), randomLiteral);
graph.add(triple);
addedTripleCount++;
if ((addedTripleCount % 100) == 0) {
@@ -201,10 +201,10 @@ public class MultiThreadedSingleTdbDatasetTest {
}
@Before
public void createGraphs(){
- mGraphs.add(provider.createGraph(new Iri(TEST_GRAPH_URI_PREFIX+graphNum[0])));
+ mGraphs.add(provider.createGraph(new IRI(TEST_GRAPH_URI_PREFIX+graphNum[0])));
testTriplesList.add(new HashSet<Triple>());
graphNum[0]++;
- mGraphs.add(provider.createGraph(new Iri(TEST_GRAPH_URI_PREFIX+graphNum[0])));
+ mGraphs.add(provider.createGraph(new IRI(TEST_GRAPH_URI_PREFIX+graphNum[0])));
testTriplesList.add(new HashSet<Triple>());
graphNum[0]++;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTest.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTest.java b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTest.java
index 00ec289..141dc8e 100644
--- a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTest.java
+++ b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTest.java
@@ -31,9 +31,9 @@ import java.util.Set;
import org.apache.clerezza.commons.rdf.BlankNode;
import org.apache.clerezza.commons.rdf.Literal;
import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.RDFTerm;
import org.apache.clerezza.commons.rdf.Triple;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.felix.scr.annotations.Activate;
@@ -81,7 +81,7 @@ public class MultiThreadedTest {
while (!stopRequested) {
try {
Literal randomLiteral = new PlainLiteralImpl(Util.createRandomString(22));
- Triple triple = new TripleImpl(new BlankNode(), new Iri("http://example.com/property"), randomLiteral);
+ Triple triple = new TripleImpl(new BlankNode(), new IRI("http://example.com/property"), randomLiteral);
mGraph.add(triple);
addedTripleCount++;
if ((addedTripleCount % 100) == 0) {
@@ -104,7 +104,7 @@ public class MultiThreadedTest {
@Before
public void setUp() throws IOException {
File tempFile;
- Iri MGRAPHNAME = new Iri("http://text.example.org/");
+ IRI MGRAPHNAME = new IRI("http://text.example.org/");
TdbTcProvider tdbTcProvider;
tempFile = File.createTempFile("tdbtest", null);
tempFile.delete();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTestSingleTdb.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTestSingleTdb.java b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTestSingleTdb.java
index b76f676..8e7dde5 100644
--- a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTestSingleTdb.java
+++ b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTestSingleTdb.java
@@ -34,9 +34,9 @@ import java.util.Set;
import org.apache.clerezza.commons.rdf.BlankNode;
import org.apache.clerezza.commons.rdf.Literal;
import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.RDFTerm;
import org.apache.clerezza.commons.rdf.Triple;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.TcProvider;
import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
@@ -86,7 +86,7 @@ public class MultiThreadedTestSingleTdb {
while (!stopRequested) {
try {
Literal randomLiteral = new PlainLiteralImpl(Util.createRandomString(22));
- Triple triple = new TripleImpl(new BlankNode(), new Iri("http://example.com/property"), randomLiteral);
+ Triple triple = new TripleImpl(new BlankNode(), new IRI("http://example.com/property"), randomLiteral);
mGraph.add(triple);
addedTripleCount++;
if ((addedTripleCount % 100) == 0) {
@@ -109,7 +109,7 @@ public class MultiThreadedTestSingleTdb {
@Before
public void setUp() throws IOException, ConfigurationException {
File tempFile;
- Iri MGRAPHNAME = new Iri("http://text.example.org/");
+ IRI MGRAPHNAME = new IRI("http://text.example.org/");
TcProvider tdbTcProvider;
tempFile = File.createTempFile("tdbtest", null);
tempFile.delete();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetGraphTest.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetGraphTest.java b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetGraphTest.java
index 1a5b78a..d1f1a81 100644
--- a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetGraphTest.java
+++ b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetGraphTest.java
@@ -6,7 +6,7 @@ import java.util.Dictionary;
import java.util.Hashtable;
import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.test.GraphTest;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -15,7 +15,7 @@ import org.osgi.service.cm.ConfigurationException;
public class SingleTdbDatasetGraphTest extends GraphTest {
private static final String MGRAPHNAME_PREFIX = "http://text.example.org/testGraph";
- private static Iri UNION_GRAPH_NAME = new Iri("http://www.example.org/unionGraph");
+ private static IRI UNION_GRAPH_NAME = new IRI("http://www.example.org/unionGraph");
private static int testGraphCounter = 0;
private static File tempFile;
@@ -36,7 +36,7 @@ public class SingleTdbDatasetGraphTest extends GraphTest {
@AfterClass
public static void cleanUpDirectory() throws IOException {
for(int i = 0; i < testGraphCounter;i++){
- provider.deleteGraph(new Iri(MGRAPHNAME_PREFIX+i));
+ provider.deleteGraph(new IRI(MGRAPHNAME_PREFIX+i));
}
provider.deactivate(null);
try {
@@ -48,7 +48,7 @@ public class SingleTdbDatasetGraphTest extends GraphTest {
@Override
protected Graph getEmptyGraph() {
- Graph graph = provider.createGraph(new Iri(MGRAPHNAME_PREFIX+testGraphCounter));
+ Graph graph = provider.createGraph(new IRI(MGRAPHNAME_PREFIX+testGraphCounter));
testGraphCounter++;
return graph;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java
index b90cfed..199cdfc 100644
--- a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java
+++ b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java
@@ -11,9 +11,9 @@ import java.util.Set;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
import org.apache.clerezza.commons.rdf.Triple;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcProvider;
import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
@@ -31,7 +31,7 @@ public class SingleTdbDatasetTcProviderTest extends TcProviderTest {
private static File tempFile;
private static Dictionary<String,Object> config;
private static SingleTdbDatasetTcProvider provider;
- private static Iri UNION_GRAPH_NAME = new Iri("http://www.example.org/unionGraph");
+ private static IRI UNION_GRAPH_NAME = new IRI("http://www.example.org/unionGraph");
@Before
public void setup() throws IOException, ConfigurationException {
@@ -100,29 +100,29 @@ public class SingleTdbDatasetTcProviderTest extends TcProviderTest {
@Test
public void testUnionGraph() throws Exception{
TcProvider provider = getInstance();
- Iri type = new Iri("http://www.w3.org/2000/01/rdf-schema#type");
- Iri name = new Iri("http://schema.org/name");
- Iri personType = new Iri("http://schema.org/Person");
- Iri companyType = new Iri("http://schema.org/Company");
- Iri worksFor = new Iri("http://schema.org/works-for");
+ IRI type = new IRI("http://www.w3.org/2000/01/rdf-schema#type");
+ IRI name = new IRI("http://schema.org/name");
+ IRI personType = new IRI("http://schema.org/Person");
+ IRI companyType = new IRI("http://schema.org/Company");
+ IRI worksFor = new IRI("http://schema.org/works-for");
//create a graph with persons
Graph persons = new SimpleGraph();
- Iri tim = new Iri("http://people.org/tim.johnson");
+ IRI tim = new IRI("http://people.org/tim.johnson");
persons.add(new TripleImpl(tim, type, personType));
persons.add(new TripleImpl(tim, name, new PlainLiteralImpl("Tim Johnson")));
- Iri john = new Iri("http://people.org/john.swenson");
+ IRI john = new IRI("http://people.org/john.swenson");
persons.add(new TripleImpl(john, type, personType));
persons.add(new TripleImpl(john, name, new PlainLiteralImpl("John Swenson")));
- provider.createImmutableGraph(new Iri("urn:persons"), persons);
+ provider.createImmutableGraph(new IRI("urn:persons"), persons);
//create a Graph with data about persons
- Graph orgdata = provider.createGraph(new Iri("urn:orgdata"));
- Iri talinor = new Iri("http://company.org/talinor");
+ Graph orgdata = provider.createGraph(new IRI("urn:orgdata"));
+ IRI talinor = new IRI("http://company.org/talinor");
orgdata.add(new TripleImpl(talinor, type, companyType));
orgdata.add(new TripleImpl(talinor, name, new PlainLiteralImpl("Talinor Inc.")));
orgdata.add(new TripleImpl(john, worksFor, talinor));
- Iri kondalor = new Iri("http://company.org/kondalor");
+ IRI kondalor = new IRI("http://company.org/kondalor");
orgdata.add(new TripleImpl(kondalor, type, companyType));
orgdata.add(new TripleImpl(kondalor, name, new PlainLiteralImpl("Kondalor Ges.m.b.H.")));
orgdata.add(new TripleImpl(tim, worksFor, kondalor));
@@ -139,17 +139,17 @@ public class SingleTdbDatasetTcProviderTest extends TcProviderTest {
// +" triples (expected "+expectedTripleCount+")",
// expectedTripleCount, data.size());
Iterator<Triple> it = data.filter(null, type, companyType);
- Set<Iri> expected = new HashSet<Iri>(Arrays.asList(talinor,kondalor));
+ Set<IRI> expected = new HashSet<IRI>(Arrays.asList(talinor,kondalor));
while(it.hasNext()){
- BlankNodeOrIri subject = it.next().getSubject();
+ BlankNodeOrIRI subject = it.next().getSubject();
Assert.assertTrue("Unexpected "+subject, expected.remove(subject));
}
Assert.assertTrue("Missing "+expected, expected.isEmpty());
it = data.filter(null, type, personType);
- expected = new HashSet<Iri>(Arrays.asList(john,tim));
+ expected = new HashSet<IRI>(Arrays.asList(john,tim));
while(it.hasNext()){
- BlankNodeOrIri subject = it.next().getSubject();
+ BlankNodeOrIRI subject = it.next().getSubject();
Assert.assertTrue("Unexpected "+subject, expected.remove(subject));
}
Assert.assertTrue("Missing "+expected, expected.isEmpty());
@@ -159,10 +159,10 @@ public class SingleTdbDatasetTcProviderTest extends TcProviderTest {
public void testListGraph(){
TcProvider provider = getInstance();
//No union graph in listGraphs
- Set<Iri> mgl = provider.listMGraphs();
+ Set<IRI> mgl = provider.listMGraphs();
Assert.assertFalse("Mgraph contains the read-only union-graph", mgl.contains(UNION_GRAPH_NAME));
//Union graph in listGraphs
- Set<Iri> gl = provider.listGraphs();
+ Set<IRI> gl = provider.listGraphs();
Assert.assertTrue("ImmutableGraph does not contain the read-only union-graph", gl.contains(UNION_GRAPH_NAME));
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbGraphTest.java
----------------------------------------------------------------------
diff --git a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbGraphTest.java b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbGraphTest.java
index 4dbaceb..8aa58ee 100644
--- a/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbGraphTest.java
+++ b/rdf/jena/tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbGraphTest.java
@@ -29,7 +29,7 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.commons.rdf.Triple;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.core.test.GraphTest;
import org.apache.clerezza.commons.rdf.Literal;
@@ -42,7 +42,7 @@ import org.junit.Test;
*/
public class TdbGraphTest extends GraphTest {
private static File tempFile;
- final private Iri MGRAPHNAME = new Iri("http://text.example.org/");
+ final private IRI MGRAPHNAME = new IRI("http://text.example.org/");
static private TdbTcProvider tdbTcProvider;
@BeforeClass
@@ -78,7 +78,7 @@ public class TdbGraphTest extends GraphTest {
Date date = new Date(0);
LiteralFactory literalFactory = LiteralFactory.getInstance();
Literal dateLiteral = literalFactory.createTypedLiteral(date);
- Triple triple = new TripleImpl(new BlankNode(), new Iri("http://example.com/property"), dateLiteral);
+ Triple triple = new TripleImpl(new BlankNode(), new IRI("http://example.com/property"), dateLiteral);
graph.add(triple);
Assert.assertTrue(graph.contains(triple));
}
@@ -90,7 +90,7 @@ public class TdbGraphTest extends GraphTest {
LiteralFactory literalFactory = LiteralFactory.getInstance();
Literal dateLiteral = literalFactory.createTypedLiteral(date);
System.out.println(dateLiteral);
- Iri property = new Iri("http://example.com/property");
+ IRI property = new IRI("http://example.com/property");
Triple triple = new TripleImpl(new BlankNode(), property, dateLiteral);
graph.add(triple);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/rdfa/src/main/java/org/apache/clerezza/rdf/rdfa/ClerezzaRDFaParser.java
----------------------------------------------------------------------
diff --git a/rdf/rdfa/src/main/java/org/apache/clerezza/rdf/rdfa/ClerezzaRDFaParser.java b/rdf/rdfa/src/main/java/org/apache/clerezza/rdf/rdfa/ClerezzaRDFaParser.java
index d68173b..9be020f 100644
--- a/rdf/rdfa/src/main/java/org/apache/clerezza/rdf/rdfa/ClerezzaRDFaParser.java
+++ b/rdf/rdfa/src/main/java/org/apache/clerezza/rdf/rdfa/ClerezzaRDFaParser.java
@@ -23,7 +23,7 @@ import java.io.InputStream;
import net.rootdev.javardfa.Parser;
import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.serializedform.ParsingProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,7 +41,7 @@ public abstract class ClerezzaRDFaParser implements ParsingProvider {
@Override
- public void parse(Graph target, InputStream in, String formatIdentifier, Iri baseUri) {
+ public void parse(Graph target, InputStream in, String formatIdentifier, IRI baseUri) {
try {
parse(target, new InputSource(in), baseUri);
} catch (IOException e) {
@@ -49,7 +49,7 @@ public abstract class ClerezzaRDFaParser implements ParsingProvider {
}
}
- private void parse(Graph target, InputSource in, Iri baseURI) throws IOException {
+ private void parse(Graph target, InputSource in, IRI baseURI) throws IOException {
Parser parser = new Parser(new ClerezzaStatementSink(target));
if (baseURI != null) {
parser.setBase(baseURI.getUnicodeString());