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/11 15:43:53 UTC
[1/9] clerezza git commit: CLEREZZA-983: Adapted to new casing of
rdf-core (part 1)
Repository: clerezza
Updated Branches:
refs/heads/rdf-commons 1ad142ea4 -> f2811c721
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmusher.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmusher.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmusher.java
index 59911c4..aba1626 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmusher.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmusher.java
@@ -24,10 +24,10 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-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.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.ontologies.OWL;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,36 +56,36 @@ public class SameAsSmusher extends BaseSmusher {
log.info("Starting smushing");
// This hashmap contains a uri (key) and the set of equivalent uris (value)
- final Map<BlankNodeOrIri, Set<BlankNodeOrIri>> node2EquivalenceSet = new HashMap<BlankNodeOrIri, Set<BlankNodeOrIri>>();
+ final Map<BlankNodeOrIRI, Set<BlankNodeOrIRI>> node2EquivalenceSet = new HashMap<BlankNodeOrIRI, Set<BlankNodeOrIRI>>();
log.info("Creating the sets of equivalent uris of each subject or object in the owl:sameAs statements");
// Determines for each subject and object in all the owl:sameAs statements the set of ewquivalent uris
for (Iterator<Triple> it = owlSameStatements.iterator(); it.hasNext();) {
final Triple triple = it.next();
- final Iri predicate = triple.getPredicate();
+ final IRI predicate = triple.getPredicate();
if (!predicate.equals(OWL.sameAs)) {
throw new RuntimeException("Statements must use only <http://www.w3.org/2002/07/owl#sameAs> predicate.");
}
- final BlankNodeOrIri subject = triple.getSubject();
+ final BlankNodeOrIRI subject = triple.getSubject();
//literals not yet supported
- final BlankNodeOrIri object = (BlankNodeOrIri)triple.getObject();
+ final BlankNodeOrIRI object = (BlankNodeOrIRI)triple.getObject();
- Set<BlankNodeOrIri> equivalentNodes = node2EquivalenceSet.get(subject);
+ Set<BlankNodeOrIRI> equivalentNodes = node2EquivalenceSet.get(subject);
// if there is not a set of equivalent uris then create a new set
if (equivalentNodes == null) {
equivalentNodes = node2EquivalenceSet.get(object);
if (equivalentNodes == null) {
- equivalentNodes = new HashSet<BlankNodeOrIri>();
+ equivalentNodes = new HashSet<BlankNodeOrIRI>();
}
} else {
- Set<BlankNodeOrIri> objectSet = node2EquivalenceSet.get(object);
+ Set<BlankNodeOrIRI> objectSet = node2EquivalenceSet.get(object);
if ((objectSet != null) && (objectSet != equivalentNodes)) {
//merge two sets
- for (BlankNodeOrIri res : objectSet) {
+ for (BlankNodeOrIRI res : objectSet) {
node2EquivalenceSet.remove(res);
}
- for (BlankNodeOrIri res : objectSet) {
+ for (BlankNodeOrIRI res : objectSet) {
node2EquivalenceSet.put(res,equivalentNodes);
}
equivalentNodes.addAll(objectSet);
@@ -105,7 +105,7 @@ public class SameAsSmusher extends BaseSmusher {
}
// This set contains the sets of equivalent uris
- Set<Set<BlankNodeOrIri>> unitedEquivalenceSets = new HashSet<Set<BlankNodeOrIri>>(node2EquivalenceSet.values());
+ Set<Set<BlankNodeOrIRI>> unitedEquivalenceSets = new HashSet<Set<BlankNodeOrIRI>>(node2EquivalenceSet.values());
smush(mGraph, unitedEquivalenceSets, addCanonicalSameAsStatements);
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/GraphUtilsTest.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/GraphUtilsTest.java b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/GraphUtilsTest.java
index 3b78422..2ec8af8 100644
--- a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/GraphUtilsTest.java
+++ b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/GraphUtilsTest.java
@@ -21,7 +21,7 @@ package org.apache.clerezza.rdf.utils;
import org.apache.clerezza.commons.rdf.BlankNode;
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.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.utils.GraphUtils.NoSuchSubGraphException;
@@ -34,9 +34,9 @@ import org.junit.Test;
*/
public class GraphUtilsTest {
- final Iri u1 = new Iri("http://ex.org/1");
- final Iri u2 = new Iri("http://ex.org/2");
- final Iri u3 = new Iri("http://ex.org/3");
+ final IRI u1 = new IRI("http://ex.org/1");
+ final IRI u2 = new IRI("http://ex.org/2");
+ final IRI u3 = new IRI("http://ex.org/3");
@Test
public void removeSubGraph() throws NoSuchSubGraphException {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/IfpSmushTest.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/IfpSmushTest.java b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/IfpSmushTest.java
index 58b377e..c9a8f0a 100644
--- a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/IfpSmushTest.java
+++ b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/IfpSmushTest.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.rdf.utils;
import org.apache.clerezza.commons.rdf.BlankNode;
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.PlainLiteralImpl;
import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
@@ -45,7 +45,7 @@ public class IfpSmushTest {
@Test
public void simpleBlankNode() {
Graph mGraph = new SimpleGraph();
- Iri mbox1 = new Iri("mailto:foo@example.org");
+ IRI mbox1 = new IRI("mailto:foo@example.org");
final BlankNode bNode1 = new BlankNode();
mGraph.add(new TripleImpl(bNode1, FOAF.mbox, mbox1));
mGraph.add(new TripleImpl(bNode1, RDFS.comment,
@@ -61,13 +61,13 @@ public class IfpSmushTest {
@Test
public void overlappingEquivalenceClasses() {
Graph mGraph = new SimpleGraph();
- Iri mbox1 = new Iri("mailto:foo@example.org");
+ IRI mbox1 = new IRI("mailto:foo@example.org");
final BlankNode bNode1 = new BlankNode();
mGraph.add(new TripleImpl(bNode1, FOAF.mbox, mbox1));
mGraph.add(new TripleImpl(bNode1, RDFS.comment,
new PlainLiteralImpl("a comment")));
final BlankNode bNode2 = new BlankNode();
- Iri mbox2 = new Iri("mailto:bar@example.org");
+ IRI mbox2 = new IRI("mailto:bar@example.org");
mGraph.add(new TripleImpl(bNode2, FOAF.mbox, mbox1));
mGraph.add(new TripleImpl(bNode2, FOAF.mbox, mbox2));
mGraph.add(new TripleImpl(bNode2, RDFS.comment,
@@ -83,8 +83,8 @@ public class IfpSmushTest {
@Test
public void oneIri() {
Graph mGraph = new SimpleGraph();
- Iri mbox1 = new Iri("mailto:foo@example.org");
- final Iri resource = new Iri("http://example.org/");
+ IRI mbox1 = new IRI("mailto:foo@example.org");
+ final IRI resource = new IRI("http://example.org/");
mGraph.add(new TripleImpl(resource, FOAF.mbox, mbox1));
mGraph.add(new TripleImpl(resource, RDFS.comment,
new PlainLiteralImpl("a comment")));
@@ -99,12 +99,12 @@ public class IfpSmushTest {
@Test
public void twoIris() {
Graph mGraph = new SimpleGraph();
- Iri mbox1 = new Iri("mailto:foo@example.org");
- final Iri resource1 = new Iri("http://example.org/");
+ IRI mbox1 = new IRI("mailto:foo@example.org");
+ final IRI resource1 = new IRI("http://example.org/");
mGraph.add(new TripleImpl(resource1, FOAF.mbox, mbox1));
mGraph.add(new TripleImpl(resource1, RDFS.comment,
new PlainLiteralImpl("a comment")));
- final Iri resource2 = new Iri("http://2.example.org/");
+ final IRI resource2 = new IRI("http://2.example.org/");
mGraph.add(new TripleImpl(resource2, FOAF.mbox, mbox1));
mGraph.add(new TripleImpl(resource2, RDFS.comment,
new PlainLiteralImpl("another comment")));
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/RdfListTest.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/RdfListTest.java b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/RdfListTest.java
index 1e62180..c81547d 100644
--- a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/RdfListTest.java
+++ b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/RdfListTest.java
@@ -25,10 +25,10 @@ import junit.framework.Assert;
import org.junit.Test;
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.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.commons.rdf.impl.utils.PlainLiteralImpl;
import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import static org.junit.Assert.*;
@@ -42,7 +42,7 @@ public class RdfListTest {
@Test
public void listCreationAndAccess() {
Graph tc = new SimpleGraph();
- List<RdfTerm> list = new RdfList(new Iri("http://example.org/mytest"), tc);
+ List<RDFTerm> list = new RdfList(new IRI("http://example.org/mytest"), tc);
assertEquals(0, list.size());
list.add(new PlainLiteralImpl("hello"));
list.add(new PlainLiteralImpl("world"));
@@ -61,7 +61,7 @@ public class RdfListTest {
assertEquals(5, list.size());
assertEquals(new PlainLiteralImpl("hello"), list.get(1));
assertEquals(new PlainLiteralImpl("interesting"), list.get(2));
- List<RdfTerm> list2 = new RdfList(new Iri("http://example.org/mytest"), tc);
+ List<RDFTerm> list2 = new RdfList(new IRI("http://example.org/mytest"), tc);
assertEquals(5, list2.size());
assertEquals(new PlainLiteralImpl("hello"), list2.get(1));
assertEquals(new PlainLiteralImpl("interesting"), list2.get(2));
@@ -87,12 +87,12 @@ public class RdfListTest {
@Test
public void listCreationAndAccess2() {
Graph tc = new SimpleGraph();
- List<RdfTerm> list = new RdfList(new Iri("http://example.org/mytest"), tc);
+ List<RDFTerm> list = new RdfList(new IRI("http://example.org/mytest"), tc);
assertEquals(0, list.size());
list.add(0,new PlainLiteralImpl("world"));
- list = new RdfList(new Iri("http://example.org/mytest"), tc);
+ list = new RdfList(new IRI("http://example.org/mytest"), tc);
list.add(0,new PlainLiteralImpl("beautifuly"));
- list = new RdfList(new Iri("http://example.org/mytest"), tc);
+ list = new RdfList(new IRI("http://example.org/mytest"), tc);
list.add(0,new PlainLiteralImpl("hello"));
assertEquals(new PlainLiteralImpl("hello"), list.get(0));
assertEquals(new PlainLiteralImpl("beautifuly"), list.get(1));
@@ -102,7 +102,7 @@ public class RdfListTest {
@Test
public void listCreationAndAccess3() {
Graph tc = new SimpleGraph();
- List<RdfTerm> list = new RdfList(new Iri("http://example.org/mytest"), tc);
+ List<RDFTerm> list = new RdfList(new IRI("http://example.org/mytest"), tc);
assertEquals(0, list.size());
BlankNode node0 = new BlankNode() {};
BlankNode node1 = new BlankNode() {};
@@ -118,7 +118,7 @@ public class RdfListTest {
@Test
public void secondButLastElementAccessTest() {
Graph tc = new SimpleGraph();
- List<RdfTerm> list = new RdfList(new Iri("http://example.org/mytest2"), tc);
+ List<RDFTerm> list = new RdfList(new IRI("http://example.org/mytest2"), tc);
list.add(new PlainLiteralImpl("hello"));
list.add(new PlainLiteralImpl("world"));
list.remove(1);
@@ -128,7 +128,7 @@ public class RdfListTest {
@Test
public void cleanGraphAfterRemoval() {
Graph tc = new SimpleGraph();
- List<RdfTerm> list = new RdfList(new Iri("http://example.org/mytest"), tc);
+ List<RDFTerm> list = new RdfList(new IRI("http://example.org/mytest"), tc);
list.add(new PlainLiteralImpl("hello"));
list.add(new PlainLiteralImpl("world"));
list.remove(1);
@@ -139,8 +139,8 @@ public class RdfListTest {
@Test
public void findContainingListNodesAndfindContainingListsTest() {
Graph tc = new SimpleGraph();
- GraphNode listA = new GraphNode(new Iri("http:///listA"), tc);
- GraphNode listB = new GraphNode(new Iri("http:///listB"), tc);
+ GraphNode listA = new GraphNode(new IRI("http:///listA"), tc);
+ GraphNode listB = new GraphNode(new IRI("http:///listB"), tc);
BlankNode element1 = new BlankNode();
BlankNode element2 = new BlankNode();
BlankNode element3 = new BlankNode();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/SameAsSmushTest.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/SameAsSmushTest.java b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/SameAsSmushTest.java
index 8512695..fc44ec2 100644
--- a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/SameAsSmushTest.java
+++ b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/SameAsSmushTest.java
@@ -23,7 +23,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.simple.SimpleGraph;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
@@ -40,8 +40,8 @@ import org.junit.Test;
*/
public class SameAsSmushTest {
- private final Iri uriA = new Iri("http://example.org/A");
- private final Iri uriB = new Iri("http://example.org/B");
+ private final IRI uriA = new IRI("http://example.org/A");
+ private final IRI uriB = new IRI("http://example.org/B");
private final Literal lit = new PlainLiteralImpl("That's me (and you)");
private Graph sameAsStatements = new SimpleGraph();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/TestGraphNode.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/TestGraphNode.java b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/TestGraphNode.java
index 45e2547..4386039 100644
--- a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/TestGraphNode.java
+++ b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/TestGraphNode.java
@@ -28,9 +28,9 @@ import org.junit.Test;
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.simple.SimpleGraph;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
@@ -47,8 +47,8 @@ public class TestGraphNode {
Graph g = new SimpleGraph();
BlankNode bNode1 = new BlankNode() {};
BlankNode bNode2 = new BlankNode() {};
- Iri property1 = new Iri("http://example.org/property1");
- Iri property2 = new Iri("http://example.org/property2");
+ IRI property1 = new IRI("http://example.org/property1");
+ IRI property2 = new IRI("http://example.org/property2");
g.add(new TripleImpl(bNode1, property1, new PlainLiteralImpl("literal")));
g.add(new TripleImpl(bNode1, property2, property1));
g.add(new TripleImpl(bNode2, property2, bNode1));
@@ -66,7 +66,7 @@ public class TestGraphNode {
Graph g = new SimpleGraph();
BlankNode bNode1 = new BlankNode() {};
BlankNode bNode2 = new BlankNode() {};
- Iri property1 = new Iri("http://example.org/property1");
+ IRI property1 = new IRI("http://example.org/property1");
GraphNode n = new GraphNode(bNode1, g);
n.addProperty(property1, bNode2);
Assert.assertEquals(1, g.size());
@@ -78,10 +78,10 @@ public class TestGraphNode {
for (int j = 0; j < 200; j++) {
Triple randomTriple = graph.getRandomTriple();
GraphNode node = new GraphNode(randomTriple.getSubject(), graph);
- Iterator<Iri> properties = node.getProperties();
+ Iterator<IRI> properties = node.getProperties();
while (properties.hasNext()) {
- Iri property = properties.next();
- Set<RdfTerm> objects = createSet(node.getObjects(property));
+ IRI property = properties.next();
+ Set<RDFTerm> objects = createSet(node.getObjects(property));
Iterator<GraphNode> objectNodes = node.getObjectNodes(property);
while (objectNodes.hasNext()) {
GraphNode graphNode = objectNodes.next();
@@ -93,10 +93,10 @@ public class TestGraphNode {
for (int j = 0; j < 200; j++) {
Triple randomTriple = graph.getRandomTriple();
GraphNode node = new GraphNode(randomTriple.getObject(), graph);
- Iterator<Iri> properties = node.getProperties();
+ Iterator<IRI> properties = node.getProperties();
while (properties.hasNext()) {
- Iri property = properties.next();
- Set<RdfTerm> subjects = createSet(node.getSubjects(property));
+ IRI property = properties.next();
+ Set<RDFTerm> subjects = createSet(node.getSubjects(property));
Iterator<GraphNode> subjectNodes = node.getSubjectNodes(property);
while (subjectNodes.hasNext()) {
GraphNode graphNode = subjectNodes.next();
@@ -111,11 +111,11 @@ public class TestGraphNode {
Graph g = new SimpleGraph();
BlankNode bNode1 = new BlankNode() {};
BlankNode bNode2 = new BlankNode() {};
- Iri property1 = new Iri("http://example.org/property1");
- Iri property2 = new Iri("http://example.org/property2");
- Iri property3 = new Iri("http://example.org/property3");
- Iri property4 = new Iri("http://example.org/property4");
- ArrayList<Iri> props = new ArrayList<Iri>();
+ IRI property1 = new IRI("http://example.org/property1");
+ IRI property2 = new IRI("http://example.org/property2");
+ IRI property3 = new IRI("http://example.org/property3");
+ IRI property4 = new IRI("http://example.org/property4");
+ ArrayList<IRI> props = new ArrayList<IRI>();
props.add(property1);
props.add(property2);
props.add(property3);
@@ -125,11 +125,11 @@ public class TestGraphNode {
n.addProperty(property2, bNode2);
n.addProperty(property3, bNode2);
n.addProperty(property4, bNode2);
- Iterator<Iri> properties = n.getProperties();
+ Iterator<IRI> properties = n.getProperties();
int i = 0;
while(properties.hasNext()){
i++;
- Iri prop = properties.next();
+ IRI prop = properties.next();
Assert.assertTrue(props.contains(prop));
props.remove(prop);
}
@@ -143,8 +143,8 @@ public class TestGraphNode {
Graph g = new SimpleGraph();
BlankNode bNode1 = new BlankNode() {};
BlankNode bNode2 = new BlankNode() {};
- Iri property1 = new Iri("http://example.org/property1");
- Iri property2 = new Iri("http://example.org/property2");
+ IRI property1 = new IRI("http://example.org/property1");
+ IRI property2 = new IRI("http://example.org/property2");
//the two properties two be deleted
g.add(new TripleImpl(bNode1, property1, new PlainLiteralImpl("literal")));
g.add(new TripleImpl(bNode1, property1, new PlainLiteralImpl("bla bla")));
@@ -162,8 +162,8 @@ public class TestGraphNode {
Graph g = new SimpleGraph();
BlankNode bNode1 = new BlankNode() {};
BlankNode bNode2 = new BlankNode() {};
- Iri property1 = new Iri("http://example.org/property1");
- Iri property2 = new Iri("http://example.org/property2");
+ IRI property1 = new IRI("http://example.org/property1");
+ IRI property2 = new IRI("http://example.org/property2");
//the properties two be deleted
g.add(new TripleImpl(bNode1, property1, new PlainLiteralImpl("literal")));
//this 4 properties should stay
@@ -182,9 +182,9 @@ public class TestGraphNode {
BlankNode bNode1 = new BlankNode();
BlankNode bNode2 = new BlankNode();
BlankNode newBnode = new BlankNode();
- Iri property1 = new Iri("http://example.org/property1");
- Iri property2 = new Iri("http://example.org/property2");
- Iri newIri = new Iri("http://example.org/newName");
+ IRI property1 = new IRI("http://example.org/property1");
+ IRI property2 = new IRI("http://example.org/property2");
+ IRI newIri = new IRI("http://example.org/newName");
Literal literal1 = new PlainLiteralImpl("literal");
Literal literal2 = new PlainLiteralImpl("bla bla");
@@ -250,7 +250,7 @@ public class TestGraphNode {
Graph g = new SimpleGraph();
BlankNode bNode1 = new BlankNode() {};
BlankNode bNode2 = new BlankNode() {};
- Iri property1 = new Iri("http://example.org/property1");
+ IRI property1 = new IRI("http://example.org/property1");
GraphNode n = new GraphNode(bNode1, g);
n.addProperty(property1, bNode2);
Assert.assertTrue(n.equals(new GraphNode(bNode1, g)));
@@ -259,10 +259,10 @@ public class TestGraphNode {
Assert.assertFalse(n.equals(n2));
}
- private Set<RdfTerm> createSet(Iterator<? extends RdfTerm> resources) {
- Set<RdfTerm> set = new HashSet<RdfTerm>();
+ private Set<RDFTerm> createSet(Iterator<? extends RDFTerm> resources) {
+ Set<RDFTerm> set = new HashSet<RDFTerm>();
while (resources.hasNext()) {
- RdfTerm resource = resources.next();
+ RDFTerm resource = resources.next();
set.add(resource);
}
return set;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/UnionGraphTest.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/UnionGraphTest.java b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/UnionGraphTest.java
index 8069438..53173f4 100644
--- a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/UnionGraphTest.java
+++ b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/UnionGraphTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import org.apache.clerezza.commons.rdf.BlankNode;
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.simple.SimpleGraph;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.junit.Assert;
@@ -34,14 +34,14 @@ import org.junit.Assert;
*/
public class UnionGraphTest {
- private final Iri uriRef1 =
- new Iri("http://example.org/ontology#res1");
- private final Iri uriRef2 =
- new Iri("http://example.org/ontology#res2");
- private final Iri uriRef3 =
- new Iri("http://example.org/ontology#res3");
- private final Iri uriRef4 =
- new Iri("http://example.org/ontology#res4");
+ private final IRI uriRef1 =
+ new IRI("http://example.org/ontology#res1");
+ private final IRI uriRef2 =
+ new IRI("http://example.org/ontology#res2");
+ private final IRI uriRef3 =
+ new IRI("http://example.org/ontology#res3");
+ private final IRI uriRef4 =
+ new IRI("http://example.org/ontology#res4");
@Test
public void readAccess() {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmushTest.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmushTest.java b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmushTest.java
index 22a5385..f2d2539 100644
--- a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmushTest.java
+++ b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmushTest.java
@@ -24,7 +24,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.simple.SimpleGraph;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
@@ -41,9 +41,9 @@ import org.junit.Test;
*/
public class SameAsSmushTest {
- private final Iri uriA = new Iri("http://example.org/A");
- private final Iri uriB = new Iri("http://example.org/B");
- private final Iri uriC = new Iri("http://example.org/C");
+ private final IRI uriA = new IRI("http://example.org/A");
+ private final IRI uriB = new IRI("http://example.org/B");
+ private final IRI uriC = new IRI("http://example.org/C");
private final Literal lit = new PlainLiteralImpl("That's me (and you)");
@@ -64,7 +64,7 @@ public class SameAsSmushTest {
SameAsSmusher smusher = new SameAsSmusher() {
@Override
- protected Iri getPreferedIri(Set<Iri> uriRefs) {
+ protected IRI getPreferedIri(Set<IRI> uriRefs) {
if (!uriRefs.contains(uriA)) throw new RuntimeException("not the set we excpect");
if (!uriRefs.contains(uriB)) throw new RuntimeException("not the set we excpect");
return uriC;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/BackupMessageBodyWriter.java
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/BackupMessageBodyWriter.java b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/BackupMessageBodyWriter.java
index 2619e14..ea34a4f 100644
--- a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/BackupMessageBodyWriter.java
+++ b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/BackupMessageBodyWriter.java
@@ -47,7 +47,7 @@ import org.apache.clerezza.commons.rdf.Graph;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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.TcManager;
import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
@@ -105,7 +105,7 @@ public class BackupMessageBodyWriter implements MessageBodyWriter<Backup> {
}
}
- private String getTcFileName(Iri tcUri, String extension,
+ private String getTcFileName(IRI tcUri, String extension,
Map<String, Integer> fileNameCount) {
String fileName = tcUri.getUnicodeString();
fileName = fileName.substring(fileName.lastIndexOf("/")+1);
@@ -128,10 +128,10 @@ public class BackupMessageBodyWriter implements MessageBodyWriter<Backup> {
compressedTcs.putNextEntry(new ZipEntry(folder));
- Set<Iri> tripleCollections = tcManager.listGraphs();
- Iterator<Iri> tcIris = tripleCollections.iterator();
+ Set<IRI> tripleCollections = tcManager.listGraphs();
+ Iterator<IRI> tcIris = tripleCollections.iterator();
while (tcIris.hasNext()) {
- Iri tcUri = tcIris.next();
+ IRI tcUri = tcIris.next();
String fileName = folder + getTcFileName(tcUri, ".nt",
fileNameCount);
Graph tripleCollection = tcManager.getGraph(tcUri);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Delete.java
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Delete.java b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Delete.java
index 7f3d8f5..98e1aee 100644
--- a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Delete.java
+++ b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Delete.java
@@ -32,7 +32,7 @@ import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
-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.commons.rdf.impl.utils.simple.SimpleGraph;
@@ -60,7 +60,7 @@ public class Delete {
@POST
- public Response delete(@Context UriInfo uriInfo, @FormParam("graphName") Iri graphName) {
+ public Response delete(@Context UriInfo uriInfo, @FormParam("graphName") IRI graphName) {
tcManager.deleteGraph(graphName);
return RedirectUtil.createSeeOtherResponse("./", uriInfo);
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/GraphManagement.java
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/GraphManagement.java b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/GraphManagement.java
index 4ae100b..fadd9be 100644
--- a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/GraphManagement.java
+++ b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/GraphManagement.java
@@ -41,7 +41,7 @@ import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
-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.simple.SimpleGraph;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
@@ -74,7 +74,7 @@ public class GraphManagement implements GlobalMenuItemsProvider {
protected void activate(ComponentContext componentContext) {
URL templateURL = getClass().getResource("graph-management.ssp");
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
- new Iri(templateURL.toString()), GRAPHMANAGEMENT.GraphManagementPage,
+ new IRI(templateURL.toString()), GRAPHMANAGEMENT.GraphManagementPage,
"naked", MediaType.APPLICATION_XHTML_XML_TYPE, true);
}
@@ -84,8 +84,8 @@ public class GraphManagement implements GlobalMenuItemsProvider {
TrailingSlash.enforcePresent(uriInfo);
final SimpleGraph resultGraph = new SimpleGraph();
GraphNode graphNode = new GraphNode(new BlankNode(), resultGraph);
- Set<Iri> tripleCollections = tcManager.listGraphs();
- for (Iri uriRef : tripleCollections) {
+ Set<IRI> tripleCollections = tcManager.listGraphs();
+ for (IRI uriRef : tripleCollections) {
graphNode.addProperty(GRAPHMANAGEMENT.tripleCollection, uriRef);
final Graph tripleCollection = tcManager.getGraph(uriRef);
resultGraph.add(new TripleImpl(uriRef,GRAPHMANAGEMENT.size,
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Restorer.java
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Restorer.java b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Restorer.java
index a5c4a33..728be7a 100644
--- a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Restorer.java
+++ b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Restorer.java
@@ -38,7 +38,7 @@ 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.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;
import org.apache.clerezza.rdf.core.serializedform.Parser;
@@ -130,7 +130,7 @@ public class Restorer {
Graph mGraph;
boolean created = false;
try {
- mGraph = target.getGraph((Iri)graphGN.getNode());
+ mGraph = target.getGraph((IRI)graphGN.getNode());
try {
mGraph.clear();
} catch (UnsupportedOperationException ex) {
@@ -139,7 +139,7 @@ public class Restorer {
continue;
}
} catch (NoSuchEntityException ex) {
- mGraph = target.createGraph((Iri)graphGN.getNode());
+ mGraph = target.createGraph((IRI)graphGN.getNode());
created = true;
}
try {
@@ -158,7 +158,7 @@ public class Restorer {
String fileName = graphGN.getLiterals(BACKUP.file).next().getLexicalForm();
Graph extracted = extractedTc.get(fileName);
try {
- target.deleteGraph((Iri)graphGN.getNode());
+ target.deleteGraph((IRI)graphGN.getNode());
} catch (UnsupportedOperationException ex) {
log.warn("could not restore "+graphGN.getNode()+" as the exsting triple "
+ "collection could not be deleted");
@@ -166,7 +166,7 @@ public class Restorer {
} catch (NoSuchEntityException ex) {
log.debug("could not remove "+graphGN.getNode()+", no such entity");
}
- target.createImmutableGraph((Iri)graphGN.getNode(), extracted);
+ target.createImmutableGraph((IRI)graphGN.getNode(), extracted);
}
}
for (Map.Entry<String, Graph> pathTcPair : extractedTc.entrySet()) {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/ResultSetMessageBodyWriter.java
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/ResultSetMessageBodyWriter.java b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/ResultSetMessageBodyWriter.java
index e596520..475f6f2 100644
--- a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/ResultSetMessageBodyWriter.java
+++ b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/ResultSetMessageBodyWriter.java
@@ -47,8 +47,8 @@ import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.clerezza.commons.rdf.BlankNode;
import org.apache.clerezza.commons.rdf.Language;
-import org.apache.clerezza.commons.rdf.RdfTerm;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.sparql.ResultSet;
import org.apache.clerezza.rdf.core.sparql.SolutionMapping;
@@ -153,15 +153,15 @@ public class ResultSetMessageBodyWriter implements MessageBodyWriter<ResultSet>
/**
- * Helper: creates value element from {@link RdfTerm} depending on its
+ * Helper: creates value element from {@link RDFTerm} depending on its
* class
*
*/
- private Element createValueElement(RdfTerm resource, Document doc) {
+ private Element createValueElement(RDFTerm resource, Document doc) {
Element value = null;
- if (resource instanceof Iri) {
+ if (resource instanceof IRI) {
value = doc.createElement("uri");
- value.appendChild(doc.createTextNode(((Iri) resource)
+ value.appendChild(doc.createTextNode(((IRI) resource)
.getUnicodeString()));
} else if (resource instanceof Literal) {
value = doc.createElement("literal");
@@ -191,8 +191,7 @@ public class ResultSetMessageBodyWriter implements MessageBodyWriter<ResultSet>
for (Variable key : keys) {
Element bindingElement = doc.createElement("binding");
bindingElement.setAttribute("name", key.getName());
- bindingElement.appendChild(createValueElement(
- (RdfTerm) solutionMap.get(key), doc));
+ bindingElement.appendChild(createValueElement((RDFTerm) solutionMap.get(key), doc));
result.appendChild(bindingElement);
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Smush.java
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Smush.java b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Smush.java
index 6194ca8..a6877bf 100644
--- a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Smush.java
+++ b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/Smush.java
@@ -31,7 +31,7 @@ import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
-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.commons.rdf.impl.utils.simple.SimpleGraph;
@@ -53,7 +53,7 @@ import org.osgi.service.component.ComponentContext;
@Property(name="javax.ws.rs", boolValue=true)
@Path("/admin/graphs/smush")
public class Smush {
- private final Iri tBoxName = new Iri("urn:x-localinstance:/tbox.graph");
+ private final IRI tBoxName = new IRI("urn:x-localinstance:/tbox.graph");
@Reference
private TcManager tcManager;
@@ -80,7 +80,7 @@ public class Smush {
@POST
- public Response smush(@Context UriInfo uriInfo, @FormParam("graphName") Iri graphName) {
+ public Response smush(@Context UriInfo uriInfo, @FormParam("graphName") IRI graphName) {
Graph mGraph = tcManager.getGraph(graphName);
Smusher.smush(mGraph, tBox);
return RedirectUtil.createSeeOtherResponse("./", uriInfo);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/SparqlEndpoint.java
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/SparqlEndpoint.java b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/SparqlEndpoint.java
index e63e018..0ddc042 100644
--- a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/SparqlEndpoint.java
+++ b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/SparqlEndpoint.java
@@ -65,9 +65,9 @@ import org.apache.clerezza.commons.rdf.BlankNode;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.clerezza.commons.rdf.Language;
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.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.commons.rdf.impl.utils.simple.SimpleGraph;
@@ -114,7 +114,7 @@ public class SparqlEndpoint {
protected void activate(ComponentContext componentContext) {
URL templateURL = getClass().getResource("sparql-endpoint.ssp");
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
- new Iri(templateURL.toString()), SPARQLENDPOINT.SparqlEndpoint,
+ new IRI(templateURL.toString()), SPARQLENDPOINT.SparqlEndpoint,
null, MediaType.APPLICATION_XHTML_XML_TYPE, true);
}
@@ -124,8 +124,8 @@ public class SparqlEndpoint {
AccessController.checkPermission(new SparqlEndpointAccessPermission());
TrailingSlash.enforceNotPresent(uriInfo);
GraphNode graphNode = new GraphNode(new BlankNode(), new SimpleGraph());
- Set<Iri> tripleCollections = tcManager.listGraphs();
- for (Iri uriRef : tripleCollections) {
+ Set<IRI> tripleCollections = tcManager.listGraphs();
+ for (IRI uriRef : tripleCollections) {
graphNode.addProperty(SPARQLENDPOINT.tripleCollection, uriRef);
}
graphNode.addProperty(RDF.type, SPARQLENDPOINT.SparqlEndpoint);
@@ -143,7 +143,7 @@ public class SparqlEndpoint {
* @param queryString
* URL encoded sparql query
* @param defaultGraphUri
- * URI of the default graph, an {@link Iri} is expected
+ * URI of the default graph, an {@link IRI} is expected
* @param applyStyleSheet
* @param serverSide
* @param styleSheetUri
@@ -151,7 +151,7 @@ public class SparqlEndpoint {
*/
@POST
public Object runFormQuery(@FormParam("query") String queryString,
- @FormParam("default-graph-uri") Iri defaultGraphUri,
+ @FormParam("default-graph-uri") IRI defaultGraphUri,
@FormParam("apply-style-sheet") String applyStyleSheet,
@FormParam("server-side") String serverSide,
@FormParam("style-sheet-uri") String styleSheetUri) {
@@ -174,7 +174,7 @@ public class SparqlEndpoint {
try {
if (defaultGraphUri == null
|| defaultGraphUri.getUnicodeString().equals("")) {
- defaultGraphUri = new Iri(Constants.CONTENT_GRAPH_URI_STRING);
+ defaultGraphUri = new IRI(Constants.CONTENT_GRAPH_URI_STRING);
//defaultGraph = contentGraph;
} else {
//defaultGraph = tcManager.getTriples(defaultGraphUri);
@@ -224,7 +224,7 @@ public class SparqlEndpoint {
*/
@GET
public Object runGetQuery(@QueryParam("query") String queryString,
- @QueryParam("default-graph-uri") Iri defaultGraphUri,
+ @QueryParam("default-graph-uri") IRI defaultGraphUri,
@QueryParam("style-sheet-uri") String styleSheetUri,
@QueryParam("server-side") String serverSide) {
AccessController.checkPermission(new SparqlEndpointAccessPermission());
@@ -373,8 +373,7 @@ public class SparqlEndpoint {
for (Variable key : keys) {
Element bindingElement = doc.createElement("binding");
bindingElement.setAttribute("name", key.getName());
- bindingElement.appendChild(createValueElement(
- (RdfTerm) solutionMap.get(key), doc));
+ bindingElement.appendChild(createValueElement((RDFTerm) solutionMap.get(key), doc));
result.appendChild(bindingElement);
}
}
@@ -382,15 +381,15 @@ public class SparqlEndpoint {
}
/**
- * Helper: creates value element from {@link RdfTerm} depending on its
+ * Helper: creates value element from {@link RDFTerm} depending on its
* class
*
*/
- private Element createValueElement(RdfTerm resource, Document doc) {
+ private Element createValueElement(RDFTerm resource, Document doc) {
Element value = null;
- if (resource instanceof Iri) {
+ if (resource instanceof IRI) {
value = doc.createElement("uri");
- value.appendChild(doc.createTextNode(((Iri) resource)
+ value.appendChild(doc.createTextNode(((IRI) resource)
.getUnicodeString()));
} else if (resource instanceof Literal) {
value = doc.createElement("literal");
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/WebAccess.java
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/WebAccess.java b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/WebAccess.java
index 1369db8..eee056f 100644
--- a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/WebAccess.java
+++ b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/WebAccess.java
@@ -49,7 +49,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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.TcManager;
import org.apache.clerezza.rdf.core.serializedform.Parser;
@@ -82,7 +82,7 @@ public class WebAccess {
* @return
*/
@GET
- public Graph getTriples(@QueryParam("name") Iri name) {
+ public Graph getTriples(@QueryParam("name") IRI name) {
AccessController.checkPermission(new WebAccessPermission());
if (name == null) {
Response r = Response.status(Response.Status.BAD_REQUEST)
@@ -112,7 +112,7 @@ public class WebAccess {
* @param triples
*/
@PUT
- public void putTriples(@QueryParam("name") Iri name, Graph triples) {
+ public void putTriples(@QueryParam("name") IRI name, Graph triples) {
AccessController.checkPermission(new WebAccessPermission());
Graph mGraph;
try {
@@ -193,7 +193,7 @@ public class WebAccess {
}
InputStream is = new ByteArrayInputStream(graph);
ImmutableGraph parsedGraph = parser.parse(is, mediaType.toString());
- Iri graphUri = new Iri(graphName);
+ IRI graphUri = new IRI(graphName);
Graph mGraph;
boolean newGraph = false;
try {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupAndRestoreTest.java
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupAndRestoreTest.java b/rdf/web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupAndRestoreTest.java
index dbe5117..ca785be 100644
--- a/rdf/web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupAndRestoreTest.java
+++ b/rdf/web/rdf.web.core/src/test/java/org/apache/clerezza/rdf/web/core/BackupAndRestoreTest.java
@@ -33,7 +33,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.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.access.TcProvider;
@@ -63,24 +63,24 @@ public class BackupAndRestoreTest {
private static String testGraphFileName = "test.graph";
private static Graph testGraph0 = new SimpleGraph();
- private static Iri testGraphUri0 = // the URI of testGraph0
- new Iri("http://localhost/test0/"+testGraphFileName);
+ private static IRI testGraphUri0 = // the URI of testGraph0
+ new IRI("http://localhost/test0/"+testGraphFileName);
// a resource in testGraph0
- private static Iri uri0 = new Iri("http://localhost/test0/testuri");
+ private static IRI uri0 = new IRI("http://localhost/test0/testuri");
private static Graph testGraph1 = new SimpleGraph();
- private static Iri testGraphUri1 = // the URI of testGraph1
- new Iri("http://localhost/test1/"+testGraphFileName);
+ private static IRI testGraphUri1 = // the URI of testGraph1
+ new IRI("http://localhost/test1/"+testGraphFileName);
// a resource in testGraph1
- private static Iri uri1 = new Iri("http://localhost/test1/testuri");
+ private static IRI uri1 = new IRI("http://localhost/test1/testuri");
private static ImmutableGraph testGraphA;
- private static Iri testGraphUriA = // the URI of testGraphA
- new Iri("http://localhost/testA/"+testGraphFileName);
+ private static IRI testGraphUriA = // the URI of testGraphA
+ new IRI("http://localhost/testA/"+testGraphFileName);
// a resource in testGraphA
- private static Iri uriA = new Iri("http://localhost/testA/testuri");
+ private static IRI uriA = new IRI("http://localhost/testA/testuri");
private static String backupContentFileName = "triplecollections.nt";
@@ -227,7 +227,7 @@ public class BackupAndRestoreTest {
// Associates testGraphUri0 with testGraph0 and testGraphUri1 with testGraph1
@Override
- public Graph getGraph(Iri name) throws NoSuchEntityException {
+ public Graph getGraph(IRI name) throws NoSuchEntityException {
if (name.equals(testGraphUri0)) {
return testGraph0;
} else if (name.equals(testGraphUri1)) {
@@ -239,8 +239,8 @@ public class BackupAndRestoreTest {
}
@Override
- public Set<Iri> listGraphs() {
- Set<Iri> result = new HashSet<Iri>();
+ public Set<IRI> listGraphs() {
+ Set<IRI> result = new HashSet<IRI>();
result.add(testGraphUri0);
result.add(testGraphUri1);
result.add(testGraphUriA);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/templating.seedsnipe/src/main/java/org/apache/clerezza/templating/seedsnipe/graphnodeadapter/GraphNodeDataFieldResolver.java
----------------------------------------------------------------------
diff --git a/templating.seedsnipe/src/main/java/org/apache/clerezza/templating/seedsnipe/graphnodeadapter/GraphNodeDataFieldResolver.java b/templating.seedsnipe/src/main/java/org/apache/clerezza/templating/seedsnipe/graphnodeadapter/GraphNodeDataFieldResolver.java
index 883bcd1..e505452 100644
--- a/templating.seedsnipe/src/main/java/org/apache/clerezza/templating/seedsnipe/graphnodeadapter/GraphNodeDataFieldResolver.java
+++ b/templating.seedsnipe/src/main/java/org/apache/clerezza/templating/seedsnipe/graphnodeadapter/GraphNodeDataFieldResolver.java
@@ -26,9 +26,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
-import org.apache.clerezza.commons.rdf.RdfTerm;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.ontologies.OWL;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.utils.GraphNode;
@@ -61,10 +61,10 @@ public class GraphNodeDataFieldResolver extends DataFieldResolver {
}
public static class PropertyKey {
- private Iri property;
+ private IRI property;
private boolean reverse;
- public PropertyKey(Iri property, boolean reverse) {
+ public PropertyKey(IRI property, boolean reverse) {
super();
this.property = property;
this.reverse = reverse;
@@ -101,7 +101,7 @@ public class GraphNodeDataFieldResolver extends DataFieldResolver {
}
- private static final Iri RDF_NIL = new Iri(
+ private static final IRI RDF_NIL = new IRI(
"http://www.w3.org/1999/02/22-rdf-syntax-ns#nil");
private RenderingFunctions renderingFunctions;
@@ -134,17 +134,17 @@ public class GraphNodeDataFieldResolver extends DataFieldResolver {
private class ExpandedNode {
private GraphNode node;
- private RdfTerm value;
+ private RDFTerm value;
private Map<PropertyKey, List<ExpandedNode>> children;
- private List<RdfTerm> list = null;
+ private List<RDFTerm> list = null;
- private ExpandedNode(RdfTerm value) {
+ private ExpandedNode(RDFTerm value) {
this.value = value;
final Graph tc = expandedNode.node.getGraph();
doListInitialization(tc);
}
- private ExpandedNode(GraphNode node, RdfTerm value) {
+ private ExpandedNode(GraphNode node, RDFTerm value) {
this.value = value;
this.node = node;
doListInitialization(node.getGraph());
@@ -154,11 +154,10 @@ public class GraphNodeDataFieldResolver extends DataFieldResolver {
* @param tc
*/
private void doListInitialization(Graph tc) {
- if (value instanceof BlankNodeOrIri) {
- if ((tc.filter((BlankNodeOrIri) value, RDF.rest, null).hasNext())
- || (tc.filter(
- (BlankNodeOrIri) value, OWL.sameAs, RDF_NIL).hasNext())) {
- list = new RdfList((BlankNodeOrIri) value, tc);
+ if (value instanceof BlankNodeOrIRI) {
+ if ((tc.filter((BlankNodeOrIRI) value, RDF.rest, null).hasNext())
+ || (tc.filter((BlankNodeOrIRI) value, OWL.sameAs, RDF_NIL).hasNext())) {
+ list = new RdfList((BlankNodeOrIRI) value, tc);
}
}
}
@@ -207,7 +206,7 @@ public class GraphNodeDataFieldResolver extends DataFieldResolver {
inverseResolve = false;
}
String uriString = getUriFromCuri(fieldName);
- Iri property = new Iri(uriString);
+ IRI property = new IRI(uriString);
List<ExpandedNode> childList = getChildList(property, inverseResolve);
if (arrayPos.length == 0) {
arrayPos = new int[1];
@@ -226,7 +225,7 @@ public class GraphNodeDataFieldResolver extends DataFieldResolver {
}
- private List<ExpandedNode> getChildList(Iri property, boolean inverseResolve) {
+ private List<ExpandedNode> getChildList(IRI property, boolean inverseResolve) {
PropertyKey propertyKey = new PropertyKey(property, inverseResolve);
List<ExpandedNode> result;
if (children == null) {
@@ -238,16 +237,16 @@ public class GraphNodeDataFieldResolver extends DataFieldResolver {
if (result == null) {
result = new ArrayList<ExpandedNode>();
if (node == null) {
- node = new GraphNode((BlankNodeOrIri) value, expandedNode.node.getGraph());
+ node = new GraphNode((BlankNodeOrIRI) value, expandedNode.node.getGraph());
}
if (inverseResolve) {
- Iterator<BlankNodeOrIri> subjects = node.getSubjects(property);
+ Iterator<BlankNodeOrIRI> subjects = node.getSubjects(property);
while (subjects.hasNext()) {
ExpandedNode childNode = new ExpandedNode(subjects.next());
result.add(childNode);
}
} else {
- Iterator<RdfTerm> objects = node.getObjects(property);
+ Iterator<RDFTerm> objects = node.getObjects(property);
while (objects.hasNext()) {
ExpandedNode childNode = new ExpandedNode(objects.next());
result.add(childNode);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/templating.seedsnipe/src/test/java/org/apache/clerezza/templating/seedsnipe/GraphNodeTest.java
----------------------------------------------------------------------
diff --git a/templating.seedsnipe/src/test/java/org/apache/clerezza/templating/seedsnipe/GraphNodeTest.java b/templating.seedsnipe/src/test/java/org/apache/clerezza/templating/seedsnipe/GraphNodeTest.java
index c2903ef..c4b8fba 100644
--- a/templating.seedsnipe/src/test/java/org/apache/clerezza/templating/seedsnipe/GraphNodeTest.java
+++ b/templating.seedsnipe/src/test/java/org/apache/clerezza/templating/seedsnipe/GraphNodeTest.java
@@ -29,9 +29,9 @@ import org.junit.Assert;
import org.junit.Test;
import org.apache.clerezza.commons.rdf.BlankNode;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
-import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
-import org.apache.clerezza.commons.rdf.RdfTerm;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
@@ -100,7 +100,7 @@ public class GraphNodeTest {
@Test
public void simple() throws IOException {
Graph mGraph = new SimpleGraph();
- BlankNodeOrIri resource = new BlankNode() {
+ BlankNodeOrIRI resource = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
GraphNode node = new GraphNode(resource, mGraph);
@@ -117,8 +117,8 @@ public class GraphNodeTest {
@Test
public void inverse() throws IOException {
Graph mGraph = new SimpleGraph();
- BlankNodeOrIri subject = new Iri("http://example.org/subject");
- Iri object = new Iri("http://example.org/object");
+ BlankNodeOrIRI subject = new IRI("http://example.org/subject");
+ IRI object = new IRI("http://example.org/object");
mGraph.add(new TripleImpl(subject, RDFS.comment, object));
GraphNode node = new GraphNode(object, mGraph);
DataFieldResolver dataFieldResolver = new GraphNodeDataFieldResolver(node, simpleFunctions);
@@ -134,7 +134,7 @@ public class GraphNodeTest {
@Test
public void defaultFunction() throws IOException {
Graph mGraph = new SimpleGraph();
- BlankNodeOrIri resource = new BlankNode() {
+ BlankNodeOrIRI resource = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
GraphNode node = new GraphNode(resource, mGraph);
@@ -168,7 +168,7 @@ public class GraphNodeTest {
@Test
public void simpleIriRoot() throws IOException {
Graph mGraph = new SimpleGraph();
- BlankNodeOrIri resource = new Iri("http://example.org/");
+ BlankNodeOrIRI resource = new IRI("http://example.org/");
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
GraphNode node = new GraphNode(resource, mGraph);
DataFieldResolver dataFieldResolver = new GraphNodeDataFieldResolver(node, simpleFunctions);
@@ -184,7 +184,7 @@ public class GraphNodeTest {
@Test
public void simpleWithNoOp() throws IOException {
Graph mGraph = new SimpleGraph();
- BlankNodeOrIri resource = new BlankNode() {
+ BlankNodeOrIRI resource = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
GraphNode node = new GraphNode(resource, mGraph);
@@ -201,7 +201,7 @@ public class GraphNodeTest {
@Test
public void simpleWithUppercase() throws IOException {
Graph mGraph = new SimpleGraph();
- BlankNodeOrIri resource = new BlankNode() {
+ BlankNodeOrIRI resource = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
GraphNode node = new GraphNode(resource, mGraph);
@@ -218,7 +218,7 @@ public class GraphNodeTest {
@Test
public void simpleWithLiteralUppercase() throws IOException {
Graph mGraph = new SimpleGraph();
- BlankNodeOrIri resource = new BlankNode() {
+ BlankNodeOrIRI resource = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
GraphNode node = new GraphNode(resource, mGraph);
@@ -235,7 +235,7 @@ public class GraphNodeTest {
@Test
public void simpleWithCombinedFunctions() throws IOException {
Graph mGraph = new SimpleGraph();
- BlankNodeOrIri resource = new BlankNode() {
+ BlankNodeOrIRI resource = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
GraphNode node = new GraphNode(resource, mGraph);
@@ -252,7 +252,7 @@ public class GraphNodeTest {
@Test
public void multiple() throws IOException {
Graph mGraph = new SimpleGraph();
- BlankNodeOrIri resource = new BlankNode() {
+ BlankNodeOrIRI resource = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("another resource")));
@@ -270,7 +270,7 @@ public class GraphNodeTest {
@Test
public void fieldTest() throws IOException {
Graph mGraph = new SimpleGraph();
- BlankNodeOrIri resource = new BlankNode() {
+ BlankNodeOrIRI resource = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
GraphNode node = new GraphNode(resource, mGraph);
@@ -287,7 +287,7 @@ public class GraphNodeTest {
@Test
public void fieldTest2() throws IOException {
Graph mGraph = new SimpleGraph();
- BlankNodeOrIri resource = new BlankNode() {
+ BlankNodeOrIRI resource = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
GraphNode node = new GraphNode(resource, mGraph);
@@ -310,7 +310,7 @@ public class GraphNodeTest {
try {
ImmutableGraph deserializedGraph = parser.parse(getClass().getResourceAsStream("libby-foaf.rdf"), "application/rdf+xml");
mGraph.addAll(deserializedGraph);
- Iri document = new Iri("http://swordfish.rdfweb.org/people/libby/rdfweb/webwho.xrdf");
+ IRI document = new IRI("http://swordfish.rdfweb.org/people/libby/rdfweb/webwho.xrdf");
Assert.assertTrue((mGraph.size() > 0));
@@ -346,7 +346,7 @@ public class GraphNodeTest {
try {
ImmutableGraph deserializedGraph = parser.parse(getClass().getResourceAsStream("libby-foaf.rdf"), "application/rdf+xml");
mGraph.addAll(deserializedGraph);
- Iri document = new Iri("http://swordfish.rdfweb.org/people/libby/rdfweb/webwho.xrdf");
+ IRI document = new IRI("http://swordfish.rdfweb.org/people/libby/rdfweb/webwho.xrdf");
Assert.assertTrue((mGraph.size() > 0));
@@ -381,12 +381,12 @@ public class GraphNodeTest {
@Test
public void rdfListAsPropertyValue() throws IOException {
Graph mGraph = new SimpleGraph();
- BlankNodeOrIri resource = new BlankNode() {
+ BlankNodeOrIRI resource = new BlankNode() {
};
- BlankNodeOrIri listNode = new BlankNode() {
+ BlankNodeOrIRI listNode = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDF.value, listNode));
- List<RdfTerm> list = new RdfList(listNode, mGraph);
+ List<RDFTerm> list = new RdfList(listNode, mGraph);
list.add(new PlainLiteralImpl("first"));
list.add(new PlainLiteralImpl("second"));
list.add(new PlainLiteralImpl("third"));
@@ -405,9 +405,9 @@ public class GraphNodeTest {
@Test
public void rdfListAsRoot() throws IOException {
Graph mGraph = new SimpleGraph();
- BlankNodeOrIri resource = new BlankNode() {
+ BlankNodeOrIRI resource = new BlankNode() {
};
- List<RdfTerm> list = new RdfList(resource, mGraph);
+ List<RDFTerm> list = new RdfList(resource, mGraph);
list.add(new PlainLiteralImpl("first"));
list.add(new PlainLiteralImpl("second"));
list.add(new PlainLiteralImpl("third"));
@@ -425,9 +425,9 @@ public class GraphNodeTest {
@Test
public void rdfListAsRootElementProperties() throws IOException {
Graph mGraph = new SimpleGraph();
- BlankNodeOrIri resource = new BlankNode() {
+ BlankNodeOrIRI resource = new BlankNode() {
};
- List<RdfTerm> list = new RdfList(resource, mGraph);
+ List<RDFTerm> list = new RdfList(resource, mGraph);
list.add(createLabeledRes("first", mGraph));
list.add(createLabeledRes("second", mGraph));
list.add(createLabeledRes("third", mGraph));
@@ -446,9 +446,9 @@ public class GraphNodeTest {
@Test
public void rdfListAsRootElementPropertiesWithPresenceTest() throws IOException {
Graph mGraph = new SimpleGraph();
- BlankNodeOrIri resource = new BlankNode() {
+ BlankNodeOrIRI resource = new BlankNode() {
};
- List<RdfTerm> list = new RdfList(resource, mGraph);
+ List<RDFTerm> list = new RdfList(resource, mGraph);
list.add(createLabeledRes("first", mGraph));
list.add(createLabeledRes("second", mGraph));
list.add(createLabeledRes("third", mGraph));
@@ -467,7 +467,7 @@ public class GraphNodeTest {
@Test
public void compareFunctionResultInIf() throws IOException {
Graph mGraph = new SimpleGraph();
- BlankNodeOrIri resource = new BlankNode();
+ BlankNodeOrIRI resource = new BlankNode();
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
GraphNode node = new GraphNode(resource, mGraph);
DataFieldResolver dataFieldResolver = new GraphNodeDataFieldResolver(node, simpleFunctions);
@@ -484,18 +484,18 @@ public class GraphNodeTest {
@Test
public void loopWithEmptyList() throws IOException {
Graph mGraph = new SimpleGraph();
- BlankNodeOrIri resource = new BlankNode() {
+ BlankNodeOrIRI resource = new BlankNode() {
};
- BlankNodeOrIri listNode1 = new BlankNode() {
+ BlankNodeOrIRI listNode1 = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDF.value, listNode1));
- List<RdfTerm> list1 = new RdfList(listNode1, mGraph);
+ List<RDFTerm> list1 = new RdfList(listNode1, mGraph);
list1.add(new PlainLiteralImpl("first"));
list1.add(new PlainLiteralImpl("second"));
list1.add(new PlainLiteralImpl("third"));
- BlankNodeOrIri listNode2 = new BlankNode() {
+ BlankNodeOrIRI listNode2 = new BlankNode() {
};
mGraph.add(new TripleImpl(resource, RDF.value, listNode2));
RdfList.createEmptyList(listNode2, mGraph);
@@ -513,7 +513,7 @@ public class GraphNodeTest {
Assert.assertEquals("\"first\"\"second\"\"third\"", writer.toString());
}
- private BlankNodeOrIri createLabeledRes(String label, Graph mGraph) {
+ private BlankNodeOrIRI createLabeledRes(String label, Graph mGraph) {
BlankNode bNode = new BlankNode();
Literal lit = new PlainLiteralImpl(label);
mGraph.add(new TripleImpl(bNode, RDFS.label, lit));
[9/9] clerezza git commit: CLEREZZA-983: Adapted to new casing of
rdf-core (part 2), also renamed IriSet -> IRISet and IriUtils -> IRIUtils
Posted by re...@apache.org.
CLEREZZA-983: Adapted to new casing of rdf-core (part 2), also renamed IriSet -> IRISet and IriUtils -> IRIUtils
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/f2811c72
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/f2811c72
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/f2811c72
Branch: refs/heads/rdf-commons
Commit: f2811c721b94395057f27af3a09e57cc916f49d3
Parents: 60d73ea
Author: Reto Gmuer <re...@apache.org>
Authored: Sat Apr 11 13:40:22 2015 +0000
Committer: Reto Gmuer <re...@apache.org>
Committed: Sat Apr 11 13:40:22 2015 +0000
----------------------------------------------------------------------
.../platform/config/PlatformConfig.java | 8 +--
.../PlatformGraphNodeProvider.scala | 24 ++++----
.../apache/clerezza/platform/BootMonitor.java | 18 +++---
.../src/main/scala/GlobalMenuRenderlet.scala | 10 ++--
.../src/main/scala/HeadedPageRenderlet.scala | 4 +-
.../jaxrs/TypeHandlerSpace.java | 4 +-
.../typehandlerspace/TypeHandlerSpaceTest.java | 14 ++---
.../src/main/scala/Ontology.scala | 4 +-
.../scala/RenderletDescriptionRenderlet.scala | 2 +-
.../typerendering/scala/AbstractRenderlet.scala | 2 +-
.../typerendering/scala/PageRenderlet.scala | 4 +-
.../typerendering/scala/RenderedPage.scala | 6 +-
.../typerendering/scala/SRenderlet.scala | 2 +-
.../typerendering/scala/XmlResult.scala | 6 +-
.../platform/typerendering/RendererFactory.java | 2 +-
.../typerendering/exception-template.ssp | 2 +-
.../platform/usermanager/UserManager.java | 8 +--
.../UserGraphAcessPermissionProvider.scala | 4 +-
.../platform/users/WebIdGraphsService.scala | 8 +--
.../clerezza/platform/users/WebIdInfo.scala | 4 +-
.../rdf/virtuoso/storage/VirtuosoBNode.java | 2 +-
.../rdf/virtuoso/storage/access/DataAccess.java | 16 ++---
.../clerezza/rdf/core/test/RandomGraph.java | 48 +++++++--------
.../clerezza/rdf/core/test/TcProviderTest.java | 56 ++++++++---------
.../rdf/file/storage/FileGraphTest.java | 8 +--
.../rdf/jena/commons/Jena2TriaUtil.java | 4 +-
.../rdf/jena/sparql/HashMapSolutionMapping.java | 4 +-
.../clerezza/rdf/jena/tdb/internals/IRISet.java | 62 +++++++++++++++++++
.../clerezza/rdf/jena/tdb/internals/IriSet.java | 62 -------------------
.../rdf/jena/tdb/internals/ModelGraph.java | 2 +-
.../tdb/storage/SingleTdbDatasetTcProvider.java | 16 ++---
.../clerezza/rdf/scala/utils/NameSpace.scala | 10 ++--
.../clerezza/rdf/scala/utils/EzMGraphTest.scala | 18 +++---
.../rdf/scala/utils/RichGraphNodeTest.scala | 18 +++---
.../rdf/scala/utils/TypeConversionTest.scala | 16 ++---
rdf/storage.web/src/main/scala/WebProxy.scala | 36 +++++------
.../apache/clerezza/rdf/utils/GraphNode.java | 4 +-
.../org/apache/clerezza/rdf/utils/IRIUtil.java | 63 ++++++++++++++++++++
.../org/apache/clerezza/rdf/utils/IriUtil.java | 63 --------------------
.../org/apache/clerezza/rdf/utils/RdfList.java | 34 +++++------
.../clerezza/rdf/utils/UriMutatingGraph.java | 38 ++++++------
.../rdf/utils/smushing/BaseSmusher.java | 10 ++--
.../rdf/utils/smushing/SameAsSmusher.java | 4 +-
.../apache/clerezza/rdf/utils/IfpSmushTest.java | 4 +-
.../clerezza/rdf/utils/TestGraphNode.java | 20 +++----
.../rdf/utils/smushing/SameAsSmushTest.java | 2 +-
.../rdf/web/core/BackupMessageBodyWriter.java | 6 +-
.../clerezza/rdf/web/core/graph-management.ssp | 6 +-
.../clerezza/rdf/web/core/sparql-endpoint.ssp | 2 +-
.../templating/seedsnipe/GraphNodeTest.java | 2 +-
50 files changed, 386 insertions(+), 386 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
----------------------------------------------------------------------
diff --git a/platform/config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java b/platform/config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
index 16aa8cf..b05f0c1 100644
--- a/platform/config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
+++ b/platform/config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
@@ -115,10 +115,10 @@ public class PlatformConfig {
* @return
*/
public GraphNode getPlatformInstance() {
- return new GraphNode(getPlatformInstanceRdfTerm(), systemGraph);
+ return new GraphNode(getPlatformInstanceRDFTerm(), systemGraph);
}
- private BlankNodeOrIRI getPlatformInstanceRdfTerm() {
+ private BlankNodeOrIRI getPlatformInstanceRDFTerm() {
Lock l = systemGraph.getLock().readLock();
l.lock();
try {
@@ -164,7 +164,7 @@ public class PlatformConfig {
* @param baseUri The base URI which will be added to the platform instance
*/
public void addBaseUri(IRI baseUri) {
- systemGraph.add(new TripleImpl(getPlatformInstanceRdfTerm(), PLATFORM.baseUri, baseUri));
+ systemGraph.add(new TripleImpl(getPlatformInstanceRDFTerm(), PLATFORM.baseUri, baseUri));
}
/**
@@ -173,7 +173,7 @@ public class PlatformConfig {
* @param baseUri The base URI which will be removed from the platform instance
*/
public void removeBaseUri(IRI baseUri) {
- systemGraph.remove(new TripleImpl(getPlatformInstanceRdfTerm(), PLATFORM.baseUri, baseUri));
+ systemGraph.remove(new TripleImpl(getPlatformInstanceRDFTerm(), PLATFORM.baseUri, baseUri));
}
protected void activate(ComponentContext componentContext) {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/PlatformGraphNodeProvider.scala
----------------------------------------------------------------------
diff --git a/platform/graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/PlatformGraphNodeProvider.scala b/platform/graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/PlatformGraphNodeProvider.scala
index a06e971..54e0d78 100644
--- a/platform/graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/PlatformGraphNodeProvider.scala
+++ b/platform/graphnodeprovider/src/main/scala/org/apache/clerezza/platform/graphnodeprovider/PlatformGraphNodeProvider.scala
@@ -47,7 +47,7 @@ class PlatformGraphNodeProvider extends GraphNodeProvider with Logging {
/**
* Get a GraphNode for the specified resource, see class comments for details.
*/
- def get(uriRef: Iri): GraphNode = {
+ def get(uriRef: IRI): GraphNode = {
val uriString = uriRef.getUnicodeString
val isLocal: Boolean = {
import scala.collection.JavaConversions._
@@ -59,10 +59,10 @@ class PlatformGraphNodeProvider extends GraphNodeProvider with Logging {
/**
* Get a GraphNode for the specified resource, The resource is assumed to be local, i.e. the method behaves like
- * get(Iri) for a Uri with an authority section contained in the Set retuned by
+ * get(IRI) for a Uri with an authority section contained in the Set retuned by
* <code>org.apache.clerezza.platform.config.PlatformConfig#getBaseUris()</code>
*/
- def getLocal(uriRef: Iri): GraphNode = {
+ def getLocal(uriRef: IRI): GraphNode = {
get(uriRef, true)
}
@@ -70,17 +70,17 @@ class PlatformGraphNodeProvider extends GraphNodeProvider with Logging {
/**
*return true iff getLocal(uriRef).getNodeContext.size > 0
*/
- def existsLocal(uriRef: Iri): Boolean = {
+ def existsLocal(uriRef: IRI): Boolean = {
val cgGraph = cgProvider.getContentGraph
lazy val localInstanceUri = {
val uri = new java.net.URI(uriRef.getUnicodeString)
- new Iri(Constants.URN_LOCAL_INSTANCE + uri.getPath)
+ new IRI(Constants.URN_LOCAL_INSTANCE + uri.getPath)
}
//TODO handle /user/
existsInGraph(uriRef,cgGraph) || existsInGraph(localInstanceUri, cgGraph)
}
- private[this] def existsInGraph(nodeUri: Iri, tc: Graph): Boolean = {
+ private[this] def existsInGraph(nodeUri: IRI, tc: Graph): Boolean = {
var readLock: Lock = tc.getLock.readLock
readLock.lock
try {
@@ -92,7 +92,7 @@ class PlatformGraphNodeProvider extends GraphNodeProvider with Logging {
}
- private def get(uriRef: Iri, isLocal: Boolean): GraphNode = {
+ private def get(uriRef: IRI, isLocal: Boolean): GraphNode = {
val uriString = uriRef.getUnicodeString
@@ -106,7 +106,7 @@ class PlatformGraphNodeProvider extends GraphNodeProvider with Logging {
uri.getScheme+"://"+uri.getAuthority
}
- val anyHostUri = new Iri(Constants.URN_LOCAL_INSTANCE + uriPath)
+ val anyHostUri = new IRI(Constants.URN_LOCAL_INSTANCE + uriPath)
var mGraphs: List[Graph] = Nil
@@ -129,12 +129,12 @@ class PlatformGraphNodeProvider extends GraphNodeProvider with Logging {
val nextSlash = uriPath.indexOf('/',6)
if (nextSlash != -1) {
val userName = uriPath.substring(6, nextSlash)
- val webIdOption = AccessController.doPrivileged(new PrivilegedAction[Option[Iri]]() {
- def run(): Option[Iri] = {
+ val webIdOption = AccessController.doPrivileged(new PrivilegedAction[Option[IRI]]() {
+ def run(): Option[IRI] = {
val userNode: GraphNode = userManager.getUserInSystemGraph(userName)
if (userNode != null) {
userNode.getNode match {
- case u: Iri => Some(u)
+ case u: IRI => Some(u)
case _ => None
}
} else {
@@ -191,7 +191,7 @@ class PlatformGraphNodeProvider extends GraphNodeProvider with Logging {
}
}
- addToUnion(tcManager.getGraph(new Iri(graphUriString)))
+ addToUnion(tcManager.getGraph(new IRI(graphUriString)))
}
val unionGraph = new UnionGraph(mGraphs:_*);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/platform/src/main/java/org/apache/clerezza/platform/BootMonitor.java
----------------------------------------------------------------------
diff --git a/platform/platform/src/main/java/org/apache/clerezza/platform/BootMonitor.java b/platform/platform/src/main/java/org/apache/clerezza/platform/BootMonitor.java
index 22d0e2d..bc00e5f 100644
--- a/platform/platform/src/main/java/org/apache/clerezza/platform/BootMonitor.java
+++ b/platform/platform/src/main/java/org/apache/clerezza/platform/BootMonitor.java
@@ -51,7 +51,7 @@ import org.osgi.service.component.ComponentContext;
* see thread starting at http://www.mail-archive.com/users@felix.apache.org/msg07647.html
*/
@Component(enabled = true, immediate = true)
-@Reference(name = "jaxrsRdfTerm",
+@Reference(name = "jaxrsRDFTerm",
cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE,
policy = ReferencePolicy.DYNAMIC,
referenceInterface = Object.class,
@@ -60,7 +60,7 @@ public class BootMonitor {
@Reference(target = "(javax.script.language=scala)")
private ScriptEngineFactory scalaScriptEngineFactory;
- private Set<Object> rootRdfTerms =
+ private Set<Object> rootRDFTerms =
Collections.synchronizedSet(new HashSet<Object>());
/**
* true when the user has been notified that clerezza started
@@ -86,23 +86,23 @@ public class BootMonitor {
t.start();
}
- protected void bindJaxrsRdfTerm(Object p) {
- rootRdfTerms.add(p);
- if (!clerezzaStarted && (rootRdfTerms.size() == 35)) {
+ protected void bindJaxrsRDFTerm(Object p) {
+ rootRDFTerms.add(p);
+ if (!clerezzaStarted && (rootRDFTerms.size() == 35)) {
Thread t = new Thread() {
@Override
public void run() {
int lastSize = 0;
for (int i = 0; i < 100; i++) {
- if (rootRdfTerms.size() == lastSize) {
+ if (rootRDFTerms.size() == lastSize) {
clerezzaStarted = true;
if (activated) {
logger.info("The Apache Clerezza Platform is now operational.");
return;
}
}
- lastSize = rootRdfTerms.size();
+ lastSize = rootRDFTerms.size();
try {
Thread.sleep(500);
} catch (InterruptedException ex) {
@@ -115,7 +115,7 @@ public class BootMonitor {
}
}
- protected void unbindJaxrsRdfTerm(Object p) {
- rootRdfTerms.remove(p);
+ protected void unbindJaxrsRDFTerm(Object p) {
+ rootRDFTerms.remove(p);
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/style.default/src/main/scala/GlobalMenuRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/style.default/src/main/scala/GlobalMenuRenderlet.scala b/platform/style.default/src/main/scala/GlobalMenuRenderlet.scala
index 85efc6f..0e85384 100644
--- a/platform/style.default/src/main/scala/GlobalMenuRenderlet.scala
+++ b/platform/style.default/src/main/scala/GlobalMenuRenderlet.scala
@@ -23,7 +23,7 @@ package org.apache.clerezza.platform.style.default
import javax.ws.rs.core.MediaType
import org.apache.clerezza.platform.typerendering._
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
import org.apache.clerezza.rdf.utils.GraphNode
import org.apache.clerezza.rdf.ontologies._
import org.apache.clerezza.rdf.core._
@@ -50,10 +50,10 @@ class GlobalMenuRenderlet extends SRenderlet {
<a href={href}>{label}</a>
}
override def content = {
- def menu(s: Any) = new Iri("http://clerezza.org/2009/11/global-menu#"+s)
-def rdfs(s: Any) = new Iri("http://www.w3.org/2000/01/rdf-schema#"+s)
-def platform(s: Any) = new Iri("http://clerezza.org/2009/08/platform#"+s)
-def dct(s: Any) = new Iri("http://purl.org/dc/terms/"+s)
+ def menu(s: Any) = new IRI("http://clerezza.org/2009/11/global-menu#"+s)
+def rdfs(s: Any) = new IRI("http://www.w3.org/2000/01/rdf-schema#"+s)
+def platform(s: Any) = new IRI("http://clerezza.org/2009/08/platform#"+s)
+def dct(s: Any) = new IRI("http://purl.org/dc/terms/"+s)
<div class="column nav">
<ul>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/style.default/src/main/scala/HeadedPageRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/style.default/src/main/scala/HeadedPageRenderlet.scala b/platform/style.default/src/main/scala/HeadedPageRenderlet.scala
index a39c0c8..b74163a 100644
--- a/platform/style.default/src/main/scala/HeadedPageRenderlet.scala
+++ b/platform/style.default/src/main/scala/HeadedPageRenderlet.scala
@@ -32,7 +32,7 @@ import org.apache.clerezza.rdf.utils._
import org.apache.clerezza.rdf.scala.utils.Preamble._
import org.apache.clerezza.platform.typerendering.scala._
import org.apache.clerezza.rdf.ontologies.DC
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
/**
* A Renderlet for the menu
@@ -92,7 +92,7 @@ resultDocModifier.addScriptReference("/scripts/status-message.js");
<div class="zz-control">
<div class="login">
{
- def platform(s: Any) = new Iri("http://clerezza.org/2009/08/platform#"+s)
+ def platform(s: Any) = new IRI("http://clerezza.org/2009/08/platform#"+s)
val userName = context/platform("user")/platform("userName")*
val displayName = if ((context/platform("user")/FOAF.name).length == 0) {
userName
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java
----------------------------------------------------------------------
diff --git a/platform/typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java b/platform/typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java
index 2485850..11c37dc 100644
--- a/platform/typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java
+++ b/platform/typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java
@@ -95,7 +95,7 @@ public class TypeHandlerSpace {
Lock lock =node.readLock();
lock.lock();
try {
- Set<IRI> rdfTypes = getRdfTypesOfIri(node);
+ Set<IRI> rdfTypes = getRdfTypesOfIRI(node);
return typeHandlerDiscovery.getTypeHandler(rdfTypes);
} finally {
lock.unlock();
@@ -105,7 +105,7 @@ public class TypeHandlerSpace {
return null;
}
- private Set<IRI> getRdfTypesOfIri(GraphNode node) {
+ private Set<IRI> getRdfTypesOfIRI(GraphNode node) {
Set<IRI> rdfTypes = new HashSet<IRI>();
Iterator<RDFTerm> types = node.getObjects(RDF.type);
while (types.hasNext()) {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerSpaceTest.java
----------------------------------------------------------------------
diff --git a/platform/typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerSpaceTest.java b/platform/typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerSpaceTest.java
index 1e89023..739a49b 100644
--- a/platform/typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerSpaceTest.java
+++ b/platform/typehandlerspace/src/test/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerSpaceTest.java
@@ -34,7 +34,7 @@ public class TypeHandlerSpaceTest {
//
// private static LockableGraph mGraph = new LockableGraphWrapper(new SimpleGraph());
//
-// Iri myType = new Iri("org.example/myType");
+// IRI myType = new IRI("org.example/myType");
//
// @Path("/myTypeHandler")
// public static class MyTypeHandler {
@@ -74,7 +74,7 @@ public class TypeHandlerSpaceTest {
//
// int port = createTestWebServer().getPort();
//
-// Iri uri = new Iri("http://localhost:" + port + "/test");
+// IRI uri = new IRI("http://localhost:" + port + "/test");
// // Setup mGraph
// Triple triple = new TripleImpl(uri, RDF.type, myType);
// mGraph.add(triple);
@@ -109,7 +109,7 @@ public class TypeHandlerSpaceTest {
// public void testGet() throws IOException {
//
// int port = createTestWebServer().getPort();
-// Iri uri = new Iri("http://localhost:" + port + "/test");
+// IRI uri = new IRI("http://localhost:" + port + "/test");
//
// // Setup mGraph
// Triple triple = new TripleImpl(uri, RDF.type, myType);
@@ -138,7 +138,7 @@ public class TypeHandlerSpaceTest {
// public void testGetDescription() throws IOException {
//
// int port = createTestWebServer().getPort();
-// Iri uri = new Iri("http://localhost:" + port + "/test");
+// IRI uri = new IRI("http://localhost:" + port + "/test");
//
// // Setup mGraph
// Triple triple = new TripleImpl(uri, RDF.type, myType);
@@ -177,7 +177,7 @@ public class TypeHandlerSpaceTest {
// TypeHandlerSpace typeHandlerSpace = new TypeHandlerSpace();
// typeHandlerSpace.tcManager = new TcManager(){
// @Override
-// public LockableGraph getGraph(Iri name) {
+// public LockableGraph getGraph(IRI name) {
// return new LockableGraph() {
//
// @Override
@@ -191,7 +191,7 @@ public class TypeHandlerSpaceTest {
// }
//
// @Override
-// public Iterator<Triple> filter(BlankNodeOrIri subject, Iri predicate, RdfTerm object) {
+// public Iterator<Triple> filter(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
// return mGraph.filter(subject, predicate, object);
// }
//
@@ -281,7 +281,7 @@ public class TypeHandlerSpaceTest {
// typeHandlerSpace.typeHandlerDiscovery = new TypeHandlerDiscovery() {
//
// @Override
-// public Object getTypeHandler(Set<Iri> rdfTypes) {
+// public Object getTypeHandler(Set<IRI> rdfTypes) {
// if (rdfTypes.contains(myType)){
// return typeHandler;
// }
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/typerendering.gui/src/main/scala/Ontology.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.gui/src/main/scala/Ontology.scala b/platform/typerendering.gui/src/main/scala/Ontology.scala
index fef2077..b09c32d 100644
--- a/platform/typerendering.gui/src/main/scala/Ontology.scala
+++ b/platform/typerendering.gui/src/main/scala/Ontology.scala
@@ -21,11 +21,11 @@
package org.apache.clerezza.platform.typerendering.gui
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
object Ontology {
- private def p(s: String) = new Iri("http://clerezza.org/2011/25/renderletgui#"+s)
+ private def p(s: String) = new IRI("http://clerezza.org/2011/25/renderletgui#"+s)
val RenderletOverviewPage = p("RenderletOverviewPage")
val Renderlet = p("Renderlet")
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/typerendering.gui/src/main/scala/RenderletDescriptionRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.gui/src/main/scala/RenderletDescriptionRenderlet.scala b/platform/typerendering.gui/src/main/scala/RenderletDescriptionRenderlet.scala
index b186d8b..849160c 100644
--- a/platform/typerendering.gui/src/main/scala/RenderletDescriptionRenderlet.scala
+++ b/platform/typerendering.gui/src/main/scala/RenderletDescriptionRenderlet.scala
@@ -23,7 +23,7 @@ package org.apache.clerezza.platform.typerendering.gui
import javax.ws.rs.core.MediaType
import org.apache.clerezza.platform.typerendering._
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
import org.apache.clerezza.rdf.utils.GraphNode
import org.apache.clerezza.rdf.ontologies._
import org.apache.clerezza.rdf.core._
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala
index e1c4924..5d8e9ad 100644
--- a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala
+++ b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/AbstractRenderlet.scala
@@ -24,7 +24,7 @@ import java.net.URI
import javax.ws.rs.core.MediaType
import org.apache.clerezza.platform.typerendering.Renderlet.RequestProperties
import org.apache.clerezza.platform.typerendering._
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
import org.apache.clerezza.rdf.utils.GraphNode
import org.osgi.service.component.ComponentContext
import org.apache.clerezza.rdf.ontologies._
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
index 4140b3f..cad4f43 100644
--- a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
+++ b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/PageRenderlet.scala
@@ -24,7 +24,7 @@ import java.net.URI
import javax.ws.rs.core.MediaType
import org.apache.clerezza.platform.typerendering.Renderlet.RequestProperties
import org.apache.clerezza.platform.typerendering._
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
import org.apache.clerezza.rdf.utils.GraphNode
import org.osgi.service.component.ComponentContext
import org.apache.clerezza.rdf.ontologies._
@@ -40,7 +40,7 @@ import org.apache.clerezza.rdf.scala.utils.Preamble._
abstract class PageRenderlet extends AbstractRenderlet {
def renderedPage(renderingArguments: RenderedPage.Arguments): RenderedPage
- def rdfType: Iri
+ def rdfType: IRI
def mode = "naked"
var renderletManager: RenderletManager = null;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
index edbd5f5..48fb6a2 100644
--- a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
+++ b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
@@ -32,7 +32,7 @@ import org.apache.clerezza.rdf.core._
import org.apache.clerezza.rdf.utils._
import org.apache.clerezza.rdf.scala.utils.Preamble._
import java.security.{PrivilegedAction, AccessController}
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
import org.osgi.framework.{BundleContext, ServiceReference}
import org.apache.clerezza.rdf.scala.utils.RichGraphNode
@@ -83,7 +83,7 @@ abstract class RenderedPage(arguments: RenderedPage.Arguments) {
* renders the specified resource without using the base-graph from resource
* rendered by the caller but getting a new context using the GraphNodeProvider
*/
- def render(resource: Iri): Seq[Node] = {
+ def render(resource: IRI): Seq[Node] = {
modeOption match {
case Some(m) => render(resource, m)
case None => render(resource, "naked")
@@ -94,7 +94,7 @@ abstract class RenderedPage(arguments: RenderedPage.Arguments) {
* renders the specified resource without using the base-graph from resource
* rendered by the caller but getting a new context using the GraphNodeProvider
*/
- def render(resource: Iri, mode: String) = {
+ def render(resource: IRI, mode: String) = {
def parseNodeSeq(string: String) = {
_root_.scala.xml.XML.loadString("<elem>" + string + "</elem>").child
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala
index ab40c2e..6bec953 100644
--- a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala
+++ b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala
@@ -24,7 +24,7 @@ import java.net.URI
import javax.ws.rs.core.MediaType
import org.apache.clerezza.platform.typerendering.TypeRenderlet.RequestProperties
import org.apache.clerezza.platform.typerendering._
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
import org.apache.clerezza.rdf.utils.GraphNode
import org.osgi.service.component.ComponentContext
import org.apache.clerezza.rdf.ontologies._
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala
----------------------------------------------------------------------
diff --git a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala
index f0b8935..c291bdf 100644
--- a/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala
+++ b/platform/typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/XmlResult.scala
@@ -34,7 +34,7 @@ import org.apache.clerezza.rdf.utils._
import org.apache.clerezza.rdf.scala.utils.Preamble._
import java.nio.charset.Charset
import java.security.{PrivilegedAction, AccessController}
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
import org.osgi.framework.{BundleContext, ServiceReference}
import org.apache.clerezza.rdf.scala.utils.RichGraphNode
@@ -85,7 +85,7 @@ abstract class XmlResult(arguments: XmlResult.Arguments) {
* renders the specified resource without using the base-graph from resource
* rendered by the caller but getting a new context using the GraphNodeProvider
*/
- def render(resource: Iri): Seq[Node] = {
+ def render(resource: IRI): Seq[Node] = {
modeOption match {
case Some(m) => render(resource, m)
case None => render(resource, "naked")
@@ -96,7 +96,7 @@ abstract class XmlResult(arguments: XmlResult.Arguments) {
* renders the specified resource without using the base-graph from resource
* rendered by the caller but getting a new context using the GraphNodeProvider
*/
- def render(resource: Iri, mode: String) = {
+ def render(resource: IRI, mode: String) = {
def parseNodeSeq(string: String) = {
_root_.scala.xml.XML.loadString("<elem>" + string + "</elem>").child
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java
index f0736cf..b91ee12 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java
@@ -130,7 +130,7 @@ public class RendererFactory {
types.add(((Literal) resource.getNode()).getDataType());
} else {
// extract rdf types
- Iterator<IRI> it = resource.getIriObjects(RDF.type);
+ Iterator<IRI> it = resource.getIRIObjects(RDF.type);
while (it.hasNext()) {
final IRI rdfType = it.next();
types.add(rdfType);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/typerendering/platform.typerendering.core/src/main/resources/org/apache/clerezza/platform/typerendering/exception-template.ssp
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/resources/org/apache/clerezza/platform/typerendering/exception-template.ssp b/platform/typerendering/platform.typerendering.core/src/main/resources/org/apache/clerezza/platform/typerendering/exception-template.ssp
index a450e08..f70a59b 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/resources/org/apache/clerezza/platform/typerendering/exception-template.ssp
+++ b/platform/typerendering/platform.typerendering.core/src/main/resources/org/apache/clerezza/platform/typerendering/exception-template.ssp
@@ -19,7 +19,7 @@
*
*/
-def typerendering(s: Any) = new Iri("http://clerezza.org/2009/04/typerendering#"+s)
+def typerendering(s: Any) = new IRI("http://clerezza.org/2009/04/typerendering#"+s)
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
----------------------------------------------------------------------
diff --git a/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java b/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
index 41bb488..4b8d7af 100644
--- a/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
+++ b/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
@@ -57,7 +57,7 @@ public interface UserManager {
/**
*
* @param title
- * @return BlankNodeOrIRI which is either a BlankNode or a Iri
+ * @return BlankNodeOrIRI which is either a BlankNode or a IRI
*/
public BlankNodeOrIRI getRoleByTitle(String title);
@@ -70,7 +70,7 @@ public interface UserManager {
/**
*
* @param user
- * the user is either a BlankNode or a Iri
+ * the user is either a BlankNode or a IRI
*
* @return Iterator defining all the Roles the specified user owns
*/
@@ -95,7 +95,7 @@ public interface UserManager {
/**
*
* @param role
- * the role is either a BlankNode or an Iri
+ * the role is either a BlankNode or an IRI
*
* @return Iterator defining all permissions of a role
*/
@@ -234,7 +234,7 @@ public interface UserManager {
/**
*
* @param user
- * the user is either a BlankNode or a Iri
+ * the user is either a BlankNode or a IRI
* @return Iterator defining all permissions of the specified user
*/
public Iterator<BlankNodeOrIRI> getPermissionsOfUser(BlankNodeOrIRI user);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala
----------------------------------------------------------------------
diff --git a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala
index dd9a6f5..84755b9 100644
--- a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala
+++ b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/UserGraphAcessPermissionProvider.scala
@@ -18,11 +18,11 @@
/*package org.apache.clerezza.platform.users
import org.apache.clerezza.platform.security.WebIdBasedPermissionProvider
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
class UserGraphAcessPermissionProvider extends WebIdBasedPermissionProvider {
- override def getPermissions(webId: Iri) : java.util.Collection[String] = {
+ override def getPermissions(webId: IRI) : java.util.Collection[String] = {
import scala.collection.JavaConversions._
val uriString = webId.getUnicodeString
def uriStringWithoutFragment = {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
----------------------------------------------------------------------
diff --git a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
index dba0e7d..535a2d3 100644
--- a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
+++ b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
@@ -27,7 +27,7 @@ import org.apache.clerezza.platform.config.PlatformConfig
import org.apache.clerezza.platform.config.SystemConfig
import org.apache.clerezza.commons.rdf.Graph
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.SecuredGraph
import org.apache.clerezza.rdf.core.access.TcManager
@@ -78,7 +78,7 @@ class WebIdGraphsService {
* @param uri the Web-Id
* @return a WebIdInfo allowing to access the graphs of the user
*/
- def getWebIdInfo(uri: Iri): WebIdInfo = {
+ def getWebIdInfo(uri: IRI): WebIdInfo = {
return new WebIdInfo {
private val uriString = uri.getUnicodeString
@@ -103,7 +103,7 @@ class WebIdGraphsService {
private lazy val localGraphUri = {
if (isLocal) uri
else {
- new Iri("urn:x-localinstance:/user/"+hashTruncatedUriString)
+ new IRI("urn:x-localinstance:/user/"+hashTruncatedUriString)
}
}
@@ -118,7 +118,7 @@ class WebIdGraphsService {
private lazy val profileDocumentUri = {
- new Iri(profileDocumentUriString)
+ new IRI(profileDocumentUriString)
}
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdInfo.scala
----------------------------------------------------------------------
diff --git a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdInfo.scala b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdInfo.scala
index 28eca05..1338d4b 100644
--- a/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdInfo.scala
+++ b/platform/users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdInfo.scala
@@ -28,14 +28,14 @@ package org.apache.clerezza.platform.users
*
*/
import org.apache.clerezza.commons.rdf.Graph
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
trait WebIdInfo {
/**
* The WebID this instance is about
*/
- def webId: Iri
+ def webId: IRI
/**
* The WebId profile graph, for remote users this is immutable
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/VirtuosoBNode.java
----------------------------------------------------------------------
diff --git a/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/VirtuosoBNode.java b/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/VirtuosoBNode.java
index e8cc46f..53de9c0 100644
--- a/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/VirtuosoBNode.java
+++ b/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/VirtuosoBNode.java
@@ -30,7 +30,7 @@ public class VirtuosoBNode extends BNode {
return skolemId;
}
- public String asSkolemIri(){
+ public String asSkolemIRI(){
return new StringBuilder().append('<').append(skolemId).append('>').toString();
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java
----------------------------------------------------------------------
diff --git a/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java b/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java
index f44a9c1..6b328a9 100644
--- a/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java
+++ b/rdf.virtuoso.storage/src/main/java/org/apache/clerezza/rdf/virtuoso/storage/access/DataAccess.java
@@ -678,9 +678,9 @@ public class DataAccess {
if (object == null)
return null;
if (object instanceof UriRef) {
- return toVirtIri((UriRef) object);
+ return toVirtIRI((UriRef) object);
} else if (object instanceof BNode) {
- return toVirtBnode((BNode) object).asSkolemIri();
+ return toVirtBnode((BNode) object).asSkolemIRI();
} else if (object instanceof PlainLiteral) {
return toVirtPlainLiteral((PlainLiteral) object);
} else if (object instanceof TypedLiteral) {
@@ -708,7 +708,7 @@ public class DataAccess {
.equals("http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral"));
return new StringBuilder().append('"').append('"').append('"')
.append(prepared).append('"').append('"').append('"')
- .append("^^").append(toVirtIri(dt)).toString();
+ .append("^^").append(toVirtIRI(dt)).toString();
}
private StringBuilder prepareString(String str, boolean xml) {
@@ -766,11 +766,11 @@ public class DataAccess {
logger.debug("toVirtPredicate(UriRef {}) ", predicate);
if (predicate == null)
return null;
- return toVirtIri(predicate);
+ return toVirtIRI(predicate);
}
- private String toVirtIri(UriRef ur) {
- logger.debug("toVirtIri(UriRef {})", ur);
+ private String toVirtIRI(UriRef ur) {
+ logger.debug("toVirtIRI(UriRef {})", ur);
return "<" + ur.getUnicodeString() + ">";
}
@@ -786,9 +786,9 @@ public class DataAccess {
return null;
}
if (subject instanceof UriRef) {
- return toVirtIri((UriRef) subject);
+ return toVirtIRI((UriRef) subject);
} else if (subject instanceof BNode) {
- return toVirtBnode((BNode) subject).asSkolemIri();
+ return toVirtBnode((BNode) subject).asSkolemIRI();
} else {
// These should be the only 2 implementations
throw new IllegalArgumentException(
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java
----------------------------------------------------------------------
diff --git a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java
index 7e6741b..996ef6f 100644
--- a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java
+++ b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java
@@ -120,21 +120,21 @@ public class RandomGraph extends GraphWrapper {
}
switch (random) {
case 0: // create new BlankNodeOrIRI
- RDFTerm newRdfTerm;
+ RDFTerm newRDFTerm;
do {
- newRdfTerm = createRandomRdfTerm();
- } while (!(newRdfTerm instanceof BlankNodeOrIRI));
- return (BlankNodeOrIRI) newRdfTerm;
+ newRDFTerm = createRandomRDFTerm();
+ } while (!(newRDFTerm instanceof BlankNodeOrIRI));
+ return (BlankNodeOrIRI) newRDFTerm;
default: // get existing BlankNodeOrIRI
- RDFTerm existingRdfTerm;
+ RDFTerm existingRDFTerm;
do {
- existingRdfTerm = getExistingRdfTerm();
- if (existingRdfTerm == null) {
+ existingRDFTerm = getExistingRDFTerm();
+ if (existingRDFTerm == null) {
random = 0;
}
- } while (!(existingRdfTerm instanceof BlankNodeOrIRI));
+ } while (!(existingRDFTerm instanceof BlankNodeOrIRI));
- return (BlankNodeOrIRI) existingRdfTerm;
+ return (BlankNodeOrIRI) existingRDFTerm;
}
}
@@ -145,16 +145,16 @@ public class RandomGraph extends GraphWrapper {
}
switch (random) {
case 0: // create new IRI
- return createRandomIri();
+ return createRandomIRI();
default: // get existing IRI
- RDFTerm existingRdfTerm;
+ RDFTerm existingRDFTerm;
do {
- existingRdfTerm = getExistingRdfTerm();
- if (existingRdfTerm == null) {
+ existingRDFTerm = getExistingRDFTerm();
+ if (existingRDFTerm == null) {
random = 0;
}
- } while (!(existingRdfTerm instanceof IRI));
- return (IRI) existingRdfTerm;
+ } while (!(existingRDFTerm instanceof IRI));
+ return (IRI) existingRDFTerm;
}
}
@@ -165,13 +165,13 @@ public class RandomGraph extends GraphWrapper {
}
switch (random) {
case 0: // create new resource
- return createRandomRdfTerm();
+ return createRandomRDFTerm();
default: // get existing resource
- RDFTerm existingRdfTerm = getExistingRdfTerm();
- if (existingRdfTerm == null) {
+ RDFTerm existingRDFTerm = getExistingRDFTerm();
+ if (existingRDFTerm == null) {
random = 0;
}
- return existingRdfTerm;
+ return existingRDFTerm;
}
}
@@ -179,19 +179,19 @@ public class RandomGraph extends GraphWrapper {
return Double.valueOf(Math.random() * faces).intValue();
}
- private RDFTerm createRandomRdfTerm() {
+ private RDFTerm createRandomRDFTerm() {
switch (rollDice(3)) {
case 0:
return new BlankNode();
case 1:
- return createRandomIri();
+ return createRandomIRI();
case 2:
return new PlainLiteralImpl(RandomStringUtils.random(rollDice(100) + 1));
}
- throw new RuntimeException("in createRandomRdfTerm()");
+ throw new RuntimeException("in createRandomRDFTerm()");
}
- private RDFTerm getExistingRdfTerm() {
+ private RDFTerm getExistingRDFTerm() {
Triple triple = getRandomTriple();
if (triple == null) {
return null;
@@ -207,7 +207,7 @@ public class RandomGraph extends GraphWrapper {
return null;
}
- private IRI createRandomIri() {
+ private IRI createRandomIRI() {
return new IRI("http://" + UUID.randomUUID().toString());
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java
----------------------------------------------------------------------
diff --git a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java
index 856bdcc..bea479d 100644
--- a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java
+++ b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java
@@ -49,8 +49,8 @@ public abstract class TcProviderTest {
protected final IRI uriRefB1 = generateUri("b1");
protected final IRI uriRefC = generateUri("c");
- protected final IRI graphIri = generateUri("myGraph");
- protected final IRI otherGraphIri = new IRI(graphIri.getUnicodeString());
+ protected final IRI graphIRI = generateUri("myGraph");
+ protected final IRI otherGraphIRI = new IRI(graphIRI.getUnicodeString());
@Test
public void testCreateImmutableGraph() {
@@ -223,7 +223,7 @@ public abstract class TcProviderTest {
// simpleTcmProvider.createGraph(uriRefA, graph);
// simpleTcmProvider.createGraph(uriRefC, graph);
//
-// Set<Iri> names = simpleTcmProvider.getNames(graph);
+// Set<IRI> names = simpleTcmProvider.getNames(graph);
//
// assertTrue(names.contains(uriRefA));
// assertTrue(names.contains(uriRefC));
@@ -236,80 +236,80 @@ public abstract class TcProviderTest {
public void testCreateGraphExtended() throws Exception {
TcProvider provider = getInstance();
- Graph graph = provider.createGraph(graphIri);
+ Graph graph = provider.createGraph(graphIRI);
assertNotNull(graph);
//get a new provider and check that graph is there
provider = getInstance();
- graph = provider.getGraph(graphIri);
+ graph = provider.getGraph(graphIRI);
assertNotNull(graph);
//check that there is no such graph, but only the mgraph
boolean expThrown = false;
try {
- ImmutableGraph g = provider.getImmutableGraph(graphIri);
+ ImmutableGraph g = provider.getImmutableGraph(graphIRI);
} catch(NoSuchEntityException e) {
expThrown = true;
}
assertTrue(expThrown);
- provider.deleteGraph(graphIri);
+ provider.deleteGraph(graphIRI);
}
@Test
public void testCreateImmutableGraphExtended() throws Exception {
TcProvider provider = getInstance();
- ImmutableGraph graph = provider.createImmutableGraph(graphIri, null);
+ ImmutableGraph graph = provider.createImmutableGraph(graphIRI, null);
assertNotNull(graph);
//get a new provider and check that graph is there
provider = getInstance();
- graph = provider.getImmutableGraph(graphIri);
+ graph = provider.getImmutableGraph(graphIRI);
assertNotNull(graph);
//check that there is no such mgraph, but only the graph
boolean expThrown = false;
try {
- Graph g = provider.getMGraph(graphIri);
+ Graph g = provider.getMGraph(graphIRI);
} catch(NoSuchEntityException e) {
expThrown = true;
}
assertTrue(expThrown);
- provider.deleteGraph(graphIri);
+ provider.deleteGraph(graphIRI);
}
@Test
public void testCreateGraphNoDuplicateNames() throws Exception {
TcProvider provider = getInstance();
- ImmutableGraph graph = provider.createImmutableGraph(graphIri, null);
+ ImmutableGraph graph = provider.createImmutableGraph(graphIRI, null);
assertNotNull(graph);
boolean expThrown = false;
try {
- ImmutableGraph other = provider.createImmutableGraph(otherGraphIri, null);
+ ImmutableGraph other = provider.createImmutableGraph(otherGraphIRI, null);
} catch(EntityAlreadyExistsException eaee) {
expThrown = true;
}
assertTrue(expThrown);
- provider.deleteGraph(graphIri);
+ provider.deleteGraph(graphIRI);
}
@Test
public void testCreateGraphNoDuplicateNames2() throws Exception {
TcProvider provider = getInstance();
- Graph graph = provider.createGraph(graphIri);
+ Graph graph = provider.createGraph(graphIRI);
assertNotNull(graph);
boolean expThrown = false;
try {
- Graph other = provider.createGraph(otherGraphIri);
+ Graph other = provider.createGraph(otherGraphIRI);
} catch(EntityAlreadyExistsException eaee) {
expThrown = true;
}
assertTrue(expThrown);
- provider.deleteGraph(graphIri);
+ provider.deleteGraph(graphIRI);
}
@Test
@@ -319,11 +319,11 @@ public abstract class TcProviderTest {
TcProvider provider = getInstance();
- ImmutableGraph graph = provider.createImmutableGraph(graphIri, createTestTripleCollection(t1));
+ ImmutableGraph graph = provider.createImmutableGraph(graphIRI, createTestTripleCollection(t1));
assertEquals(1, graph.size());
assertTrue(graph.contains(t1));
- provider.deleteGraph(graphIri);
+ provider.deleteGraph(graphIRI);
}
@Test
@@ -335,7 +335,7 @@ public abstract class TcProviderTest {
TcProvider provider = getInstance();
- ImmutableGraph graph = provider.createImmutableGraph(graphIri, createTestTripleCollection(t1));
+ ImmutableGraph graph = provider.createImmutableGraph(graphIRI, createTestTripleCollection(t1));
boolean expThrown = false;
@@ -384,7 +384,7 @@ public abstract class TcProviderTest {
}
assertTrue(expThrown);
- provider.deleteGraph(graphIri);
+ provider.deleteGraph(graphIRI);
}
// This tests can not pass, because equals in AbstractGraph is not implemented
@@ -395,11 +395,11 @@ public abstract class TcProviderTest {
// TcProvider provider = getInstance();
//
// Graph triples = createTestTripleCollection(createTestTriple());
-// ImmutableGraph graph = provider.createGraph(graphIri, triples);
+// ImmutableGraph graph = provider.createGraph(graphIRI, triples);
//
// provider = getInstance();
-// Set<Iri> names = provider.getNames(graph);
-// assertTrue(names.contains(graphIri));
+// Set<IRI> names = provider.getNames(graph);
+// assertTrue(names.contains(graphIRI));
// }
//
// @Test
@@ -414,7 +414,7 @@ public abstract class TcProviderTest {
// IRI name2 = new IRI("http://myGraph2");
// ImmutableGraph secondGraph = provider.createGraph(name2, triples);
//
-// Set<Iri> names = provider.getNames(graph);
+// Set<IRI> names = provider.getNames(graph);
// assertNotNull(names);
// assertEquals(2, names.size());
// }
@@ -457,11 +457,11 @@ public abstract class TcProviderTest {
public void testGetTriplesGraph() throws Exception {
TcProvider provider = getInstance();
- Graph graph = provider.createGraph(graphIri);
+ Graph graph = provider.createGraph(graphIRI);
- Graph tc = provider.getGraph(graphIri);
+ Graph tc = provider.getGraph(graphIRI);
assertNotNull(tc);
- provider.deleteGraph(graphIri);
+ provider.deleteGraph(graphIRI);
}
private Triple createTestTriple() {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/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 048e976..a43a5fa 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
@@ -55,9 +55,9 @@ public class FileGraphTest {
@BeforeClass
public static void setup() throws Exception {
- createTempFileFromRdfTerm(NT_FILE_NAME);
- createTempFileFromRdfTerm(RDF_FILE_NAME);
- createTempFileFromRdfTerm(TURTLE_FILE_NAME);
+ createTempFileFromRDFTerm(NT_FILE_NAME);
+ createTempFileFromRDFTerm(RDF_FILE_NAME);
+ createTempFileFromRDFTerm(TURTLE_FILE_NAME);
}
@AfterClass
@@ -67,7 +67,7 @@ public class FileGraphTest {
deleteTempFile(TURTLE_FILE_NAME);
}
- private static void createTempFileFromRdfTerm(String resourceName)
+ private static void createTempFileFromRDFTerm(String resourceName)
throws FileNotFoundException, IOException {
InputStream in = FileTcProviderTest.class.getResourceAsStream(resourceName);
File file = new File(URI.create(getTempFileUri(resourceName)));
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/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 1be13fe..809d8ac 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
@@ -103,7 +103,7 @@ public class Jena2TriaUtil {
if (node.isLiteral()) {
return convertJenaLiteral2Literal(node);
}
- throw new RuntimeException("cannot convert " + node + " to RdfTerm");
+ throw new RuntimeException("cannot convert " + node + " to RDFTerm");
}
/**
@@ -124,7 +124,7 @@ public class Jena2TriaUtil {
if (node.isURI()) {
return convertJenaUri2UriRef(node);
}
- throw new RuntimeException("cannot convert " + node + " to BlankNodeOrIri");
+ throw new RuntimeException("cannot convert " + node + " to BlankNodeOrIRI");
}
public Triple convertTriple(com.hp.hpl.jena.graph.Triple triple) {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/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 f7d4431..404a23d 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
@@ -40,7 +40,7 @@ class HashMapSolutionMapping extends HashMap<Variable, RDFTerm> implements Solut
final Iterator<String> varNames = querySolution.varNames();
while (varNames.hasNext()) {
final String varName = varNames.next();
- put(new Variable(varName), toRdfTerm(querySolution.get(varName)));
+ put(new Variable(varName), toRDFTerm(querySolution.get(varName)));
}
}
@Override
@@ -48,7 +48,7 @@ class HashMapSolutionMapping extends HashMap<Variable, RDFTerm> implements Solut
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/f2811c72/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
new file mode 100644
index 0000000..7520810
--- /dev/null
+++ b/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/IRISet.java
@@ -0,0 +1,62 @@
+package org.apache.clerezza.rdf.jena.tdb.internals;
+
+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.rdf.ontologies.RDF;
+
+/**
+ * Represents a set of uri ref Set<IRI>
+ * @author Minto van der Sluis
+ */
+public class IRISet extends AbstractSet<IRI> {
+ private ModelGraph graphNameIndex;
+ private IRI graphType;
+
+ public IRISet(ModelGraph index, IRI object) {
+ graphNameIndex = index;
+ graphType = object;
+ }
+
+ @Override
+ public int size() {
+ // TODO: How to get the proper size based on graphType
+ return graphNameIndex.getGraph().size();
+ }
+
+ @Override
+ public Iterator<IRI> iterator() {
+ final Iterator<Triple> indexIter = graphNameIndex.getGraph().filter( null, RDF.type, graphType );
+ return new Iterator<IRI>() {
+ @Override
+ public boolean hasNext() {
+ return indexIter.hasNext();
+ }
+
+ @Override
+ public IRI next() {
+ return IRI.class.cast(indexIter.next().getSubject());
+ }
+
+ @Override
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+ };
+ }
+
+ @Override
+ 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();
+ }
+ return false;
+ }
+};
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/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
deleted file mode 100644
index 3e5b2a2..0000000
--- a/rdf/jena/tdb.storage/src/main/java/org/apache/clerezza/rdf/jena/tdb/internals/IriSet.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.apache.clerezza.rdf.jena.tdb.internals;
-
-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.rdf.ontologies.RDF;
-
-/**
- * Represents a set of uri ref Set<Iri>
- * @author Minto van der Sluis
- */
-public class IriSet extends AbstractSet<IRI> {
- private ModelGraph graphNameIndex;
- private IRI graphType;
-
- public IriSet(ModelGraph index, IRI object) {
- graphNameIndex = index;
- graphType = object;
- }
-
- @Override
- public int size() {
- // TODO: How to get the proper size based on graphType
- return graphNameIndex.getGraph().size();
- }
-
- @Override
- public Iterator<IRI> iterator() {
- final Iterator<Triple> indexIter = graphNameIndex.getGraph().filter( null, RDF.type, graphType );
- return new Iterator<IRI>() {
- @Override
- public boolean hasNext() {
- return indexIter.hasNext();
- }
-
- @Override
- public IRI next() {
- return IRI.class.cast(indexIter.next().getSubject());
- }
-
- @Override
- public void remove() {
- throw new UnsupportedOperationException();
- }
- };
- }
-
- @Override
- 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();
- }
- return false;
- }
-};
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/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 4a8258d..7044fe1 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
@@ -22,7 +22,7 @@ import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleImmutableGraph;
* Represents the Jena {@link Model} and the Clerezza {@link ImmutableGraph} or
* {@link Graph}. It also provide access to the {@link JenaGraphAdaptor}
* so that this component can add parsed data to {@link ImmutableGraph}s created
- * by calls to {@link SingleTdbDatasetTcProvider#createGraph(Iri, TripleCollection)}.
+ * by calls to {@link SingleTdbDatasetTcProvider#createGraph(IRI, TripleCollection)}.
* @author Rupert Westenthaler
*
*/
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/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 0e84390..d08b7b1 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
@@ -27,7 +27,7 @@ import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.jena.tdb.internals.ModelGraph;
import org.apache.clerezza.rdf.jena.tdb.internals.Symbols;
-import org.apache.clerezza.rdf.jena.tdb.internals.IriSet;
+import org.apache.clerezza.rdf.jena.tdb.internals.IRISet;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@@ -62,7 +62,7 @@ import org.apache.clerezza.rdf.core.access.TcManager;
* such as <code>"${myHome}/myRdfStore"</code><p>
* The {@link #DEFAULT_GRAPH_NAME} property can be used to define the
* name of the ImmutableGraph that exposes the {@link Dataset#getDefaultModel()} as
- * both {@link TcProvider#getGraph(Iri)} and {@link TcProvider#getGraph(Iri)}.
+ * both {@link TcProvider#getGraph(IRI)} and {@link TcProvider#getGraph(IRI)}.
* This easily allows to access the union graph of the Jena TDB dataset.<p>
* This {@link TcProvider} {@link ConfigurationPolicy#REQUIRE requires} an
* configuration and uses the {@link Component#configurationFactory()
@@ -401,7 +401,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
@Override
public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
if(name == null){
- throw new IllegalArgumentException("The parsed ImmutableGraph Iri MUST NOT be NULL!");
+ throw new IllegalArgumentException("The parsed ImmutableGraph IRI MUST NOT be NULL!");
}
datasetLock.readLock().lock();
try {
@@ -422,7 +422,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
@Override
public Graph getMGraph(IRI name) throws NoSuchEntityException {
if(name == null){
- throw new IllegalArgumentException("The parsed ImmutableGraph Iri MUST NOT be NULL!");
+ throw new IllegalArgumentException("The parsed ImmutableGraph IRI MUST NOT be NULL!");
}
datasetLock.readLock().lock();
try {
@@ -443,7 +443,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
@Override
public Graph getGraph(IRI name) throws NoSuchEntityException {
if(name == null){
- throw new IllegalArgumentException("The parsed ImmutableGraph Iri MUST NOT be NULL!");
+ throw new IllegalArgumentException("The parsed ImmutableGraph IRI MUST NOT be NULL!");
}
datasetLock.readLock().lock();
try {
@@ -467,7 +467,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
public Set<IRI> listImmutableGraphs() {
datasetLock.readLock().lock();
try {
- return new HashSet(new IriSet( graphNameIndex, Symbols.ImmutableGraph ));
+ return new HashSet(new IRISet( graphNameIndex, Symbols.ImmutableGraph ));
} finally {
datasetLock.readLock().unlock();
}
@@ -481,7 +481,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
public Set<IRI> listMGraphs() {
datasetLock.readLock().lock();
try {
- return new HashSet(new IriSet( graphNameIndex, Symbols.Graph ));
+ return new HashSet(new IRISet( graphNameIndex, Symbols.Graph ));
} finally {
datasetLock.readLock().unlock();
}
@@ -495,7 +495,7 @@ public class SingleTdbDatasetTcProvider extends BaseTdbTcProvider implements Wei
public Set<IRI> listGraphs() {
datasetLock.readLock().lock();
try {
- return new HashSet(new IriSet( graphNameIndex, null ));
+ return new HashSet(new IRISet( graphNameIndex, null ));
} finally {
datasetLock.readLock().unlock();
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/NameSpace.scala
----------------------------------------------------------------------
diff --git a/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/NameSpace.scala b/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/NameSpace.scala
index fc44b29..513098e 100644
--- a/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/NameSpace.scala
+++ b/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/NameSpace.scala
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.scala.utils
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
/**
* A IRI-namespace prefix
@@ -26,12 +26,12 @@ import org.apache.clerezza.commons.rdf.Iri
class NameSpace(prefix: String) {
/**
- * returns a Iri applying this namespace prefix to the given symbol
+ * returns a IRI applying this namespace prefix to the given symbol
*/
- def +(s: Symbol) = new Iri(prefix + s.name)
+ def +(s: Symbol) = new IRI(prefix + s.name)
/**
- * returns a Iri applying this prefix to the given string
+ * returns a IRI applying this prefix to the given string
*/
- def +(s: String) = new Iri(prefix + s)
+ def +(s: String) = new IRI(prefix + s)
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EzMGraphTest.scala
----------------------------------------------------------------------
diff --git a/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EzMGraphTest.scala b/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EzMGraphTest.scala
index d5e6544..bc9bd55 100644
--- a/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EzMGraphTest.scala
+++ b/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/EzMGraphTest.scala
@@ -20,7 +20,7 @@ package org.apache.clerezza.rdf.scala.utils
import org.apache.clerezza.commons.rdf.BlankNode
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.Language
import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl
@@ -48,11 +48,11 @@ class EzGraphTest {
/**import some references in order to reduce dependencies */
- final val hex: Iri = new Iri("http://www.w3.org/ns/auth/cert#hex")
- final val identity: Iri = new Iri("http://www.w3.org/ns/auth/cert#identity")
- final val RSAPublicKey: Iri = new Iri("http://www.w3.org/ns/auth/rsa#RSAPublicKey")
- final val modulus: Iri = new Iri("http://www.w3.org/ns/auth/rsa#modulus")
- final val public_exponent: Iri = new Iri("http://www.w3.org/ns/auth/rsa#public_exponent")
+ final val hex: IRI = new IRI("http://www.w3.org/ns/auth/cert#hex")
+ final val identity: IRI = new IRI("http://www.w3.org/ns/auth/cert#identity")
+ final val RSAPublicKey: IRI = new IRI("http://www.w3.org/ns/auth/rsa#RSAPublicKey")
+ final val modulus: IRI = new IRI("http://www.w3.org/ns/auth/rsa#modulus")
+ final val public_exponent: IRI = new IRI("http://www.w3.org/ns/auth/rsa#public_exponent")
val henryUri: String = "http://bblfish.net/#hjs"
val retoUri: String = "http://farewellutopia.com/reto/#me"
@@ -63,13 +63,13 @@ class EzGraphTest {
val gr = new SimpleGraph
val reto = new BlankNode()
val danny = new BlankNode()
- val henry = new Iri(henryUri)
+ val henry = new IRI(henryUri)
gr.add(new TripleImpl(reto, RDF.`type`, FOAF.Person))
gr.add(new TripleImpl(reto, FOAF.name, new PlainLiteralImpl("Reto Bachman-Gmür", new Language("rm"))))
//it is difficult to remember that one needs to put a string literal if one does not want to specify a language
gr.add(new TripleImpl(reto, FOAF.title, new TypedLiteralImpl("Mr", XSD.string)))
- gr.add(new TripleImpl(reto, FOAF.currentProject, new Iri("http://clerezza.org/")))
+ gr.add(new TripleImpl(reto, FOAF.currentProject, new IRI("http://clerezza.org/")))
gr.add(new TripleImpl(reto, FOAF.knows, henry))
gr.add(new TripleImpl(reto, FOAF.knows, danny))
@@ -79,7 +79,7 @@ class EzGraphTest {
gr.add(new TripleImpl(danny, FOAF.knows, reto))
gr.add(new TripleImpl(henry, FOAF.name, new TypedLiteralImpl("Henry Story", XSD.string))) //It is tricky to remember that one needs this for pure strings
- gr.add(new TripleImpl(henry, FOAF.currentProject, new Iri("http://webid.info/")))
+ gr.add(new TripleImpl(henry, FOAF.currentProject, new IRI("http://webid.info/")))
gr.add(new TripleImpl(henry, RDF.`type`, FOAF.Person))
gr.add(new TripleImpl(henry, FOAF.knows, danny))
gr.add(new TripleImpl(henry, FOAF.knows, reto))
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNodeTest.scala
----------------------------------------------------------------------
diff --git a/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNodeTest.scala b/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNodeTest.scala
index 5240cc7..fa0a8b0 100644
--- a/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNodeTest.scala
+++ b/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNodeTest.scala
@@ -24,7 +24,7 @@ import org.apache.clerezza.rdf.core.impl._
import org.apache.clerezza.rdf.ontologies._
import org.apache.clerezza.commons.rdf.BlankNode
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.Language
import org.apache.clerezza.commons.rdf.Literal
import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl
@@ -36,10 +36,10 @@ import Preamble._
class RichGraphNodeTest {
- private val johnUri = new Iri("http://example.org/john")
- private val susanneUri = new Iri("http://example.org/susanne")
- private val listUri = new Iri("http://example.org/list")
- private val greetingsUri = new Iri("http://example.org/greetings")
+ private val johnUri = new IRI("http://example.org/john")
+ private val susanneUri = new IRI("http://example.org/susanne")
+ private val listUri = new IRI("http://example.org/list")
+ private val greetingsUri = new IRI("http://example.org/greetings")
private val billBlankNode = new BlankNode()
private var node : RichGraphNode = null;
private var mGraph = new SimpleGraph()
@@ -96,9 +96,9 @@ class RichGraphNodeTest {
def testIterate = {
val simple: Graph = new SimpleGraph();
val node = new GraphNode(new BlankNode(), simple);
- node.addProperty(DCTERMS.provenance, new Iri("http://example.org/foo"));
- node.addProperty(DCTERMS.language, new Iri("http://www.bluewin.ch/"));
- simple.add(new TripleImpl(new Iri("http://www.bluewin.ch/"),RDF.`type`, RDFS.Container));
+ node.addProperty(DCTERMS.provenance, new IRI("http://example.org/foo"));
+ node.addProperty(DCTERMS.language, new IRI("http://www.bluewin.ch/"));
+ simple.add(new TripleImpl(new IRI("http://www.bluewin.ch/"),RDF.`type`, RDFS.Container));
node.addProperty(RDF.`type`, PLATFORM.HeadedPage);
node.addProperty(RDF.`type`, RDFS.Class);
val test: CollectedIter[RichGraphNode] = node/DCTERMS.language/RDF.`type`;
@@ -158,7 +158,7 @@ class RichGraphNodeTest {
@Test
def literalAsObject = {
val dateLiteral = new TypedLiteralImpl("2009-01-01T01:33:58Z",
- new Iri("http://www.w3.org/2001/XMLSchema#dateTime"))
+ new IRI("http://www.w3.org/2001/XMLSchema#dateTime"))
val node = new GraphNode(dateLiteral, new SimpleGraph())
Assert.assertNotNull(node.as[java.util.Date])
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/TypeConversionTest.scala
----------------------------------------------------------------------
diff --git a/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/TypeConversionTest.scala b/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/TypeConversionTest.scala
index d73d5f6..f60b1eb 100644
--- a/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/TypeConversionTest.scala
+++ b/rdf/scala.utils/src/test/scala/org/apache/clerezza/rdf/scala/utils/TypeConversionTest.scala
@@ -18,7 +18,7 @@ package org.apache.clerezza.rdf.scala.utils
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.clerezza.commons.rdf.Iri
+import org.apache.clerezza.commons.rdf.IRI
import org.apache.clerezza.commons.rdf.Language
import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl
@@ -34,27 +34,27 @@ class TypeConversionTest {
@Test
def useStringAsObject {
- val t = new TripleImpl(new Iri(("http://example.org/subject")), new Iri(("http://example.org/predicate")), "a value")
+ val t = new TripleImpl(new IRI(("http://example.org/subject")), new IRI(("http://example.org/predicate")), "a value")
Assert.assertEquals(literalFactory.createTypedLiteral("a value"), t.getObject)
}
/*@Test
def useStringWithLanguageTag {
- val t = new TripleImpl(new Iri(("http://example.org/subject")), new Iri(("http://example.org/predicate")), "a value"("en"))
+ val t = new TripleImpl(new IRI(("http://example.org/subject")), new IRI(("http://example.org/predicate")), "a value"("en"))
Assert.assertEquals(new PlainLiteralImpl("a value", new Language("en")), t.getObject)
}*/
@Test
def useStringWithLanguageTag {
val lit = new PlainLiteralImpl("a value", new Language("en"))
- val t = new TripleImpl(new Iri(("http://example.org/subject")), new Iri(("http://example.org/predicate")), "a value" lang "en")
+ val t = new TripleImpl(new IRI(("http://example.org/subject")), new IRI(("http://example.org/predicate")), "a value" lang "en")
Assert.assertEquals(lit, t.getObject)
}
@Test
def useStringWithType {
- val typeUri = new Iri("http://example.org/dt")
- val t = new TripleImpl(new Iri(("http://example.org/subject")), new Iri(("http://example.org/predicate")), "a value"^^typeUri)
+ val typeUri = new IRI("http://example.org/dt")
+ val t = new TripleImpl(new IRI(("http://example.org/subject")), new IRI(("http://example.org/predicate")), "a value"^^typeUri)
Assert.assertEquals(new TypedLiteralImpl("a value", typeUri), t.getObject)
}
@@ -67,8 +67,8 @@ class TypeConversionTest {
@Test
def dotUri {
- val t = new TripleImpl(new Iri(("http://example.org/subject")), new Iri(("http://example.org/predicate")), "http://example.org".iri)
- Assert.assertEquals(new Iri("http://example.org"), t.getObject)
+ val t = new TripleImpl(new IRI(("http://example.org/subject")), new IRI(("http://example.org/predicate")), "http://example.org".iri)
+ Assert.assertEquals(new IRI("http://example.org"), t.getObject)
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/storage.web/src/main/scala/WebProxy.scala
----------------------------------------------------------------------
diff --git a/rdf/storage.web/src/main/scala/WebProxy.scala b/rdf/storage.web/src/main/scala/WebProxy.scala
index e51d91c..d501595 100644
--- a/rdf/storage.web/src/main/scala/WebProxy.scala
+++ b/rdf/storage.web/src/main/scala/WebProxy.scala
@@ -21,7 +21,7 @@ package org.apache.clerezza.rdf.storage.web
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._
import org.apache.clerezza.commons.rdf.impl.utils.AbstractGraph
import org.osgi.service.component.ComponentContext
@@ -96,10 +96,10 @@ class WebProxy extends WeightedTcProvider with Logging {
* @return
* @throws NoSuchEntityException
*/
- def getMGraph(name: Iri): Graph = {
+ def getMGraph(name: IRI): Graph = {
val graph = getImmutableGraph(name)
return new AbstractGraph() {
- protected def performFilter(subject: BlankNodeOrIri, predicate: Iri, `object` : RdfTerm): java.util.Iterator[Triple] = {
+ protected def performFilter(subject: BlankNodeOrIRI, predicate: IRI, `object` : RDFTerm): java.util.Iterator[Triple] = {
graph.filter(subject, predicate, `object`)
}
@@ -107,7 +107,7 @@ class WebProxy extends WeightedTcProvider with Logging {
}
}
- def getImmutableGraph(name: Iri): ImmutableGraph = {
+ def getImmutableGraph(name: IRI): ImmutableGraph = {
try {
getGraph(name, Cache.Fetch)
} catch {
@@ -119,24 +119,24 @@ class WebProxy extends WeightedTcProvider with Logging {
}
}
- def getGraph(name: Iri): Graph = {
+ def getGraph(name: IRI): Graph = {
return getMGraph(name)
}
- def createGraph(name: Iri): Graph = {
+ def createGraph(name: IRI): Graph = {
throw new UnsupportedOperationException
}
- def createImmutableGraph(name: Iri, triples: Graph): ImmutableGraph = {
+ def createImmutableGraph(name: IRI, triples: Graph): ImmutableGraph = {
throw new UnsupportedOperationException
}
- def deleteGraph(name: Iri): Unit = {
+ def deleteGraph(name: IRI): Unit = {
throw new UnsupportedOperationException
}
- def getNames(graph: ImmutableGraph): java.util.Set[Iri] = {
- var result: java.util.Set[Iri] = new java.util.HashSet[Iri]
+ def getNames(graph: ImmutableGraph): java.util.Set[IRI] = {
+ var result: java.util.Set[IRI] = new java.util.HashSet[IRI]
import collection.JavaConversions._
for (name <- listGraphs) {
if (getImmutableGraph(name).equals(graph)) {
@@ -146,27 +146,27 @@ class WebProxy extends WeightedTcProvider with Logging {
return result
}
- def listGraphs: java.util.Set[Iri] = {
- var result: java.util.Set[Iri] = new java.util.HashSet[Iri]
+ def listGraphs: java.util.Set[IRI] = {
+ var result: java.util.Set[IRI] = new java.util.HashSet[IRI]
result.addAll(listMGraphs)
result.addAll(listImmutableGraphs)
return result
}
- def listMGraphs: java.util.Set[Iri] = {
+ def listMGraphs: java.util.Set[IRI] = {
//or should we list graphs for which we have a cached version?
- return java.util.Collections.emptySet[Iri]
+ return java.util.Collections.emptySet[IRI]
}
- def listImmutableGraphs: java.util.Set[Iri] = {
- return java.util.Collections.emptySet[Iri]
+ def listImmutableGraphs: java.util.Set[IRI] = {
+ return java.util.Collections.emptySet[IRI]
}
/**
* The semantics of this resource
* @param update if a remote URI, update information on the resource first
*/
- def getGraph(name: Iri, updatePolicy: Cache.Value): ImmutableGraph = {
+ def getGraph(name: IRI, updatePolicy: Cache.Value): ImmutableGraph = {
logger.debug("getting graph " + name)
if (name.getUnicodeString.indexOf('#') != -1) {
logger.debug("not dereferencing URI with hash sign. Please see CLEREZZA-533 for debate.")
@@ -176,7 +176,7 @@ class WebProxy extends WeightedTcProvider with Logging {
//these are not dereferenceable
throw new NoSuchEntityException(name)
}
- val cacheGraphName = new Iri("urn:x-localinstance:/cache/" + name.getUnicodeString)
+ val cacheGraphName = new IRI("urn:x-localinstance:/cache/" + name.getUnicodeString)
//todo: follow redirects and keep track of them
//todo: keep track of headers especially date and etag. test for etag similarity
//todo: for https connection allow user to specify his webid and send his key: ie allow web server to be an agent
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java
index c710699..b052b01 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java
@@ -398,7 +398,7 @@ public class GraphNode {
};
}
- public Iterator<IRI> getIriObjects(IRI property) {
+ public Iterator<IRI> getIRIObjects(IRI property) {
return getTypeSelectedObjects(property, IRI.class);
}
@@ -450,7 +450,7 @@ public class GraphNode {
/**
*
* @param triples
- * @returnan {@link Iterator}<{@link Iri}> containing the predicates from
+ * @returnan {@link Iterator}<{@link IRI}> containing the predicates from
* an {@link Iterator}<{@link Triple}>
*/
private Iterator<IRI> getUniquePredicates(final Iterator<Triple> triples) {
[8/9] clerezza git commit: CLEREZZA-983: Adapted to new casing of
rdf-core (part 2), also renamed IriSet -> IRISet and IriUtils -> IRIUtils
Posted by re...@apache.org.
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/IRIUtil.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/IRIUtil.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/IRIUtil.java
new file mode 100644
index 0000000..f33a351
--- /dev/null
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/IRIUtil.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.clerezza.rdf.utils;
+
+
+/**
+ * A utility class for IRI and String manipulations.
+ *
+ * @author tio
+ */
+public class IRIUtil {
+
+ /**
+ * Strips #x00 - #x1F and #x7F-#x9F from a Unicode string
+ * @see <a href="http://www.w3.org/TR/rdf-concepts/#dfn-URI-reference">
+ * http://www.w3.org/TR/rdf-concepts/#dfn-URI-reference</a> and
+ * replaces all US-ASCII space character with a "+".
+ *
+ * @param inputChars
+ * @return the stripped string
+ *
+ */
+ public static String stripNonIRIChars(CharSequence inputChars) {
+
+ if (inputChars == null) {
+ return "";
+ }
+
+ StringBuffer buffer = new StringBuffer();
+
+ for (int i = 0; i < inputChars.length(); i++) {
+ char c = inputChars.charAt(i);
+
+ if (!isIllegal(c)) {
+ buffer.append(c);
+ }
+ }
+ return buffer.toString().replaceAll("\\s+", "+");
+ }
+
+ private static boolean isIllegal(char ch) {
+ if ((ch >= 0x7F) && (ch <= 0x9F)) {
+ return true;
+ }
+ return false;
+ }
+}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/IriUtil.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/IriUtil.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/IriUtil.java
deleted file mode 100644
index 323c9f2..0000000
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/IriUtil.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.clerezza.rdf.utils;
-
-
-/**
- * A utility class for Iri and String manipulations.
- *
- * @author tio
- */
-public class IriUtil {
-
- /**
- * Strips #x00 - #x1F and #x7F-#x9F from a Unicode string
- * @see <a href="http://www.w3.org/TR/rdf-concepts/#dfn-URI-reference">
- * http://www.w3.org/TR/rdf-concepts/#dfn-URI-reference</a> and
- * replaces all US-ASCII space character with a "+".
- *
- * @param inputChars
- * @return the stripped string
- *
- */
- public static String stripNonIriChars(CharSequence inputChars) {
-
- if (inputChars == null) {
- return "";
- }
-
- StringBuffer buffer = new StringBuffer();
-
- for (int i = 0; i < inputChars.length(); i++) {
- char c = inputChars.charAt(i);
-
- if (!isIllegal(c)) {
- buffer.append(c);
- }
- }
- return buffer.toString().replaceAll("\\s+", "+");
- }
-
- private static boolean isIllegal(char ch) {
- if ((ch >= 0x7F) && (ch <= 0x9F)) {
- return true;
- }
- return false;
- }
-}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/RdfList.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/RdfList.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/RdfList.java
index e9192ab..9419a5c 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/RdfList.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/RdfList.java
@@ -73,13 +73,13 @@ public class RdfList extends AbstractList<RDFTerm> {
* Get a list for the specified resource.
*
* If the list is modified using the created instance
- * <code>listRdfTerm</code> will always be the first list.
+ * <code>listRDFTerm</code> will always be the first list.
*
- * @param listRdfTerm
+ * @param listRDFTerm
* @param tc
*/
- public RdfList(BlankNodeOrIRI listRdfTerm, Graph tc) {
- firstList = listRdfTerm;
+ public RdfList(BlankNodeOrIRI listRDFTerm, Graph tc) {
+ firstList = listRDFTerm;
this.tc = tc;
}
@@ -95,23 +95,23 @@ public class RdfList extends AbstractList<RDFTerm> {
/**
* Creates an empty RdfList by writing a triple
- * "{@code listRdfTerm} owl:sameAs rdf.nil ." to {@code tc}.
+ * "{@code listRDFTerm} owl:sameAs rdf.nil ." to {@code tc}.
*
- * @param listRdfTerm
+ * @param listRDFTerm
* @param tc
* @return an empty rdf:List.
* @throws IllegalArgumentException
- * if the provided {@code listRdfTerm} is a non-empty rdf:List.
+ * if the provided {@code listRDFTerm} is a non-empty rdf:List.
*/
- public static RdfList createEmptyList(BlankNodeOrIRI listRdfTerm, Graph tc)
+ public static RdfList createEmptyList(BlankNodeOrIRI listRDFTerm, Graph tc)
throws IllegalArgumentException {
- if (!tc.filter(listRdfTerm, RDF.first, null).hasNext()) {
- RdfList list = new RdfList(listRdfTerm, tc);
- list.tc.add(new TripleImpl(listRdfTerm, OWL.sameAs, RDF_NIL));
+ if (!tc.filter(listRDFTerm, RDF.first, null).hasNext()) {
+ RdfList list = new RdfList(listRDFTerm, tc);
+ list.tc.add(new TripleImpl(listRDFTerm, OWL.sameAs, RDF_NIL));
return list;
} else {
- throw new IllegalArgumentException(listRdfTerm + "is a non-empty rdf:List.");
+ throw new IllegalArgumentException(listRDFTerm + "is a non-empty rdf:List.");
}
}
@@ -237,16 +237,16 @@ public class RdfList extends AbstractList<RDFTerm> {
return (BlankNodeOrIRI) tc.filter(list, RDF.rest, null).next().getObject();
}
- private RDFTerm getFirstEntry(final BlankNodeOrIRI listRdfTerm) {
+ private RDFTerm getFirstEntry(final BlankNodeOrIRI listRDFTerm) {
try {
- return tc.filter(listRdfTerm, RDF.first, null).next().getObject();
+ return tc.filter(listRDFTerm, RDF.first, null).next().getObject();
} catch (final NullPointerException e) {
RuntimeException runtimeEx = AccessController.doPrivileged(new PrivilegedAction<RuntimeException>() {
@Override
public RuntimeException run(){
try {
final FileOutputStream fileOutputStream = new FileOutputStream("/tmp/broken-list.nt");
- final GraphNode graphNode = new GraphNode(listRdfTerm, tc);
+ final GraphNode graphNode = new GraphNode(listRDFTerm, tc);
Serializer.getInstance().serialize(fileOutputStream, graphNode.getNodeContext(), SupportedFormat.N_TRIPLE);
fileOutputStream.flush();
logger.warn("GraphNode: " + graphNode);
@@ -254,7 +254,7 @@ public class RdfList extends AbstractList<RDFTerm> {
while (properties.hasNext()) {
logger.warn("available: " + properties.next());
}
- return new RuntimeException("broken list " + listRdfTerm, e);
+ return new RuntimeException("broken list " + listRDFTerm, e);
} catch (Exception ex) {
return new RuntimeException(ex);
}
@@ -265,7 +265,7 @@ public class RdfList extends AbstractList<RDFTerm> {
}
}
- public BlankNodeOrIRI getListRdfTerm() {
+ public BlankNodeOrIRI getListRDFTerm() {
return firstList;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UriMutatingGraph.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UriMutatingGraph.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UriMutatingGraph.java
index 5513dca..d202388 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UriMutatingGraph.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UriMutatingGraph.java
@@ -33,7 +33,7 @@ import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleImmutableGraph;
/**
- * This wrapps a Triplecollection changing a prefix for the Iris contained
+ * This wrapps a Triplecollection changing a prefix for the IRIs contained
* in subject or object position.
*
* Currently it only supports read opearations.
@@ -57,50 +57,50 @@ public class UriMutatingGraph implements Graph {
targetPrefixLength= targetPrefix.length();
}
- private <R extends RDFTerm> R toTargetRdfTerm(final R sourceRdfTerm) {
- if (sourceRdfTerm instanceof IRI) {
- final IRI sourceIri = (IRI) sourceRdfTerm;
- if (sourceIri.getUnicodeString().startsWith(sourcePrefix)) {
- final String uriRest = sourceIri.getUnicodeString()
+ private <R extends RDFTerm> R toTargetRDFTerm(final R sourceRDFTerm) {
+ if (sourceRDFTerm instanceof IRI) {
+ final IRI sourceIRI = (IRI) sourceRDFTerm;
+ if (sourceIRI.getUnicodeString().startsWith(sourcePrefix)) {
+ final String uriRest = sourceIRI.getUnicodeString()
.substring(sourcePrefixLength);
return (R) new IRI(targetPrefix+uriRest);
}
}
- return sourceRdfTerm;
+ return sourceRDFTerm;
}
private Triple toTargetTriple(Triple triple) {
if (triple == null) {
return null;
}
- return new TripleImpl(toTargetRdfTerm(triple.getSubject()),
- triple.getPredicate(), toTargetRdfTerm(triple.getObject()));
+ return new TripleImpl(toTargetRDFTerm(triple.getSubject()),
+ triple.getPredicate(), toTargetRDFTerm(triple.getObject()));
}
- private <R extends RDFTerm> R toSourceRdfTerm(final R targetRdfTerm) {
- if (targetRdfTerm instanceof IRI) {
- final IRI sourceIri = (IRI) targetRdfTerm;
- if (sourceIri.getUnicodeString().startsWith(targetPrefix)) {
- final String uriRest = sourceIri.getUnicodeString()
+ private <R extends RDFTerm> R toSourceRDFTerm(final R targetRDFTerm) {
+ if (targetRDFTerm instanceof IRI) {
+ final IRI sourceIRI = (IRI) targetRDFTerm;
+ if (sourceIRI.getUnicodeString().startsWith(targetPrefix)) {
+ final String uriRest = sourceIRI.getUnicodeString()
.substring(targetPrefixLength);
return (R) new IRI(sourcePrefix+uriRest);
}
}
- return targetRdfTerm;
+ return targetRDFTerm;
}
private Triple toSourceTriple(Triple triple) {
if (triple == null) {
return null;
}
- return new TripleImpl(toSourceRdfTerm(triple.getSubject()),
- triple.getPredicate(), toSourceRdfTerm(triple.getObject()));
+ return new TripleImpl(toSourceRDFTerm(triple.getSubject()),
+ triple.getPredicate(), toSourceRDFTerm(triple.getObject()));
}
@Override
public Iterator<Triple> filter(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
- final Iterator<Triple> baseIter = base.filter(toSourceRdfTerm(subject),
- predicate, toSourceRdfTerm(object));
+ final Iterator<Triple> baseIter = base.filter(toSourceRDFTerm(subject),
+ predicate, toSourceRDFTerm(object));
return new WrappedIteraror(baseIter);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/BaseSmusher.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/BaseSmusher.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/BaseSmusher.java
index 90f3c26..bf25a99 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/BaseSmusher.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/BaseSmusher.java
@@ -105,15 +105,15 @@ public class BaseSmusher {
case 0:
return new BlankNode();
}
- final IRI preferedIri = getPreferedIri(uriRefs);
+ final IRI preferedIRI = getPreferedIRI(uriRefs);
final Iterator<IRI> uriRefIter = uriRefs.iterator();
while (uriRefIter.hasNext()) {
IRI uriRef = uriRefIter.next();
- if (!uriRef.equals(preferedIri)) {
- owlSameAsGraph.add(new TripleImpl(uriRef, OWL.sameAs, preferedIri));
+ if (!uriRef.equals(preferedIRI)) {
+ owlSameAsGraph.add(new TripleImpl(uriRef, OWL.sameAs, preferedIRI));
}
}
- return preferedIri;
+ return preferedIRI;
}
@@ -125,7 +125,7 @@ public class BaseSmusher {
* @param uriRefs
* @return
*/
- protected IRI getPreferedIri(Set<IRI> uriRefs) {
+ protected IRI getPreferedIRI(Set<IRI> uriRefs) {
final Iterator<IRI> uriRefIter = uriRefs.iterator();
//instead of an arbitrary one we might either decide lexicographically
//or look at their frequency in mGraph
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmusher.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmusher.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmusher.java
index aba1626..78e8893 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmusher.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmusher.java
@@ -44,10 +44,10 @@ public class SameAsSmusher extends BaseSmusher {
/**
* This will ensure that all properties of sameAs resources are associated
- * to the preferedIri as returned by {@code getPreferedIri}
+ * to the preferedIRI as returned by {@code getPreferedIRI}
* @param mGraph
* @param owlSameStatements
- * @param addCanonicalSameAsStatements if true owl:sameAsStatements with the preferedIri as object will be added
+ * @param addCanonicalSameAsStatements if true owl:sameAsStatements with the preferedIRI as object will be added
*/
public void smush(Graph mGraph,
Graph owlSameStatements,
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/IfpSmushTest.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/IfpSmushTest.java b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/IfpSmushTest.java
index c9a8f0a..2d9e4c6 100644
--- a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/IfpSmushTest.java
+++ b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/IfpSmushTest.java
@@ -81,7 +81,7 @@ public class IfpSmushTest {
}
@Test
- public void oneIri() {
+ public void oneIRI() {
Graph mGraph = new SimpleGraph();
IRI mbox1 = new IRI("mailto:foo@example.org");
final IRI resource = new IRI("http://example.org/");
@@ -97,7 +97,7 @@ public class IfpSmushTest {
}
@Test
- public void twoIris() {
+ public void twoIRIs() {
Graph mGraph = new SimpleGraph();
IRI mbox1 = new IRI("mailto:foo@example.org");
final IRI resource1 = new IRI("http://example.org/");
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/TestGraphNode.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/TestGraphNode.java b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/TestGraphNode.java
index 4386039..2fdd2f4 100644
--- a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/TestGraphNode.java
+++ b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/TestGraphNode.java
@@ -184,7 +184,7 @@ public class TestGraphNode {
BlankNode newBnode = new BlankNode();
IRI property1 = new IRI("http://example.org/property1");
IRI property2 = new IRI("http://example.org/property2");
- IRI newIri = new IRI("http://example.org/newName");
+ IRI newIRI = new IRI("http://example.org/newName");
Literal literal1 = new PlainLiteralImpl("literal");
Literal literal2 = new PlainLiteralImpl("bla bla");
@@ -201,12 +201,12 @@ public class TestGraphNode {
GraphNode node = new GraphNode(property1,
new SimpleGraph(initialGraph.iterator()));
- node.replaceWith(newIri, true);
+ node.replaceWith(newIRI, true);
Assert.assertEquals(5, node.getGraph().size());
- Triple expectedTriple1 = new TripleImpl(bNode1, newIri, literal1);
- Triple expectedTriple2 = new TripleImpl(bNode1, property2, newIri);
- Triple expectedTriple3 = new TripleImpl(newIri, newIri, bNode2);
- Triple expectedTriple4 = new TripleImpl(newIri, newIri, literal2);
+ Triple expectedTriple1 = new TripleImpl(bNode1, newIRI, literal1);
+ Triple expectedTriple2 = new TripleImpl(bNode1, property2, newIRI);
+ Triple expectedTriple3 = new TripleImpl(newIRI, newIRI, bNode2);
+ Triple expectedTriple4 = new TripleImpl(newIRI, newIRI, literal2);
Assert.assertTrue(node.getGraph().contains(expectedTriple1));
Assert.assertTrue(node.getGraph().contains(expectedTriple2));
@@ -235,10 +235,10 @@ public class TestGraphNode {
Assert.assertTrue(node.getGraph().contains(expectedTriple8));
node = new GraphNode(property1, new SimpleGraph(initialGraph.iterator()));
- node.replaceWith(newIri);
- Triple expectedTriple9 = new TripleImpl(bNode1, property2, newIri);
- Triple expectedTriple10 = new TripleImpl(newIri, property1, bNode2);
- Triple expectedTriple11 = new TripleImpl(newIri, property1, literal2);
+ node.replaceWith(newIRI);
+ Triple expectedTriple9 = new TripleImpl(bNode1, property2, newIRI);
+ Triple expectedTriple10 = new TripleImpl(newIRI, property1, bNode2);
+ Triple expectedTriple11 = new TripleImpl(newIRI, property1, literal2);
Assert.assertTrue(node.getGraph().contains(triple1));
Assert.assertTrue(node.getGraph().contains(expectedTriple9));
Assert.assertTrue(node.getGraph().contains(expectedTriple10));
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmushTest.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmushTest.java b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmushTest.java
index f2d2539..6e67ed4 100644
--- a/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmushTest.java
+++ b/rdf/utils/src/test/java/org/apache/clerezza/rdf/utils/smushing/SameAsSmushTest.java
@@ -64,7 +64,7 @@ public class SameAsSmushTest {
SameAsSmusher smusher = new SameAsSmusher() {
@Override
- protected IRI getPreferedIri(Set<IRI> uriRefs) {
+ protected IRI getPreferedIRI(Set<IRI> uriRefs) {
if (!uriRefs.contains(uriA)) throw new RuntimeException("not the set we excpect");
if (!uriRefs.contains(uriB)) throw new RuntimeException("not the set we excpect");
return uriC;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/BackupMessageBodyWriter.java
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/BackupMessageBodyWriter.java b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/BackupMessageBodyWriter.java
index ea34a4f..c0584af 100644
--- a/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/BackupMessageBodyWriter.java
+++ b/rdf/web/rdf.web.core/src/main/java/org/apache/clerezza/rdf/web/core/BackupMessageBodyWriter.java
@@ -129,9 +129,9 @@ public class BackupMessageBodyWriter implements MessageBodyWriter<Backup> {
compressedTcs.putNextEntry(new ZipEntry(folder));
Set<IRI> tripleCollections = tcManager.listGraphs();
- Iterator<IRI> tcIris = tripleCollections.iterator();
- while (tcIris.hasNext()) {
- IRI tcUri = tcIris.next();
+ Iterator<IRI> tcIRIs = tripleCollections.iterator();
+ while (tcIRIs.hasNext()) {
+ IRI tcUri = tcIRIs.next();
String fileName = folder + getTcFileName(tcUri, ".nt",
fileNameCount);
Graph tripleCollection = tcManager.getGraph(tcUri);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/graph-management.ssp
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/graph-management.ssp b/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/graph-management.ssp
index 85f32ee..802bd62 100644
--- a/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/graph-management.ssp
+++ b/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/graph-management.ssp
@@ -19,9 +19,9 @@
*
*/
-def gm(s: Any) = new Iri("http://clerezza.org/2010/03/graph-management#"+s)
-def rdf(s: Any) = new Iri("http://www.w3.org/1999/02/22-rdf-syntax-ns#"+s)
-def tcp(s: Any) = new Iri("http://clerezza.org/2009/06/tcprovider#"+s)
+def gm(s: Any) = new IRI("http://clerezza.org/2010/03/graph-management#"+s)
+def rdf(s: Any) = new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#"+s)
+def tcp(s: Any) = new IRI("http://clerezza.org/2009/06/tcprovider#"+s)
resultDocModifier.setTitle("Manage Triple Collections");
resultDocModifier.addNodes2Elem("tx-module", <h1>Manage Triple Collections</h1>);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/sparql-endpoint.ssp
----------------------------------------------------------------------
diff --git a/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/sparql-endpoint.ssp b/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/sparql-endpoint.ssp
index 5d2b0c1..4af5add 100644
--- a/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/sparql-endpoint.ssp
+++ b/rdf/web/rdf.web.core/src/main/resources/org/apache/clerezza/rdf/web/core/sparql-endpoint.ssp
@@ -19,7 +19,7 @@
*
*/
-def se(s: Any) = new Iri("http://clerezza.org/2009/11/sparql-endpoint#"+s)
+def se(s: Any) = new IRI("http://clerezza.org/2009/11/sparql-endpoint#"+s)
<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml" lang="en">
<head>
<title>SPARQL Endpoint</title>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f2811c72/templating.seedsnipe/src/test/java/org/apache/clerezza/templating/seedsnipe/GraphNodeTest.java
----------------------------------------------------------------------
diff --git a/templating.seedsnipe/src/test/java/org/apache/clerezza/templating/seedsnipe/GraphNodeTest.java b/templating.seedsnipe/src/test/java/org/apache/clerezza/templating/seedsnipe/GraphNodeTest.java
index c4b8fba..6517caf 100644
--- a/templating.seedsnipe/src/test/java/org/apache/clerezza/templating/seedsnipe/GraphNodeTest.java
+++ b/templating.seedsnipe/src/test/java/org/apache/clerezza/templating/seedsnipe/GraphNodeTest.java
@@ -166,7 +166,7 @@ public class GraphNodeTest {
}
@Test
- public void simpleIriRoot() throws IOException {
+ public void simpleIRIRoot() throws IOException {
Graph mGraph = new SimpleGraph();
BlankNodeOrIRI resource = new IRI("http://example.org/");
mGraph.add(new TripleImpl(resource, RDFS.comment, new PlainLiteralImpl("a resource")));
[3/9] clerezza git commit: CLEREZZA-983: Adapted to new casing of
rdf-core (part 1)
Posted by re...@apache.org.
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());
[7/9] clerezza git commit: CLEREZZA-983: Adapted to new casing of
rdf-core (part 1)
Posted by re...@apache.org.
CLEREZZA-983: Adapted to new casing of rdf-core (part 1)
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/60d73ea7
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/60d73ea7
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/60d73ea7
Branch: refs/heads/rdf-commons
Commit: 60d73ea787f0dd3787a706ab1dd4995ff9b96800
Parents: 1ad142e
Author: Reto Gmuer <re...@apache.org>
Authored: Sat Apr 11 12:59:25 2015 +0000
Committer: Reto Gmuer <re...@apache.org>
Committed: Sat Apr 11 12:59:25 2015 +0000
----------------------------------------------------------------------
.../jaxrs/rdf/providers/GraphNodeWriter.java | 36 ++--
.../ResultSetCsvMessageBodyWriter.java | 14 +-
.../ResultSetJsonMessageBodyWriter.java | 14 +-
.../ResultSetTsvMessageBodyWriter.java | 12 +-
.../ResultSetXmlMessageBodyWriter.java | 15 +-
.../platform/config/PlatformConfig.java | 40 ++---
.../clerezza/platform/config/SystemConfig.java | 24 +--
.../content/ContentGraphProvider.java | 22 +--
.../platform/logging/LoggingManager.java | 4 +-
.../org/apache/clerezza/platform/Constants.java | 14 +-
.../jaxrs/TypeHandlerSpace.java | 22 +--
.../typehandlerspace/TypeHandlerDiscovery.java | 4 +-
.../impl/TypeHandlerDiscoveryImpl.java | 17 +-
.../platform/typepriority/TypePrioritizer.java | 38 ++---
.../typepriority/TypePrioritizerTest.java | 6 +-
.../ScalaServerPagesService.java | 6 +-
.../scalaserverpages/SspTypeRenderlet.java | 8 +-
.../seedsnipe/WebRenderingFunctions.java | 20 +--
.../typerendering/seedsnipe/GenericTest.java | 4 +-
.../seedsnipe/WebRenderingFunctionsTest.java | 4 +-
.../typerendering/CallbackRenderer.java | 6 +-
.../typerendering/CallbackRendererImpl.java | 4 +-
.../platform/typerendering/RendererFactory.java | 22 +--
.../typerendering/RenderingException.java | 4 +-
.../RenderingspecificationException.java | 4 +-
.../typerendering/RenderletManager.java | 4 +-
.../typerendering/RenderletManagerImpl.java | 20 +--
.../typerendering/RenderletRendererImpl.java | 4 +-
.../TypeRenderingExceptionMapper.java | 7 +-
.../platform/typerendering/TypeRenderlet.java | 4 +-
.../platform/usermanager/UserManager.java | 20 +--
.../platform/usermanager/UserManagerImpl.java | 91 +++++-----
.../clerezza/rdf/core/test/GraphTest.java | 46 ++---
.../clerezza/rdf/core/test/GraphWrapper.java | 8 +-
.../test/LockableMGraphWrapperForTesting.java | 8 +-
.../clerezza/rdf/core/test/RandomGraph.java | 48 +++---
.../clerezza/rdf/core/test/TcProviderTest.java | 36 ++--
.../rdf/core/InvalidLiteralTypeException.java | 4 +-
.../access/EntityAlreadyExistsException.java | 8 +-
.../core/access/EntityUndeletableException.java | 8 +-
.../access/ImmutableGraphServiceFactory.java | 6 +-
.../rdf/core/access/MGraphServiceFactory.java | 6 +-
.../rdf/core/access/NoSuchEntityException.java | 8 +-
.../rdf/core/access/QueryableTcProvider.java | 4 +-
.../clerezza/rdf/core/access/SecuredGraph.java | 12 +-
.../clerezza/rdf/core/access/TcManager.java | 66 +++----
.../clerezza/rdf/core/access/TcProvider.java | 22 +--
.../rdf/core/access/TcProviderMultiplexer.java | 52 +++---
.../access/security/TcAccessController.java | 72 ++++----
.../rdf/core/impl/WriteBlockedGraph.java | 8 +-
.../core/impl/util/PrivilegedGraphWrapper.java | 10 +-
.../core/impl/util/SimpleLiteralFactory.java | 44 ++---
.../rdf/core/serializedform/Parser.java | 6 +-
.../core/serializedform/ParsingProvider.java | 4 +-
.../rdf/core/sparql/SolutionMapping.java | 6 +-
.../rdf/core/sparql/SparqlPreParser.java | 8 +-
.../clerezza/rdf/core/sparql/query/DataSet.java | 6 +-
.../rdf/core/sparql/query/FunctionCall.java | 10 +-
.../core/sparql/query/GroupGraphPattern.java | 4 +-
.../rdf/core/sparql/query/InlineData.java | 4 +-
.../rdf/core/sparql/query/PredicatePath.java | 8 +-
.../core/sparql/query/ResourceOrVariable.java | 12 +-
.../rdf/core/sparql/query/UriRefExpression.java | 10 +-
.../rdf/core/sparql/query/UriRefOrVariable.java | 10 +-
.../core/sparql/query/impl/SimpleDataSet.java | 14 +-
.../query/impl/SimpleGroupGraphPattern.java | 10 +-
.../sparql/query/impl/SimpleInlineData.java | 8 +-
.../query/impl/SimplePropertyPathPattern.java | 16 +-
.../rdf/core/sparql/query/impl/SimpleQuery.java | 6 +-
.../query/impl/SimpleStringQuerySerializer.java | 10 +-
.../sparql/query/impl/SimpleTriplePattern.java | 20 +--
.../clerezza/rdf/core/sparql/update/Update.java | 4 +-
.../rdf/core/sparql/update/UpdateOperation.java | 6 +-
.../sparql/update/impl/BaseUpdateOperation.java | 18 +-
.../update/impl/ClearOrDropOperation.java | 8 +-
.../sparql/update/impl/CreateOperation.java | 6 +-
.../core/sparql/update/impl/LoadOperation.java | 6 +-
.../sparql/update/impl/ModifyOperation.java | 20 +--
.../core/sparql/update/impl/SimpleUpdate.java | 6 +-
.../update/impl/SimpleUpdateOperation.java | 14 +-
.../update/impl/UpdateOperationWithQuads.java | 10 +-
.../core/sparql/JavaCCGeneratedQueryParser.jj | 64 +++----
.../sparql/JavaCCGeneratedSparqlPreParser.jj | 154 ++++++++---------
.../clerezza/rdf/core/LiteralFactoryTest.java | 12 +-
.../apache/clerezza/rdf/core/UriRefTest.java | 12 +-
.../clerezza/rdf/core/access/SecurityTest.java | 34 ++--
.../clerezza/rdf/core/access/TcManagerTest.java | 10 +-
.../rdf/core/access/providers/WeightedA.java | 24 +--
.../rdf/core/access/providers/WeightedA1.java | 24 +--
.../core/access/providers/WeightedAHeavy.java | 24 +--
.../core/access/providers/WeightedBlight.java | 24 +--
.../core/access/providers/WeightedDummy.java | 26 +--
.../impl/util/SimpleLiteralFactoryTest.java | 14 +-
.../rdf/core/serializedform/ParserTest.java | 6 +-
.../TestServiceManagedProvider.java | 4 +-
.../rdf/core/sparql/QueryParserTest.java | 26 +--
.../rdf/core/sparql/QuerySerializerTest.java | 32 ++--
.../rdf/core/sparql/SparqlPreParserTest.java | 108 ++++++------
.../clerezza/rdf/file/storage/FileGraph.java | 14 +-
.../rdf/file/storage/FileTcProvider.java | 32 ++--
.../rdf/file/storage/FileGraphTest.java | 20 +--
.../rdf/file/storage/FileTcProviderTest.java | 8 +-
.../rdf/jena/commons/Jena2TriaUtil.java | 36 ++--
.../rdf/jena/commons/Tria2JenaUtil.java | 22 +--
.../clerezza/rdf/jena/facade/JenaGraph.java | 12 +-
.../rdf/facade/blackbox/TestBasics.java | 6 +-
.../rdf/jena/parser/JenaParserProvider.java | 5 +-
.../rdf/jena/parser/JenaParserProviderTest.java | 4 +-
.../serializer/TestJenaSerializerProvider.java | 14 +-
.../rdf/jena/sparql/HashMapSolutionMapping.java | 8 +-
.../rdf/jena/sparql/JenaSparqlEngine.java | 10 +-
.../rdf/jena/sparql/TcDatasetGraph.java | 10 +-
.../clerezza/rdf/jena/sparql/SimpleTest.java | 16 +-
.../rdf/jena/storage/JenaGraphAdaptor.java | 8 +-
.../clerezza/rdf/jena/tdb/internals/IriSet.java | 22 +--
.../rdf/jena/tdb/internals/ModelGraph.java | 2 +-
.../rdf/jena/tdb/internals/Symbols.java | 10 +-
.../rdf/jena/tdb/storage/BaseTdbTcProvider.java | 4 +-
.../tdb/storage/SingleTdbDatasetTcProvider.java | 58 +++----
.../rdf/jena/tdb/storage/TdbTcProvider.java | 42 ++---
.../MultiThreadedSingleTdbDatasetTest.java | 10 +-
.../rdf/jena/tdb/storage/MultiThreadedTest.java | 8 +-
.../tdb/storage/MultiThreadedTestSingleTdb.java | 8 +-
.../tdb/storage/SingleTdbDatasetGraphTest.java | 8 +-
.../storage/SingleTdbDatasetTcProviderTest.java | 40 ++---
.../rdf/jena/tdb/storage/TdbGraphTest.java | 8 +-
.../clerezza/rdf/rdfa/ClerezzaRDFaParser.java | 6 +-
.../rdf/rdfa/ClerezzaStatementSink.java | 20 +--
.../clerezza/rdf/scala/utils/EzLiteral.scala | 8 +-
.../clerezza/rdf/scala/utils/EzMGraph.scala | 10 +-
.../clerezza/rdf/scala/utils/Preamble.scala | 12 +-
.../rdf/scala/utils/RichGraphNode.scala | 46 ++---
.../clerezza/rdf/schemagen/SchemaGen.java | 84 ++++-----
.../rdf/simple/storage/SimpleTcProvider.java | 32 ++--
.../rdf/simple/storage/AccessViaTcManager.java | 4 +-
.../apache/clerezza/rdf/utils/GraphNode.java | 170 +++++++++----------
.../apache/clerezza/rdf/utils/GraphUtils.java | 8 +-
.../org/apache/clerezza/rdf/utils/RdfList.java | 46 ++---
.../clerezza/rdf/utils/SeeAlsoExpander.java | 28 +--
.../apache/clerezza/rdf/utils/UnionGraph.java | 10 +-
.../clerezza/rdf/utils/UriMutatingGraph.java | 24 +--
.../graphnodeprovider/GraphNodeProvider.java | 14 +-
.../rdf/utils/smushing/BaseSmusher.java | 44 ++---
.../clerezza/rdf/utils/smushing/IfpSmusher.java | 30 ++--
.../rdf/utils/smushing/SameAsSmusher.java | 24 +--
.../clerezza/rdf/utils/GraphUtilsTest.java | 8 +-
.../apache/clerezza/rdf/utils/IfpSmushTest.java | 18 +-
.../apache/clerezza/rdf/utils/RdfListTest.java | 24 +--
.../clerezza/rdf/utils/SameAsSmushTest.java | 6 +-
.../clerezza/rdf/utils/TestGraphNode.java | 58 +++----
.../clerezza/rdf/utils/UnionGraphTest.java | 18 +-
.../rdf/utils/smushing/SameAsSmushTest.java | 10 +-
.../rdf/web/core/BackupMessageBodyWriter.java | 10 +-
.../apache/clerezza/rdf/web/core/Delete.java | 4 +-
.../clerezza/rdf/web/core/GraphManagement.java | 8 +-
.../apache/clerezza/rdf/web/core/Restorer.java | 10 +-
.../web/core/ResultSetMessageBodyWriter.java | 15 +-
.../org/apache/clerezza/rdf/web/core/Smush.java | 6 +-
.../clerezza/rdf/web/core/SparqlEndpoint.java | 29 ++--
.../apache/clerezza/rdf/web/core/WebAccess.java | 8 +-
.../rdf/web/core/BackupAndRestoreTest.java | 26 +--
.../GraphNodeDataFieldResolver.java | 39 +++--
.../templating/seedsnipe/GraphNodeTest.java | 64 +++----
163 files changed, 1638 insertions(+), 1646 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java
index 256806d..264fc77 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/rdf/providers/GraphNodeWriter.java
@@ -38,10 +38,10 @@ import javax.ws.rs.core.UriInfo;
import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
-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.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.utils.GraphNode;
@@ -100,15 +100,15 @@ public class GraphNodeWriter implements MessageBodyWriter<GraphNode> {
private Graph getExpandedContext(GraphNode node) {
final Graph result = new SimpleGraph(node.getNodeContext());
- final Set<RdfTerm> expandedResources = new HashSet<RdfTerm>();
+ final Set<RDFTerm> expandedResources = new HashSet<RDFTerm>();
expandedResources.add(node.getNode());
while (true) {
- Set<RdfTerm> additionalExpansionRes = getAdditionalExpansionResources(result);
+ Set<RDFTerm> additionalExpansionRes = getAdditionalExpansionResources(result);
additionalExpansionRes.removeAll(expandedResources);
if (additionalExpansionRes.size() == 0) {
return result;
}
- for (RdfTerm resource : additionalExpansionRes) {
+ for (RDFTerm resource : additionalExpansionRes) {
final GraphNode additionalNode = new GraphNode(resource, node.getGraph());
result.addAll(additionalNode.getNodeContext());
expandedResources.add(resource);
@@ -116,14 +116,14 @@ public class GraphNodeWriter implements MessageBodyWriter<GraphNode> {
}
}
- private Set<RdfTerm> getAdditionalExpansionResources(Graph tc) {
- final Set<Iri> subjectExpansionProperties = getSubjectExpansionProperties();
- final Set<Iri> objectExpansionProperties = getObjectExpansionProperties();
- final Set<RdfTerm> result = new HashSet<RdfTerm>();
+ private Set<RDFTerm> getAdditionalExpansionResources(Graph tc) {
+ final Set<IRI> subjectExpansionProperties = getSubjectExpansionProperties();
+ final Set<IRI> objectExpansionProperties = getObjectExpansionProperties();
+ final Set<RDFTerm> result = new HashSet<RDFTerm>();
if ((subjectExpansionProperties.size() > 0)
|| (objectExpansionProperties.size() > 0)) {
for (Triple triple : tc) {
- final Iri predicate = triple.getPredicate();
+ final IRI predicate = triple.getPredicate();
if (subjectExpansionProperties.contains(predicate)) {
result.add(triple.getSubject());
}
@@ -135,28 +135,28 @@ public class GraphNodeWriter implements MessageBodyWriter<GraphNode> {
return result;
}
- private Set<Iri> getSubjectExpansionProperties() {
+ private Set<IRI> getSubjectExpansionProperties() {
final MultivaluedMap<String, String> queryParams = uriInfo.getQueryParameters();
final List<String> paramValues = queryParams.get(SUBJ_EXP_PARAM);
if (paramValues == null) {
- return new HashSet<Iri>(0);
+ return new HashSet<IRI>(0);
}
- final Set<Iri> result = new HashSet<Iri>(paramValues.size());
+ final Set<IRI> result = new HashSet<IRI>(paramValues.size());
for (String uriString : paramValues) {
- result.add(new Iri(uriString));
+ result.add(new IRI(uriString));
}
return result;
}
- private Set<Iri> getObjectExpansionProperties() {
+ private Set<IRI> getObjectExpansionProperties() {
final MultivaluedMap<String, String> queryParams = uriInfo.getQueryParameters();
final List<String> paramValues = queryParams.get(OBJ_EXP_PARAM);
if (paramValues == null) {
- return new HashSet<Iri>(0);
+ return new HashSet<IRI>(0);
}
- final Set<Iri> result = new HashSet<Iri>(paramValues.size());
+ final Set<IRI> result = new HashSet<IRI>(paramValues.size());
for (String uriString : paramValues) {
- result.add(new Iri(uriString));
+ result.add(new IRI(uriString));
}
return result;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java
index 967b56f..9a4a3c3 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetCsvMessageBodyWriter.java
@@ -33,8 +33,8 @@ import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
import org.apache.clerezza.commons.rdf.BlankNode;
-import org.apache.clerezza.commons.rdf.RdfTerm;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.ResultSet;
import org.apache.clerezza.rdf.core.sparql.SolutionMapping;
import org.apache.clerezza.commons.rdf.Literal;
@@ -179,7 +179,7 @@ public class ResultSetCsvMessageBodyWriter implements MessageBodyWriter<ResultSe
if( !first ) {
outputStream.write( separator );
}
- RdfTerm resource = lineData.get( header );
+ RDFTerm resource = lineData.get( header );
if( resource != null ) {
writeEscaped( outputStream, getResourceValue( resource ) );
}
@@ -189,12 +189,12 @@ public class ResultSetCsvMessageBodyWriter implements MessageBodyWriter<ResultSe
}
/**
- * Helper to get the proper string representation for the given RdfTerm.
+ * Helper to get the proper string representation for the given RDFTerm.
*/
- private String getResourceValue( RdfTerm resource ) {
+ private String getResourceValue( RDFTerm resource ) {
StringBuilder value = new StringBuilder();
- if( resource instanceof Iri ) {
- value.append( ((Iri) resource).getUnicodeString() );
+ if( resource instanceof IRI ) {
+ value.append(((IRI) resource).getUnicodeString() );
} else if( resource instanceof Literal ) {
value.append( ((Literal) resource).getLexicalForm() );
} else if( resource instanceof BlankNode ) {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetJsonMessageBodyWriter.java
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetJsonMessageBodyWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetJsonMessageBodyWriter.java
index a78c9a0..a56baf1 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetJsonMessageBodyWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetJsonMessageBodyWriter.java
@@ -34,8 +34,8 @@ import javax.ws.rs.ext.Provider;
import org.apache.clerezza.commons.rdf.BlankNode;
import org.apache.clerezza.commons.rdf.Language;
-import org.apache.clerezza.commons.rdf.RdfTerm;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.ResultSet;
import org.apache.clerezza.rdf.core.sparql.SolutionMapping;
import org.apache.clerezza.rdf.core.sparql.query.Variable;
@@ -114,15 +114,15 @@ public class ResultSetJsonMessageBodyWriter implements MessageBodyWriter<ResultS
}
/**
- * Helper: creates value element from {@link RdfTerm} depending on its
+ * Helper: creates value element from {@link RDFTerm} depending on its
* class
*
*/
- private JSONObject createResultElement(RdfTerm resource) {
+ private JSONObject createResultElement(RDFTerm resource) {
JSONObject element = new JSONObject();
- if (resource instanceof Iri) {
+ if (resource instanceof IRI) {
element.put("type", "uri");
- element.put("value", Iri.class.cast(resource).getUnicodeString());
+ element.put("value", IRI.class.cast(resource).getUnicodeString());
} else if (resource instanceof Literal) {
element.put("type", "literal");
element.put("value", Literal.class.cast(resource).getLexicalForm());
@@ -151,7 +151,7 @@ public class ResultSetJsonMessageBodyWriter implements MessageBodyWriter<ResultS
JSONObject result = new JSONObject();
Set<Variable> keys = solutionMap.keySet();
for (Variable key : keys) {
- result.put(key.getName(), createResultElement((RdfTerm) solutionMap.get(key)));
+ result.put(key.getName(), createResultElement((RDFTerm) solutionMap.get(key)));
}
return result;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java
index 5b5fefe..2db72aa 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetTsvMessageBodyWriter.java
@@ -33,8 +33,8 @@ import javax.ws.rs.ext.MessageBodyWriter;
import javax.ws.rs.ext.Provider;
import org.apache.clerezza.commons.rdf.BlankNode;
-import org.apache.clerezza.commons.rdf.RdfTerm;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.ResultSet;
import org.apache.clerezza.rdf.core.sparql.SolutionMapping;
import org.apache.clerezza.commons.rdf.Literal;
@@ -179,7 +179,7 @@ public class ResultSetTsvMessageBodyWriter implements MessageBodyWriter<ResultSe
if( !first ) {
outputStream.write( separator );
}
- RdfTerm resource = lineData.get( header );
+ RDFTerm resource = lineData.get( header );
if( resource != null ) {
writeEscaped( outputStream, getResourceValue( resource ) );
}
@@ -189,11 +189,11 @@ public class ResultSetTsvMessageBodyWriter implements MessageBodyWriter<ResultSe
}
/**
- * Helper to get the proper string representation for the given RdfTerm.
+ * Helper to get the proper string representation for the given RDFTerm.
*/
- private String getResourceValue( RdfTerm resource ) {
+ private String getResourceValue( RDFTerm resource ) {
StringBuilder value = new StringBuilder();
- if( resource instanceof Iri ) {
+ if( resource instanceof IRI ) {
value.append( resource.toString() );
} else if( resource instanceof Literal ) {
value.append( "\"" );
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetXmlMessageBodyWriter.java
----------------------------------------------------------------------
diff --git a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetXmlMessageBodyWriter.java b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetXmlMessageBodyWriter.java
index f4abb17..1250edd 100644
--- a/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetXmlMessageBodyWriter.java
+++ b/jaxrs.rdf.providers/src/main/java/org/apache/clerezza/jaxrs/sparql/providers/ResultSetXmlMessageBodyWriter.java
@@ -41,8 +41,8 @@ import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
import org.apache.clerezza.commons.rdf.Language;
-import org.apache.clerezza.commons.rdf.RdfTerm;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.ResultSet;
import org.apache.clerezza.rdf.core.sparql.SolutionMapping;
import org.apache.clerezza.rdf.core.sparql.query.Variable;
@@ -147,15 +147,15 @@ public class ResultSetXmlMessageBodyWriter implements MessageBodyWriter<ResultSe
/**
- * Helper: creates value element from {@link RdfTerm} depending on its
+ * Helper: creates value element from {@link RDFTerm} depending on its
* class
*
*/
- private Element createValueElement(RdfTerm resource, Document doc) {
+ private Element createValueElement(RDFTerm resource, Document doc) {
Element value = null;
- if (resource instanceof Iri) {
+ if (resource instanceof IRI) {
value = doc.createElement("uri");
- value.appendChild(doc.createTextNode(((Iri) resource)
+ value.appendChild(doc.createTextNode(((IRI) resource)
.getUnicodeString()));
} else if (resource instanceof Literal) {
value = doc.createElement("literal");
@@ -185,8 +185,7 @@ public class ResultSetXmlMessageBodyWriter implements MessageBodyWriter<ResultSe
for (Variable key : keys) {
Element bindingElement = doc.createElement("binding");
bindingElement.setAttribute("name", key.getName());
- bindingElement.appendChild(createValueElement(
- (RdfTerm) solutionMap.get(key), doc));
+ bindingElement.appendChild(createValueElement((RDFTerm) solutionMap.get(key), doc));
result.appendChild(bindingElement);
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
----------------------------------------------------------------------
diff --git a/platform/config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java b/platform/config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
index 003df78..16aa8cf 100644
--- a/platform/config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
+++ b/platform/config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
@@ -30,10 +30,10 @@ import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
-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.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
@@ -61,7 +61,7 @@ public class PlatformConfig {
* @deprecated use org.apache.clerezza.platform.Contants instead
*/
@Deprecated
- public static final Iri CONFIG_GRAPH_URI = Constants.CONFIG_GRAPH_URI;
+ public static final IRI CONFIG_GRAPH_URI = Constants.CONFIG_GRAPH_URI;
/**
* A filter that can be used to get the config graph as OSGi service,
@@ -78,27 +78,27 @@ public class PlatformConfig {
* Returns the default base URI of the Clerezza platform instance.
* @return the base URI of the Clerezza platform
*/
- public Iri getDefaultBaseUri() {
- return AccessController.doPrivileged(new PrivilegedAction<Iri>() {
+ public IRI getDefaultBaseUri() {
+ return AccessController.doPrivileged(new PrivilegedAction<IRI>() {
@Override
- public Iri run() {
+ public IRI run() {
GraphNode platformInstance = getPlatformInstance();
Lock l = platformInstance.readLock();
l.lock();
try {
- Iterator<RdfTerm> triples = platformInstance.getObjects(PLATFORM.defaultBaseUri);
+ Iterator<RDFTerm> triples = platformInstance.getObjects(PLATFORM.defaultBaseUri);
if (triples.hasNext()) {
- return (Iri) triples.next();
+ return (IRI) triples.next();
} else {
String port = context.getProperty("org.osgi.service.http.port");
if (port == null) {
port = DEFAULT_PORT;
}
if (port.equals("80")) {
- return new Iri("http://localhost/");
+ return new IRI("http://localhost/");
}
- return new Iri("http://localhost:" + port + "/");
+ return new IRI("http://localhost:" + port + "/");
}
} finally {
l.unlock();
@@ -118,7 +118,7 @@ public class PlatformConfig {
return new GraphNode(getPlatformInstanceRdfTerm(), systemGraph);
}
- private BlankNodeOrIri getPlatformInstanceRdfTerm() {
+ private BlankNodeOrIRI getPlatformInstanceRdfTerm() {
Lock l = systemGraph.getLock().readLock();
l.lock();
try {
@@ -138,17 +138,17 @@ public class PlatformConfig {
* @return the base URI of the Clerezza platform
*/
//todo: if this is the only class that sets and reads base uris then getBaseURIs should keep a cache
- public Set<Iri> getBaseUris() {
+ public Set<IRI> getBaseUris() {
- return AccessController.doPrivileged(new PrivilegedAction<Set<Iri>>() {
+ return AccessController.doPrivileged(new PrivilegedAction<Set<IRI>>() {
@Override
- public Set<Iri> run() {
- Iterator<RdfTerm> baseUrisIter = getPlatformInstance().
+ public Set<IRI> run() {
+ Iterator<RDFTerm> baseUrisIter = getPlatformInstance().
getObjects(PLATFORM.baseUri);
- Set<Iri> baseUris = new HashSet<Iri>();
+ Set<IRI> baseUris = new HashSet<IRI>();
while (baseUrisIter.hasNext()) {
- Iri baseUri = (Iri) baseUrisIter.next();
+ IRI baseUri = (IRI) baseUrisIter.next();
baseUris.add(baseUri);
}
baseUris.add(getDefaultBaseUri());
@@ -163,7 +163,7 @@ public class PlatformConfig {
*
* @param baseUri The base URI which will be added to the platform instance
*/
- public void addBaseUri(Iri baseUri) {
+ public void addBaseUri(IRI baseUri) {
systemGraph.add(new TripleImpl(getPlatformInstanceRdfTerm(), PLATFORM.baseUri, baseUri));
}
@@ -172,7 +172,7 @@ public class PlatformConfig {
*
* @param baseUri The base URI which will be removed from the platform instance
*/
- public void removeBaseUri(Iri baseUri) {
+ public void removeBaseUri(IRI baseUri) {
systemGraph.remove(new TripleImpl(getPlatformInstanceRdfTerm(), PLATFORM.baseUri, baseUri));
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/config/src/main/java/org/apache/clerezza/platform/config/SystemConfig.java
----------------------------------------------------------------------
diff --git a/platform/config/src/main/java/org/apache/clerezza/platform/config/SystemConfig.java b/platform/config/src/main/java/org/apache/clerezza/platform/config/SystemConfig.java
index e5fc314..1527ee4 100644
--- a/platform/config/src/main/java/org/apache/clerezza/platform/config/SystemConfig.java
+++ b/platform/config/src/main/java/org/apache/clerezza/platform/config/SystemConfig.java
@@ -29,7 +29,7 @@ import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.osgi.service.component.ComponentContext;
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;
@@ -65,7 +65,7 @@ public class SystemConfig implements WeightedTcProvider {
* @deprecated use org.apache.clerezza.platform.Contants instead
*/
@Deprecated
- public static final Iri SYSTEM_GRAPH_URI = Constants.SYSTEM_GRAPH_URI;
+ public static final IRI SYSTEM_GRAPH_URI = Constants.SYSTEM_GRAPH_URI;
/**
* A filter that can be used to get the system graph as OSGi service, that
* is provided by
@@ -128,12 +128,12 @@ public class SystemConfig implements WeightedTcProvider {
}
@Override
- public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
+ public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
throw new NoSuchEntityException(name);
}
@Override
- public Graph getMGraph(Iri name) throws NoSuchEntityException {
+ public Graph getMGraph(IRI name) throws NoSuchEntityException {
if (name.equals(Constants.SYSTEM_GRAPH_URI)) {
return systemGraph;
} else {
@@ -142,42 +142,42 @@ public class SystemConfig 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() {
return Collections.emptySet();
}
@Override
- public Set<Iri> listMGraphs() {
+ public Set<IRI> listMGraphs() {
return Collections.singleton(Constants.SYSTEM_GRAPH_URI);
}
@Override
- public Set<Iri> listGraphs() {
+ public Set<IRI> listGraphs() {
return listMGraphs();
}
@Override
- public Graph createGraph(Iri name) throws UnsupportedOperationException, EntityAlreadyExistsException {
+ public Graph createGraph(IRI name) throws UnsupportedOperationException, EntityAlreadyExistsException {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public ImmutableGraph createImmutableGraph(Iri name, Graph triples) throws UnsupportedOperationException, EntityAlreadyExistsException {
+ public ImmutableGraph createImmutableGraph(IRI name, Graph triples) throws UnsupportedOperationException, EntityAlreadyExistsException {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public void deleteGraph(Iri name) throws UnsupportedOperationException, NoSuchEntityException, EntityUndeletableException {
+ public void deleteGraph(IRI name) throws UnsupportedOperationException, NoSuchEntityException, EntityUndeletableException {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> getNames(ImmutableGraph graph) {
+ public Set<IRI> getNames(ImmutableGraph graph) {
return Collections.emptySet();
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java
----------------------------------------------------------------------
diff --git a/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java b/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java
index 9b79d85..9891444 100644
--- a/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java
+++ b/platform/graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java
@@ -26,7 +26,7 @@ import org.apache.clerezza.platform.Constants;
import org.osgi.service.component.ComponentContext;
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.utils.UnionGraph;
@@ -73,7 +73,7 @@ public class ContentGraphProvider {
/**
* The URIs of the read-only addition-<code>Graph</code>s
*/
- private Iri[] additions;
+ private IRI[] additions;
private ReentrantReadWriteLock configLock = new ReentrantReadWriteLock();
@@ -85,9 +85,9 @@ public class ContentGraphProvider {
}
String[] additionUriStrings = (String[]) context.getProperties().get(
CONTENT_ADDITIONS);
- additions = new Iri[additionUriStrings.length];
+ additions = new IRI[additionUriStrings.length];
for (int i = 0; i < additionUriStrings.length; i++) {
- additions[i] = new Iri(additionUriStrings[i]);
+ additions[i] = new IRI(additionUriStrings[i]);
}
}
@@ -98,7 +98,7 @@ public class ContentGraphProvider {
Graph[] united = new Graph[additions.length + 1];
int i = 0;
united[i++] = tcManager.getGraph(Constants.CONTENT_GRAPH_URI);
- for (Iri uriRef : additions) {
+ for (IRI uriRef : additions) {
united[i++] = tcManager.getGraph(uriRef);
}
return new UnionGraph(united);
@@ -107,25 +107,25 @@ public class ContentGraphProvider {
}
}
- public void addTemporaryAdditionGraph(Iri graphName) {
+ public void addTemporaryAdditionGraph(IRI graphName) {
configLock.writeLock().lock();
try {
- Set<Iri> additionsSet = new HashSet<Iri>(Arrays
+ Set<IRI> additionsSet = new HashSet<IRI>(Arrays
.asList(additions));
additionsSet.add(graphName);
- additions = additionsSet.toArray(new Iri[additionsSet.size()]);
+ additions = additionsSet.toArray(new IRI[additionsSet.size()]);
} finally {
configLock.writeLock().unlock();
}
}
- public void removeTemporaryAdditionGraph(Iri graphName) {
+ public void removeTemporaryAdditionGraph(IRI graphName) {
configLock.writeLock().lock();
try {
- Set<Iri> additionsSet = new HashSet<Iri>(Arrays
+ Set<IRI> additionsSet = new HashSet<IRI>(Arrays
.asList(additions));
additionsSet.remove(graphName);
- additions = additionsSet.toArray(new Iri[additionsSet.size()]);
+ additions = additionsSet.toArray(new IRI[additionsSet.size()]);
} finally {
configLock.writeLock().unlock();
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/logging/core/src/main/java/org/apache/clerezza/platform/logging/LoggingManager.java
----------------------------------------------------------------------
diff --git a/platform/logging/core/src/main/java/org/apache/clerezza/platform/logging/LoggingManager.java b/platform/logging/core/src/main/java/org/apache/clerezza/platform/logging/LoggingManager.java
index 85a41bc..9129a41 100644
--- a/platform/logging/core/src/main/java/org/apache/clerezza/platform/logging/LoggingManager.java
+++ b/platform/logging/core/src/main/java/org/apache/clerezza/platform/logging/LoggingManager.java
@@ -45,7 +45,7 @@ import org.apache.clerezza.platform.logging.ontologies.LOGGING;
import org.apache.clerezza.platform.typerendering.RenderletManager;
import org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesRenderlet;
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.simple.SimpleGraph;
import org.apache.clerezza.rdf.ontologies.PLATFORM;
import org.apache.clerezza.rdf.ontologies.RDF;
@@ -78,7 +78,7 @@ public class LoggingManager implements GlobalMenuItemsProvider {
public void activate(ComponentContext context)
throws URISyntaxException, IOException {
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
- new Iri(getClass().getResource(
+ new IRI(getClass().getResource(
"config-page-naked.ssp").toURI().toString()),
LOGGING.LoggingConfigPage, "naked",
MediaType.APPLICATION_XHTML_XML_TYPE, true);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/platform/src/main/java/org/apache/clerezza/platform/Constants.java
----------------------------------------------------------------------
diff --git a/platform/platform/src/main/java/org/apache/clerezza/platform/Constants.java b/platform/platform/src/main/java/org/apache/clerezza/platform/Constants.java
index 49c4a49..b31e9ea 100644
--- a/platform/platform/src/main/java/org/apache/clerezza/platform/Constants.java
+++ b/platform/platform/src/main/java/org/apache/clerezza/platform/Constants.java
@@ -17,7 +17,7 @@
package org.apache.clerezza.platform;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
/**
* This class gropus some constant values used by the clerezza.platform components
@@ -40,8 +40,8 @@ public class Constants {
/**
* the uri of the system graph
*/
- public static final Iri SYSTEM_GRAPH_URI =
- new Iri(SYSTEM_GRAPH_URI_STRING);
+ public static final IRI SYSTEM_GRAPH_URI =
+ new IRI(SYSTEM_GRAPH_URI_STRING);
/**
* the uri of the config graph as string
@@ -51,8 +51,8 @@ public class Constants {
/**
* the uri of the config graph as string
*/
- public static final Iri CONFIG_GRAPH_URI =
- new Iri(CONFIG_GRAPH_URI_STRING);
+ public static final IRI CONFIG_GRAPH_URI =
+ new IRI(CONFIG_GRAPH_URI_STRING);
/**
* the uri of the content graph as string
@@ -62,8 +62,8 @@ public class Constants {
/**
* the uri of the content graph
*/
- public static final Iri CONTENT_GRAPH_URI =
- new Iri(CONTENT_GRAPH_URI_STRING);
+ public static final IRI CONTENT_GRAPH_URI =
+ new IRI(CONTENT_GRAPH_URI_STRING);
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java
----------------------------------------------------------------------
diff --git a/platform/typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java b/platform/typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java
index 80c2bed..2485850 100644
--- a/platform/typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java
+++ b/platform/typehandlerspace.jaxrs2/src/main/java/org/apache/clerezza/platform/typehandlerspace/jaxrs/TypeHandlerSpace.java
@@ -31,8 +31,8 @@ import javax.ws.rs.core.UriInfo;
import org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider;
import org.apache.clerezza.platform.typehandlerspace.TypeHandlerDiscovery;
-import org.apache.clerezza.commons.rdf.RdfTerm;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.felix.scr.annotations.Component;
@@ -89,13 +89,13 @@ public class TypeHandlerSpace {
}
private Object getTypeHandler(String absoluteUriPath) {
- Iri uri = new Iri(absoluteUriPath);
+ IRI uri = new IRI(absoluteUriPath);
if (gnp.existsLocal(uri)) {
GraphNode node = gnp.getLocal(uri);
Lock lock =node.readLock();
lock.lock();
try {
- Set<Iri> rdfTypes = getRdfTypesOfIri(node);
+ Set<IRI> rdfTypes = getRdfTypesOfIri(node);
return typeHandlerDiscovery.getTypeHandler(rdfTypes);
} finally {
lock.unlock();
@@ -105,17 +105,17 @@ public class TypeHandlerSpace {
return null;
}
- private Set<Iri> getRdfTypesOfIri(GraphNode node) {
- Set<Iri> rdfTypes = new HashSet<Iri>();
- Iterator<RdfTerm> types = node.getObjects(RDF.type);
+ private Set<IRI> getRdfTypesOfIri(GraphNode node) {
+ Set<IRI> rdfTypes = new HashSet<IRI>();
+ Iterator<RDFTerm> types = node.getObjects(RDF.type);
while (types.hasNext()) {
- RdfTerm typeStmtObj = types.next();
- if (!(typeStmtObj instanceof Iri)) {
+ RDFTerm typeStmtObj = types.next();
+ if (!(typeStmtObj instanceof IRI)) {
throw new RuntimeException(
"RDF type is expected to be a URI but is " + typeStmtObj
+ "(of " + node.getNode() + ")");
}
- Iri rdfType = (Iri) typeStmtObj;
+ IRI rdfType = (IRI) typeStmtObj;
rdfTypes.add(rdfType);
}
@@ -128,7 +128,7 @@ public class TypeHandlerSpace {
public Object getDescription(@Context UriInfo uriInfo){
String absoluteUriPath = uriInfo.getAbsolutePath().toString();
//Graph contentGraph = cgp.getContentGraph();
- Iri uri = new Iri(absoluteUriPath.substring(0,
+ IRI uri = new IRI(absoluteUriPath.substring(0,
absoluteUriPath.length() - DESCRIPTION_SUFFIX.length()));
GraphNode graphNode = gnp.getLocal(uri);
return graphNode.getNodeContext();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerDiscovery.java
----------------------------------------------------------------------
diff --git a/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerDiscovery.java b/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerDiscovery.java
index 580f59c..746103e 100644
--- a/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerDiscovery.java
+++ b/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/TypeHandlerDiscovery.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.platform.typehandlerspace;
import java.util.Set;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
/**
* Implementations of this interface map RDF-types to type handlers. A type
@@ -41,6 +41,6 @@ public interface TypeHandlerDiscovery {
* be handled
* @return the type handler for most important rdf-type in the set
*/
- public Object getTypeHandler(Set<Iri> rdfTypes);
+ public Object getTypeHandler(Set<IRI> rdfTypes);
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/impl/TypeHandlerDiscoveryImpl.java
----------------------------------------------------------------------
diff --git a/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/impl/TypeHandlerDiscoveryImpl.java b/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/impl/TypeHandlerDiscoveryImpl.java
index a3f9c35..c5cb673 100644
--- a/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/impl/TypeHandlerDiscoveryImpl.java
+++ b/platform/typehandlerspace/src/main/java/org/apache/clerezza/platform/typehandlerspace/impl/TypeHandlerDiscoveryImpl.java
@@ -35,7 +35,7 @@ import org.apache.felix.scr.annotations.Service;
import org.apache.clerezza.platform.typehandlerspace.SupportedTypes;
import org.apache.clerezza.platform.typehandlerspace.TypeHandlerDiscovery;
import org.apache.clerezza.platform.typepriority.TypePrioritizer;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.ontologies.RDFS;
import org.apache.felix.scr.annotations.ReferencePolicy;
@@ -56,8 +56,7 @@ public class TypeHandlerDiscoveryImpl implements TypeHandlerDiscovery {
@Reference
private TypePrioritizer typePrioritizer;
- private final Map<Iri, Object> typeHandlerMap = Collections.synchronizedMap(
- new HashMap<Iri, Object>());
+ private final Map<IRI, Object> typeHandlerMap = Collections.synchronizedMap(new HashMap<IRI, Object>());
protected void bindTypeHandler(Object typeHandler) {
SupportedTypes supportedTypes = typeHandler.getClass()
@@ -66,17 +65,17 @@ public class TypeHandlerDiscoveryImpl implements TypeHandlerDiscovery {
return;
}
for (String typeUriString : supportedTypes.types()) {
- Iri typeUri = new Iri(typeUriString);
+ IRI typeUri = new IRI(typeUriString);
typeHandlerMap.put(typeUri, typeHandler);
}
}
protected void unbindTypeHandler(Object typeHandler) {
- Iterator<Iri> keys = typeHandlerMap.keySet().iterator();
- Set<Iri> toRemove = new HashSet<Iri>(typeHandlerMap.size());
+ Iterator<IRI> keys = typeHandlerMap.keySet().iterator();
+ Set<IRI> toRemove = new HashSet<IRI>(typeHandlerMap.size());
synchronized(typeHandlerMap) {
while (keys.hasNext()) {
- Iri uriRef = keys.next();
+ IRI uriRef = keys.next();
if(typeHandlerMap.get(uriRef) == typeHandler) {
toRemove.add(uriRef);
}
@@ -89,12 +88,12 @@ public class TypeHandlerDiscoveryImpl implements TypeHandlerDiscovery {
}
@Override
- public Object getTypeHandler(final Set<Iri> types) {
+ public Object getTypeHandler(final Set<IRI> types) {
return AccessController.doPrivileged(new PrivilegedAction<Object>() {
@Override
public Object run() {
- Iterator<Iri> prioritizedTypes = typePrioritizer.iterate(types);
+ Iterator<IRI> prioritizedTypes = typePrioritizer.iterate(types);
while (prioritizedTypes.hasNext()) {
Object result = typeHandlerMap.get(prioritizedTypes.next());
if (result != null) {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/typepriority/src/main/java/org/apache/clerezza/platform/typepriority/TypePrioritizer.java
----------------------------------------------------------------------
diff --git a/platform/typepriority/src/main/java/org/apache/clerezza/platform/typepriority/TypePrioritizer.java b/platform/typepriority/src/main/java/org/apache/clerezza/platform/typepriority/TypePrioritizer.java
index 487726d..4fc0f8b 100644
--- a/platform/typepriority/src/main/java/org/apache/clerezza/platform/typepriority/TypePrioritizer.java
+++ b/platform/typepriority/src/main/java/org/apache/clerezza/platform/typepriority/TypePrioritizer.java
@@ -33,8 +33,8 @@ import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.References;
import org.apache.felix.scr.annotations.Service;
import org.apache.clerezza.platform.config.SystemConfig;
-import org.apache.clerezza.commons.rdf.RdfTerm;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.ontologies.RDFS;
import org.apache.clerezza.rdf.utils.RdfList;
import org.apache.clerezza.commons.rdf.Graph;
@@ -52,9 +52,9 @@ import org.slf4j.LoggerFactory;
referenceInterface=Graph.class,
target=SystemConfig.SYSTEM_GRAPH_FILTER)})
public class TypePrioritizer {
- public static final Iri typePriorityListUri = new Iri("urn:x-localinstance:/typePriorityList");
+ public static final IRI typePriorityListUri = new IRI("urn:x-localinstance:/typePriorityList");
- private List<Iri> typePriorityList;
+ private List<IRI> typePriorityList;
private static final Logger log = LoggerFactory.getLogger(TypePrioritizer.class);
Graph systemGraph;
@@ -63,12 +63,12 @@ public class TypePrioritizer {
Lock l = systemGraph.getLock().readLock();
l.lock();
try {
- List<RdfTerm> rdfTypePriorityList = new RdfList(
+ List<RDFTerm> rdfTypePriorityList = new RdfList(
typePriorityListUri, systemGraph);
- typePriorityList = new ArrayList<Iri>(rdfTypePriorityList.size());
- for (RdfTerm resource : rdfTypePriorityList) {
- if (resource instanceof Iri) {
- typePriorityList.add((Iri) resource);
+ typePriorityList = new ArrayList<IRI>(rdfTypePriorityList.size());
+ for (RDFTerm resource : rdfTypePriorityList) {
+ if (resource instanceof IRI) {
+ typePriorityList.add((IRI) resource);
} else {
log.warn("Type priority list contains a resource "
+ "that is not a uri, skipping.");
@@ -90,17 +90,17 @@ public class TypePrioritizer {
* @param rdfTypes the rdf types to be sorted
* @return a sorted iterator of the types
*/
- public Iterator<Iri> iterate(final Collection<Iri> rdfTypes) {
- return new Iterator<Iri>() {
- final Set<Iri> remaining = new HashSet<Iri>(rdfTypes);
+ public Iterator<IRI> iterate(final Collection<IRI> rdfTypes) {
+ return new Iterator<IRI>() {
+ final Set<IRI> remaining = new HashSet<IRI>(rdfTypes);
boolean rdfsResourceRemovedAndNotYetReturned = remaining.remove(RDFS.Resource);
- final Iterator<Iri> typePriorityIter = typePriorityList.iterator();
- Iterator<Iri> remainingIter = null;
- Iri next = prepareNext();
+ final Iterator<IRI> typePriorityIter = typePriorityList.iterator();
+ Iterator<IRI> remainingIter = null;
+ IRI next = prepareNext();
- private Iri prepareNext() {
+ private IRI prepareNext() {
while (typePriorityIter.hasNext()) {
- Iri nextPriority = typePriorityIter.next();
+ IRI nextPriority = typePriorityIter.next();
if (remaining.contains(nextPriority)) {
remaining.remove(nextPriority);
return nextPriority;
@@ -127,11 +127,11 @@ public class TypePrioritizer {
}
@Override
- public Iri next() {
+ public IRI next() {
if (next == null) {
throw new NoSuchElementException();
}
- Iri current = next;
+ IRI current = next;
next = prepareNext();
return current;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/typepriority/src/test/java/org/apache/clerezza/platform/typepriority/TypePrioritizerTest.java
----------------------------------------------------------------------
diff --git a/platform/typepriority/src/test/java/org/apache/clerezza/platform/typepriority/TypePrioritizerTest.java b/platform/typepriority/src/test/java/org/apache/clerezza/platform/typepriority/TypePrioritizerTest.java
index ccaa75d..ff95059 100644
--- a/platform/typepriority/src/test/java/org/apache/clerezza/platform/typepriority/TypePrioritizerTest.java
+++ b/platform/typepriority/src/test/java/org/apache/clerezza/platform/typepriority/TypePrioritizerTest.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
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.ontologies.FOAF;
import org.apache.clerezza.rdf.ontologies.RDF;
@@ -51,11 +51,11 @@ public class TypePrioritizerTest {
@Test
public void oderList() {
- List<Iri> l = new ArrayList<Iri>();
+ List<IRI> l = new ArrayList<IRI>();
l.add(FOAF.Agent);
l.add(RDF.Bag);
l.add(FOAF.Person);
- Iterator<Iri> iter = typePrioritizer.iterate(l);
+ Iterator<IRI> iter = typePrioritizer.iterate(l);
Assert.assertEquals(FOAF.Person, iter.next());
Assert.assertEquals(FOAF.Agent, iter.next());
Assert.assertEquals(RDF.Bag, iter.next());
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesService.java
----------------------------------------------------------------------
diff --git a/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesService.java b/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesService.java
index 4e37f0d..738fbaa 100644
--- a/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesService.java
+++ b/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesService.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.platform.typerendering.scalaserverpages;
import org.apache.clerezza.platform.typerendering.TypeRenderlet;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.scala.scripting.CompilerService;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
@@ -66,7 +66,7 @@ public class ScalaServerPagesService {
* @param mediaType
* @return
*/
- public ServiceRegistration registerScalaServerPage(URL location, Iri rdfType,
+ public ServiceRegistration registerScalaServerPage(URL location, IRI rdfType,
String modePattern, MediaType mediaType) {
return registerScalaServerPage(location, rdfType, modePattern, mediaType, bundleContext);
}
@@ -83,7 +83,7 @@ public class ScalaServerPagesService {
* @param callerBundleContext
* @return
*/
- public ServiceRegistration registerScalaServerPage(URL location, Iri rdfType,
+ public ServiceRegistration registerScalaServerPage(URL location, IRI rdfType,
String modePattern, MediaType mediaType, BundleContext callerBundleContext) {
TypeRenderlet sspTypeRenderlet = new SspTypeRenderlet(location, rdfType,
modePattern, mediaType, scalaCompilerService);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/SspTypeRenderlet.java
----------------------------------------------------------------------
diff --git a/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/SspTypeRenderlet.java b/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/SspTypeRenderlet.java
index 501fd9b..c6d547b 100644
--- a/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/SspTypeRenderlet.java
+++ b/platform/typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/SspTypeRenderlet.java
@@ -21,7 +21,7 @@ package org.apache.clerezza.platform.typerendering.scalaserverpages;
import java.util.logging.Level;
import org.apache.clerezza.platform.typerendering.CallbackRenderer;
import org.apache.clerezza.platform.typerendering.TypeRenderlet;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.clerezza.scala.scripting.CompilerService;
import org.slf4j.Logger;
@@ -53,7 +53,7 @@ public class SspTypeRenderlet implements TypeRenderlet {
+ lineSeparator + "}" + lineSeparator + "}" + lineSeparator).toCharArray();
- private Iri rdfType;
+ private IRI rdfType;
private String modePattern;
private MediaType mediaType;
private URL sspLocation;
@@ -61,7 +61,7 @@ public class SspTypeRenderlet implements TypeRenderlet {
private TypeRenderlet lastCompiledSsp = null;
private CompilerService scalaCompilerService;
- SspTypeRenderlet(URL sspLocation, Iri rdfType, String modePattern, MediaType mediaType,
+ SspTypeRenderlet(URL sspLocation, IRI rdfType, String modePattern, MediaType mediaType,
CompilerService scalaCompilerService) {
this.sspLocation = sspLocation;
this.rdfType = rdfType;
@@ -71,7 +71,7 @@ public class SspTypeRenderlet implements TypeRenderlet {
}
@Override
- public Iri getRdfType() {
+ public IRI getRdfType() {
return rdfType;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctions.java
----------------------------------------------------------------------
diff --git a/platform/typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctions.java b/platform/typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctions.java
index eda3b7b..2f560a8 100644
--- a/platform/typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctions.java
+++ b/platform/typerendering.seedsnipe/src/main/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctions.java
@@ -31,11 +31,11 @@ import org.apache.clerezza.rdf.core.LiteralFactory;
import org.apache.clerezza.commons.rdf.BlankNode;
import org.apache.clerezza.commons.rdf.Language;
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.utils.GraphNode;
import org.apache.clerezza.templating.RenderingFunction;
import org.apache.clerezza.templating.RenderingFunctions;
-import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
import org.apache.clerezza.commons.rdf.Graph;
/**
@@ -44,9 +44,9 @@ import org.apache.clerezza.commons.rdf.Graph;
*/
class WebRenderingFunctions implements RenderingFunctions {
- private static final Iri XML_DATE_LITERAL = new Iri(
+ private static final IRI XML_DATE_LITERAL = new IRI(
"http://www.w3.org/2001/XMLSchema#dateTime");
- private final static Iri RDF_XML_LITERAL = new Iri(
+ private final static IRI RDF_XML_LITERAL = new IRI(
"http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral");
private Graph graph;
private GraphNode context;
@@ -84,8 +84,8 @@ class WebRenderingFunctions implements RenderingFunctions {
}
stringValue = ((Literal) value).getLexicalForm();
} else {
- if (value instanceof Iri) {
- stringValue = ((Iri) value).getUnicodeString();
+ if (value instanceof IRI) {
+ stringValue = ((IRI) value).getUnicodeString();
} else {
stringValue = value.toString();
}
@@ -138,7 +138,7 @@ class WebRenderingFunctions implements RenderingFunctions {
@Override
public String process(Object... values) throws IOException {
- BlankNodeOrIri resource = (BlankNodeOrIri) values[0];
+ BlankNodeOrIRI resource = (BlankNodeOrIRI) values[0];
GraphNode graphNode = new GraphNode(resource, graph);
String mode = null;
if (values.length > 1) {
@@ -185,10 +185,10 @@ class WebRenderingFunctions implements RenderingFunctions {
* A function that returns the Datatype of a Literal or null if the
* Literal has no language or if the object is not a Literal
*/
- private static RenderingFunction datatypeFunction = new RenderingFunction<Object, Iri>() {
+ private static RenderingFunction datatypeFunction = new RenderingFunction<Object, IRI>() {
@Override
- public Iri process(Object... values) {
+ public IRI process(Object... values) {
Object value = values[0];
if (value instanceof Literal) {
return ((Literal) value).getDataType();
@@ -225,7 +225,7 @@ class WebRenderingFunctions implements RenderingFunctions {
if (value instanceof Literal) {
return "literal";
}
- if (value instanceof Iri) {
+ if (value instanceof IRI) {
return "iri";
}
if (value instanceof BlankNode) {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/GenericTest.java
----------------------------------------------------------------------
diff --git a/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/GenericTest.java b/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/GenericTest.java
index a7f3858..0622b33 100644
--- a/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/GenericTest.java
+++ b/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/GenericTest.java
@@ -24,7 +24,7 @@ import java.io.InputStream;
import org.junit.Assert;
import org.junit.Test;
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.Parser;
import org.apache.clerezza.rdf.utils.GraphNode;
@@ -34,7 +34,7 @@ import org.apache.clerezza.rdf.utils.GraphNode;
*/
public class GenericTest {
- private final Iri root = new Iri("http://tests.clerezza.org/root#");
+ private final IRI root = new IRI("http://tests.clerezza.org/root#");
private final SeedsnipeRenderlet renderlet = new SeedsnipeRenderlet();
@Test
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctionsTest.java
----------------------------------------------------------------------
diff --git a/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctionsTest.java b/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctionsTest.java
index 520e54d..e326ae2 100644
--- a/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctionsTest.java
+++ b/platform/typerendering.seedsnipe/src/test/java/org/apache/clerezza/platform/typerendering/seedsnipe/WebRenderingFunctionsTest.java
@@ -27,7 +27,7 @@ import org.apache.clerezza.rdf.core.LiteralFactory;
import org.junit.Assert;
import org.junit.Test;
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.templating.RenderingFunction;
/**
@@ -105,7 +105,7 @@ public class WebRenderingFunctionsTest {
null, null, null, null);
RenderingFunction<Object, Boolean> function = webRenderingFunctions
.getNamedFunctions().get("contains");
- Iri testObject = new Iri("http://example.org/bla#fooBar");
+ IRI testObject = new IRI("http://example.org/bla#fooBar");
Assert.assertTrue(function.process(testObject, "bla"));
Assert.assertFalse(function.process(testObject, "hello"));
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRenderer.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRenderer.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRenderer.java
index 5a0cb10..0148cd3 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRenderer.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRenderer.java
@@ -21,7 +21,7 @@ package org.apache.clerezza.platform.typerendering;
import java.io.IOException;
import java.io.OutputStream;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.utils.GraphNode;
/**
@@ -48,7 +48,7 @@ public interface CallbackRenderer {
/**
* Renders a specified named resource using the GraphNode returned by
- * <code>org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider#get(org.apache.clerezza.commons.rdf.Iri)</code>.
+ * <code>org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider#get(org.apache.clerezza.commons.rdf.IRI)</code>.
*
* Otherwise same as render(GraphNode, .GraphNode, String, OutputStream)
*
@@ -58,7 +58,7 @@ public interface CallbackRenderer {
* @param os
* @throws IOException
*/
- public void render(Iri resource, GraphNode context, String mode,
+ public void render(IRI resource, GraphNode context, String mode,
OutputStream os) throws IOException;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java
index a0b31e8..aa77cc6 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java
@@ -30,7 +30,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.UriInfo;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider;
@@ -71,7 +71,7 @@ public class CallbackRendererImpl implements CallbackRenderer {
}
@Override
- public void render(final Iri resource, GraphNode context, String mode,
+ public void render(final IRI resource, GraphNode context, String mode,
OutputStream os) throws IOException {
final GraphNode resourceNode = AccessController.doPrivileged( new PrivilegedAction<GraphNode>() {
@Override
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java
index 91886fc..f0736cf 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererFactory.java
@@ -25,7 +25,7 @@ import org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider;
import org.apache.clerezza.platform.typepriority.TypePrioritizer;
import org.apache.clerezza.platform.typerendering.utils.MediaTypeMap;
import org.apache.clerezza.platform.typerendering.utils.RegexMap;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.ontologies.RDFS;
import org.apache.clerezza.rdf.utils.GraphNode;
@@ -91,8 +91,8 @@ public class RendererFactory {
}
}
- private Map<Iri, RegexMap<MediaTypeMap<TypeRenderletStartLevel>>> typeRenderletMap =
- Collections.synchronizedMap(new HashMap<Iri, RegexMap<MediaTypeMap<TypeRenderletStartLevel>>>());
+ private Map<IRI, RegexMap<MediaTypeMap<TypeRenderletStartLevel>>> typeRenderletMap =
+ Collections.synchronizedMap(new HashMap<IRI, RegexMap<MediaTypeMap<TypeRenderletStartLevel>>>());
private BundleContext bundleContext;
@@ -125,14 +125,14 @@ public class RendererFactory {
*/
public Renderer createRenderer(GraphNode resource, String mode,
List<MediaType> acceptableMediaTypes) {
- Set<Iri> types = new HashSet<Iri>();
+ Set<IRI> types = new HashSet<IRI>();
if (resource.getNode() instanceof Literal) {
types.add(((Literal) resource.getNode()).getDataType());
} else {
// extract rdf types
- Iterator<Iri> it = resource.getIriObjects(RDF.type);
+ Iterator<IRI> it = resource.getIriObjects(RDF.type);
while (it.hasNext()) {
- final Iri rdfType = it.next();
+ final IRI rdfType = it.next();
types.add(rdfType);
}
types.add(RDFS.Resource);
@@ -140,11 +140,11 @@ public class RendererFactory {
return getRenderer(types, mode, acceptableMediaTypes);
}
- private Renderer getRenderer(Set<Iri> types, String mode,
+ private Renderer getRenderer(Set<IRI> types, String mode,
List<MediaType> acceptableMediaTypes) {
- Iterator<Iri> sortedTypes = typePrioritizer.iterate(types);
+ Iterator<IRI> sortedTypes = typePrioritizer.iterate(types);
while (sortedTypes.hasNext()) {
- final Iri currentType = sortedTypes.next();
+ final IRI currentType = sortedTypes.next();
final RegexMap<MediaTypeMap<TypeRenderletStartLevel>> regexMap = typeRenderletMap.get(currentType);
if (regexMap != null) {
Iterator<MediaTypeMap<TypeRenderletStartLevel>> mediaTypeMapIter = regexMap.getMatching(mode);
@@ -190,7 +190,7 @@ public class RendererFactory {
}
private void registerRenderlet(TypeRenderlet typeRenderlet, int startLevel) {
- final Iri rdfType = typeRenderlet.getRdfType();
+ final IRI rdfType = typeRenderlet.getRdfType();
RegexMap<MediaTypeMap<TypeRenderletStartLevel>> regexMap = typeRenderletMap.get(rdfType);
if (regexMap == null) {
regexMap = new RegexMap<MediaTypeMap<TypeRenderletStartLevel>>();
@@ -208,7 +208,7 @@ public class RendererFactory {
protected void unbindTypeRenderlet(TypeRenderlet typeRenderlet) {
TypeRenderletStartLevel typeRenderletStartLevel = new TypeRenderletStartLevel(typeRenderlet, 0);
- for (Map.Entry<Iri, RegexMap<MediaTypeMap<TypeRenderletStartLevel>>> typeEntry: typeRenderletMap.entrySet()) {
+ for (Map.Entry<IRI, RegexMap<MediaTypeMap<TypeRenderletStartLevel>>> typeEntry: typeRenderletMap.entrySet()) {
final RegexMap<MediaTypeMap<TypeRenderletStartLevel>> regexMap = typeEntry.getValue();
for (Map.Entry<String, MediaTypeMap<TypeRenderletStartLevel>> regexEntry: regexMap.entrySet()) {
final MediaTypeMap<TypeRenderletStartLevel> mediaTypeMap = regexEntry.getValue();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingException.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingException.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingException.java
index cbe1469..8b0cbe9 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingException.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingException.java
@@ -23,7 +23,7 @@ import java.io.StringWriter;
import java.net.URI;
import org.apache.clerezza.platform.typerendering.ontologies.TYPERENDERING;
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.PlainLiteralImpl;
import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.utils.GraphNode;
@@ -53,7 +53,7 @@ public class RenderingException extends TypeRenderingException {
public GraphNode getExceptionGraphNode() {
GraphNode result = new GraphNode(new BlankNode(), new SimpleGraph());
result.addProperty(RDF.type, TYPERENDERING.Exception);
- result.addProperty(TYPERENDERING.errorSource, new Iri(renderingSpecification.toString()));
+ result.addProperty(TYPERENDERING.errorSource, new IRI(renderingSpecification.toString()));
result.addProperty(TYPERENDERING.message, new PlainLiteralImpl(getMessage()));
result.addProperty(TYPERENDERING.stackTrace, getStackTraceLiteral());
return result;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingspecificationException.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingspecificationException.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingspecificationException.java
index a186180..b92da78 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingspecificationException.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingspecificationException.java
@@ -22,7 +22,7 @@ import java.net.URI;
import org.apache.clerezza.platform.typerendering.ontologies.TYPERENDERING;
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.PlainLiteralImpl;
import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.ontologies.RDF;
@@ -124,7 +124,7 @@ public class RenderingspecificationException extends TypeRenderingException{
GraphNode result = new GraphNode(new BlankNode(), new SimpleGraph());
result.addProperty(RDF.type, TYPERENDERING.Exception);
LiteralFactory factory = LiteralFactory.getInstance();
- result.addProperty(TYPERENDERING.errorSource, new Iri(renderingSpecification.toString()));
+ result.addProperty(TYPERENDERING.errorSource, new IRI(renderingSpecification.toString()));
if (lineNumber != -1) {
result.addProperty(TYPERENDERING.line, factory.createTypedLiteral(new Integer(lineNumber)));
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManager.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManager.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManager.java
index 29e3d6d..cc0011b 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManager.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManager.java
@@ -18,7 +18,7 @@
package org.apache.clerezza.platform.typerendering;
import javax.ws.rs.core.MediaType;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
/**
* Over the RenderletManagerImpl renderlets can be registered.
@@ -48,6 +48,6 @@ public interface RenderletManager {
* required.
* @param mediaType The media type of the rendered
* @param builtIn ignored
- */ void registerRenderlet(String renderletServiceName, final Iri renderingSpecification, final Iri rdfType, final String mode, final MediaType mediaType, boolean builtIn);
+ */ void registerRenderlet(String renderletServiceName, final IRI renderingSpecification, final IRI rdfType, final String mode, final MediaType mediaType, boolean builtIn);
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManagerImpl.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManagerImpl.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManagerImpl.java
index 201b670..71907d5 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManagerImpl.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletManagerImpl.java
@@ -33,7 +33,7 @@ import java.util.Set;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.ws.rs.core.MediaType;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
@@ -67,12 +67,12 @@ public class RenderletManagerImpl implements RenderletManager {
private static class RegistrationRequest {
String renderletServiceName;
- Iri renderingSpecification;
- Iri rdfType;
+ IRI renderingSpecification;
+ IRI rdfType;
String mode;
MediaType mediaType;
- public RegistrationRequest(String renderletServiceName, Iri renderingSpecification, Iri rdfType, String mode, MediaType mediaType) {
+ public RegistrationRequest(String renderletServiceName, IRI renderingSpecification, IRI rdfType, String mode, MediaType mediaType) {
this.renderletServiceName = renderletServiceName;
this.renderingSpecification = renderingSpecification;
this.rdfType = rdfType;
@@ -112,8 +112,8 @@ public class RenderletManagerImpl implements RenderletManager {
* @param builtIn ignored
*/
public void registerRenderlet(String renderletServiceName,
- final Iri renderingSpecification,
- final Iri rdfType,
+ final IRI renderingSpecification,
+ final IRI rdfType,
final String mode,
final MediaType mediaType, boolean builtIn) {
RegistrationRequest registrationRequest = new RegistrationRequest(renderletServiceName,
@@ -232,8 +232,8 @@ public class RenderletManagerImpl implements RenderletManager {
private boolean attemptRegistration(RegistrationRequest registrationRequest) {
final String renderletServiceName = registrationRequest.renderletServiceName;
- Iri renderingSpecification = registrationRequest.renderingSpecification;
- final Iri rdfType = registrationRequest.rdfType;
+ IRI renderingSpecification = registrationRequest.renderingSpecification;
+ final IRI rdfType = registrationRequest.rdfType;
final String modePattern = registrationRequest.mode;
final MediaType mediaType = registrationRequest.mediaType;
@@ -252,7 +252,7 @@ public class RenderletManagerImpl implements RenderletManager {
TypeRenderlet typeRenderlet = new TypeRenderlet() {
@Override
- public Iri getRdfType() {
+ public IRI getRdfType() {
return rdfType;
}
@@ -304,7 +304,7 @@ public class RenderletManagerImpl implements RenderletManager {
return true;
}
- private ServiceRegistration getAlreadyRegisteredServiceReg(Iri rdfType,
+ private ServiceRegistration getAlreadyRegisteredServiceReg(IRI rdfType,
MediaType mediaType, String modePattern) {
for (ServiceRegistration serviceRegistration : registeredTypeRenderlets) {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererImpl.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererImpl.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererImpl.java
index 3bde164..8b87ec7 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererImpl.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererImpl.java
@@ -28,7 +28,7 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.UriInfo;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.osgi.framework.BundleContext;
import org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider;
@@ -52,7 +52,7 @@ class RenderletRendererImpl implements Renderer {
private GraphNodeProvider graphNodeProvider;
- RenderletRendererImpl(Iri renderingSpecification, org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider graphNodeProvider,
+ RenderletRendererImpl(IRI renderingSpecification, org.apache.clerezza.rdf.utils.graphnodeprovider.GraphNodeProvider graphNodeProvider,
Renderlet renderlet, MediaType mediaType,
RendererFactory rendererFactory,
BundleContext bundleContext) {
[4/9] clerezza git commit: CLEREZZA-983: Adapted to new casing of
rdf-core (part 1)
Posted by re...@apache.org.
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedSparqlPreParser.jj
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedSparqlPreParser.jj b/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedSparqlPreParser.jj
index 35050c0..4ef0976 100644
--- a/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedSparqlPreParser.jj
+++ b/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedSparqlPreParser.jj
@@ -41,8 +41,8 @@ import java.util.regex.Pattern;
import org.apache.clerezza.commons.rdf.BlankNode;
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.Iri;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.LiteralFactory;
import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
import org.apache.clerezza.commons.rdf.impl.utils.TypedLiteralImpl;
@@ -115,14 +115,14 @@ import org.apache.clerezza.rdf.core.sparql.update.impl.UpdateOperationWithQuads;
*/
class JavaCCGeneratedSparqlPreParser {
- private static final Iri RDF_TYPE =
- new Iri("http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
- private static final Iri RDF_FIRST =
- new Iri("http://www.w3.org/1999/02/22-rdf-syntax-ns#first");
- private static final Iri RDF_REST =
- new Iri("http://www.w3.org/1999/02/22-rdf-syntax-ns#rest");
- private static final Iri RDF_NIL =
- new Iri("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil");
+ private static final IRI RDF_TYPE =
+ new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
+ private static final IRI RDF_FIRST =
+ new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#first");
+ private static final IRI RDF_REST =
+ new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#rest");
+ private static final IRI RDF_NIL =
+ new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil");
/** A RegEx pattern for separating out a namespace from a prefixed name. */
private static final Pattern pfxNamePattern = Pattern.compile("([^:]*):(.*)");
@@ -134,17 +134,17 @@ class JavaCCGeneratedSparqlPreParser {
private class GraphRefAllSpec {
GraphSpec graphSpec;
- Iri graph;
+ IRI graph;
public void setGraphSpec(GraphSpec graphSpec) {
this.graphSpec = graphSpec;
}
public GraphSpec getGraphSpec() {
return this.graphSpec;
}
- public void setGraph(Iri graph){
+ public void setGraph(IRI graph){
this.graph = graph;
}
- public Iri getGraph() {
+ public IRI getGraph() {
return this.graph;
}
}
@@ -287,16 +287,16 @@ class JavaCCGeneratedSparqlPreParser {
return bNode;
}
- private Iri createUriRef(String r) throws ParseException {
+ private IRI createUriRef(String r) throws ParseException {
// Create an IRI directly if the string does not start with a prefix
Matcher m = pfxNamePattern.matcher(r);
if (!m.matches()) {
// either a normal IRI, or one with a BASE
- return isRelative(r) ? new Iri(base + r) : new Iri(r);
+ return isRelative(r) ? new IRI(base + r) : new IRI(r);
}
// extract the prefix, and attempt to convert to a URI before creating the reference
String ns = prefixes.get(m.group(1));
- return ns == null ? new Iri(r) : new Iri(ns + m.group(2));
+ return ns == null ? new IRI(r) : new IRI(ns + m.group(2));
}
/**
@@ -558,7 +558,7 @@ private Query ConstructQuery() : {
return query; }
}
-/* [11] DescribeQuery ::= 'DESCRIBE' ( VarOrIri+ | '*' ) DatasetClause* WhereClause? SolutionModifier */
+/* [11] DescribeQuery ::= 'DESCRIBE' ( VarOrIRI+ | '*' ) DatasetClause* WhereClause? SolutionModifier */
private Query DescribeQuery() : {
Query query;
UriRefOrVariable node; } {
@@ -566,7 +566,7 @@ private Query DescribeQuery() : {
<DESCRIBE> {
query = new SimpleDescribeQuery(); }
(
- ( node=VarOrIri() {
+ ( node=VarOrIRI() {
((SimpleDescribeQuery) query).addResourceToDescribe(node); } )+
|
"*" {
@@ -597,7 +597,7 @@ private void DatasetClause(Query query) : {} {
/* [14] DefaultGraphClause ::= SourceSelector */
private void DefaultGraphClause(Query query) : {
- Iri defaultGraph; } {
+ IRI defaultGraph; } {
defaultGraph=SourceSelector() {
((SimpleQuery) query).addDefaultGraph(defaultGraph); }
@@ -605,17 +605,17 @@ private void DefaultGraphClause(Query query) : {
/* [15] NamedGraphClause ::= 'NAMED' SourceSelector */
private void NamedGraphClause(Query query) : {
- Iri namedGraph; } {
+ IRI namedGraph; } {
<NAMED> namedGraph=SourceSelector() {
((SimpleQuery) query).addNamedGraph(namedGraph); }
}
/* [16] SourceSelector ::= iri */
-private Iri SourceSelector() : {
- Iri graph; } {
+private IRI SourceSelector() : {
+ IRI graph; } {
- graph=Iri() {
+ graph=IRI() {
return graph; }
}
@@ -781,7 +781,7 @@ private void Update1(Update update) : {
/* [31] Load ::= 'LOAD' 'SILENT'? iri ( 'INTO' GraphRef )? */
private UpdateOperation Load() : {
- Iri uriRef;
+ IRI uriRef;
LoadOperation operation; } {
<LOAD> {
operation = new LoadOperation(); }
@@ -789,7 +789,7 @@ private UpdateOperation Load() : {
<SILENT> {
operation.setSilent(true); }
)?
- uriRef = Iri() {
+ uriRef = IRI() {
operation.setSource(uriRef); }
(
<INTO>
@@ -834,7 +834,7 @@ private UpdateOperation Drop() : {
/* [34] Create ::= 'CREATE' 'SILENT'? GraphRef */
private UpdateOperation Create() : {
- Iri uriRef;
+ IRI uriRef;
CreateOperation operation; } {
<CREATE> {
operation = new CreateOperation(); }
@@ -927,7 +927,7 @@ private UpdateOperation DeleteWhere() : {
/* [41] Modify ::= ( 'WITH' iri )? ( DeleteClause InsertClause? | InsertClause ) UsingClause* 'WHERE' GroupGraphPattern */
private UpdateOperation Modify() : {
- Iri fallbackGraph = null;
+ IRI fallbackGraph = null;
UpdateOperationWithQuads deleteOperation = null;
UpdateOperationWithQuads insertOperation = null;
SimpleDataSet dataSet = new SimpleDataSet();
@@ -935,7 +935,7 @@ private UpdateOperation Modify() : {
ModifyOperation operation; } {
(
<WITH>
- fallbackGraph = Iri()
+ fallbackGraph = IRI()
)?
(
deleteOperation = DeleteClause()
@@ -986,21 +986,21 @@ private UpdateOperationWithQuads InsertClause() : {
/* [44] UsingClause ::= 'USING' ( iri | 'NAMED' iri ) */
private void UsingClause(SimpleDataSet dataSet) : {
- Iri graph; } {
+ IRI graph; } {
<USING>
(
- graph = Iri() {
+ graph = IRI() {
dataSet.addDefaultGraph(graph); }
|
<NAMED>
- graph = Iri() {
+ graph = IRI() {
dataSet.addNamedGraph(graph); }
)
}
/* [45] GraphOrDefault ::= 'DEFAULT_T' | 'GRAPH'? iri */
private GraphRefAllSpec GraphOrDefault() : {
- Iri uriRef;
+ IRI uriRef;
GraphRefAllSpec graphRefAllSpec = new GraphRefAllSpec(); } {
(
<DEFAULT_T> {
@@ -1009,7 +1009,7 @@ private GraphRefAllSpec GraphOrDefault() : {
(
<GRAPH>
)?
- uriRef = Iri() {
+ uriRef = IRI() {
graphRefAllSpec.setGraph(uriRef);
graphRefAllSpec.setGraphSpec(GraphSpec.GRAPH); }
) {
@@ -1017,16 +1017,16 @@ private GraphRefAllSpec GraphOrDefault() : {
}
/* [46] GraphRef ::= 'GRAPH' iri */
-private Iri GraphRef() : {
- Iri uriRef; } {
+private IRI GraphRef() : {
+ IRI uriRef; } {
<GRAPH>
- uriRef = Iri() {
+ uriRef = IRI() {
return uriRef; }
}
/* [47] GraphRefAll ::= GraphRef | 'DEFAULT_T' | 'NAMED' | 'ALL' */
private GraphRefAllSpec GraphRefAll() : {
- Iri uriRef;
+ IRI uriRef;
GraphRefAllSpec graphRefAllSpec = new GraphRefAllSpec(); } {
(
uriRef = GraphRef() {
@@ -1076,13 +1076,13 @@ private void Quads(UpdateOperationWithQuads operation) : {
)*
}
-/* [51] QuadsNotTriples ::= 'GRAPH' VarOrIri '{' TriplesTemplate? '}' */
+/* [51] QuadsNotTriples ::= 'GRAPH' VarOrIRI '{' TriplesTemplate? '}' */
private void QuadsNotTriples(UpdateOperationWithQuads operation) : {
UriRefOrVariable graph;
Set<TriplePattern> triplePatterns = null; } {
<GRAPH>
- graph=VarOrIri()
+ graph=VarOrIRI()
"{"
(
triplePatterns=TriplesTemplate()
@@ -1184,18 +1184,18 @@ private void OptionalGraphPattern(GroupGraphPattern groupGraphPattern) : {
((SimpleGroupGraphPattern) groupGraphPattern).addOptionalGraphPattern(optional); }
}
-/* [58] GraphGraphPattern ::= 'GRAPH' VarOrIri GroupGraphPattern */
+/* [58] GraphGraphPattern ::= 'GRAPH' VarOrIRI GroupGraphPattern */
private void GraphGraphPattern(GroupGraphPattern groupGraphPattern) : {
UriRefOrVariable graph;
GroupGraphPattern g; } {
<GRAPH>
- graph=VarOrIri()
+ graph=VarOrIRI()
g=GroupGraphPattern() {
((SimpleGroupGraphPattern) groupGraphPattern).addGraphPattern(new SimpleGraphGraphPattern(graph, g)); }
}
-/* [59] ServiceGraphPattern ::= 'SERVICE' 'SILENT'? VarOrIri GroupGraphPattern */
+/* [59] ServiceGraphPattern ::= 'SERVICE' 'SILENT'? VarOrIRI GroupGraphPattern */
private void ServiceGraphPattern(GroupGraphPattern groupGraphPattern) : {
UriRefOrVariable service;
GroupGraphPattern g;
@@ -1206,7 +1206,7 @@ private void ServiceGraphPattern(GroupGraphPattern groupGraphPattern) : {
<SILENT> {
silent = true; }
)?
- service=VarOrIri()
+ service=VarOrIRI()
g=GroupGraphPattern() {
SimpleServiceGraphPattern simpleServiceGraphPattern;
simpleServiceGraphPattern = new SimpleServiceGraphPattern(service, g);
@@ -1255,14 +1255,14 @@ private InlineData DataBlock() : {
/* [63] InlineDataOneVar ::= Var '{' DataBlockValue* '}' */
private void InlineDataOneVar(InlineData inlineData) : {
Variable var;
- RdfTerm val; } {
+ RDFTerm val; } {
var=Var() {
((SimpleInlineData) inlineData).addVariable(var); }
"{"
(
val=DataBlockValue() {
- List<RdfTerm> values = new ArrayList<RdfTerm>();
+ List<RDFTerm> values = new ArrayList<RDFTerm>();
values.add(val);
((SimpleInlineData) inlineData).addValues(values); }
)*
@@ -1272,7 +1272,7 @@ private void InlineDataOneVar(InlineData inlineData) : {
/* [64] InlineDataFull ::= ( NIL | '(' Var* ')' ) '{' ( '(' DataBlockValue* ')' | NIL )* '}' */
private void InlineDataFull(InlineData inlineData) : {
Variable var;
- RdfTerm val; } {
+ RDFTerm val; } {
(
<NIL>
|
@@ -1288,7 +1288,7 @@ private void InlineDataFull(InlineData inlineData) : {
(
(
"(" {
- List<RdfTerm> values = new ArrayList<RdfTerm>(); }
+ List<RDFTerm> values = new ArrayList<RDFTerm>(); }
(
val=DataBlockValue() {
values.add(val); }
@@ -1298,15 +1298,15 @@ private void InlineDataFull(InlineData inlineData) : {
)
|
<NIL> {
- ((SimpleInlineData) inlineData).addValues(new ArrayList<RdfTerm>()); }
+ ((SimpleInlineData) inlineData).addValues(new ArrayList<RDFTerm>()); }
)*
"}"
}
/* [65] DataBlockValue ::= iri | RDFLiteral | NumericLiteral | BooleanLiteral | 'UNDEF' */
-private RdfTerm DataBlockValue() : {
- RdfTerm r = null; } {
- (r=Iri() | r=RDFLiteral() | r=NumericLiteral() | r=BooleanLiteral() | <UNDEF> ) {
+private RDFTerm DataBlockValue() : {
+ RDFTerm r = null; } {
+ (r=IRI() | r=RDFLiteral() | r=NumericLiteral() | r=BooleanLiteral() | <UNDEF> ) {
return r; }
}
@@ -1359,10 +1359,10 @@ private Expression Constraint() : {
/* [70] FunctionCall ::= iri ArgList */
private FunctionCall FunctionCall() : {
- Iri name;
+ IRI name;
List<Expression> arguments; } {
- name=Iri()
+ name=IRI()
arguments=ArgList() {
return new FunctionCall(name, arguments); }
}
@@ -1477,11 +1477,11 @@ private void PropertyListNotEmpty(ResourceOrVariable subject, Set<TriplePattern>
)*
}
-/* [78] Verb ::= VarOrIri | 'a' */
+/* [78] Verb ::= VarOrIRI | 'a' */
private UriRefOrVariable Verb() : {
UriRefOrVariable predicate; } {
- predicate=VarOrIri() {
+ predicate=VarOrIRI() {
return predicate; }
| "a" {
return new UriRefOrVariable(RDF_TYPE); }
@@ -1685,10 +1685,10 @@ private String PathMod() : {} {
/* [94] PathPrimary ::= iri | 'a' | '!' PathNegatedPropertySet | '(' Path ')' */
private PropertyPathExpression PathPrimary() : {
PropertyPathExpression ppe;
- Iri uriRef; } {
+ IRI uriRef; } {
(
- uriRef=Iri() {
+ uriRef=IRI() {
return new PredicatePath(uriRef); }
|
"a" {
@@ -1731,10 +1731,10 @@ private PropertyPathExpression PathNegatedPropertySet() : {
/* [96] PathOneInPropertySet ::= iri | 'a' | '^' ( iri | 'a' ) */
private PropertyPathExpression PathOneInPropertySet() : {
- Iri uriRef; } {
+ IRI uriRef; } {
(
- uriRef=Iri() {
+ uriRef=IRI() {
return new PredicatePath(uriRef); }
|
"a" {
@@ -1742,7 +1742,7 @@ private PropertyPathExpression PathOneInPropertySet() : {
|
"^"
(
- uriRef=Iri() {
+ uriRef=IRI() {
return new UnaryPropertyPathOperation("^", new PredicatePath(uriRef)); }
|
"a" {
@@ -1863,16 +1863,16 @@ private ResourceOrVariable VarOrTerm() : {
)
}
-/* [107] VarOrIri ::= Var | iri */
-private UriRefOrVariable VarOrIri() : {
+/* [107] VarOrIRI ::= Var | iri */
+private UriRefOrVariable VarOrIRI() : {
Variable var;
- Iri uriRef; } {
+ IRI uriRef; } {
(
var=Var() {
return new UriRefOrVariable(var); }
|
- uriRef=Iri() {
+ uriRef=IRI() {
return new UriRefOrVariable(uriRef); }
)
}
@@ -1885,12 +1885,12 @@ private Variable Var() : {
return createVariable(t.image); }
}
-/* [109] GraphTerm ::= Iri | RDFLiteral | NumericLiteral | BooleanLiteral | BlankNode | NIL */
+/* [109] GraphTerm ::= IRI | RDFLiteral | NumericLiteral | BooleanLiteral | BlankNode | NIL */
private ResourceOrVariable GraphTerm() : {
ResourceOrVariable bNode = null;
- RdfTerm r = null; } {
+ RDFTerm r = null; } {
- (r=Iri() | r=RDFLiteral() | r=NumericLiteral() | r=BooleanLiteral() | bNode=BlankNode() | <NIL> {
+ (r=IRI() | r=RDFLiteral() | r=NumericLiteral() | r=BooleanLiteral() | bNode=BlankNode() | <NIL> {
r = RDF_NIL; }) {
if (bNode == null) {
return new ResourceOrVariable(r);
@@ -2057,7 +2057,7 @@ private Expression PrimaryExpression() : {
e=BuiltInCall()
*/
|
- e=IriOrFunction()
+ e=IRIOrFunction()
|
l=RDFLiteral()
|
@@ -2283,12 +2283,12 @@ private Expression NotExistsFunc() : {
return patternExistenceCondition; }
}
-/* [128] IriOrFunction ::= iri ArgList? */
-private Expression IriOrFunction() : {
- Iri uriRef;
+/* [128] IRIOrFunction ::= iri ArgList? */
+private Expression IRIOrFunction() : {
+ IRI uriRef;
List<Expression> args; } {
- uriRef=Iri()
+ uriRef=IRI()
(
args=ArgList() {
return new FunctionCall(uriRef, args); }
@@ -2300,7 +2300,7 @@ private Expression IriOrFunction() : {
private Literal RDFLiteral() : {
Token t;
String s;
- Iri type; } {
+ IRI type; } {
s = String()
(
@@ -2309,7 +2309,7 @@ private Literal RDFLiteral() : {
|
(
"^^"
- type=Iri() {
+ type=IRI() {
return new TypedLiteralImpl(s, type); }
)
)? {
@@ -2400,8 +2400,8 @@ private String String() : {
}
/* [136] iri ::= IRIREF | PrefixedName */
-private Iri Iri() : {
- Iri uriRef;
+private IRI IRI() : {
+ IRI uriRef;
Token t; } {
t=<IRIREF> {
@@ -2412,7 +2412,7 @@ private Iri Iri() : {
}
/* [137] PrefixedName ::= PNAME_LN | PNAME_NS */
-private Iri PrefixedName() : {
+private IRI PrefixedName() : {
Token t; } {
( t=<PNAME_LN> | t=<PNAME_NS> ) {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/LiteralFactoryTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/LiteralFactoryTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/LiteralFactoryTest.java
index e333535..f0dbd79 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/LiteralFactoryTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/LiteralFactoryTest.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.rdf.core;
import org.apache.clerezza.commons.rdf.Literal;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import java.util.Arrays;
import java.util.Date;
import org.junit.Test;
@@ -52,7 +52,7 @@ public class LiteralFactoryTest {
bytes[i] = i;
}
Literal literal = LiteralFactory.getInstance().createTypedLiteral(bytes);
- Assert.assertEquals(new Iri("http://www.w3.org/2001/XMLSchema#base64Binary"),
+ Assert.assertEquals(new IRI("http://www.w3.org/2001/XMLSchema#base64Binary"),
literal.getDataType());
//we are using bytes.getClass() but there should be a way to get
//that instance of Class without getting it from an instance
@@ -69,7 +69,7 @@ public class LiteralFactoryTest {
public void dateConversion() {
Date date = new Date();
Literal literal = LiteralFactory.getInstance().createTypedLiteral(date);
- Assert.assertEquals(new Iri("http://www.w3.org/2001/XMLSchema#dateTime"),
+ Assert.assertEquals(new IRI("http://www.w3.org/2001/XMLSchema#dateTime"),
literal.getDataType());
Date dateBack = LiteralFactory.getInstance().createObject(Date.class, literal);
Assert.assertEquals(date.getTime(), dateBack.getTime());
@@ -83,7 +83,7 @@ public class LiteralFactoryTest {
public void stringConversion() {
String value = "Hello world";
Literal literal = LiteralFactory.getInstance().createTypedLiteral(value);
- Assert.assertEquals(new Iri("http://www.w3.org/2001/XMLSchema#string"),
+ Assert.assertEquals(new IRI("http://www.w3.org/2001/XMLSchema#string"),
literal.getDataType());
String valueBack = LiteralFactory.getInstance().createObject(String.class, literal);
Assert.assertEquals(value, valueBack);
@@ -97,7 +97,7 @@ public class LiteralFactoryTest {
public void intConversion() {
int value = 3;
Literal literal = LiteralFactory.getInstance().createTypedLiteral(value);
- Assert.assertEquals(new Iri("http://www.w3.org/2001/XMLSchema#int"),
+ Assert.assertEquals(new IRI("http://www.w3.org/2001/XMLSchema#int"),
literal.getDataType());
Integer valueBack = LiteralFactory.getInstance().createObject(Integer.class, literal);
Assert.assertEquals(value, valueBack.intValue());
@@ -111,7 +111,7 @@ public class LiteralFactoryTest {
public void longConversion() {
long value = 332314646;
Literal literal = LiteralFactory.getInstance().createTypedLiteral(value);
- Assert.assertEquals(new Iri("http://www.w3.org/2001/XMLSchema#long"),
+ Assert.assertEquals(new IRI("http://www.w3.org/2001/XMLSchema#long"),
literal.getDataType());
Long valueBack = LiteralFactory.getInstance().createObject(Long.class, literal);
Assert.assertEquals(value, valueBack.longValue());
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/UriRefTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/UriRefTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/UriRefTest.java
index 27ab33e..71d6846 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/UriRefTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/UriRefTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import org.junit.Test;
@@ -39,11 +39,11 @@ public class UriRefTest {
public void uriRefEqualityTest() {
try {
String uriRefString = "http://example.org/üöä";
- Iri uriRef1 = new Iri(uriRefString);
- Iri uriRef2 = new Iri(uriRefString);
+ IRI uriRef1 = new IRI(uriRefString);
+ IRI uriRef2 = new IRI(uriRefString);
Assert.assertEquals(uriRef1, uriRef2);
- Iri uriRef3 =
- new Iri(URLEncoder.encode(uriRefString, "utf-8"));
+ IRI uriRef3 =
+ new IRI(URLEncoder.encode(uriRefString, "utf-8"));
Assert.assertFalse(uriRef1.equals(uriRef3));
} catch (UnsupportedEncodingException ex) {
logger.error("Exception {} ", ex);
@@ -53,7 +53,7 @@ public class UriRefTest {
@Test
public void toStringTest() {
String uriRefString = "http://example.org/üöä";
- Iri uriRef = new Iri(uriRefString);
+ IRI uriRef = new IRI(uriRefString);
Assert.assertEquals("<"+uriRefString+">", uriRef.toString());
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
index 35bf406..bd11974 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
@@ -36,7 +36,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.providers.WeightedA;
import org.apache.clerezza.rdf.core.access.providers.WeightedDummy;
import org.apache.clerezza.rdf.core.access.security.TcPermission;
@@ -57,8 +57,8 @@ public class SecurityTest {
////needed to unbind because this is injected with META-INF/services - file
TcManager.getInstance().unbindWeightedTcProvider(new WeightedA());
TcManager.getInstance().bindWeightedTcProvider(new WeightedDummy());
- TcManager.getInstance().createGraph(new Iri("http://example.org/ImmutableGraph/alreadyexists"));
- TcManager.getInstance().createGraph(new Iri("http://example.org/read/ImmutableGraph"));
+ TcManager.getInstance().createGraph(new IRI("http://example.org/ImmutableGraph/alreadyexists"));
+ TcManager.getInstance().createGraph(new IRI("http://example.org/read/ImmutableGraph"));
}
@AfterClass
@@ -112,69 +112,69 @@ public class SecurityTest {
@Test(expected=NoSuchEntityException.class)
public void testAcessGraph() {
- TcManager.getInstance().getImmutableGraph(new Iri("http://example.org/permitted"));
+ TcManager.getInstance().getImmutableGraph(new IRI("http://example.org/permitted"));
}
@Test(expected=AccessControlException.class)
public void testNoWildCard() {
- TcManager.getInstance().getImmutableGraph(new Iri("http://example.org/permitted/subthing"));
+ TcManager.getInstance().getImmutableGraph(new IRI("http://example.org/permitted/subthing"));
}
@Test(expected=NoSuchEntityException.class)
public void testAllowedArea() {
- TcManager.getInstance().getImmutableGraph(new Iri("http://example.org/area/allowed/something"));
+ TcManager.getInstance().getImmutableGraph(new IRI("http://example.org/area/allowed/something"));
}
@Test(expected=AccessControlException.class)
public void testAcessForbiddenGraph() {
- TcManager.getInstance().getImmutableGraph(new Iri("http://example.org/forbidden"));
+ TcManager.getInstance().getImmutableGraph(new IRI("http://example.org/forbidden"));
}
@Test(expected=NoSuchEntityException.class)
public void testCustomPermissions() {
- Iri graphUri = new Iri("http://example.org/custom");
+ IRI graphUri = new IRI("http://example.org/custom");
TcManager.getInstance().getTcAccessController().setRequiredReadPermissionStrings(graphUri,
Collections.singletonList("(java.io.FilePermission \"/etc\" \"write\")"));
//new FilePermission("/etc", "write").toString()));
- Graph ag = TcManager.getInstance().getGraph(new Iri("urn:x-localinstance:/ImmutableGraph-access.ImmutableGraph"));
+ Graph ag = TcManager.getInstance().getGraph(new IRI("urn:x-localinstance:/ImmutableGraph-access.ImmutableGraph"));
System.out.print(ag.toString());
TcManager.getInstance().getMGraph(graphUri);
}
@Test(expected=AccessControlException.class)
public void testCustomPermissionsIncorrect() {
- Iri graphUri = new Iri("http://example.org/custom");
+ IRI graphUri = new IRI("http://example.org/custom");
TcManager.getInstance().getTcAccessController().setRequiredReadPermissionStrings(graphUri,
Collections.singletonList("(java.io.FilePermission \"/etc\" \"write\")"));
//new FilePermission("/etc", "write").toString()));
- Graph ag = TcManager.getInstance().getGraph(new Iri("urn:x-localinstance:/ImmutableGraph-access.ImmutableGraph"));
+ Graph ag = TcManager.getInstance().getGraph(new IRI("urn:x-localinstance:/ImmutableGraph-access.ImmutableGraph"));
System.out.print(ag.toString());
TcManager.getInstance().createGraph(graphUri);
}
@Test
public void testCustomReadWritePermissions() {
- Iri graphUri = new Iri("http://example.org/read-write-custom");
+ IRI graphUri = new IRI("http://example.org/read-write-custom");
TcManager.getInstance().getTcAccessController().setRequiredReadWritePermissionStrings(graphUri,
Collections.singletonList("(java.io.FilePermission \"/etc\" \"write\")"));
//new FilePermission("/etc", "write").toString()));
- Graph ag = TcManager.getInstance().getGraph(new Iri("urn:x-localinstance:/ImmutableGraph-access.ImmutableGraph"));
+ Graph ag = TcManager.getInstance().getGraph(new IRI("urn:x-localinstance:/ImmutableGraph-access.ImmutableGraph"));
System.out.print(ag.toString());
TcManager.getInstance().createGraph(graphUri);
}
@Test(expected=EntityAlreadyExistsException.class)
public void testCreateMGraph() {
- TcManager.getInstance().createGraph(new Iri("http://example.org/ImmutableGraph/alreadyexists"));
+ TcManager.getInstance().createGraph(new IRI("http://example.org/ImmutableGraph/alreadyexists"));
}
@Test(expected=AccessControlException.class)
public void testCreateMGraphWithoutWritePermission() {
- TcManager.getInstance().createGraph(new Iri("http://example.org/read/ImmutableGraph"));
+ TcManager.getInstance().createGraph(new IRI("http://example.org/read/ImmutableGraph"));
}
@Test(expected=ReadOnlyException.class)
public void testAddTripleToMGraph() {
- Graph graph = TcManager.getInstance().getMGraph(new Iri("http://example.org/read/ImmutableGraph"));
- Triple triple = new TripleImpl(new Iri("http://example.org/definition/isNonLiteral"), new Iri("http://example.org/definition/isTest"), new PlainLiteralImpl("test"));
+ Graph graph = TcManager.getInstance().getMGraph(new IRI("http://example.org/read/ImmutableGraph"));
+ Triple triple = new TripleImpl(new IRI("http://example.org/definition/isNonLiteral"), new IRI("http://example.org/definition/isTest"), new PlainLiteralImpl("test"));
graph.add(triple);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java
index 6e3ab07..181e36f 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java
@@ -27,7 +27,7 @@ import org.mockito.Mockito;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
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.providers.WeightedA;
import org.apache.clerezza.rdf.core.access.providers.WeightedA1;
import org.apache.clerezza.rdf.core.access.providers.WeightedAHeavy;
@@ -50,10 +50,10 @@ import static org.junit.Assert.*;
*/
public class TcManagerTest {
- public static Iri uriRefAHeavy = new Iri("http://example.org/aHeavy");
- public static Iri uriRefB = new Iri("http://example.org/b");;
- public static final Iri uriRefA = new Iri("http://example.org/a");
- public static final Iri uriRefA1 = new Iri("http://example.org/a1");
+ public static IRI uriRefAHeavy = new IRI("http://example.org/aHeavy");
+ public static IRI uriRefB = new IRI("http://example.org/b");;
+ public static final IRI uriRefA = new IRI("http://example.org/a");
+ public static final IRI uriRefA1 = new IRI("http://example.org/a1");
private TcManager graphAccess;
private QueryEngine queryEngine;
private final WeightedA weightedA = new WeightedA();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java
index 0216dd6..624a80d 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java
@@ -24,7 +24,7 @@ import java.util.Set;
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.EntityUndeletableException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
@@ -37,14 +37,14 @@ import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
* @author reto
*/
public class WeightedA implements WeightedTcProvider {
- private Set<Iri> mGraphList = new HashSet<Iri>();
+ private Set<IRI> mGraphList = new HashSet<IRI>();
@Override
public int getWeight() {
return 5;
}
@Override
- public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
+ public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
if (name.equals(TcManagerTest.uriRefA)) {
Graph mResult = new SimpleMGraph();
mResult.add(new TripleImpl(TcManagerTest.uriRefA,
@@ -56,48 +56,48 @@ public class WeightedA implements WeightedTcProvider {
}
@Override
- public Graph getMGraph(Iri name) throws NoSuchEntityException {
+ public Graph getMGraph(IRI name) throws NoSuchEntityException {
throw new NoSuchEntityException(name);
}
@Override
- public Graph getGraph(Iri name) throws NoSuchEntityException {
+ public Graph getGraph(IRI name) throws NoSuchEntityException {
return getImmutableGraph(name);
}
@Override
- public Graph createGraph(Iri name) {
+ public Graph createGraph(IRI name) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public ImmutableGraph createImmutableGraph(Iri name, Graph triples) {
+ public ImmutableGraph createImmutableGraph(IRI name, Graph triples) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public void deleteGraph(Iri name) throws NoSuchEntityException,
+ public void deleteGraph(IRI name) throws NoSuchEntityException,
EntityUndeletableException {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> getNames(ImmutableGraph ImmutableGraph) {
+ public Set<IRI> getNames(ImmutableGraph ImmutableGraph) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> listGraphs() {
+ public Set<IRI> listGraphs() {
return Collections.singleton(TcManagerTest.uriRefA);
}
@Override
- public Set<Iri> listMGraphs() {
+ public Set<IRI> listMGraphs() {
return mGraphList;
}
@Override
- public Set<Iri> listImmutableGraphs() {
+ public Set<IRI> listImmutableGraphs() {
return listGraphs();
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java
index f121cdf..9053e02 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java
@@ -24,7 +24,7 @@ import java.util.Set;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.clerezza.commons.rdf.Graph;
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.EntityUndeletableException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
@@ -38,14 +38,14 @@ import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
* @author reto
*/
public class WeightedA1 implements WeightedTcProvider {
- private Set<Iri> mGraphList = new HashSet<Iri>();
+ private Set<IRI> mGraphList = new HashSet<IRI>();
@Override
public int getWeight() {
return 5;
}
@Override
- public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
+ public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
if (name.equals(TcManagerTest.uriRefA)) {
Graph mResult = new SimpleMGraph();
mResult.add(new TripleImpl(TcManagerTest.uriRefA1,
@@ -57,48 +57,48 @@ public class WeightedA1 implements WeightedTcProvider {
}
@Override
- public Graph getMGraph(Iri name) throws NoSuchEntityException {
+ public Graph getMGraph(IRI name) throws NoSuchEntityException {
throw new NoSuchEntityException(name);
}
@Override
- public Graph getGraph(Iri name) throws NoSuchEntityException {
+ public Graph getGraph(IRI name) throws NoSuchEntityException {
return getImmutableGraph(name);
}
@Override
- public Graph createGraph(Iri name) {
+ public Graph createGraph(IRI name) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public ImmutableGraph createImmutableGraph(Iri name, Graph triples) {
+ public ImmutableGraph createImmutableGraph(IRI name, Graph triples) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public void deleteGraph(Iri name) throws NoSuchEntityException,
+ public void deleteGraph(IRI name) throws NoSuchEntityException,
EntityUndeletableException {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> getNames(ImmutableGraph ImmutableGraph) {
+ public Set<IRI> getNames(ImmutableGraph ImmutableGraph) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> listImmutableGraphs() {
+ public Set<IRI> listImmutableGraphs() {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> listMGraphs() {
+ public Set<IRI> listMGraphs() {
return mGraphList;
}
@Override
- public Set<Iri> listGraphs() {
+ public Set<IRI> listGraphs() {
return listMGraphs();
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java
index ef9497e..7674ca6 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java
@@ -25,7 +25,7 @@ import java.util.Set;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.clerezza.commons.rdf.Graph;
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.EntityUndeletableException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
@@ -46,7 +46,7 @@ public class WeightedAHeavy implements WeightedTcProvider {
}
@Override
- public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
+ public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
if (name.equals(TcManagerTest.uriRefA)) {
Graph mResult = new SimpleGraph();
mResult.add(new TripleImpl(TcManagerTest.uriRefAHeavy,
@@ -57,47 +57,47 @@ public class WeightedAHeavy implements WeightedTcProvider {
}
@Override
- public Graph getMGraph(Iri name) throws NoSuchEntityException {
+ public Graph getMGraph(IRI name) throws NoSuchEntityException {
throw new NoSuchEntityException(name);
}
@Override
- public Graph getGraph(Iri name) throws NoSuchEntityException {
+ public Graph getGraph(IRI name) throws NoSuchEntityException {
return getImmutableGraph(name);
}
@Override
- public Graph createGraph(Iri name) {
+ public Graph createGraph(IRI name) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public ImmutableGraph createImmutableGraph(Iri name, Graph triples) {
+ public ImmutableGraph createImmutableGraph(IRI name, Graph triples) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public void deleteGraph(Iri name) throws NoSuchEntityException,
+ public void deleteGraph(IRI name) throws NoSuchEntityException,
EntityUndeletableException {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> getNames(ImmutableGraph ImmutableGraph) {
+ public Set<IRI> getNames(ImmutableGraph ImmutableGraph) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> listGraphs() {
+ public Set<IRI> listGraphs() {
return Collections.singleton(TcManagerTest.uriRefA);
}
@Override
- public Set<Iri> listMGraphs() {
- return new HashSet<Iri>();
+ public Set<IRI> listMGraphs() {
+ return new HashSet<IRI>();
}
@Override
- public Set<Iri> listImmutableGraphs() {
+ public Set<IRI> listImmutableGraphs() {
return listGraphs();
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java
index d528fbd..68ad4cf 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java
@@ -24,7 +24,7 @@ import java.util.Set;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.clerezza.commons.rdf.Graph;
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.EntityUndeletableException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
@@ -44,7 +44,7 @@ public class WeightedBlight implements WeightedTcProvider {
}
@Override
- public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
+ public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
if (name.equals(TcManagerTest.uriRefB)) {
Graph mResult = new SimpleMGraph();
mResult.add(new TripleImpl(TcManagerTest.uriRefB, TcManagerTest.uriRefB, TcManagerTest.uriRefB));
@@ -59,48 +59,48 @@ public class WeightedBlight implements WeightedTcProvider {
}
@Override
- public Graph getMGraph(Iri name) throws NoSuchEntityException {
+ public Graph getMGraph(IRI name) throws NoSuchEntityException {
throw new NoSuchEntityException(name);
}
@Override
- public Graph getGraph(Iri name) throws NoSuchEntityException {
+ public Graph getGraph(IRI name) throws NoSuchEntityException {
return getImmutableGraph(name);
}
@Override
- public Graph createGraph(Iri name) {
+ public Graph createGraph(IRI name) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public ImmutableGraph createImmutableGraph(Iri name, Graph triples) {
+ public ImmutableGraph createImmutableGraph(IRI name, Graph triples) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public void deleteGraph(Iri name) throws NoSuchEntityException,
+ public void deleteGraph(IRI name) throws NoSuchEntityException,
EntityUndeletableException {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> getNames(ImmutableGraph ImmutableGraph) {
+ public Set<IRI> getNames(ImmutableGraph ImmutableGraph) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> listImmutableGraphs() {
+ public Set<IRI> listImmutableGraphs() {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> listMGraphs() {
- return new HashSet<Iri>();
+ public Set<IRI> listMGraphs() {
+ return new HashSet<IRI>();
}
@Override
- public Set<Iri> listGraphs() {
+ public Set<IRI> listGraphs() {
return listMGraphs();
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java
index 64c164d..5d616fb 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java
@@ -26,7 +26,7 @@ import java.util.Set;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.clerezza.commons.rdf.Graph;
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;
@@ -40,10 +40,10 @@ import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleMGraph;
*/
public class WeightedDummy implements WeightedTcProvider {
- private Map<Iri, Graph> tripleMap = new HashMap<Iri, Graph>();
+ private Map<IRI, Graph> tripleMap = new HashMap<IRI, Graph>();
@Override
- public ImmutableGraph createImmutableGraph(Iri name, Graph triples)
+ public ImmutableGraph createImmutableGraph(IRI name, Graph triples)
throws EntityAlreadyExistsException {
if ((name == null) || (name.getUnicodeString() == null)
|| (name.getUnicodeString().trim().length() == 0)) {
@@ -69,7 +69,7 @@ public class WeightedDummy implements WeightedTcProvider {
}
@Override
- public Graph createGraph(Iri name) throws EntityAlreadyExistsException {
+ public Graph createGraph(IRI name) throws EntityAlreadyExistsException {
if ((name == null) || (name.getUnicodeString() == null)
|| (name.getUnicodeString().trim().length() == 0)) {
throw new IllegalArgumentException("Name must not be null");
@@ -88,7 +88,7 @@ public class WeightedDummy implements WeightedTcProvider {
}
@Override
- public void deleteGraph(Iri name)
+ public void deleteGraph(IRI name)
throws NoSuchEntityException, EntityUndeletableException {
if (tripleMap.remove(name) == null) {
throw new NoSuchEntityException(name);
@@ -96,7 +96,7 @@ public class WeightedDummy implements WeightedTcProvider {
}
@Override
- public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
+ public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
Graph Graph = tripleMap.get(name);
if (Graph == null) {
throw new NoSuchEntityException(name);
@@ -107,7 +107,7 @@ public class WeightedDummy implements WeightedTcProvider {
}
@Override
- public Graph getMGraph(Iri name) throws NoSuchEntityException {
+ public Graph getMGraph(IRI name) throws NoSuchEntityException {
Graph Graph = tripleMap.get(name);
if (Graph == null) {
throw new NoSuchEntityException(name);
@@ -118,13 +118,13 @@ public class WeightedDummy implements WeightedTcProvider {
}
@Override
- public Set<Iri> getNames(ImmutableGraph ImmutableGraph) {
+ public Set<IRI> getNames(ImmutableGraph ImmutableGraph) {
throw new UnsupportedOperationException(
"Not supported yet. equals() has to be implemented first");
}
@Override
- public Graph getGraph(Iri name)
+ public Graph getGraph(IRI name)
throws NoSuchEntityException {
Graph Graph = tripleMap.get(name);
if (Graph == null) {
@@ -140,17 +140,17 @@ public class WeightedDummy implements WeightedTcProvider {
}
@Override
- public Set<Iri> listImmutableGraphs() {
+ public Set<IRI> listImmutableGraphs() {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> listMGraphs() {
- return new HashSet<Iri>();
+ public Set<IRI> listMGraphs() {
+ return new HashSet<IRI>();
}
@Override
- public Set<Iri> listGraphs() {
+ public Set<IRI> listGraphs() {
return listMGraphs();
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactoryTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactoryTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactoryTest.java
index 36d3584..e8b16b8 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactoryTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactoryTest.java
@@ -21,7 +21,7 @@ package org.apache.clerezza.rdf.core.impl.util;
import junit.framework.Assert;
import org.apache.clerezza.rdf.core.impl.util.SimpleLiteralFactory;
import org.apache.clerezza.commons.rdf.Literal;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.junit.Test;
/**
@@ -30,12 +30,12 @@ import org.junit.Test;
*/
public class SimpleLiteralFactoryTest {
- final private static Iri xsdInteger =
- new Iri("http://www.w3.org/2001/XMLSchema#integer");
- final private static Iri xsdInt =
- new Iri("http://www.w3.org/2001/XMLSchema#int");
- final private static Iri xsdLong =
- new Iri("http://www.w3.org/2001/XMLSchema#long");
+ final private static IRI xsdInteger =
+ new IRI("http://www.w3.org/2001/XMLSchema#integer");
+ final private static IRI xsdInt =
+ new IRI("http://www.w3.org/2001/XMLSchema#int");
+ final private static IRI xsdLong =
+ new IRI("http://www.w3.org/2001/XMLSchema#long");
SimpleLiteralFactory simpleLiteralFactory = new SimpleLiteralFactory();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/ParserTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/ParserTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/ParserTest.java
index 2919ba4..2745026 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/ParserTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/ParserTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core.serializedform;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.commons.rdf.Graph;
import java.io.InputStream;
import junit.framework.Assert;
@@ -74,7 +74,7 @@ public class ParserTest {
static class ParsingProviderA implements ParsingProvider {
@Override
- public void parse(Graph target, InputStream serializedGraph, String formatIdentifier, Iri baseUri) {
+ public void parse(Graph target, InputStream serializedGraph, String formatIdentifier, IRI baseUri) {
providerAInvoked = true;
}
};
@@ -82,7 +82,7 @@ public class ParserTest {
static class ParsingProviderB implements ParsingProvider {
@Override
- public void parse(Graph target, InputStream serializedGraph, String formatIdentifier, Iri baseUri) {
+ public void parse(Graph target, InputStream serializedGraph, String formatIdentifier, IRI baseUri) {
providerBInvoked = true;
}
};
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/TestServiceManagedProvider.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/TestServiceManagedProvider.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/TestServiceManagedProvider.java
index 6bf5c91..7e7adb7 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/TestServiceManagedProvider.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/TestServiceManagedProvider.java
@@ -22,7 +22,7 @@ import java.io.InputStream;
import org.apache.clerezza.commons.rdf.Graph;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
/**
* This class is listed in
@@ -36,7 +36,7 @@ public class TestServiceManagedProvider implements ParsingProvider {
private static boolean parseInvoked;
@Override
- public void parse(Graph target, InputStream serializedGraph, String formatIdentifier, Iri baseUri) {
+ public void parse(Graph target, InputStream serializedGraph, String formatIdentifier, IRI baseUri) {
parseInvoked = true;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QueryParserTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QueryParserTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QueryParserTest.java
index 69f33bc..f39e338 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QueryParserTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QueryParserTest.java
@@ -24,7 +24,7 @@ import java.util.Set;
import org.junit.Assert;
import org.junit.Test;
import org.apache.clerezza.commons.rdf.Language;
-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.rdf.core.sparql.query.AskQuery;
import org.apache.clerezza.rdf.core.sparql.query.BasicGraphPattern;
@@ -75,7 +75,7 @@ public class QueryParserTest {
Assert.assertTrue(selectQuery.getSelection().get(0)
.equals(new Variable(variable)));
Assert.assertTrue(selectQuery.getDataSet().getDefaultGraphs().toArray()[0]
- .equals(new Iri(defaultGraph)));
+ .equals(new IRI(defaultGraph)));
GraphPattern gp = (GraphPattern) selectQuery.getQueryPattern()
.getGraphPatterns().toArray()[0];
@@ -85,8 +85,8 @@ public class QueryParserTest {
Set<TriplePattern> triplePatterns = bgp.getTriplePatterns();
Assert.assertTrue(triplePatterns.size()==1);
- ResourceOrVariable s = new ResourceOrVariable(new Iri(subject));
- UriRefOrVariable p = new UriRefOrVariable(new Iri(predicate));
+ ResourceOrVariable s = new ResourceOrVariable(new IRI(subject));
+ UriRefOrVariable p = new UriRefOrVariable(new IRI(predicate));
ResourceOrVariable o = new ResourceOrVariable(new Variable(variable));
Assert.assertTrue(triplePatterns.contains(
@@ -187,8 +187,8 @@ public class QueryParserTest {
.getConstructTemplate();
Assert.assertTrue(triplePatterns.size()==1);
- ResourceOrVariable s = new ResourceOrVariable(new Iri(subject1));
- UriRefOrVariable p = new UriRefOrVariable(new Iri(predicate1));
+ ResourceOrVariable s = new ResourceOrVariable(new IRI(subject1));
+ UriRefOrVariable p = new UriRefOrVariable(new IRI(predicate1));
ResourceOrVariable o = new ResourceOrVariable(new Variable(variable1));
Assert.assertTrue(triplePatterns.contains(
@@ -202,7 +202,7 @@ public class QueryParserTest {
Assert.assertTrue(triplePatterns.size()==1);
s = new ResourceOrVariable(new Variable(variable2));
- p = new UriRefOrVariable(new Iri(predicate2));
+ p = new UriRefOrVariable(new IRI(predicate2));
Assert.assertTrue(triplePatterns.contains(
new SimpleTriplePattern(s, p, o)));
@@ -222,7 +222,7 @@ public class QueryParserTest {
Assert.assertTrue(DescribeQuery.class.isAssignableFrom(q.getClass()));
DescribeQuery describeQuery = (DescribeQuery) q;
Assert.assertTrue(describeQuery.getResourcesToDescribe().get(0)
- .getResource().equals(new Iri(resource)));
+ .getResource().equals(new IRI(resource)));
}
@Test
@@ -251,7 +251,7 @@ public class QueryParserTest {
Assert.assertTrue(triplePatterns.size()==1);
Assert.assertTrue(triplePatterns.contains(new SimpleTriplePattern(new Variable(variable),
- new Iri(predicate), new PlainLiteralImpl(object))));
+ new IRI(predicate), new PlainLiteralImpl(object))));
}
@Test
@@ -292,8 +292,8 @@ public class QueryParserTest {
Set<TriplePattern> triplePatterns = bgp.getTriplePatterns();
Assert.assertTrue(triplePatterns.size()==1);
- ResourceOrVariable s = new ResourceOrVariable(new Iri(base+subject));
- UriRefOrVariable p = new UriRefOrVariable(new Iri(prefixUri+predicate));
+ ResourceOrVariable s = new ResourceOrVariable(new IRI(base+subject));
+ UriRefOrVariable p = new UriRefOrVariable(new IRI(prefixUri+predicate));
ResourceOrVariable o = new ResourceOrVariable(new Variable(variable));
Assert.assertTrue(triplePatterns.contains(
@@ -367,7 +367,7 @@ public class QueryParserTest {
Set<TriplePattern> triplePatterns = bgp.getTriplePatterns();
Assert.assertTrue(triplePatterns.size() == 1);
- Assert.assertTrue(triplePatterns.contains(new SimpleTriplePattern(var1, new Iri(prefix1Uri + predicate1),
+ Assert.assertTrue(triplePatterns.contains(new SimpleTriplePattern(var1, new IRI(prefix1Uri + predicate1),
var2)));
GraphPattern gp2 = (GraphPattern) ogp.getOptionalGraphPattern()
@@ -377,7 +377,7 @@ public class QueryParserTest {
triplePatterns = bgp.getTriplePatterns();
Assert.assertTrue(triplePatterns.size() == 1);
- Assert.assertTrue(triplePatterns.contains(new SimpleTriplePattern(var1, new Iri(prefix2Uri + predicate2),
+ Assert.assertTrue(triplePatterns.contains(new SimpleTriplePattern(var1, new IRI(prefix2Uri + predicate2),
var3)));
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QuerySerializerTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QuerySerializerTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QuerySerializerTest.java
index f463ed8..eccf13f 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QuerySerializerTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QuerySerializerTest.java
@@ -23,7 +23,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.apache.clerezza.rdf.core.LiteralFactory;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.query.BinaryOperation;
import org.apache.clerezza.rdf.core.sparql.query.BuiltInCall;
import org.apache.clerezza.rdf.core.sparql.query.Expression;
@@ -62,12 +62,12 @@ public class QuerySerializerTest {
SimpleSelectQuery selectQuery = new SimpleSelectQuery();
Variable variable = new Variable("title");
selectQuery.addSelection(variable);
- Iri defaultGraph = new Iri("http://example.org/library");
+ IRI defaultGraph = new IRI("http://example.org/library");
selectQuery.addDefaultGraph(defaultGraph);
ResourceOrVariable subject = new ResourceOrVariable(
- new Iri("http://example.org/book/book1"));
+ new IRI("http://example.org/book/book1"));
UriRefOrVariable predicate = new UriRefOrVariable(
- new Iri("http://purl.org/dc/elements/1.1/title"));
+ new IRI("http://purl.org/dc/elements/1.1/title"));
ResourceOrVariable object = new ResourceOrVariable(variable);
TriplePattern triplePattern = new SimpleTriplePattern(subject, predicate, object);
Set<TriplePattern> triplePatterns = new HashSet<TriplePattern>();
@@ -90,16 +90,16 @@ public class QuerySerializerTest {
"WHERE { ?x <http://xmlns.com/foaf/0.1/name> ?name . }";
ResourceOrVariable s = new ResourceOrVariable(
- new Iri("http://example.org/person#Alice"));
+ new IRI("http://example.org/person#Alice"));
UriRefOrVariable p = new UriRefOrVariable(
- new Iri("http://www.w3.org/2001/vcard-rdf/3.0#FN"));
+ new IRI("http://www.w3.org/2001/vcard-rdf/3.0#FN"));
ResourceOrVariable o = new ResourceOrVariable(new Variable("name"));
Set<TriplePattern> constructTriplePatterns = new HashSet<TriplePattern>();
constructTriplePatterns.add(new SimpleTriplePattern(s, p, o));
SimpleConstructQuery constructQuery = new SimpleConstructQuery(constructTriplePatterns);
s = new ResourceOrVariable(new Variable("x"));
- p = new UriRefOrVariable(new Iri("http://xmlns.com/foaf/0.1/name"));
+ p = new UriRefOrVariable(new IRI("http://xmlns.com/foaf/0.1/name"));
Set<TriplePattern> triplePatterns = new HashSet<TriplePattern>();
triplePatterns.add(new SimpleTriplePattern(s, p, o));
@@ -119,7 +119,7 @@ public class QuerySerializerTest {
SimpleDescribeQuery describeQuery = new SimpleDescribeQuery();
describeQuery.addResourceToDescribe(new ResourceOrVariable(
- new Iri("http://example.org/book/book1")));
+ new IRI("http://example.org/book/book1")));
Assert.assertTrue(describeQuery.toString()
.replaceAll("( |\n)+", " ").trim().equals(queryString));
@@ -133,7 +133,7 @@ public class QuerySerializerTest {
ResourceOrVariable s = new ResourceOrVariable(new Variable("x"));
UriRefOrVariable p = new UriRefOrVariable(
- new Iri("http://xmlns.com/foaf/0.1/name"));
+ new IRI("http://xmlns.com/foaf/0.1/name"));
ResourceOrVariable o = new ResourceOrVariable(
LiteralFactory.getInstance().createTypedLiteral("Alice"));
@@ -173,9 +173,9 @@ public class QuerySerializerTest {
Variable x = new Variable("x");
Set<TriplePattern> triplePatterns = new HashSet<TriplePattern>();
triplePatterns.add(new SimpleTriplePattern(x,
- new Iri("http://example.org/ns#price"), price));
+ new IRI("http://example.org/ns#price"), price));
triplePatterns.add(new SimpleTriplePattern(x,
- new Iri("http://purl.org/dc/elements/1.1/title"), title));
+ new IRI("http://purl.org/dc/elements/1.1/title"), title));
SimpleBasicGraphPattern bgp = new SimpleBasicGraphPattern(triplePatterns);
SimpleGroupGraphPattern queryPattern = new SimpleGroupGraphPattern();
@@ -204,13 +204,13 @@ public class QuerySerializerTest {
Variable myType = new Variable("myType");
Set<TriplePattern> triplePatterns = new HashSet<TriplePattern>();
triplePatterns.add(new SimpleTriplePattern(resource,
- new Iri("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"), myType));
+ new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"), myType));
SimpleBasicGraphPattern bgp = new SimpleBasicGraphPattern(triplePatterns);
SimpleGroupGraphPattern queryPattern = new SimpleGroupGraphPattern();
queryPattern.addGraphPattern(bgp);
BinaryOperation constraint = new BinaryOperation("=",
- resource, new UriRefExpression(new Iri("http://example.org/ontology#special")));
+ resource, new UriRefExpression(new IRI("http://example.org/ontology#special")));
queryPattern.addConstraint(constraint);
selectQuery.setQueryPattern(queryPattern);
@@ -261,13 +261,13 @@ public class QuerySerializerTest {
Variable x = new Variable("x");
Set<TriplePattern> triplePatterns = new HashSet<TriplePattern>();
triplePatterns.add(new SimpleTriplePattern(x,
- new Iri("http://purl.org/dc/elements/1.1/title"), title));
+ new IRI("http://purl.org/dc/elements/1.1/title"), title));
SimpleBasicGraphPattern bgp = new SimpleBasicGraphPattern(triplePatterns);
Set<TriplePattern> triplePatternsOpt = new HashSet<TriplePattern>();
triplePatternsOpt.add(new SimpleTriplePattern(x,
- new Iri("http://example.org/ns#price"), price));
+ new IRI("http://example.org/ns#price"), price));
SimpleBasicGraphPattern bgpOpt =
new SimpleBasicGraphPattern(triplePatternsOpt);
@@ -299,7 +299,7 @@ public class QuerySerializerTest {
Variable x = new Variable("x");
Set<TriplePattern> triplePatterns = new HashSet<TriplePattern>();
triplePatterns.add(new SimpleTriplePattern(
- new Iri("http://localhost/testitem"), p, x));
+ new IRI("http://localhost/testitem"), p, x));
SimpleBasicGraphPattern bgp = new SimpleBasicGraphPattern(triplePatterns);
SimpleGroupGraphPattern queryPattern = new SimpleGroupGraphPattern();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParserTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParserTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParserTest.java
index 8472dc6..a261e09 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParserTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParserTest.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.rdf.core.sparql;
import java.util.HashSet;
import java.util.Set;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.junit.Assert;
import org.junit.Test;
@@ -31,14 +31,14 @@ import org.junit.Test;
*/
public class SparqlPreParserTest {
- private final static Iri DEFAULT_GRAPH = new Iri("http://example.org/default.graph");
- private final static Iri NAMED_GRAPH = new Iri("http://example.org/dummy.graph");
- private final static Iri TEST_GRAPH = new Iri("http://example.org/test.graph");
+ private final static IRI DEFAULT_GRAPH = new IRI("http://example.org/default.graph");
+ private final static IRI NAMED_GRAPH = new IRI("http://example.org/dummy.graph");
+ private final static IRI TEST_GRAPH = new IRI("http://example.org/test.graph");
class MyTcManager extends TcManager {
@Override
- public Set<Iri> listGraphs() {
- Set<Iri> result = new HashSet<Iri>();
+ public Set<IRI> listGraphs() {
+ Set<IRI> result = new HashSet<IRI>();
result.add(NAMED_GRAPH);
return result;
}
@@ -57,7 +57,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStrBuilder.toString(), DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStrBuilder.toString(), DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@@ -69,7 +69,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStrBuilder.toString(), DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStrBuilder.toString(), DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs == null);
}
@@ -87,7 +87,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStrBuilder.toString(), DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStrBuilder.toString(), DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
}
@@ -98,7 +98,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@@ -109,7 +109,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@@ -120,7 +120,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
}
@@ -131,7 +131,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@@ -142,7 +142,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(new MyTcManager());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(NAMED_GRAPH));
}
@@ -153,7 +153,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
}
@@ -164,7 +164,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@@ -175,7 +175,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(new MyTcManager());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(NAMED_GRAPH));
}
@@ -186,7 +186,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
}
@@ -197,7 +197,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
}
@@ -208,8 +208,8 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
- Set<Iri> expected = new HashSet<Iri>();
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> expected = new HashSet<IRI>();
expected.add(DEFAULT_GRAPH);
expected.add(TEST_GRAPH);
Assert.assertTrue(referredGraphs.containsAll(expected));
@@ -222,8 +222,8 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
- Set<Iri> expected = new HashSet<Iri>();
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> expected = new HashSet<IRI>();
expected.add(DEFAULT_GRAPH);
expected.add(TEST_GRAPH);
Assert.assertTrue(referredGraphs.containsAll(expected));
@@ -236,8 +236,8 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
- Set<Iri> expected = new HashSet<Iri>();
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> expected = new HashSet<IRI>();
expected.add(DEFAULT_GRAPH);
expected.add(TEST_GRAPH);
Assert.assertTrue(referredGraphs.containsAll(expected));
@@ -250,8 +250,8 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
- Set<Iri> expected = new HashSet<Iri>();
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> expected = new HashSet<IRI>();
expected.add(DEFAULT_GRAPH);
expected.add(TEST_GRAPH);
Assert.assertTrue(referredGraphs.containsAll(expected));
@@ -264,8 +264,8 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
- Set<Iri> expected = new HashSet<Iri>();
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> expected = new HashSet<IRI>();
expected.add(DEFAULT_GRAPH);
expected.add(TEST_GRAPH);
Assert.assertTrue(referredGraphs.containsAll(expected));
@@ -278,8 +278,8 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
- Set<Iri> expected = new HashSet<Iri>();
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> expected = new HashSet<IRI>();
expected.add(DEFAULT_GRAPH);
expected.add(TEST_GRAPH);
Assert.assertTrue(referredGraphs.containsAll(expected));
@@ -293,7 +293,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@@ -304,7 +304,7 @@ public class SparqlPreParserTest {
"INSERT DATA { GRAPH " + TEST_GRAPH.toString() + " { <http://example/book1> ns:price 42 } }";
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
}
@@ -316,7 +316,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@@ -327,7 +327,7 @@ public class SparqlPreParserTest {
"DELETE DATA { GRAPH " + TEST_GRAPH.toString() + " { <http://example/book1> ns:price 42 } }";
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
}
@@ -339,9 +339,9 @@ public class SparqlPreParserTest {
"DELETE DATA { GRAPH " + TEST_GRAPH.toString() + " { <http://example/book1> ns:price 42 } }";
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
- Set<Iri> expected = new HashSet<Iri>();
+ Set<IRI> expected = new HashSet<IRI>();
expected.add(DEFAULT_GRAPH);
expected.add(TEST_GRAPH);
Assert.assertTrue(referredGraphs.containsAll(expected));
@@ -355,7 +355,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@@ -369,11 +369,11 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
- Set<Iri> expected = new HashSet<Iri>();
- expected.add(new Iri("http://example.com/names"));
- expected.add(new Iri("http://example.com/addresses"));
+ Set<IRI> expected = new HashSet<IRI>();
+ expected.add(new IRI("http://example.com/names"));
+ expected.add(new IRI("http://example.com/addresses"));
Assert.assertTrue(referredGraphs.containsAll(expected));
}
@@ -385,7 +385,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
}
@@ -397,7 +397,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@@ -410,11 +410,11 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
- Set<Iri> expected = new HashSet<Iri>();
- expected.add(new Iri("http://example/bookStore2"));
- expected.add(new Iri("http://example/bookStore"));
+ Set<IRI> expected = new HashSet<IRI>();
+ expected.add(new IRI("http://example/bookStore2"));
+ expected.add(new IRI("http://example/bookStore"));
Assert.assertTrue(referredGraphs.containsAll(expected));
}
@@ -444,11 +444,11 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
- Set<Iri> expected = new HashSet<Iri>();
- expected.add(new Iri("http://example/bookStore2"));
- expected.add(new Iri("http://example/bookStore"));
+ Set<IRI> expected = new HashSet<IRI>();
+ expected.add(new IRI("http://example/bookStore2"));
+ expected.add(new IRI("http://example/bookStore"));
Assert.assertTrue(referredGraphs.containsAll(expected));
}
@@ -465,7 +465,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@@ -482,7 +482,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java
----------------------------------------------------------------------
diff --git a/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java b/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java
index 388bbdb..a1cec37 100644
--- a/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java
+++ b/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java
@@ -30,10 +30,10 @@ import java.util.Collection;
import java.util.Iterator;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
-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.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
@@ -49,7 +49,7 @@ public class FileGraph extends SimpleGraph {
private File file;
private String fileType;
- FileGraph(Iri uri, Parser parser,
+ FileGraph(IRI uri, Parser parser,
Serializer serializer) {
this(new File(URI.create(uri.getUnicodeString())), parser, serializer);
}
@@ -121,9 +121,9 @@ public class FileGraph extends SimpleGraph {
}
@Override
- public Iterator<Triple> filter(final BlankNodeOrIri subject,
- final Iri predicate,
- final RdfTerm object) {
+ public Iterator<Triple> filter(final BlankNodeOrIRI subject,
+ final IRI predicate,
+ final RDFTerm object) {
final Iterator<Triple> baseIter = super.filter(subject, predicate, object);
Iterator<Triple> iterator = new Iterator<Triple>() {
[6/9] clerezza git commit: CLEREZZA-983: Adapted to new casing of
rdf-core (part 1)
Posted by re...@apache.org.
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderingExceptionMapper.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderingExceptionMapper.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderingExceptionMapper.java
index 4dcee16..d60d9af 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderingExceptionMapper.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderingExceptionMapper.java
@@ -29,7 +29,7 @@ import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.clerezza.platform.typerendering.ontologies.TYPERENDERING;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
@@ -79,9 +79,8 @@ public class TypeRenderingExceptionMapper implements ExceptionMapper<TypeRenderi
*/
protected void activate(ComponentContext componentContext) throws Exception {
URL template = getClass().getResource("exception-template.ssp");
- renderletManager.registerRenderlet(
- "org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesRenderlet",
- new Iri(template.toURI().toString()),
+ renderletManager.registerRenderlet("org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesRenderlet",
+ new IRI(template.toURI().toString()),
TYPERENDERING.Exception, ".*",
MediaType.APPLICATION_XHTML_XML_TYPE, true);
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderlet.java
----------------------------------------------------------------------
diff --git a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderlet.java b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderlet.java
index ecbaae5..851d725 100644
--- a/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderlet.java
+++ b/platform/typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderlet.java
@@ -25,7 +25,7 @@ import java.security.PrivilegedAction;
import java.util.Map;
import javax.ws.rs.core.*;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -126,7 +126,7 @@ public interface TypeRenderlet {
/**
* @return the rdf type rendered by this renderlet
*/
- Iri getRdfType();
+ IRI getRdfType();
/**
* The renderer may render resources in different modes. Such a mode is
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
----------------------------------------------------------------------
diff --git a/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java b/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
index 6cc9691..41bb488 100644
--- a/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
+++ b/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
@@ -22,7 +22,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
import org.apache.clerezza.rdf.utils.GraphNode;
/**
@@ -57,15 +57,15 @@ public interface UserManager {
/**
*
* @param title
- * @return BlankNodeOrIri which is either a BlankNode or a Iri
+ * @return BlankNodeOrIRI which is either a BlankNode or a Iri
*/
- public BlankNodeOrIri getRoleByTitle(String title);
+ public BlankNodeOrIRI getRoleByTitle(String title);
/**
*
* @return Iterator defining all roles, except base roles
*/
- public Iterator<BlankNodeOrIri> getRoles();
+ public Iterator<BlankNodeOrIRI> getRoles();
/**
*
@@ -74,7 +74,7 @@ public interface UserManager {
*
* @return Iterator defining all the Roles the specified user owns
*/
- public Iterator<BlankNodeOrIri> getRolesOfUser(BlankNodeOrIri user);
+ public Iterator<BlankNodeOrIRI> getRolesOfUser(BlankNodeOrIRI user);
/**
*
@@ -99,7 +99,7 @@ public interface UserManager {
*
* @return Iterator defining all permissions of a role
*/
- public Iterator<BlankNodeOrIri> getPermissionsOfRole(BlankNodeOrIri role);
+ public Iterator<BlankNodeOrIRI> getPermissionsOfRole(BlankNodeOrIRI role);
/**
* Deletes the defined permissions of the role
@@ -171,10 +171,10 @@ public interface UserManager {
/**
*
* @param name specifies the username of the user
- * @return BlankNodeOrIri representing the user in the system ImmutableGraph
+ * @return BlankNodeOrIRI representing the user in the system ImmutableGraph
*/
@Deprecated
- public BlankNodeOrIri getUserByName(String name);
+ public BlankNodeOrIRI getUserByName(String name);
/**
* Returns the user with the specified name in an (editable) Graph
@@ -216,7 +216,7 @@ public interface UserManager {
*
* @return Iterator of users in the system ImmutableGraph.
*/
- public Iterator<BlankNodeOrIri> getUsers();
+ public Iterator<BlankNodeOrIRI> getUsers();
/**
*
@@ -237,7 +237,7 @@ public interface UserManager {
* the user is either a BlankNode or a Iri
* @return Iterator defining all permissions of the specified user
*/
- public Iterator<BlankNodeOrIri> getPermissionsOfUser(BlankNodeOrIri user);
+ public Iterator<BlankNodeOrIRI> getPermissionsOfUser(BlankNodeOrIRI user);
/**
*
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
----------------------------------------------------------------------
diff --git a/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java b/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
index 847de60..ce712f3 100644
--- a/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
+++ b/platform/usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
@@ -40,10 +40,10 @@ import org.slf4j.LoggerFactory;
import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
import org.apache.clerezza.commons.rdf.BlankNode;
import org.apache.clerezza.commons.rdf.Graph;
-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.core.access.SecuredGraph;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
@@ -103,14 +103,14 @@ public class UserManagerImpl implements UserManager {
}
@Override
- public BlankNodeOrIri getRoleByTitle(String title) {
+ public BlankNodeOrIRI getRoleByTitle(String title) {
Graph systemGraph = getSystemGraph();
Lock readLock = systemGraph.getLock().readLock();
readLock.lock();
try {
Iterator<Triple> triples = systemGraph.filter(null, DC.title,
new PlainLiteralImpl(title));
- BlankNodeOrIri role = null;
+ BlankNodeOrIRI role = null;
while (triples.hasNext()) {
role = triples.next().getSubject();
if (systemGraph.filter(role, RDF.type, PERMISSION.Role).hasNext()) {
@@ -129,18 +129,18 @@ public class UserManagerImpl implements UserManager {
}
@Override
- public Iterator<BlankNodeOrIri> getRoles() {
+ public Iterator<BlankNodeOrIRI> getRoles() {
Graph systemGraph = getSystemGraph();
Lock readLock = systemGraph.getLock().readLock();
readLock.lock();
try {
- final Iterator<BlankNodeOrIri> allRolesIter = getResourcesOfType(PERMISSION.Role);
- final Set<BlankNodeOrIri> allRolesSet = new HashSet<BlankNodeOrIri>();
+ final Iterator<BlankNodeOrIRI> allRolesIter = getResourcesOfType(PERMISSION.Role);
+ final Set<BlankNodeOrIRI> allRolesSet = new HashSet<BlankNodeOrIRI>();
while (allRolesIter.hasNext()) {
allRolesSet.add(allRolesIter.next());
}
- final Set<BlankNodeOrIri> nonBaseRolesSet = new HashSet<BlankNodeOrIri>();
- for (BlankNodeOrIri role : allRolesSet) {
+ final Set<BlankNodeOrIRI> nonBaseRolesSet = new HashSet<BlankNodeOrIRI>();
+ for (BlankNodeOrIRI role : allRolesSet) {
if (!systemGraph.filter(role, RDF.type, PERMISSION.BaseRole).hasNext()) {
nonBaseRolesSet.add(role);
}
@@ -152,15 +152,15 @@ public class UserManagerImpl implements UserManager {
}
@Override
- public Iterator<BlankNodeOrIri> getRolesOfUser(BlankNodeOrIri user){
+ public Iterator<BlankNodeOrIRI> getRolesOfUser(BlankNodeOrIRI user){
Graph systemGraph = getSystemGraph();
Lock readLock = systemGraph.getLock().readLock();
readLock.lock();
try {
final Iterator<Triple> triples = systemGraph.filter(user,SIOC.has_function, null);
- Set<BlankNodeOrIri> userRoles = new HashSet<BlankNodeOrIri>();
+ Set<BlankNodeOrIRI> userRoles = new HashSet<BlankNodeOrIRI>();
while (triples.hasNext()) {
- userRoles.add((BlankNodeOrIri) triples.next().getObject());
+ userRoles.add((BlankNodeOrIRI) triples.next().getObject());
}
return userRoles.iterator();
} finally {
@@ -174,7 +174,7 @@ public class UserManagerImpl implements UserManager {
return;
}
- BlankNodeOrIri role = getRoleByTitle(title);
+ BlankNodeOrIRI role = getRoleByTitle(title);
if (role == null) {
return;
}
@@ -184,7 +184,7 @@ public class UserManagerImpl implements UserManager {
deleteTriplesOfASubject(role);
}
- private boolean isBaseRole(BlankNodeOrIri role) {
+ private boolean isBaseRole(BlankNodeOrIRI role) {
Graph systemGraph = getSystemGraph();
GraphNode roleNode = new GraphNode(role, systemGraph);
Lock readLock = roleNode.readLock();
@@ -197,7 +197,7 @@ public class UserManagerImpl implements UserManager {
}
- private void deleteTriplesOfASubject(BlankNodeOrIri subject) {
+ private void deleteTriplesOfASubject(BlankNodeOrIRI subject) {
Graph systemGraph = getSystemGraph();
Lock writeLock = systemGraph.getLock().writeLock();
writeLock.lock();
@@ -225,7 +225,7 @@ public class UserManagerImpl implements UserManager {
permissionEntries);
}
- private void addPermissionEntriesForARole(BlankNodeOrIri role,
+ private void addPermissionEntriesForARole(BlankNodeOrIRI role,
String id, List<String> permissionEntries) {
AccessController.checkPermission(new SecurityPermission("getPolicy"));
if (role == null) {
@@ -261,7 +261,7 @@ public class UserManagerImpl implements UserManager {
* @param permissionString the specified java permission entry
* @return permission node
*/
- private BlankNodeOrIri getPermissionOfAJavaPermEntry(
+ private BlankNodeOrIRI getPermissionOfAJavaPermEntry(
String permissionString) {
Graph systemGraph = getSystemGraph();
Literal javaPermEntry = new PlainLiteralImpl(permissionString);
@@ -290,16 +290,16 @@ public class UserManagerImpl implements UserManager {
}
@Override
- public Iterator<BlankNodeOrIri> getPermissionsOfRole(BlankNodeOrIri role) {
+ public Iterator<BlankNodeOrIRI> getPermissionsOfRole(BlankNodeOrIRI role) {
Graph systemGraph = getSystemGraph();
Lock readLock = systemGraph.getLock().readLock();
readLock.lock();
try {
final Iterator<Triple> triples = systemGraph.filter(role,
PERMISSION.hasPermission, null);
- Set<BlankNodeOrIri> permissions = new HashSet<BlankNodeOrIri>();
+ Set<BlankNodeOrIRI> permissions = new HashSet<BlankNodeOrIRI>();
while (triples.hasNext()) {
- permissions.add((BlankNodeOrIri) triples.next().getObject());
+ permissions.add((BlankNodeOrIRI) triples.next().getObject());
}
return permissions.iterator();
} finally {
@@ -320,7 +320,7 @@ public class UserManagerImpl implements UserManager {
permissionEntries);
}
- private void deletePermissionEntriesOfARole(BlankNodeOrIri role,
+ private void deletePermissionEntriesOfARole(BlankNodeOrIRI role,
String id, List<String> permissionEntries) {
AccessController.checkPermission(new SecurityPermission("getPolicy"));
if (role == null) {
@@ -335,7 +335,7 @@ public class UserManagerImpl implements UserManager {
writeLock.lock();
try {
for (String permissionEntry : permissionEntries) {
- BlankNodeOrIri permission = getPermissionOfAJavaPermEntry(permissionEntry);
+ BlankNodeOrIRI permission = getPermissionOfAJavaPermEntry(permissionEntry);
systemGraph.remove(new TripleImpl(role, PERMISSION.hasPermission,
permission));
}
@@ -356,7 +356,7 @@ public class UserManagerImpl implements UserManager {
getRoleByTitle(title));
}
- private void deleteAllPermissionEntriesOfARole(BlankNodeOrIri role) {
+ private void deleteAllPermissionEntriesOfARole(BlankNodeOrIRI role) {
AccessController.checkPermission(new SecurityPermission("getPolicy"));
if (role == null) {
return;
@@ -401,7 +401,7 @@ public class UserManagerImpl implements UserManager {
new PlainLiteralImpl(name)));
if (email != null) {
systemGraph.add(new TripleImpl(user, FOAF.mbox,
- new Iri("mailto:" + email)));
+ new IRI("mailto:" + email)));
}
if (password != null) {
try {
@@ -446,11 +446,11 @@ public class UserManagerImpl implements UserManager {
readLock.lock();
try {
Iterator<Triple> triples = systemGraph.filter(null, FOAF.mbox,
- new Iri("mailto:" + email));
+ new IRI("mailto:" + email));
if (!triples.hasNext()) {
return null;
}
- BlankNodeOrIri user = triples.next().getSubject();
+ BlankNodeOrIRI user = triples.next().getSubject();
triples = systemGraph.filter(user, PLATFORM.userName, null);
if (!triples.hasNext()) {
throw new UserHasNoNameException("User with email address" + email
@@ -470,7 +470,7 @@ public class UserManagerImpl implements UserManager {
if (name == null) {
throw new IllegalArgumentException("userName may not be null");
}
- BlankNodeOrIri user = getUserByUserName(name);
+ BlankNodeOrIRI user = getUserByUserName(name);
if (user == null) {
throw new UserNotExistsException(name);
}
@@ -480,7 +480,7 @@ public class UserManagerImpl implements UserManager {
writeLock.lock();
try {
if (email != null) {
- updateProperty(userGraphNode, FOAF.mbox, new Iri("mailto:" + email));
+ updateProperty(userGraphNode, FOAF.mbox, new IRI("mailto:" + email));
}
if (password != null) {
@@ -499,7 +499,7 @@ public class UserManagerImpl implements UserManager {
}
if (!assignedRoles.isEmpty()) {
userGraphNode.deleteProperties(SIOC.has_function);
- addRolesToUser(assignedRoles, (BlankNodeOrIri) userGraphNode.getNode());
+ addRolesToUser(assignedRoles, (BlankNodeOrIRI) userGraphNode.getNode());
//refresh the policy so it will recheck the permissions
Policy.getPolicy().refresh();
}
@@ -508,14 +508,14 @@ public class UserManagerImpl implements UserManager {
}
}
- private void addRolesToUser(Collection<String> assignedRoles, BlankNodeOrIri user) throws RoleUnavailableException {
+ private void addRolesToUser(Collection<String> assignedRoles, BlankNodeOrIRI user) throws RoleUnavailableException {
Graph systemGraph = getSystemGraph();
for (String roleTitle : assignedRoles) {
// skip empty strings
if ((roleTitle == null) || (roleTitle.trim().length() == 0)) {
continue;
}
- BlankNodeOrIri role = getRoleByTitle(roleTitle);
+ BlankNodeOrIRI role = getRoleByTitle(roleTitle);
if (role == null) {
throw new RoleUnavailableException(roleTitle);
}
@@ -523,7 +523,7 @@ public class UserManagerImpl implements UserManager {
}
}
- private void updateProperty(GraphNode node, Iri predicate, RdfTerm object) {
+ private void updateProperty(GraphNode node, IRI predicate, RDFTerm object) {
node.deleteProperties(predicate);
node.addProperty(predicate, object);
}
@@ -548,29 +548,29 @@ public class UserManagerImpl implements UserManager {
readLock.lock();
try {
return systemGraph.filter(null, FOAF.mbox,
- new Iri("mailto:" + email)).hasNext();
+ new IRI("mailto:" + email)).hasNext();
} finally {
readLock.unlock();
}
}
@Override
- public BlankNodeOrIri getUserByName( String name) {
+ public BlankNodeOrIRI getUserByName( String name) {
return getUserByUserName(name);
}
@Override
- public Iterator<BlankNodeOrIri> getUsers() {
+ public Iterator<BlankNodeOrIRI> getUsers() {
return getResourcesOfType(FOAF.Agent);
}
- private Iterator<BlankNodeOrIri> getResourcesOfType(Iri type) {
+ private Iterator<BlankNodeOrIRI> getResourcesOfType(IRI type) {
Graph systemGraph = getSystemGraph();
Lock readLock = systemGraph.getLock().readLock();
readLock.lock();
try {
final Iterator<Triple> triples = systemGraph.filter(null, RDF.type, type);
- Set<BlankNodeOrIri> userRoles = new HashSet<BlankNodeOrIri>();
+ Set<BlankNodeOrIRI> userRoles = new HashSet<BlankNodeOrIRI>();
while (triples.hasNext()) {
userRoles.add(triples.next().getSubject());
}
@@ -586,7 +586,7 @@ public class UserManagerImpl implements UserManager {
return;
}
- BlankNodeOrIri user = getUserByUserName(name);
+ BlankNodeOrIRI user = getUserByUserName(name);
if (user != null) {
deleteTriplesOfASubject(user);
}
@@ -606,7 +606,7 @@ public class UserManagerImpl implements UserManager {
}
@Override
- public Iterator<BlankNodeOrIri> getPermissionsOfUser(BlankNodeOrIri user) {
+ public Iterator<BlankNodeOrIRI> getPermissionsOfUser(BlankNodeOrIRI user) {
return getPermissionsOfRole(user);
}
@@ -653,7 +653,7 @@ public class UserManagerImpl implements UserManager {
@Override
public GraphNode getUserInSystemGraph(final String name) {
Graph systemGraph = getSystemGraph();
- BlankNodeOrIri user = getUserByUserName(name);
+ BlankNodeOrIRI user = getUserByUserName(name);
if (user != null) {
return new GraphNode(user, systemGraph);
} else {
@@ -676,11 +676,10 @@ public class UserManagerImpl implements UserManager {
readLock.unlock();
}
} else {
- BlankNodeOrIri user = AccessController.doPrivileged(
- new PrivilegedAction<BlankNodeOrIri>() {
+ BlankNodeOrIRI user = AccessController.doPrivileged(new PrivilegedAction<BlankNodeOrIRI>() {
@Override
- public BlankNodeOrIri run() {
+ public BlankNodeOrIRI run() {
return getUserByUserName(name);
}
});
@@ -703,7 +702,7 @@ public class UserManagerImpl implements UserManager {
@Override
public GraphNode getUserGraphNode(final String name) {
Graph systemGraph = getSystemGraph();
- BlankNodeOrIri user = getUserByUserName(name);
+ BlankNodeOrIRI user = getUserByUserName(name);
if (user != null) {
GraphNode userNodeInSystemGraph =
new GraphNode(getUserByUserName(name), systemGraph);
@@ -715,7 +714,7 @@ public class UserManagerImpl implements UserManager {
}
}
- private BlankNodeOrIri getUserByUserName(String name) {
+ private BlankNodeOrIRI getUserByUserName(String name) {
Graph systemGraph = getSystemGraph();
Lock readLock = systemGraph.getLock().readLock();
readLock.lock();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphTest.java
----------------------------------------------------------------------
diff --git a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphTest.java b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphTest.java
index f4966b2..f110041 100644
--- a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphTest.java
+++ b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphTest.java
@@ -26,10 +26,10 @@ 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.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.commons.rdf.impl.utils.TripleImpl;
import org.junit.Test;
import org.apache.clerezza.commons.rdf.Language;
@@ -47,16 +47,16 @@ import org.junit.Assert;
*/
public abstract class GraphTest {
- private final Iri uriRef1 =
- new Iri("http://example.org/ontology#res1");
- private final Iri uriRef2 =
- new Iri("http://example.org/ontology#res2");
- private final Iri uriRef3 =
- new Iri("http://example.org/ontology#res3");
- private final Iri uriRef4 =
- new Iri("http://example.org/ontology#res4");
- private final Iri xmlLiteralType =
- new Iri("http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral");
+ private final IRI uriRef1 =
+ new IRI("http://example.org/ontology#res1");
+ private final IRI uriRef2 =
+ new IRI("http://example.org/ontology#res2");
+ private final IRI uriRef3 =
+ new IRI("http://example.org/ontology#res3");
+ private final IRI uriRef4 =
+ new IRI("http://example.org/ontology#res4");
+ private final IRI xmlLiteralType =
+ new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral");
private Literal literal1 = new PlainLiteralImpl("literal1");
private Literal literal2 = new PlainLiteralImpl("literal2");
private BlankNode bnode1 = new BlankNode();
@@ -91,8 +91,8 @@ public abstract class GraphTest {
graph.add(new TripleImpl(bnode, uriRef1, uriRef3));
graph.add(new TripleImpl(bnode, uriRef1, uriRef4));
tripleIter = graph.filter(null, uriRef1, null);
- Set<BlankNodeOrIri> subjectInMatchingTriples = new HashSet<BlankNodeOrIri>();
- Set<RdfTerm> objectsInMatchingTriples = new HashSet<RdfTerm>();
+ Set<BlankNodeOrIRI> subjectInMatchingTriples = new HashSet<BlankNodeOrIRI>();
+ Set<RDFTerm> objectsInMatchingTriples = new HashSet<RDFTerm>();
while (tripleIter.hasNext()) {
Triple triple = tripleIter.next();
subjectInMatchingTriples.add(triple.getSubject());
@@ -100,7 +100,7 @@ public abstract class GraphTest {
}
Assert.assertEquals(1, subjectInMatchingTriples.size());
Assert.assertEquals(2, objectsInMatchingTriples.size());
- Set<RdfTerm> expectedObjects = new HashSet<RdfTerm>();
+ Set<RDFTerm> expectedObjects = new HashSet<RDFTerm>();
expectedObjects.add(uriRef3);
expectedObjects.add(uriRef4);
Assert.assertEquals(expectedObjects, objectsInMatchingTriples);
@@ -137,7 +137,7 @@ public abstract class GraphTest {
graph.add(triple1);
Iterator<Triple> tripleIter = graph.filter(uriRef1, uriRef2, null);
Assert.assertTrue(tripleIter.hasNext());
- RdfTerm gotValue = tripleIter.next().getObject();
+ RDFTerm gotValue = tripleIter.next().getObject();
Assert.assertEquals(value, gotValue);
}
@@ -151,7 +151,7 @@ public abstract class GraphTest {
graph.add(triple1);
Iterator<Triple> tripleIter = graph.filter(uriRef1, uriRef2, null);
Assert.assertTrue(tripleIter.hasNext());
- RdfTerm gotValue = tripleIter.next().getObject();
+ RDFTerm gotValue = tripleIter.next().getObject();
Assert.assertEquals(value, gotValue);
Assert.assertEquals(language, ((Literal)gotValue).getLanguage());
}
@@ -242,7 +242,7 @@ public abstract class GraphTest {
public void testGetSameBlankNode() throws Exception {
Graph graph = getEmptyGraph();
BlankNode bNode = new BlankNode();
- final Iri HAS_NAME = new Iri("http://example.org/ontology/hasName");
+ final IRI HAS_NAME = new IRI("http://example.org/ontology/hasName");
final PlainLiteralImpl name = new PlainLiteralImpl("http://example.org/people/alice");
final PlainLiteralImpl name2 = new PlainLiteralImpl("http://example.org/people/bob");
final Triple tripleAlice = new TripleImpl(bNode, HAS_NAME, name);
@@ -335,14 +335,14 @@ public abstract class GraphTest {
// Find bob
iterator = graph.filter(null, null,
- new Iri("http://example.org/people/bob"));
+ new IRI("http://example.org/people/bob"));
resultSet= toCollection(iterator);
Assert.assertEquals(1, resultSet.size());
Assert.assertTrue(resultSet.contains(tripleBob));
// Find alice
iterator = graph.filter(null, null,
- new Iri("http://example.org/people/alice"));
+ new IRI("http://example.org/people/alice"));
resultSet= toCollection(iterator);
Assert.assertEquals(1, resultSet.size());
Assert.assertTrue(resultSet.contains(tripleAlice));
@@ -566,8 +566,8 @@ public abstract class GraphTest {
*/
private Triple createTriple(String subject, String predicate,
String object) {
- return new TripleImpl(new Iri(subject), new Iri(predicate),
- new Iri(object));
+ return new TripleImpl(new IRI(subject), new IRI(predicate),
+ new IRI(object));
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphWrapper.java
----------------------------------------------------------------------
diff --git a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphWrapper.java b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphWrapper.java
index e977eba..5b84df0 100644
--- a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphWrapper.java
+++ b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/GraphWrapper.java
@@ -22,12 +22,12 @@ package org.apache.clerezza.rdf.core.test;
import java.util.Collection;
import java.util.Iterator;
import java.util.concurrent.locks.ReadWriteLock;
-import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
-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;
/**
@@ -43,7 +43,7 @@ class GraphWrapper implements Graph {
}
@Override
- public Iterator<Triple> filter(BlankNodeOrIri subject, Iri predicate, RdfTerm object) {
+ public Iterator<Triple> filter(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
return wrapped.filter(subject, predicate, object);
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockableMGraphWrapperForTesting.java
----------------------------------------------------------------------
diff --git a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockableMGraphWrapperForTesting.java b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockableMGraphWrapperForTesting.java
index 3d49c2b..980f6d2 100644
--- a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockableMGraphWrapperForTesting.java
+++ b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/LockableMGraphWrapperForTesting.java
@@ -22,10 +22,10 @@ import java.util.Iterator;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.clerezza.commons.rdf.Graph;
-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;
/**
* Wrappes an Graph as a LockableGraph. If a method is called that reads
@@ -51,7 +51,7 @@ public class LockableMGraphWrapperForTesting extends GraphWrapper {
}
@Override
- public Iterator<Triple> filter(BlankNodeOrIri subject, Iri predicate, RdfTerm object) {
+ public Iterator<Triple> filter(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
LockChecker.checkIfReadLocked(lock);
readLock.lock();
try {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java
----------------------------------------------------------------------
diff --git a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java
index a71e298..7e6741b 100644
--- a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java
+++ b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/RandomGraph.java
@@ -22,10 +22,10 @@ import java.util.Iterator;
import java.util.UUID;
import org.apache.clerezza.commons.rdf.BlankNode;
import org.apache.clerezza.commons.rdf.Graph;
-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.commons.rdf.impl.utils.PlainLiteralImpl;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.commons.lang.RandomStringUtils;
@@ -113,52 +113,52 @@ public class RandomGraph extends GraphWrapper {
return new TripleImpl(getSubject(), getPredicate(), getObject());
}
- private BlankNodeOrIri getSubject() {
+ private BlankNodeOrIRI getSubject() {
int random = rollDice(interconnectivity);
if (size() == 0) {
random = 0;
}
switch (random) {
- case 0: // create new BlankNodeOrIri
- RdfTerm newRdfTerm;
+ case 0: // create new BlankNodeOrIRI
+ RDFTerm newRdfTerm;
do {
newRdfTerm = createRandomRdfTerm();
- } while (!(newRdfTerm instanceof BlankNodeOrIri));
- return (BlankNodeOrIri) newRdfTerm;
- default: // get existing BlankNodeOrIri
- RdfTerm existingRdfTerm;
+ } while (!(newRdfTerm instanceof BlankNodeOrIRI));
+ return (BlankNodeOrIRI) newRdfTerm;
+ default: // get existing BlankNodeOrIRI
+ RDFTerm existingRdfTerm;
do {
existingRdfTerm = getExistingRdfTerm();
if (existingRdfTerm == null) {
random = 0;
}
- } while (!(existingRdfTerm instanceof BlankNodeOrIri));
+ } while (!(existingRdfTerm instanceof BlankNodeOrIRI));
- return (BlankNodeOrIri) existingRdfTerm;
+ return (BlankNodeOrIRI) existingRdfTerm;
}
}
- private Iri getPredicate() {
+ private IRI getPredicate() {
int random = rollDice(interconnectivity);
if (size() == 0) {
random = 0;
}
switch (random) {
- case 0: // create new Iri
+ case 0: // create new IRI
return createRandomIri();
- default: // get existing Iri
- RdfTerm existingRdfTerm;
+ default: // get existing IRI
+ RDFTerm existingRdfTerm;
do {
existingRdfTerm = getExistingRdfTerm();
if (existingRdfTerm == null) {
random = 0;
}
- } while (!(existingRdfTerm instanceof Iri));
- return (Iri) existingRdfTerm;
+ } while (!(existingRdfTerm instanceof IRI));
+ return (IRI) existingRdfTerm;
}
}
- private RdfTerm getObject() {
+ private RDFTerm getObject() {
int random = rollDice(interconnectivity);
if (size() == 0) {
random = 0;
@@ -167,7 +167,7 @@ public class RandomGraph extends GraphWrapper {
case 0: // create new resource
return createRandomRdfTerm();
default: // get existing resource
- RdfTerm existingRdfTerm = getExistingRdfTerm();
+ RDFTerm existingRdfTerm = getExistingRdfTerm();
if (existingRdfTerm == null) {
random = 0;
}
@@ -179,7 +179,7 @@ public class RandomGraph extends GraphWrapper {
return Double.valueOf(Math.random() * faces).intValue();
}
- private RdfTerm createRandomRdfTerm() {
+ private RDFTerm createRandomRdfTerm() {
switch (rollDice(3)) {
case 0:
return new BlankNode();
@@ -191,7 +191,7 @@ public class RandomGraph extends GraphWrapper {
throw new RuntimeException("in createRandomRdfTerm()");
}
- private RdfTerm getExistingRdfTerm() {
+ private RDFTerm getExistingRdfTerm() {
Triple triple = getRandomTriple();
if (triple == null) {
return null;
@@ -207,8 +207,8 @@ public class RandomGraph extends GraphWrapper {
return null;
}
- private Iri createRandomIri() {
- return new Iri("http://" + UUID.randomUUID().toString());
+ private IRI createRandomIri() {
+ return new IRI("http://" + UUID.randomUUID().toString());
}
/**
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java
----------------------------------------------------------------------
diff --git a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java
index bafd251..856bdcc 100644
--- a/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java
+++ b/rdf/core.test/src/main/java/org/apache/clerezza/rdf/core/test/TcProviderTest.java
@@ -26,9 +26,9 @@ import org.junit.Test;
import org.apache.clerezza.commons.rdf.BlankNode;
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.EntityAlreadyExistsException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
@@ -43,14 +43,14 @@ import static org.junit.Assert.*;
*/
public abstract class TcProviderTest {
- protected final Iri uriRefA = generateUri("a");
- protected final Iri uriRefA1 = generateUri("a1");
- protected final Iri uriRefB = generateUri("b");
- protected final Iri uriRefB1 = generateUri("b1");
- protected final Iri uriRefC = generateUri("c");
+ protected final IRI uriRefA = generateUri("a");
+ protected final IRI uriRefA1 = generateUri("a1");
+ protected final IRI uriRefB = generateUri("b");
+ protected final IRI uriRefB1 = generateUri("b1");
+ protected final IRI uriRefC = generateUri("c");
- protected final Iri graphIri = generateUri("myGraph");
- protected final Iri otherGraphIri = new Iri(graphIri.getUnicodeString());
+ protected final IRI graphIri = generateUri("myGraph");
+ protected final IRI otherGraphIri = new IRI(graphIri.getUnicodeString());
@Test
public void testCreateImmutableGraph() {
@@ -408,10 +408,10 @@ public abstract class TcProviderTest {
// Graph triples = createTestTripleCollection(createTestTriple());
//
// TcProvider provider = getInstance();
-// Iri name1 = new Iri("http://myGraph1");
+// IRI name1 = new IRI("http://myGraph1");
// ImmutableGraph graph = provider.createGraph(name1, triples);
//
-// Iri name2 = new Iri("http://myGraph2");
+// IRI name2 = new IRI("http://myGraph2");
// ImmutableGraph secondGraph = provider.createGraph(name2, triples);
//
// Set<Iri> names = provider.getNames(graph);
@@ -425,10 +425,10 @@ public abstract class TcProviderTest {
Graph triples = createTestTripleCollection(createTestTriple());
TcProvider provider = getInstance();
- Iri name1 = new Iri("http://myGraph1");
+ IRI name1 = new IRI("http://myGraph1");
ImmutableGraph graph = provider.createImmutableGraph(name1, triples);
- Iri name2 = new Iri("http://myGraph2");
+ IRI name2 = new IRI("http://myGraph2");
ImmutableGraph secondGraph = provider.createImmutableGraph(name2, triples);
//if we delete graph with name1, the second graph should still be there
@@ -465,9 +465,9 @@ public abstract class TcProviderTest {
}
private Triple createTestTriple() {
- BlankNodeOrIri subject = new BlankNode() {};
- Iri predicate = new Iri("http://test.com/");
- BlankNodeOrIri object = new Iri("http://test.com/myObject");
+ BlankNodeOrIRI subject = new BlankNode() {};
+ IRI predicate = new IRI("http://test.com/");
+ BlankNodeOrIRI object = new IRI("http://test.com/myObject");
return new TripleImpl(subject, predicate, object);
}
@@ -477,8 +477,8 @@ public abstract class TcProviderTest {
return new SimpleGraph(ts);
}
- protected Iri generateUri(String name) {
- return new Iri("http://example.org/" + name);
+ protected IRI generateUri(String name) {
+ return new IRI("http://example.org/" + name);
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/InvalidLiteralTypeException.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/InvalidLiteralTypeException.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/InvalidLiteralTypeException.java
index 8238be6..923ea6b 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/InvalidLiteralTypeException.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/InvalidLiteralTypeException.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
/**
* Thrown when a literal is of the wrong type for conversion to a java-type
@@ -34,7 +34,7 @@ public class InvalidLiteralTypeException extends RuntimeException {
* @param javaType the <code>Class</code> to convert to
* @param literalType the literalType which can't be converted
*/
- public InvalidLiteralTypeException(Class<?> javaType, Iri literalType) {
+ public InvalidLiteralTypeException(Class<?> javaType, IRI literalType) {
super("Cannot create a "+javaType+" from a literal of type "+literalType);
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityAlreadyExistsException.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityAlreadyExistsException.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityAlreadyExistsException.java
index 190d398..3057789 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityAlreadyExistsException.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityAlreadyExistsException.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core.access;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
/**
* is thrown on an attempt to create an entity with a name which already exists
@@ -27,7 +27,7 @@ import org.apache.clerezza.commons.rdf.Iri;
*/
public class EntityAlreadyExistsException extends RuntimeException {
- private Iri entityName;
+ private IRI entityName;
/**
* creates an exception indicating that an entity with the specified name
@@ -35,7 +35,7 @@ public class EntityAlreadyExistsException extends RuntimeException {
*
* @param entityName the name of the entity which already exists
*/
- public EntityAlreadyExistsException(Iri entityName) {
+ public EntityAlreadyExistsException(IRI entityName) {
super("An entity with this name already exists: "+entityName);
this.entityName = entityName;
}
@@ -44,7 +44,7 @@ public class EntityAlreadyExistsException extends RuntimeException {
*
* @return the name of the entity which already exists
*/
- public Iri getEntityName() {
+ public IRI getEntityName() {
return entityName;
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityUndeletableException.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityUndeletableException.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityUndeletableException.java
index 43a16c1..f11742b 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityUndeletableException.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/EntityUndeletableException.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core.access;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
/**
* is thrown on an attempt to delete an entity with a provider that
@@ -27,7 +27,7 @@ import org.apache.clerezza.commons.rdf.Iri;
* @author reto
*/
public class EntityUndeletableException extends RuntimeException {
- private Iri entityName;
+ private IRI entityName;
/**
* creates an exception indicating that the entity with the specified name
@@ -35,7 +35,7 @@ public class EntityUndeletableException extends RuntimeException {
*
* @param entityName the name of the entity which is undeletable
*/
- public EntityUndeletableException(Iri entityName) {
+ public EntityUndeletableException(IRI entityName) {
super("This entity is undeletable: "+entityName);
this.entityName = entityName;
}
@@ -44,7 +44,7 @@ public class EntityUndeletableException extends RuntimeException {
*
* @return the name of the entity which is undeletable
*/
- public Iri getEntityName() {
+ public IRI getEntityName() {
return entityName;
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/ImmutableGraphServiceFactory.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/ImmutableGraphServiceFactory.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/ImmutableGraphServiceFactory.java
index aaa3e07..35ef2f9 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/ImmutableGraphServiceFactory.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/ImmutableGraphServiceFactory.java
@@ -22,7 +22,7 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceFactory;
import org.osgi.framework.ServiceRegistration;
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.security.TcAccessController;
/**
@@ -34,10 +34,10 @@ import org.apache.clerezza.rdf.core.access.security.TcAccessController;
public class ImmutableGraphServiceFactory implements ServiceFactory {
private final TcManager tcManager;
- private final Iri name;
+ private final IRI name;
private final TcAccessController tcAccessController;
- ImmutableGraphServiceFactory(TcManager tcManager, Iri name,
+ ImmutableGraphServiceFactory(TcManager tcManager, IRI name,
TcAccessController tcAccessController) {
this.tcManager = tcManager;
this.name = name;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/MGraphServiceFactory.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/MGraphServiceFactory.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/MGraphServiceFactory.java
index 3f189d9..5253201 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/MGraphServiceFactory.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/MGraphServiceFactory.java
@@ -21,7 +21,7 @@ package org.apache.clerezza.rdf.core.access;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceFactory;
import org.osgi.framework.ServiceRegistration;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.security.TcAccessController;
/**
@@ -33,10 +33,10 @@ import org.apache.clerezza.rdf.core.access.security.TcAccessController;
public class MGraphServiceFactory implements ServiceFactory {
private TcManager tcManager;
- private Iri name;
+ private IRI name;
private final TcAccessController tcAccessController;
- MGraphServiceFactory(TcManager tcManager, Iri name,
+ MGraphServiceFactory(TcManager tcManager, IRI name,
TcAccessController tcAccessController) {
this.tcManager = tcManager;
this.name = name;
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/NoSuchEntityException.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/NoSuchEntityException.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/NoSuchEntityException.java
index 551d9b8..a39c63f 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/NoSuchEntityException.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/NoSuchEntityException.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core.access;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
/**
* is thrown on an attempt to perform an operation on an entity (i.e. a
@@ -27,7 +27,7 @@ import org.apache.clerezza.commons.rdf.Iri;
* @author reto
*/
public class NoSuchEntityException extends RuntimeException {
- private Iri entityName;
+ private IRI entityName;
/**
* creates an exception indicating that the entity with the specified name
@@ -35,7 +35,7 @@ public class NoSuchEntityException extends RuntimeException {
*
* @param entityName the name for which no entity exists
*/
- public NoSuchEntityException(Iri entityName) {
+ public NoSuchEntityException(IRI entityName) {
super("No such entity: "+entityName);
this.entityName = entityName;
}
@@ -45,7 +45,7 @@ public class NoSuchEntityException extends RuntimeException {
*
* @return the name of the entity that doesn't exist
*/
- public Iri getEntityName() {
+ public IRI getEntityName() {
return entityName;
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/QueryableTcProvider.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/QueryableTcProvider.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/QueryableTcProvider.java
index 4f804a1..0f38bee 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/QueryableTcProvider.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/QueryableTcProvider.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.rdf.core.access;
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.sparql.query.Query;
/**
@@ -38,6 +38,6 @@ public interface QueryableTcProvider extends TcProvider {
* FROM clause is present
* @return the resulting ResultSet, ImmutableGraph or Boolean value
*/
- public Object executeSparqlQuery(String query, Iri defaultGraphUri);
+ public Object executeSparqlQuery(String query, IRI defaultGraphUri);
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/SecuredGraph.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/SecuredGraph.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/SecuredGraph.java
index 51591b7..9cf5be7 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/SecuredGraph.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/SecuredGraph.java
@@ -22,11 +22,11 @@ import java.security.AccessControlException;
import java.util.Collection;
import java.util.Iterator;
import java.util.concurrent.locks.ReadWriteLock;
-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.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.security.TcAccessController;
import org.apache.clerezza.rdf.core.impl.WriteBlockedGraph;
import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleImmutableGraph;
@@ -45,10 +45,10 @@ import org.apache.clerezza.commons.rdf.event.GraphListener;
public class SecuredGraph implements Graph {
private final Graph wrapped;
- private final Iri name;
+ private final IRI name;
private final TcAccessController tcAccessController;
- public SecuredGraph(Graph wrapped, Iri name,
+ public SecuredGraph(Graph wrapped, IRI name,
TcAccessController tcAccessController) {
this.wrapped = wrapped;
this.name = name;
@@ -56,7 +56,7 @@ public class SecuredGraph implements Graph {
}
@Override
- public Iterator<Triple> filter(final BlankNodeOrIri subject, final Iri predicate, final RdfTerm object) {
+ public Iterator<Triple> filter(final BlankNodeOrIRI subject, final IRI predicate, final RDFTerm object) {
final Iterator<Triple> baseIter = wrapped.filter(subject, predicate, object);
return new Iterator<Triple>() {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcManager.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcManager.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcManager.java
index 35bfdd2..f62b209 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcManager.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcManager.java
@@ -33,7 +33,7 @@ import java.util.TreeSet;
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.security.TcAccessController;
import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.core.impl.WriteBlockedGraph;
@@ -118,8 +118,8 @@ public class TcManager extends TcProviderMultiplexer {
}
};
- private Map<Iri, ServiceRegistration> serviceRegistrations = Collections
- .synchronizedMap(new HashMap<Iri, ServiceRegistration>());
+ private Map<IRI, ServiceRegistration> serviceRegistrations = Collections
+ .synchronizedMap(new HashMap<IRI, ServiceRegistration>());
protected QueryEngine queryEngine;
private boolean isActivated = false;
@@ -206,13 +206,13 @@ public class TcManager extends TcProviderMultiplexer {
}
@Override
- public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
+ public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
tcAccessController.checkReadPermission(name);
return super.getImmutableGraph(name);
}
@Override
- public Graph getMGraph(Iri name) {
+ public Graph getMGraph(IRI name) {
try {
tcAccessController.checkReadWritePermission(name);
} catch (AccessControlException e) {
@@ -223,7 +223,7 @@ public class TcManager extends TcProviderMultiplexer {
}
@Override
- public Graph getGraph(Iri name) {
+ public Graph getGraph(IRI name) {
try {
tcAccessController.checkReadWritePermission(name);
} catch (AccessControlException e) {
@@ -235,54 +235,54 @@ public class TcManager extends TcProviderMultiplexer {
}
@Override
- public Graph createGraph(Iri name)
+ public Graph createGraph(IRI name)
throws UnsupportedOperationException {
tcAccessController.checkReadWritePermission(name);
return super.createGraph(name);
}
@Override
- public ImmutableGraph createImmutableGraph(Iri name, Graph triples) {
+ public ImmutableGraph createImmutableGraph(IRI name, Graph triples) {
tcAccessController.checkReadWritePermission(name);
return super.createImmutableGraph(name, triples);
}
@Override
- public void deleteGraph(Iri name) {
+ public void deleteGraph(IRI name) {
tcAccessController.checkReadWritePermission(name);
super.deleteGraph(name);
}
@Override
- public Set<Iri> getNames(ImmutableGraph ImmutableGraph) {
+ public Set<IRI> getNames(ImmutableGraph ImmutableGraph) {
return super.getNames(ImmutableGraph);
}
@Override
- public Set<Iri> listGraphs() {
- Set<Iri> result = super.listGraphs();
+ public Set<IRI> listGraphs() {
+ Set<IRI> result = super.listGraphs();
return excludeNonReadable(result);
}
@Override
- public Set<Iri> listMGraphs() {
- Set<Iri> result = super.listMGraphs();
+ public Set<IRI> listMGraphs() {
+ Set<IRI> result = super.listMGraphs();
return excludeNonReadable(result);
}
@Override
- public Set<Iri> listImmutableGraphs() {
- Set<Iri> result = super.listImmutableGraphs();
+ public Set<IRI> listImmutableGraphs() {
+ Set<IRI> result = super.listImmutableGraphs();
return excludeNonReadable(result);
}
- private Set<Iri> excludeNonReadable(Set<Iri> tcNames) {
+ private Set<IRI> excludeNonReadable(Set<IRI> tcNames) {
SecurityManager security = System.getSecurityManager();
if (security == null) {
return tcNames;
}
- Set<Iri> result = new HashSet<Iri>();
- for (Iri name : tcNames) {
+ Set<IRI> result = new HashSet<IRI>();
+ for (IRI name : tcNames) {
try {
tcAccessController.checkReadPermission(name);
} catch (AccessControlException e) {
@@ -306,9 +306,9 @@ public class TcManager extends TcProviderMultiplexer {
public Object executeSparqlQuery(String query, Graph defaultGraph) throws ParseException {
TcProvider singleTargetTcProvider = null;
- final Iri defaultGraphName = new Iri("urn:x-temp:/kjsfadfhfasdffds");
+ final IRI defaultGraphName = new IRI("urn:x-temp:/kjsfadfhfasdffds");
final SparqlPreParser sparqlPreParser = new SparqlPreParser(this);
- final Set<Iri> referencedGraphs = sparqlPreParser.getReferredGraphs(query, defaultGraphName);
+ final Set<IRI> referencedGraphs = sparqlPreParser.getReferredGraphs(query, defaultGraphName);
if ((referencedGraphs != null) && (!referencedGraphs.contains(defaultGraphName))) {
singleTargetTcProvider = getSingleTargetTcProvider(referencedGraphs);
}
@@ -337,9 +337,9 @@ public class TcManager extends TcProviderMultiplexer {
if (forceFastlane) {
singleTargetTcProvider = getSingleTargetTcProvider(Collections.EMPTY_SET);
} else {
- final Iri defaultGraphName = new Iri("urn:x-temp:/kjsfadfhfasdffds");
+ final IRI defaultGraphName = new IRI("urn:x-temp:/kjsfadfhfasdffds");
SparqlPreParser sparqlPreParser = new SparqlPreParser(this);
- final Set<Iri> referencedGraphs = sparqlPreParser.getReferredGraphs(query, defaultGraphName);
+ final Set<IRI> referencedGraphs = sparqlPreParser.getReferredGraphs(query, defaultGraphName);
if ((referencedGraphs != null) && (!referencedGraphs.contains(defaultGraphName))) {
singleTargetTcProvider = getSingleTargetTcProvider(referencedGraphs);
}
@@ -365,7 +365,7 @@ public class TcManager extends TcProviderMultiplexer {
* @param defaultGraphName the ImmutableGraph to be used as default ImmutableGraph in the Sparql ImmutableGraph Store
* @return the resulting ResultSet, ImmutableGraph or Boolean value
*/
- public Object executeSparqlQuery(String query, Iri defaultGraphName) throws ParseException {
+ public Object executeSparqlQuery(String query, IRI defaultGraphName) throws ParseException {
return executeSparqlQuery(query, defaultGraphName, false);
}
@@ -379,13 +379,13 @@ public class TcManager extends TcProviderMultiplexer {
* @param forceFastlane indicate whether to force fastlane usage.
* @return the resulting ResultSet, ImmutableGraph or Boolean value
*/
- public Object executeSparqlQuery(String query, Iri defaultGraphName, boolean forceFastlane) throws ParseException {
+ public Object executeSparqlQuery(String query, IRI defaultGraphName, boolean forceFastlane) throws ParseException {
TcProvider singleTargetTcProvider = null;
if (forceFastlane) {
singleTargetTcProvider = getSingleTargetTcProvider(Collections.singleton(defaultGraphName));
} else {
SparqlPreParser sparqlPreParser = new SparqlPreParser(this);
- final Set<Iri> referencedGraphs = sparqlPreParser.getReferredGraphs(query, defaultGraphName);
+ final Set<IRI> referencedGraphs = sparqlPreParser.getReferredGraphs(query, defaultGraphName);
if ((referencedGraphs != null)) {
singleTargetTcProvider = getSingleTargetTcProvider(referencedGraphs);
}
@@ -552,7 +552,7 @@ public class TcManager extends TcProviderMultiplexer {
}
@Override
- protected void mGraphAppears(Iri name) {
+ protected void mGraphAppears(IRI name) {
if (isTcServicesEnabled()) {
// Only create the service when activated. When not activated
// creating will be delayed till after activation.
@@ -563,7 +563,7 @@ public class TcManager extends TcProviderMultiplexer {
}
@Override
- protected void graphAppears(Iri name) {
+ protected void graphAppears(IRI name) {
if (isTcServicesEnabled()) {
// Only create the service when activated. When not activated
// creating will be delayed till after activation.
@@ -573,7 +573,7 @@ public class TcManager extends TcProviderMultiplexer {
}
}
- private void registerGraphAsService(Iri name, boolean isMGraph) {
+ private void registerGraphAsService(IRI name, boolean isMGraph) {
Dictionary<String,Object> props = new Hashtable<String, Object>();
props.put("name", name.getUnicodeString());
String[] interfaceNames;
@@ -597,7 +597,7 @@ public class TcManager extends TcProviderMultiplexer {
}
@Override
- protected void tcDisappears(Iri name) {
+ protected void tcDisappears(IRI name) {
ServiceRegistration reg = serviceRegistrations.get(name);
if (reg != null) {
reg.unregister();
@@ -605,15 +605,15 @@ public class TcManager extends TcProviderMultiplexer {
}
}
- private TcProvider getSingleTargetTcProvider(final Set<Iri> referencedGraphs) {
+ private TcProvider getSingleTargetTcProvider(final Set<IRI> referencedGraphs) {
TcProvider singleTargetTcProvider = null;
for (WeightedTcProvider provider : providerList) {
- final Set<Iri> providerGraphs = provider.listGraphs();
+ final Set<IRI> providerGraphs = provider.listGraphs();
if (providerGraphs.containsAll(referencedGraphs)) {
singleTargetTcProvider = provider;
break; //success
}
- for (Iri graphName : referencedGraphs) {
+ for (IRI graphName : referencedGraphs) {
if (providerGraphs.contains(graphName)) {
break; //failure
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProvider.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProvider.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProvider.java
index ef8fa0b..31b8fe7 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProvider.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProvider.java
@@ -22,7 +22,7 @@ import java.util.Set;
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;
/**
* A TC (Graph) Provider allows access to and optionally
@@ -40,7 +40,7 @@ public interface TcProvider {
* @throws NoSuchEntityException if there is no <code>ImmutableGraph</code>
* with the specified name
*/
- ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException;
+ ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException;
/**
* Get an <code>Graph</code> taht is not <code>ImmutableGrah</code>. The instances
@@ -51,7 +51,7 @@ public interface TcProvider {
* @throws NoSuchEntityException if there is no <code>Graph</code>
* with the specified name
*/
- Graph getMGraph(Iri name) throws NoSuchEntityException;
+ Graph getMGraph(IRI name) throws NoSuchEntityException;
/**
* This method is used to get a <code>Graph</code> indifferently
@@ -66,7 +66,7 @@ public interface TcProvider {
* @throws NoSuchEntityException if there is no <code>ImmutableGraph</code>
* or <code>Graph</code> with the specified name
*/
- Graph getGraph(Iri name) throws NoSuchEntityException;
+ Graph getGraph(IRI name) throws NoSuchEntityException;
/**
* Lists the name of the <Code>ImmutableGraph</code>s available through this
@@ -76,7 +76,7 @@ public interface TcProvider {
*
* @return the list of <Code>ImmutableGraph</code>s
*/
- Set<Iri> listImmutableGraphs();
+ Set<IRI> listImmutableGraphs();
/**
* Lists the name of the <Code>Graph</code>s available through this
@@ -86,7 +86,7 @@ public interface TcProvider {
*
* @return the list of <Code>Graph</code>s
*/
- Set<Iri> listMGraphs();
+ Set<IRI> listMGraphs();
/**
* Lists the name of the <Code>Graph</code>s available through this
@@ -96,7 +96,7 @@ public interface TcProvider {
*
* @return the list of <Code>Graph</code>s
*/
- Set<Iri> listGraphs();
+ Set<IRI> listGraphs();
/**
* Creates an initially empty <code>Graph</code> with a specified name
@@ -108,7 +108,7 @@ public interface TcProvider {
* @throws EntityAlreadyExistsException if an Graph with the specified name
* already exists
*/
- Graph createGraph(Iri name) throws UnsupportedOperationException,
+ Graph createGraph(IRI name) throws UnsupportedOperationException,
EntityAlreadyExistsException;
/**
@@ -122,7 +122,7 @@ public interface TcProvider {
* @throws EntityAlreadyExistsException if a ImmutableGraph with the specified name
* already exists
*/
- ImmutableGraph createImmutableGraph(Iri name, Graph triples)
+ ImmutableGraph createImmutableGraph(IRI name, Graph triples)
throws UnsupportedOperationException, EntityAlreadyExistsException;
/**
@@ -137,7 +137,7 @@ public interface TcProvider {
* <code>ImmutableGraph</code> or an <code>Graph</code>.
* @throws EntityUndeletableException if the specified ImmutableGraph is undeletable
*/
- void deleteGraph(Iri name) throws UnsupportedOperationException,
+ void deleteGraph(IRI name) throws UnsupportedOperationException,
NoSuchEntityException, EntityUndeletableException;
/**
@@ -147,5 +147,5 @@ public interface TcProvider {
* @return the set names of <code>ImmutableGraph</code>, the set is empty if
* <code>ImmutableGraph</code> is unknown
*/
- Set<Iri> getNames(ImmutableGraph immutableGraph);
+ Set<IRI> getNames(ImmutableGraph immutableGraph);
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProviderMultiplexer.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProviderMultiplexer.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProviderMultiplexer.java
index 7b7eea9..094238d 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProviderMultiplexer.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/TcProviderMultiplexer.java
@@ -33,7 +33,7 @@ import java.util.TreeSet;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.clerezza.commons.rdf.Graph;
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.sparql.QueryEngine;
/**
@@ -52,7 +52,7 @@ public class TcProviderMultiplexer implements TcProvider {
* otherwise the locks in the <code>Graph</code>s would have no effect
* between different instances and concurrency issues could occur.
*/
- private Map<Iri, MGraphHolder> mGraphCache = Collections.synchronizedMap(new HashMap<Iri, MGraphHolder>());
+ private Map<IRI, MGraphHolder> mGraphCache = Collections.synchronizedMap(new HashMap<IRI, MGraphHolder>());
/**
* Flag to indicate whether mgraphs should be cached for faster access. By
@@ -91,7 +91,7 @@ public class TcProviderMultiplexer implements TcProvider {
*
* @param name
*/
- protected void graphAppears(Iri name) {
+ protected void graphAppears(IRI name) {
}
/**
@@ -102,7 +102,7 @@ public class TcProviderMultiplexer implements TcProvider {
*
* @param name
*/
- protected void mGraphAppears(Iri name) {
+ protected void mGraphAppears(IRI name) {
}
/**
@@ -115,7 +115,7 @@ public class TcProviderMultiplexer implements TcProvider {
*
* @param name
*/
- protected void tcDisappears(Iri name) {
+ protected void tcDisappears(IRI name) {
}
/**
@@ -135,7 +135,7 @@ public class TcProviderMultiplexer implements TcProvider {
*/
private void updateGraphCache(WeightedTcProvider provider,
boolean providerAdded) {
- Set<Iri> uriSet = provider.listGraphs();
+ Set<IRI> uriSet = provider.listGraphs();
if (!(uriSet == null || uriSet.isEmpty())) {
if (providerAdded) {
weightedProviderAdded(provider, uriSet);
@@ -146,10 +146,10 @@ public class TcProviderMultiplexer implements TcProvider {
}
private void weightedProviderAdded(WeightedTcProvider newProvider,
- Set<Iri> newProvidedUris) {
+ Set<IRI> newProvidedUris) {
Set<WeightedTcProvider> lowerWeightedProviderList = getLowerWeightedProvider(newProvider);
if (isCachingEnabled()) {
- for (Iri name : newProvidedUris) {
+ for (IRI name : newProvidedUris) {
final MGraphHolder holder = mGraphCache.get(name);
if ((holder != null) && (holder.getWeightedTcProvider() != null)) {
if (lowerWeightedProviderList.contains(holder.getWeightedTcProvider())) {
@@ -187,8 +187,8 @@ public class TcProviderMultiplexer implements TcProvider {
}
private void weightedProviderRemoved(WeightedTcProvider oldProvider,
- Set<Iri> oldProvidedUris) {
- for (Iri name : oldProvidedUris) {
+ Set<IRI> oldProvidedUris) {
+ for (IRI name : oldProvidedUris) {
final MGraphHolder holder = mGraphCache.get(name);
if ((holder != null) && (holder.getWeightedTcProvider() != null)
&& holder.getWeightedTcProvider().equals(oldProvider)) {
@@ -218,7 +218,7 @@ public class TcProviderMultiplexer implements TcProvider {
}
@Override
- public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
+ public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
for (TcProvider provider : providerList) {
try {
return provider.getImmutableGraph(name);
@@ -232,7 +232,7 @@ public class TcProviderMultiplexer implements TcProvider {
}
@Override
- public Graph getMGraph(Iri name)
+ public Graph getMGraph(IRI name)
throws NoSuchEntityException {
Graph result = getMGraphFromCache(name);
if (result == null) {
@@ -246,7 +246,7 @@ public class TcProviderMultiplexer implements TcProvider {
return result;
}
- private Graph getMGraphFromCache(Iri name) {
+ private Graph getMGraphFromCache(IRI name) {
MGraphHolder holder = mGraphCache.get(name);
if (holder == null) {
return null;
@@ -254,7 +254,7 @@ public class TcProviderMultiplexer implements TcProvider {
return holder.getMGraph();
}
- private Graph getUnsecuredMGraphAndAddToCache(Iri name)
+ private Graph getUnsecuredMGraphAndAddToCache(IRI name)
throws NoSuchEntityException {
for (WeightedTcProvider provider : providerList) {
try {
@@ -276,7 +276,7 @@ public class TcProviderMultiplexer implements TcProvider {
}
@Override
- public Graph getGraph(Iri name)
+ public Graph getGraph(IRI name)
throws NoSuchEntityException {
Graph result;
for (WeightedTcProvider provider : providerList) {
@@ -298,7 +298,7 @@ public class TcProviderMultiplexer implements TcProvider {
}
@Override
- public Graph createGraph(Iri name)
+ public Graph createGraph(IRI name)
throws UnsupportedOperationException {
for (WeightedTcProvider provider : providerList) {
@@ -323,7 +323,7 @@ public class TcProviderMultiplexer implements TcProvider {
}
@Override
- public ImmutableGraph createImmutableGraph(Iri name, Graph triples) {
+ public ImmutableGraph createImmutableGraph(IRI name, Graph triples) {
for (WeightedTcProvider provider : providerList) {
try {
ImmutableGraph result = provider.createImmutableGraph(name, triples);
@@ -347,7 +347,7 @@ public class TcProviderMultiplexer implements TcProvider {
}
@Override
- public void deleteGraph(Iri name) {
+ public void deleteGraph(IRI name) {
for (TcProvider provider : providerList) {
try {
provider.deleteGraph(name);
@@ -375,8 +375,8 @@ public class TcProviderMultiplexer implements TcProvider {
}
@Override
- public Set<Iri> getNames(ImmutableGraph ImmutableGraph) {
- Set<Iri> result = new HashSet<Iri>();
+ public Set<IRI> getNames(ImmutableGraph ImmutableGraph) {
+ Set<IRI> result = new HashSet<IRI>();
for (TcProvider provider : providerList) {
result.addAll(provider.getNames(ImmutableGraph));
}
@@ -384,8 +384,8 @@ public class TcProviderMultiplexer implements TcProvider {
}
@Override
- public Set<Iri> listGraphs() {
- Set<Iri> result = new HashSet<Iri>();
+ public Set<IRI> listGraphs() {
+ Set<IRI> result = new HashSet<IRI>();
for (TcProvider provider : providerList) {
result.addAll(provider.listGraphs());
}
@@ -393,8 +393,8 @@ public class TcProviderMultiplexer implements TcProvider {
}
@Override
- public Set<Iri> listMGraphs() {
- Set<Iri> result = new HashSet<Iri>();
+ public Set<IRI> listMGraphs() {
+ Set<IRI> result = new HashSet<IRI>();
for (TcProvider provider : providerList) {
result.addAll(provider.listMGraphs());
}
@@ -402,8 +402,8 @@ public class TcProviderMultiplexer implements TcProvider {
}
@Override
- public Set<Iri> listImmutableGraphs() {
- Set<Iri> result = new HashSet<Iri>();
+ public Set<IRI> listImmutableGraphs() {
+ Set<IRI> result = new HashSet<IRI>();
for (TcProvider provider : providerList) {
result.addAll(provider.listImmutableGraphs());
}
[2/9] clerezza git commit: CLEREZZA-983: Adapted to new casing of
rdf-core (part 1)
Posted by re...@apache.org.
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/rdfa/src/main/java/org/apache/clerezza/rdf/rdfa/ClerezzaStatementSink.java
----------------------------------------------------------------------
diff --git a/rdf/rdfa/src/main/java/org/apache/clerezza/rdf/rdfa/ClerezzaStatementSink.java b/rdf/rdfa/src/main/java/org/apache/clerezza/rdf/rdfa/ClerezzaStatementSink.java
index cbb90be..bd80af4 100644
--- a/rdf/rdfa/src/main/java/org/apache/clerezza/rdf/rdfa/ClerezzaStatementSink.java
+++ b/rdf/rdfa/src/main/java/org/apache/clerezza/rdf/rdfa/ClerezzaStatementSink.java
@@ -23,12 +23,12 @@ import java.util.Map;
import net.rootdev.javardfa.StatementSink;
import org.apache.clerezza.commons.rdf.BlankNode;
-import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
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.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.impl.utils.PlainLiteralImpl;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.commons.rdf.impl.utils.TypedLiteralImpl;
@@ -61,12 +61,12 @@ public class ClerezzaStatementSink implements StatementSink {
@Override
public void addObject(String subject, String predicate, String object) {
- mgraph.add(new TripleImpl(transform(subject), new Iri(predicate), transform(object)));
+ mgraph.add(new TripleImpl(transform(subject), new IRI(predicate), transform(object)));
}
- private BlankNodeOrIri transform(String nonLiteral) {
- BlankNodeOrIri s;
- RdfTerm o;
+ private BlankNodeOrIRI transform(String nonLiteral) {
+ BlankNodeOrIRI s;
+ RDFTerm o;
if (nonLiteral.startsWith("_:")) {
s = bnodeLookup.get(nonLiteral);
if (s == null) {
@@ -74,7 +74,7 @@ public class ClerezzaStatementSink implements StatementSink {
bnodeLookup.put(nonLiteral, (BlankNode) s);
}
} else {
- s = new Iri(nonLiteral);
+ s = new IRI(nonLiteral);
}
return s;
}
@@ -89,9 +89,9 @@ public class ClerezzaStatementSink implements StatementSink {
obj = new PlainLiteralImpl(lex, new Language(lang));
}
} else {
- obj = new TypedLiteralImpl(lex, new Iri(datatype));
+ obj = new TypedLiteralImpl(lex, new IRI(datatype));
}
- mgraph.add(new TripleImpl(transform(subject), new Iri(predicate), obj));
+ mgraph.add(new TripleImpl(transform(subject), new IRI(predicate), obj));
}
@Override
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzLiteral.scala
----------------------------------------------------------------------
diff --git a/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzLiteral.scala b/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzLiteral.scala
index 7fb0bb4..809eb5f 100644
--- a/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzLiteral.scala
+++ b/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzLiteral.scala
@@ -21,12 +21,12 @@ package org.apache.clerezza.rdf.scala.utils
//import org.apache.clerezza.rdf.core.impl.{TypedLiteralImpl, PlainLiteralImpl}
import org.apache.clerezza.rdf.ontologies.XSD
-import org.apache.clerezza.commons.rdf.Iri
+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.impl.utils.PlainLiteralImpl
import org.apache.clerezza.commons.rdf.impl.utils.TypedLiteralImpl
-//import org.apache.clerezza.commons.rdf.core.{TypedLiteral, Language, PlainLiteral, Iri}
+//import org.apache.clerezza.commons.rdf.core.{TypedLiteral, Language, PlainLiteral, IRI}
object EzLiteral extends EzLiteralImplicits
@@ -65,7 +65,7 @@ class EzLiteral(string: String) extends TypedLiteralImpl(string,XSD.string) {
/**
* Map to a Typed Literal of given type
*/
- def ^^(typ: Iri): Literal = new TypedLiteralImpl(string, typ)
+ def ^^(typ: IRI): Literal = new TypedLiteralImpl(string, typ)
/**
* alias for iri
@@ -76,6 +76,6 @@ class EzLiteral(string: String) extends TypedLiteralImpl(string,XSD.string) {
/**
* Map to an IRI of given lexical form
*/
- def iri = new Iri(string)
+ def iri = new IRI(string)
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzMGraph.scala
----------------------------------------------------------------------
diff --git a/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzMGraph.scala b/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzMGraph.scala
index 1e86b50..1794b4b 100644
--- a/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzMGraph.scala
+++ b/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EzMGraph.scala
@@ -22,10 +22,10 @@ package org.apache.clerezza.rdf.scala.utils
import org.apache.clerezza.rdf.core._
import org.apache.clerezza.rdf.core.impl._
import org.apache.clerezza.commons.rdf.BlankNode
-import org.apache.clerezza.commons.rdf.BlankNodeOrIri
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI
import org.apache.clerezza.commons.rdf.Graph
-import org.apache.clerezza.commons.rdf.Iri
-import org.apache.clerezza.commons.rdf.RdfTerm
+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.commons.rdf.impl.utils.AbstractGraph
import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph
@@ -44,8 +44,8 @@ class EzGraph(val baseTc: Graph) extends AbstractGraph with TcDependentConversio
def this() = this (new SimpleGraph())
- def performFilter(subject: BlankNodeOrIri, predicate: Iri,
- obj: RdfTerm): java.util.Iterator[Triple] = baseTc.filter(subject, predicate, obj)
+ def performFilter(subject: BlankNodeOrIRI, predicate: IRI,
+ obj: RDFTerm): java.util.Iterator[Triple] = baseTc.filter(subject, predicate, obj)
override def performSize = baseTc.size
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Preamble.scala
----------------------------------------------------------------------
diff --git a/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Preamble.scala b/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Preamble.scala
index f9c4c55..1c8484f 100644
--- a/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Preamble.scala
+++ b/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/Preamble.scala
@@ -27,9 +27,9 @@ import java.net.URL
import java.util.Date
import org.apache.clerezza.rdf.core._
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.Literal
-import org.apache.clerezza.commons.rdf.RdfTerm
+import org.apache.clerezza.commons.rdf.RDFTerm
import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl
import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph
import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleImmutableGraph
@@ -71,7 +71,7 @@ protected trait TcDependentConversions extends TcIndependentConversions {
def baseTc: Graph
- implicit def toRichGraphNode(resource: RdfTerm) = {
+ implicit def toRichGraphNode(resource: RDFTerm) = {
new RichGraphNode(new GraphNode(resource, baseTc))
}
}
@@ -108,11 +108,11 @@ protected trait TcIndependentConversions extends EzLiteralImplicits {
implicit def double2lit(double: Double) = litFactory.createTypedLiteral(double)
- implicit def uriRef2Prefix(uriRef: Iri) = new NameSpace(uriRef.getUnicodeString)
+ implicit def uriRef2Prefix(uriRef: IRI) = new NameSpace(uriRef.getUnicodeString)
- implicit def URItoIri(uri: URI) = new Iri(uri.toString)
+ implicit def URItoIRI(uri: URI) = new IRI(uri.toString)
- implicit def URLtoIri(url: URL) = new Iri(url.toExternalForm)
+ implicit def URLtoIRI(url: URL) = new IRI(url.toExternalForm)
}
protected object TcIndependentConversions {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNode.scala
----------------------------------------------------------------------
diff --git a/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNode.scala b/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNode.scala
index 86d436c..a176165 100644
--- a/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNode.scala
+++ b/rdf/scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/RichGraphNode.scala
@@ -25,9 +25,9 @@ import java.util.Iterator
import _root_.scala.collection.JavaConversions._
import _root_.scala.reflect.Manifest
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.Literal
-import org.apache.clerezza.commons.rdf.RdfTerm
+import org.apache.clerezza.commons.rdf.RDFTerm
import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph
import org.apache.clerezza.rdf.utils.UnionGraph
@@ -41,7 +41,7 @@ import org.apache.clerezza.rdf.utils.UnionGraph
* @param resource the node represented by this RichGraphNode
* @param graph the Graph that describes the resource
*/
-class RichGraphNode(resource: RdfTerm, graph: Graph ) extends GraphNode(resource, graph) {
+class RichGraphNode(resource: RDFTerm, graph: Graph ) extends GraphNode(resource, graph) {
/**
* Construct a RichGraphNode given an existing [[GraphNde]]
@@ -55,7 +55,7 @@ class RichGraphNode(resource: RdfTerm, graph: Graph ) extends GraphNode(resource
*
* @return all objects of the specified property of the node wrapped by this object
*/
- def /(property: Iri): CollectedIter[RichGraphNode] = {
+ def /(property: IRI): CollectedIter[RichGraphNode] = {
new CollectedIter[RichGraphNode](() => new GraphNodeIter(getObjects(property)), readLock)
}
@@ -65,7 +65,7 @@ class RichGraphNode(resource: RdfTerm, graph: Graph ) extends GraphNode(resource
* @param property the property for which the subjects pointing to this node by that property are requested
* @return the matching resources
*/
- def /-(property: Iri): CollectedIter[RichGraphNode] = {
+ def /-(property: IRI): CollectedIter[RichGraphNode] = {
new CollectedIter[RichGraphNode](() => new GraphNodeIter(getSubjects(property)), readLock)
}
@@ -87,14 +87,14 @@ class RichGraphNode(resource: RdfTerm, graph: Graph ) extends GraphNode(resource
/**
* produces a default String representation for the node, this is the lexical form of literals,
- * the unicode-string for Iri and for BlankNodes the value returned by toString
+ * the unicode-string for IRI and for BlankNodes the value returned by toString
*
* @return the default string representation of the node
*/
def * : String = {
getNode() match {
case lit: Literal => lit.getLexicalForm
- case uri: Iri => uri.getUnicodeString
+ case uri: IRI => uri.getUnicodeString
case wrappedNode => wrappedNode.toString
}
}
@@ -119,16 +119,16 @@ class RichGraphNode(resource: RdfTerm, graph: Graph ) extends GraphNode(resource
}
/**
- * Operator syntax shortcut to get the <code>RdfTerm</code> wrapped by this
+ * Operator syntax shortcut to get the <code>RDFTerm</code> wrapped by this
* <code>GraphNode</code>
*
- * @return the node represented by this GraphNode as RdfTerm, same as <code>getNode</code>
+ * @return the node represented by this GraphNode as RDFTerm, same as <code>getNode</code>
*/
def ! = {
getNode()
}
- private class GraphNodeIter[T <: RdfTerm](base: Iterator[T]) extends Iterator[RichGraphNode] {
+ private class GraphNodeIter[T <: RDFTerm](base: Iterator[T]) extends Iterator[RichGraphNode] {
override def hasNext() = {
base.hasNext();
}
@@ -144,7 +144,7 @@ class RichGraphNode(resource: RdfTerm, graph: Graph ) extends GraphNode(resource
/**
*Sets the RDF:type of the subject */
- def a(rdfclass: Iri): RichGraphNode = {
+ def a(rdfclass: IRI): RichGraphNode = {
addProperty(RDF.`type`, rdfclass)
return this
}
@@ -159,7 +159,7 @@ class RichGraphNode(resource: RdfTerm, graph: Graph ) extends GraphNode(resource
/**
* relate the subject via the given relation to....
*/
- def --(rel: RdfTerm): DashTuple = new DashTuple(rel)
+ def --(rel: RDFTerm): DashTuple = new DashTuple(rel)
def --(rel: RichGraphNode): DashTuple = new DashTuple(rel.getNode)
@@ -169,9 +169,9 @@ class RichGraphNode(resource: RdfTerm, graph: Graph ) extends GraphNode(resource
*/
def <--(tuple: RichGraphNode#DashTuple): RichGraphNode = {
val inversePropertyRes = tuple.first.getNode
- val inverseProperty: Iri = inversePropertyRes match {
- case p: Iri => p
- case _ => throw new RuntimeException("DashTuple must be a Iri")
+ val inverseProperty: IRI = inversePropertyRes match {
+ case p: IRI => p
+ case _ => throw new RuntimeException("DashTuple must be a IRI")
}
RichGraphNode.this.addInverseProperty(inverseProperty, tuple.second)
RichGraphNode.this
@@ -185,7 +185,7 @@ class RichGraphNode(resource: RdfTerm, graph: Graph ) extends GraphNode(resource
// /**
// * ...to the following non literal
// */
-// def --(subj: BlankNodeOrIri): RichGraphNode = {
+// def --(subj: BlankNodeOrIRI): RichGraphNode = {
// RichGraphNode.this.addInverseProperty(rel, subj)
// RichGraphNode.this
// }
@@ -193,14 +193,14 @@ class RichGraphNode(resource: RdfTerm, graph: Graph ) extends GraphNode(resource
// /**
// * ...to the following resource (given as a string)
// */
-// def --(subj: String): RichGraphNode = --(new Iri(subj))
+// def --(subj: String): RichGraphNode = --(new IRI(subj))
//
// /**
// * ...to the following EzGraphNode
// * (useful for opening a new parenthesis and specifying other things in more detail
// */
// def --(subj: GraphNode): RichGraphNode = {
-// --(subj.getNode.asInstanceOf[BlankNodeOrIri])
+// --(subj.getNode.asInstanceOf[BlankNodeOrIRI])
// }
// // since we can only have inverses from non literals (howto deal with bndoes?)
// }
@@ -208,16 +208,16 @@ class RichGraphNode(resource: RdfTerm, graph: Graph ) extends GraphNode(resource
/**
* class for relations with the current RichGraphNode.ref as subject
*/
- class DashTuple(val second: RdfTerm) {
+ class DashTuple(val second: RDFTerm) {
val first = RichGraphNode.this
/**
* ...to the following non resource
*/
- def -->(obj: RdfTerm): RichGraphNode = {
+ def -->(obj: RDFTerm): RichGraphNode = {
val property = second match {
- case u: Iri => u;
- case _ => throw new RuntimeException("Property must be a Iri")
+ case u: IRI => u;
+ case _ => throw new RuntimeException("Property must be a IRI")
}
RichGraphNode.this.addProperty(property, obj)
RichGraphNode.this
@@ -234,7 +234,7 @@ class RichGraphNode(resource: RdfTerm, graph: Graph ) extends GraphNode(resource
/**
* Add one relation for each member of the iterable collection
*/
- def -->>[T <: RdfTerm](uris: Iterable[T]): RichGraphNode = {
+ def -->>[T <: RDFTerm](uris: Iterable[T]): RichGraphNode = {
for (u <- uris) -->(u)
RichGraphNode.this
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/schemagen/main/src/main/java/org/apache/clerezza/rdf/schemagen/SchemaGen.java
----------------------------------------------------------------------
diff --git a/rdf/schemagen/main/src/main/java/org/apache/clerezza/rdf/schemagen/SchemaGen.java b/rdf/schemagen/main/src/main/java/org/apache/clerezza/rdf/schemagen/SchemaGen.java
index ad73af9..f7e5e1d 100644
--- a/rdf/schemagen/main/src/main/java/org/apache/clerezza/rdf/schemagen/SchemaGen.java
+++ b/rdf/schemagen/main/src/main/java/org/apache/clerezza/rdf/schemagen/SchemaGen.java
@@ -35,12 +35,12 @@ import java.util.TreeSet;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.commons.rdf.BlankNode;
-import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
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.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.simple.SimpleGraph;
import org.wymiwyg.commons.util.arguments.AnnotatedInterfaceArguments;
@@ -104,7 +104,7 @@ public class SchemaGen {
Iterator<Triple> ontologyTriples = schemaGraph.filter(null, RDF.type, OWL.Ontology);
String result;
if(ontologyTriples.hasNext()) {
- result = ((Iri) ontologyTriples.next().getSubject()).getUnicodeString();
+ result = ((IRI) ontologyTriples.next().getSubject()).getUnicodeString();
} else {
throw new RuntimeException("No OWL Ontology found!");
}
@@ -133,7 +133,7 @@ public class SchemaGen {
out.println(';');
}
out.println();
- out.println("import org.apache.clerezza.commons.rdf.Iri;");
+ out.println("import org.apache.clerezza.commons.rdf.IRI;");
out.println();
out.print("public class ");
out.print(getSimpleName());
@@ -188,16 +188,16 @@ public class SchemaGen {
out.println(description);
out.println("\t */");
}
- out.print("\tpublic static final Iri ");
+ out.print("\tpublic static final IRI ");
out.print(ontologyResource.getLocalName());
- out.print(" = new Iri(\"");
+ out.print(" = new IRI(\"");
out.print(ontologyResource.getUriString());
out.println("\");");
}
}
- private Collection<OntologyResource> getResourcesOfType(Iri type) {
+ private Collection<OntologyResource> getResourcesOfType(IRI type) {
return getResourcesOfType(type, null);
}
@@ -207,13 +207,13 @@ public class SchemaGen {
* @param ignore a set things to ignore
* @return
*/
- private Collection<OntologyResource> getResourcesOfType(Iri type, Collection<OntologyResource> ignore) {
+ private Collection<OntologyResource> getResourcesOfType(IRI type, Collection<OntologyResource> ignore) {
Set<OntologyResource> result = new HashSet<OntologyResource>();
Iterator<Triple> classStatemente = schemaGraph.filter(null, RDF.type,
type);
while (classStatemente.hasNext()) {
Triple triple = classStatemente.next();
- BlankNodeOrIri classResource = triple.getSubject();
+ BlankNodeOrIRI classResource = triple.getSubject();
if (classResource instanceof BlankNode) {
if (type !=null) System.err.println("Ignoring anonymous resource of type " + type.getUnicodeString());
else System.err.println("Ignoring anonymous resource");
@@ -224,7 +224,7 @@ public class SchemaGen {
}
// Test if the given resource belongs to the ontology
- final Iri classUri = (Iri) classResource;
+ final IRI classUri = (IRI) classResource;
final String strClassUri = classUri.getUnicodeString();
if (strClassUri.startsWith(namespace)) {
// The remaining part of the class URI must not contain
@@ -248,7 +248,7 @@ public class SchemaGen {
return result;
}
- private ImmutableGraph getNodeContext(BlankNodeOrIri resource, Graph graph) {
+ private ImmutableGraph getNodeContext(BlankNodeOrIRI resource, Graph graph) {
final HashSet<BlankNode> dontExpand = new HashSet<BlankNode>();
if (resource instanceof BlankNode) {
dontExpand.add((BlankNode) resource);
@@ -257,14 +257,14 @@ public class SchemaGen {
}
- private Graph getContextOf(BlankNodeOrIri node, Set<BlankNode> dontExpand,
+ private Graph getContextOf(BlankNodeOrIRI node, Set<BlankNode> dontExpand,
Graph graph) {
Graph result = new SimpleGraph();
Iterator<Triple> forwardProperties = graph.filter(node, null, null);
while (forwardProperties.hasNext()) {
Triple triple = forwardProperties.next();
result.add(triple);
- RdfTerm object = triple.getObject();
+ RDFTerm object = triple.getObject();
if (object instanceof BlankNode) {
BlankNode bNodeObject = (BlankNode) object;
if (!dontExpand.contains(bNodeObject)) {
@@ -277,7 +277,7 @@ public class SchemaGen {
while (backwardProperties.hasNext()) {
Triple triple = backwardProperties.next();
result.add(triple);
- BlankNodeOrIri subject = triple.getSubject();
+ BlankNodeOrIRI subject = triple.getSubject();
if (subject instanceof BlankNode) {
BlankNode bNodeSubject = (BlankNode) subject;
if (!dontExpand.contains(bNodeSubject)) {
@@ -309,7 +309,7 @@ public class SchemaGen {
Comparable<OntologyResource> {
final Graph graph;
- final Iri uri;
+ final IRI uri;
static final List<String> reservedWords = Arrays.asList(
"abstract", "assert", "boolean", "break", "byte", "case",
@@ -322,7 +322,7 @@ public class SchemaGen {
"synchronized", "this", "throw", "throws", "transient",
"true", "try", "void", "volatile", "while");
- OntologyResource(Iri uri, Graph graph) {
+ OntologyResource(IRI uri, Graph graph) {
this.uri = uri;
this.graph = graph;
}
@@ -348,7 +348,7 @@ public class SchemaGen {
Iterator<Triple> titleStatements = graph.filter(
uri, DCTERMS.title, null);
while (titleStatements.hasNext()) {
- RdfTerm object = titleStatements.next().getObject();
+ RDFTerm object = titleStatements.next().getObject();
if (object instanceof Literal) {
result.append("title: ");
result.append (((Literal) object).getLexicalForm());
@@ -358,7 +358,7 @@ public class SchemaGen {
Iterator<Triple> descriptionStatements = graph.filter(
uri, DCTERMS.description, null);
while (descriptionStatements.hasNext()) {
- RdfTerm object = descriptionStatements.next().getObject();
+ RDFTerm object = descriptionStatements.next().getObject();
if (object instanceof Literal) {
result.append("description: ");
result.append (((Literal) object).getLexicalForm());
@@ -368,7 +368,7 @@ public class SchemaGen {
Iterator<Triple> skosDefStatements = graph.filter(
uri, SKOS.definition, null);
while (skosDefStatements.hasNext()) {
- RdfTerm object = skosDefStatements.next().getObject();
+ RDFTerm object = skosDefStatements.next().getObject();
if (object instanceof Literal) {
result.append("definition: ");
result.append (((Literal) object).getLexicalForm());
@@ -378,7 +378,7 @@ public class SchemaGen {
Iterator<Triple> rdfsCommentStatements = graph.filter(
uri, RDFS.comment, null);
while (rdfsCommentStatements.hasNext()) {
- RdfTerm object = rdfsCommentStatements.next().getObject();
+ RDFTerm object = rdfsCommentStatements.next().getObject();
if (object instanceof Literal) {
result.append("comment: ");
result.append(((Literal) object).getLexicalForm());
@@ -388,7 +388,7 @@ public class SchemaGen {
Iterator<Triple> skosNoteStatements = graph.filter(
uri, SKOS.note, null);
while (skosNoteStatements.hasNext()) {
- RdfTerm object = skosNoteStatements.next().getObject();
+ RDFTerm object = skosNoteStatements.next().getObject();
if (object instanceof Literal) {
result.append("note: ");
result.append (((Literal) object).getLexicalForm());
@@ -398,13 +398,13 @@ public class SchemaGen {
Iterator<Triple> skosExampleStatements = graph.filter(
uri, SKOS.example, null);
while (skosExampleStatements.hasNext()) {
- RdfTerm object = skosExampleStatements.next().getObject();
+ RDFTerm object = skosExampleStatements.next().getObject();
if (object instanceof Literal) {
result.append("example: ");
result.append (((Literal) object).getLexicalForm());
result.append("\n");
- } else if (object instanceof Iri) {
- result.append("see <a href="+((Iri)object).getUnicodeString()+">example</a>");
+ } else if (object instanceof IRI) {
+ result.append("see <a href="+((IRI)object).getUnicodeString()+">example</a>");
result.append("\n");
}
}
@@ -444,13 +444,13 @@ public class SchemaGen {
private static final String NS = "http://www.w3.org/2002/07/owl#";
- private static final Iri Class =
- new Iri(NS + "Class");
- public static final RdfTerm Ontology = new Iri(NS + "Ontology");
- private static final Iri DatatypeProperty =
- new Iri(NS + "DatatypeProperty");
- private static final Iri ObjectProperty =
- new Iri(NS + "ObjectProperty");
+ private static final IRI Class =
+ new IRI(NS + "Class");
+ public static final RDFTerm Ontology = new IRI(NS + "Ontology");
+ private static final IRI DatatypeProperty =
+ new IRI(NS + "DatatypeProperty");
+ private static final IRI ObjectProperty =
+ new IRI(NS + "ObjectProperty");
}
/** RDFS Ontology. */
@@ -458,9 +458,9 @@ public class SchemaGen {
private static final String NS =
"http://www.w3.org/2000/01/rdf-schema#";
- private static final Iri Class = new Iri(NS + "Class");
- private static final Iri Datatype = new Iri(NS + "Datatype");
- private static final Iri comment = new Iri(NS + "comment");
+ private static final IRI Class = new IRI(NS + "Class");
+ private static final IRI Datatype = new IRI(NS + "Datatype");
+ private static final IRI comment = new IRI(NS + "comment");
}
/** RDF Ontology. */
@@ -468,19 +468,19 @@ public class SchemaGen {
private static final String NS =
"http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- private static final Iri Property = new Iri(NS + "Property");
- private static final Iri type = new Iri(NS + "type");
+ private static final IRI Property = new IRI(NS + "Property");
+ private static final IRI type = new IRI(NS + "type");
}
private static class SKOS {
- static final Iri definition = new Iri("http://www.w3.org/2008/05/skos#definition");
- static final Iri note = new Iri("http://www.w3.org/2004/02/skos/core#note");
- static final Iri example = new Iri("http://www.w3.org/2004/02/skos/core#example");
+ static final IRI definition = new IRI("http://www.w3.org/2008/05/skos#definition");
+ static final IRI note = new IRI("http://www.w3.org/2004/02/skos/core#note");
+ static final IRI example = new IRI("http://www.w3.org/2004/02/skos/core#example");
}
private static class DCTERMS {
- public static final Iri title = new Iri("http://purl.org/dc/terms/title");
- public static final Iri description = new Iri("http://purl.org/dc/terms/description");
+ public static final IRI title = new IRI("http://purl.org/dc/terms/title");
+ public static final IRI description = new IRI("http://purl.org/dc/terms/description");
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/simple.storage/src/main/java/org/apache/clerezza/rdf/simple/storage/SimpleTcProvider.java
----------------------------------------------------------------------
diff --git a/rdf/simple.storage/src/main/java/org/apache/clerezza/rdf/simple/storage/SimpleTcProvider.java b/rdf/simple.storage/src/main/java/org/apache/clerezza/rdf/simple/storage/SimpleTcProvider.java
index 1dbdaa1..11352ca 100644
--- a/rdf/simple.storage/src/main/java/org/apache/clerezza/rdf/simple/storage/SimpleTcProvider.java
+++ b/rdf/simple.storage/src/main/java/org/apache/clerezza/rdf/simple/storage/SimpleTcProvider.java
@@ -25,7 +25,7 @@ import java.util.Set;
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;
@@ -40,10 +40,10 @@ import org.osgi.service.component.annotations.Component;
@Component(service = WeightedTcProvider.class, property = TcManager.GENERAL_PURPOSE_TC+"=true")
public class SimpleTcProvider implements WeightedTcProvider {
- private Map<Iri, Graph> tripleMap = new HashMap<Iri, Graph>();
+ private Map<IRI, Graph> tripleMap = new HashMap<IRI, Graph>();
@Override
- public ImmutableGraph createImmutableGraph(Iri name, Graph triples)
+ public ImmutableGraph createImmutableGraph(IRI name, Graph triples)
throws EntityAlreadyExistsException {
if ((name == null) || (name.getUnicodeString() == null)
|| (name.getUnicodeString().trim().length() == 0)) {
@@ -73,7 +73,7 @@ public class SimpleTcProvider implements WeightedTcProvider {
}
@Override
- public Graph createGraph(Iri name) throws EntityAlreadyExistsException {
+ public Graph createGraph(IRI name) throws EntityAlreadyExistsException {
if ((name == null) || (name.getUnicodeString() == null)
|| (name.getUnicodeString().trim().length() == 0)) {
throw new IllegalArgumentException("Name must not be null");
@@ -92,7 +92,7 @@ public class SimpleTcProvider implements WeightedTcProvider {
}
@Override
- public void deleteGraph(Iri name)
+ public void deleteGraph(IRI name)
throws NoSuchEntityException, EntityUndeletableException {
if (tripleMap.remove(name) == null) {
throw new NoSuchEntityException(name);
@@ -100,7 +100,7 @@ public class SimpleTcProvider implements WeightedTcProvider {
}
@Override
- public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
+ public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
Graph tripleCollection = tripleMap.get(name);
if (tripleCollection == null) {
throw new NoSuchEntityException(name);
@@ -111,7 +111,7 @@ public class SimpleTcProvider implements WeightedTcProvider {
}
@Override
- public Graph getMGraph(Iri name) throws NoSuchEntityException {
+ public Graph getMGraph(IRI name) throws NoSuchEntityException {
Graph tripleCollection = tripleMap.get(name);
if (tripleCollection == null) {
throw new NoSuchEntityException(name);
@@ -122,13 +122,13 @@ public class SimpleTcProvider implements WeightedTcProvider {
}
@Override
- public Set<Iri> getNames(ImmutableGraph graph) {
+ public Set<IRI> getNames(ImmutableGraph graph) {
throw new UnsupportedOperationException(
"Not supported yet. equals() has to be implemented first");
}
@Override
- public Graph getGraph(Iri name)
+ public Graph getGraph(IRI name)
throws NoSuchEntityException {
Graph tripleCollection = tripleMap.get(name);
if (tripleCollection == null) {
@@ -144,9 +144,9 @@ public class SimpleTcProvider implements WeightedTcProvider {
}
@Override
- public Set<Iri> listImmutableGraphs() {
- Set<Iri> result = new HashSet<Iri>();
- for (Iri uriRef : listGraphs()) {
+ public Set<IRI> listImmutableGraphs() {
+ Set<IRI> result = new HashSet<IRI>();
+ for (IRI uriRef : listGraphs()) {
if (tripleMap.get(uriRef) instanceof ImmutableGraph) {
result.add(uriRef);
}
@@ -155,9 +155,9 @@ public class SimpleTcProvider implements WeightedTcProvider {
}
@Override
- public Set<Iri> listMGraphs() {
- Set<Iri> result = new HashSet<Iri>();
- for (Iri uriRef : listGraphs()) {
+ public Set<IRI> listMGraphs() {
+ Set<IRI> result = new HashSet<IRI>();
+ for (IRI uriRef : listGraphs()) {
if (!(tripleMap.get(uriRef) instanceof ImmutableGraph)) {
result.add(uriRef);
}
@@ -166,7 +166,7 @@ public class SimpleTcProvider implements WeightedTcProvider {
}
@Override
- public Set<Iri> listGraphs() {
+ public Set<IRI> listGraphs() {
return tripleMap.keySet();
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/simple.storage/src/test/java/org/apache/clerezza/rdf/simple/storage/AccessViaTcManager.java
----------------------------------------------------------------------
diff --git a/rdf/simple.storage/src/test/java/org/apache/clerezza/rdf/simple/storage/AccessViaTcManager.java b/rdf/simple.storage/src/test/java/org/apache/clerezza/rdf/simple/storage/AccessViaTcManager.java
index 9c86d60..8714b97 100644
--- a/rdf/simple.storage/src/test/java/org/apache/clerezza/rdf/simple/storage/AccessViaTcManager.java
+++ b/rdf/simple.storage/src/test/java/org/apache/clerezza/rdf/simple/storage/AccessViaTcManager.java
@@ -17,7 +17,7 @@ package org.apache.clerezza.rdf.simple.storage;
import org.apache.clerezza.rdf.core.access.TcManager;
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.junit.Assert;
import org.junit.Test;
@@ -30,7 +30,7 @@ public class AccessViaTcManager {
@Test
public void simple() {
- Graph g = TcManager.getInstance().createGraph(new Iri("http://example.org/foo"));
+ Graph g = TcManager.getInstance().createGraph(new IRI("http://example.org/foo"));
Assert.assertTrue(g instanceof SimpleGraph);
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java
index af8696c..c710699 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java
@@ -37,7 +37,7 @@ import org.apache.clerezza.commons.rdf.*;
*/
public class GraphNode {
- private final RdfTerm resource;
+ private final RDFTerm resource;
private final Graph graph;
/**
@@ -46,7 +46,7 @@ public class GraphNode {
* @param resource the resource this GraphNode represents
* @param graph the Graph that describes the resource
*/
- public GraphNode(RdfTerm resource, Graph graph) {
+ public GraphNode(RDFTerm resource, Graph graph) {
if (resource == null) {
throw new IllegalArgumentException("resource may not be null");
}
@@ -71,7 +71,7 @@ public class GraphNode {
*
* @return the node represented by this GraphNode
*/
- public RdfTerm getNode() {
+ public RDFTerm getNode() {
return resource;
}
@@ -99,10 +99,10 @@ public class GraphNode {
Lock l = readLock();
l.lock();
try {
- final HashSet<RdfTerm> dontExpand = new HashSet<RdfTerm>();
+ final HashSet<RDFTerm> dontExpand = new HashSet<RDFTerm>();
dontExpand.add(resource);
- if (resource instanceof Iri) {
- return getContextOf((Iri) resource, dontExpand).getImmutableGraph();
+ if (resource instanceof IRI) {
+ return getContextOf((IRI) resource, dontExpand).getImmutableGraph();
}
return getContextOf(resource, dontExpand).getImmutableGraph();
} finally {
@@ -111,17 +111,17 @@ public class GraphNode {
}
- private Graph getContextOf(Iri node, final Set<RdfTerm> dontExpand) {
+ private Graph getContextOf(IRI node, final Set<RDFTerm> dontExpand) {
final String uriPrefix = node.getUnicodeString()+'#';
return getContextOf(node, dontExpand, new Acceptor() {
@Override
- public boolean expand(RdfTerm resource) {
+ public boolean expand(RDFTerm resource) {
if (resource instanceof BlankNode) {
return true;
}
- if (resource instanceof Iri) {
- return ((Iri)resource).getUnicodeString().startsWith(uriPrefix);
+ if (resource instanceof IRI) {
+ return ((IRI)resource).getUnicodeString().startsWith(uriPrefix);
}
return false;
}
@@ -129,18 +129,18 @@ public class GraphNode {
}
/**
- * Returns the context of a <code>BlankNodeOrIri</code>
+ * Returns the context of a <code>BlankNodeOrIRI</code>
*
* @param node
* @param dontExpand a list of bnodes at which to stop expansion, if node
* is a BlankNode it should be contained (potentially faster)
* @return the context of a node
*/
- private Graph getContextOf(RdfTerm node, final Set<RdfTerm> dontExpand) {
+ private Graph getContextOf(RDFTerm node, final Set<RDFTerm> dontExpand) {
return getContextOf(node, dontExpand, new Acceptor() {
@Override
- public boolean expand(RdfTerm resource) {
+ public boolean expand(RDFTerm resource) {
if (resource instanceof BlankNode) {
return true;
}
@@ -150,16 +150,16 @@ public class GraphNode {
}
private interface Acceptor {
- boolean expand(RdfTerm resource);
+ boolean expand(RDFTerm resource);
}
- private Graph getContextOf(RdfTerm node, final Set<RdfTerm> dontExpand, Acceptor acceptor) {
+ private Graph getContextOf(RDFTerm node, final Set<RDFTerm> dontExpand, Acceptor acceptor) {
Graph result = new SimpleGraph();
- if (node instanceof BlankNodeOrIri) {
- Iterator<Triple> forwardProperties = graph.filter((BlankNodeOrIri) node, null, null);
+ if (node instanceof BlankNodeOrIRI) {
+ Iterator<Triple> forwardProperties = graph.filter((BlankNodeOrIRI) node, null, null);
while (forwardProperties.hasNext()) {
Triple triple = forwardProperties.next();
result.add(triple);
- RdfTerm object = triple.getObject();
+ RDFTerm object = triple.getObject();
if (acceptor.expand(object) && !dontExpand.contains(object)) {
dontExpand.add(object);
result.addAll(getContextOf(object, dontExpand, acceptor));
@@ -170,7 +170,7 @@ public class GraphNode {
while (backwardProperties.hasNext()) {
Triple triple = backwardProperties.next();
result.add(triple);
- BlankNodeOrIri subject = triple.getSubject();
+ BlankNodeOrIRI subject = triple.getSubject();
if (acceptor.expand(subject) && !dontExpand.contains(subject)) {
dontExpand.add(subject);
result.addAll(getContextOf(subject, dontExpand, acceptor));
@@ -179,8 +179,8 @@ public class GraphNode {
return result;
}
- private <T> Iterator<T> getTypeSelectedObjects(Iri property, final Class<T> type) {
- final Iterator<RdfTerm> objects = getObjects(property);
+ private <T> Iterator<T> getTypeSelectedObjects(IRI property, final Class<T> type) {
+ final Iterator<RDFTerm> objects = getObjects(property);
return new Iterator<T>() {
T next = prepareNext();
@@ -204,7 +204,7 @@ public class GraphNode {
private T prepareNext() {
while (objects.hasNext()) {
- RdfTerm nextObject = objects.next();
+ RDFTerm nextObject = objects.next();
if (type.isAssignableFrom(nextObject.getClass())) {
return (T) nextObject;
}
@@ -214,8 +214,8 @@ public class GraphNode {
};
}
- public Iterator<Literal> getLiterals(Iri property) {
- final Iterator<RdfTerm> objects = getObjects(property);
+ public Iterator<Literal> getLiterals(IRI property) {
+ final Iterator<RDFTerm> objects = getObjects(property);
return new Iterator<Literal>() {
Literal next = prepareNext();
@@ -239,7 +239,7 @@ public class GraphNode {
private Literal prepareNext() {
while (objects.hasNext()) {
- RdfTerm nextObject = objects.next();
+ RDFTerm nextObject = objects.next();
if (nextObject instanceof Literal) {
return (Literal) nextObject;
}
@@ -257,8 +257,8 @@ public class GraphNode {
* @return the number of triples in the underlying triple-collection
* which meet the specified condition
*/
- public int countObjects(Iri property) {
- return countTriples(graph.filter((BlankNodeOrIri) resource, property, null));
+ public int countObjects(IRI property) {
+ return countTriples(graph.filter((BlankNodeOrIRI) resource, property, null));
}
private int countTriples(final Iterator<Triple> triples) {
@@ -277,10 +277,10 @@ public class GraphNode {
* @param property the property
* @return
*/
- public Iterator<RdfTerm> getObjects(Iri property) {
- if (resource instanceof BlankNodeOrIri) {
- final Iterator<Triple> triples = graph.filter((BlankNodeOrIri) resource, property, null);
- return new Iterator<RdfTerm>() {
+ public Iterator<RDFTerm> getObjects(IRI property) {
+ if (resource instanceof BlankNodeOrIRI) {
+ final Iterator<Triple> triples = graph.filter((BlankNodeOrIRI) resource, property, null);
+ return new Iterator<RDFTerm>() {
@Override
public boolean hasNext() {
@@ -288,7 +288,7 @@ public class GraphNode {
}
@Override
- public RdfTerm next() {
+ public RDFTerm next() {
final Triple triple = triples.next();
if (triple != null) {
return triple.getObject();
@@ -303,7 +303,7 @@ public class GraphNode {
}
};
} else {
- return new Iterator<RdfTerm>() {
+ return new Iterator<RDFTerm>() {
@Override
public boolean hasNext() {
@@ -311,7 +311,7 @@ public class GraphNode {
}
@Override
- public RdfTerm next() {
+ public RDFTerm next() {
return null;
}
@@ -333,11 +333,11 @@ public class GraphNode {
* @return true if the node represented by this object is the subject of a
* statement with the given prediate and object, false otherwise
*/
- public boolean hasProperty(Iri property, RdfTerm object) {
+ public boolean hasProperty(IRI property, RDFTerm object) {
Lock l = readLock();
l.lock();
try {
- Iterator<RdfTerm> objects = getObjects(property);
+ Iterator<RDFTerm> objects = getObjects(property);
if (object == null) {
return objects.hasNext();
}
@@ -360,7 +360,7 @@ public class GraphNode {
* @return the number of triples in the underlying triple-collection
* which meet the specified condition
*/
- public int countSubjects(Iri property) {
+ public int countSubjects(IRI property) {
Lock l = readLock();
l.lock();
try {
@@ -377,9 +377,9 @@ public class GraphNode {
* @param property the property
* @return
*/
- public Iterator<BlankNodeOrIri> getSubjects(Iri property) {
+ public Iterator<BlankNodeOrIRI> getSubjects(IRI property) {
final Iterator<Triple> triples = graph.filter(null, property, resource);
- return new Iterator<BlankNodeOrIri>() {
+ return new Iterator<BlankNodeOrIRI>() {
@Override
public boolean hasNext() {
@@ -387,7 +387,7 @@ public class GraphNode {
}
@Override
- public BlankNodeOrIri next() {
+ public BlankNodeOrIRI next() {
return triples.next().getSubject();
}
@@ -398,24 +398,24 @@ public class GraphNode {
};
}
- public Iterator<Iri> getIriObjects(Iri property) {
- return getTypeSelectedObjects(property, Iri.class);
+ public Iterator<IRI> getIriObjects(IRI property) {
+ return getTypeSelectedObjects(property, IRI.class);
}
/**
- * Get all available properties as an {@link Iterator}<{@link Iri}>.
- * You can use <code>getObjects(Iri property)</code> to get the values of
+ * Get all available properties as an {@link Iterator}<{@link IRI}>.
+ * You can use <code>getObjects(IRI property)</code> to get the values of
* each property
*
* @return an iterator over properties of this node
*/
- public Iterator<Iri> getProperties() {
- if (resource instanceof BlankNodeOrIri) {
- final Iterator<Triple> triples = graph.filter((BlankNodeOrIri) resource, null, null);
+ public Iterator<IRI> getProperties() {
+ if (resource instanceof BlankNodeOrIRI) {
+ final Iterator<Triple> triples = graph.filter((BlankNodeOrIRI) resource, null, null);
return getUniquePredicates(triples);
} else {
- return new Iterator<Iri>() {
+ return new Iterator<IRI>() {
@Override
public boolean hasNext() {
@@ -423,7 +423,7 @@ public class GraphNode {
}
@Override
- public Iri next() {
+ public IRI next() {
return null;
}
@@ -436,13 +436,13 @@ public class GraphNode {
}
/**
- * Get all inverse properties as an {@link Iterator}<{@link Iri}>.
- * You can use <code>getSubject(Iri property)</code> to get the values of
+ * Get all inverse properties as an {@link Iterator}<{@link IRI}>.
+ * You can use <code>getSubject(IRI property)</code> to get the values of
* each inverse property
*
* @return an iterator over properties pointing to this node
*/
- public Iterator<Iri> getInverseProperties() {
+ public Iterator<IRI> getInverseProperties() {
final Iterator<Triple> triples = graph.filter(null, null, resource);
return getUniquePredicates(triples);
}
@@ -453,8 +453,8 @@ public class GraphNode {
* @returnan {@link Iterator}<{@link Iri}> containing the predicates from
* an {@link Iterator}<{@link Triple}>
*/
- private Iterator<Iri> getUniquePredicates(final Iterator<Triple> triples) {
- final Set<Iri> resultSet = new HashSet<Iri>();
+ private Iterator<IRI> getUniquePredicates(final Iterator<Triple> triples) {
+ final Set<IRI> resultSet = new HashSet<IRI>();
while (triples.hasNext()) {
resultSet.add(triples.next().getPredicate());
}
@@ -467,9 +467,9 @@ public class GraphNode {
* @param predicate
* @param object
*/
- public void addProperty(Iri predicate, RdfTerm object) {
- if (resource instanceof BlankNodeOrIri) {
- graph.add(new TripleImpl((BlankNodeOrIri) resource, predicate, object));
+ public void addProperty(IRI predicate, RDFTerm object) {
+ if (resource instanceof BlankNodeOrIRI) {
+ graph.add(new TripleImpl((BlankNodeOrIRI) resource, predicate, object));
} else {
throw new RuntimeException("Literals cannot be the subject of a statement");
}
@@ -483,7 +483,7 @@ public class GraphNode {
* @param property the predicate of the triple to be created
* @param value the value of the typed literal object
*/
- public void addPropertyValue(Iri property, Object value) {
+ public void addPropertyValue(IRI property, Object value) {
addProperty(property,
LiteralFactory.getInstance().createTypedLiteral(value));
}
@@ -495,9 +495,9 @@ public class GraphNode {
* @param predicate
* @param subject
*/
- public void addInverseProperty(Iri predicate, RdfTerm subject) {
- if (subject instanceof BlankNodeOrIri) {
- graph.add(new TripleImpl((BlankNodeOrIri) subject, predicate, resource));
+ public void addInverseProperty(IRI predicate, RDFTerm subject) {
+ if (subject instanceof BlankNodeOrIRI) {
+ graph.add(new TripleImpl((BlankNodeOrIRI) subject, predicate, resource));
} else {
throw new RuntimeException("Literals cannot be the subject of a statement");
}
@@ -510,9 +510,9 @@ public class GraphNode {
*
* @return a List to easy access the rdf:List represented by this node
*/
- public List<RdfTerm> asList() {
- if (resource instanceof BlankNodeOrIri) {
- return new RdfList((BlankNodeOrIri) resource, graph);
+ public List<RDFTerm> asList() {
+ if (resource instanceof BlankNodeOrIRI) {
+ return new RdfList((BlankNodeOrIRI) resource, graph);
} else {
throw new RuntimeException("Literals cannot be the subject of a List");
}
@@ -524,9 +524,9 @@ public class GraphNode {
*
* @param predicate
*/
- public void deleteProperties(Iri predicate) {
- if (resource instanceof BlankNodeOrIri) {
- Iterator<Triple> tripleIter = graph.filter((BlankNodeOrIri) resource, predicate, null);
+ public void deleteProperties(IRI predicate) {
+ if (resource instanceof BlankNodeOrIRI) {
+ Iterator<Triple> tripleIter = graph.filter((BlankNodeOrIRI) resource, predicate, null);
Collection<Triple> toDelete = new ArrayList<Triple>();
while (tripleIter.hasNext()) {
Triple triple = tripleIter.next();
@@ -544,9 +544,9 @@ public class GraphNode {
* @param predicate
* @param object
*/
- public void deleteProperty(Iri predicate, RdfTerm object) {
- if (resource instanceof BlankNodeOrIri) {
- graph.remove(new TripleImpl((BlankNodeOrIri) resource, predicate, object));
+ public void deleteProperty(IRI predicate, RDFTerm object) {
+ if (resource instanceof BlankNodeOrIRI) {
+ graph.remove(new TripleImpl((BlankNodeOrIRI) resource, predicate, object));
}
}
@@ -556,27 +556,27 @@ public class GraphNode {
}
/**
- * Replaces the graph node resouce with the specified <code>BlankNodeOrIri</code>.
+ * Replaces the graph node resouce with the specified <code>BlankNodeOrIRI</code>.
* The resource is only replaced where it is either subject or object.
* @param replacement
* @return a GraphNode representing the replecement node
*/
- public GraphNode replaceWith(BlankNodeOrIri replacement) {
+ public GraphNode replaceWith(BlankNodeOrIRI replacement) {
return replaceWith(replacement, false);
}
/**
- * Replaces the graph node resouce with the specified <code>BlankNodeOrIri</code>.
+ * Replaces the graph node resouce with the specified <code>BlankNodeOrIRI</code>.
* Over the boolean <code>checkPredicate</code> it can be specified if the
* resource should also be replaced where it is used as predicate.
* @param replacement
* @param checkPredicates
* @return a GraphNode representing the replecement node
*/
- public GraphNode replaceWith(BlankNodeOrIri replacement, boolean checkPredicates) {
+ public GraphNode replaceWith(BlankNodeOrIRI replacement, boolean checkPredicates) {
Graph newTriples = new SimpleGraph();
if (!(resource instanceof Literal)) {
- Iterator<Triple> subjectTriples = graph.filter((BlankNodeOrIri) resource, null,
+ Iterator<Triple> subjectTriples = graph.filter((BlankNodeOrIRI) resource, null,
null);
while (subjectTriples.hasNext()) {
Triple triple = subjectTriples.next();
@@ -600,14 +600,14 @@ public class GraphNode {
graph.addAll(newTriples);
newTriples.clear();
- if (checkPredicates && replacement instanceof Iri
- && resource instanceof Iri) {
+ if (checkPredicates && replacement instanceof IRI
+ && resource instanceof IRI) {
Iterator<Triple> predicateTriples = graph.filter(null,
- (Iri) resource, null);
+ (IRI) resource, null);
while (predicateTriples.hasNext()) {
Triple triple = predicateTriples.next();
Triple newTriple = new TripleImpl(triple.getSubject(),
- (Iri) replacement, triple.getObject());
+ (IRI) replacement, triple.getObject());
predicateTriples.remove();
newTriples.add(newTriple);
}
@@ -624,8 +624,8 @@ public class GraphNode {
* @param property
* @return
*/
- public Iterator<GraphNode> getObjectNodes(Iri property) {
- final Iterator<RdfTerm> objects = this.getObjects(property);
+ public Iterator<GraphNode> getObjectNodes(IRI property) {
+ final Iterator<RDFTerm> objects = this.getObjects(property);
return new Iterator<GraphNode>() {
@Override
@@ -635,7 +635,7 @@ public class GraphNode {
@Override
public GraphNode next() {
- RdfTerm object = objects.next();
+ RDFTerm object = objects.next();
return new GraphNode(object, graph);
}
@@ -655,8 +655,8 @@ public class GraphNode {
* @param property
* @return
*/
- public Iterator<GraphNode> getSubjectNodes(Iri property) {
- final Iterator<BlankNodeOrIri> subjects = this.getSubjects(property);
+ public Iterator<GraphNode> getSubjectNodes(IRI property) {
+ final Iterator<BlankNodeOrIRI> subjects = this.getSubjects(property);
return new Iterator<GraphNode>() {
@Override
@@ -666,7 +666,7 @@ public class GraphNode {
@Override
public GraphNode next() {
- RdfTerm object = subjects.next();
+ RDFTerm object = subjects.next();
return new GraphNode(object, graph);
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphUtils.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphUtils.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphUtils.java
index 4ed57cd..f1c82d5 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphUtils.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphUtils.java
@@ -25,8 +25,8 @@ import java.util.Set;
import org.apache.clerezza.commons.rdf.BlankNode;
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.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.impl.utils.simple.SimpleGraph;
@@ -72,7 +72,7 @@ public class GraphUtils {
break;
}
final GraphNode objectGN = new GraphNode(triple.getObject(), unGroundedTriples);
- BlankNodeOrIri subject = triple.getSubject();
+ BlankNodeOrIRI subject = triple.getSubject();
ImmutableGraph context = objectGN.getNodeContext();
Iterator<Triple> potentialIter = mGraph.filter(subject, triple.getPredicate(), null);
while (potentialIter.hasNext()) {
@@ -97,7 +97,7 @@ public class GraphUtils {
break;
}
final GraphNode subjectGN = new GraphNode(triple.getSubject(), unGroundedTriples);
- RdfTerm object = triple.getObject();
+ RDFTerm object = triple.getObject();
if (object instanceof BlankNode) {
object = null;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/RdfList.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/RdfList.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/RdfList.java
index f6e4311..e9192ab 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/RdfList.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/RdfList.java
@@ -28,9 +28,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
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.Iri;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
@@ -54,18 +54,18 @@ import org.slf4j.LoggerFactory;
*
* @author rbn, mir
*/
-public class RdfList extends AbstractList<RdfTerm> {
+public class RdfList extends AbstractList<RDFTerm> {
private static final Logger logger = LoggerFactory.getLogger(RdfList.class);
- private final static Iri RDF_NIL =
- new Iri("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil");
+ private final static IRI RDF_NIL =
+ new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil");
/**
* a list of the linked rdf:List elements in order
*/
- private List<BlankNodeOrIri> listList = new ArrayList<BlankNodeOrIri>();
- private List<RdfTerm> valueList = new ArrayList<RdfTerm>();
- private BlankNodeOrIri firstList;
+ private List<BlankNodeOrIRI> listList = new ArrayList<BlankNodeOrIRI>();
+ private List<RDFTerm> valueList = new ArrayList<RDFTerm>();
+ private BlankNodeOrIRI firstList;
private Graph tc;
private boolean totallyExpanded = false;
@@ -78,7 +78,7 @@ public class RdfList extends AbstractList<RdfTerm> {
* @param listRdfTerm
* @param tc
*/
- public RdfList(BlankNodeOrIri listRdfTerm, Graph tc) {
+ public RdfList(BlankNodeOrIRI listRdfTerm, Graph tc) {
firstList = listRdfTerm;
this.tc = tc;
@@ -90,7 +90,7 @@ public class RdfList extends AbstractList<RdfTerm> {
* @param listNode
*/
public RdfList(GraphNode listNode) {
- this((BlankNodeOrIri)listNode.getNode(), listNode.getGraph());
+ this((BlankNodeOrIRI)listNode.getNode(), listNode.getGraph());
}
/**
@@ -103,7 +103,7 @@ public class RdfList extends AbstractList<RdfTerm> {
* @throws IllegalArgumentException
* if the provided {@code listRdfTerm} is a non-empty rdf:List.
*/
- public static RdfList createEmptyList(BlankNodeOrIri listRdfTerm, Graph tc)
+ public static RdfList createEmptyList(BlankNodeOrIRI listRdfTerm, Graph tc)
throws IllegalArgumentException {
if (!tc.filter(listRdfTerm, RDF.first, null).hasNext()) {
@@ -119,7 +119,7 @@ public class RdfList extends AbstractList<RdfTerm> {
if (totallyExpanded) {
return;
}
- BlankNodeOrIri currentList;
+ BlankNodeOrIRI currentList;
if (listList.size() > 0) {
currentList = listList.get(listList.size()-1);
} else {
@@ -150,7 +150,7 @@ public class RdfList extends AbstractList<RdfTerm> {
@Override
- public RdfTerm get(int index) {
+ public RDFTerm get(int index) {
expandTill(index + 1);
return valueList.get(index);
}
@@ -162,7 +162,7 @@ public class RdfList extends AbstractList<RdfTerm> {
}
@Override
- public void add(int index, RdfTerm element) {
+ public void add(int index, RDFTerm element) {
expandTill(index);
if (index == 0) {
//special casing to make sure the first list remains the same resource
@@ -187,9 +187,9 @@ public class RdfList extends AbstractList<RdfTerm> {
* @param index is > 0
* @param element
*/
- private void addInRdfList(int index, RdfTerm element) {
+ private void addInRdfList(int index, RDFTerm element) {
expandTill(index+1);
- BlankNodeOrIri newList = new BlankNode() {
+ BlankNodeOrIRI newList = new BlankNode() {
};
tc.add(new TripleImpl(newList, RDF.first, element));
if (index < listList.size()) {
@@ -205,7 +205,7 @@ public class RdfList extends AbstractList<RdfTerm> {
}
@Override
- public RdfTerm remove(int index) {
+ public RDFTerm remove(int index) {
//keeping the first list resource
tc.remove(new TripleImpl(listList.get(index), RDF.first, valueList.get(index)));
if (index == (listList.size() - 1)) {
@@ -233,11 +233,11 @@ public class RdfList extends AbstractList<RdfTerm> {
return valueList.remove(index);
}
- private BlankNodeOrIri getRest(BlankNodeOrIri list) {
- return (BlankNodeOrIri) tc.filter(list, RDF.rest, null).next().getObject();
+ private BlankNodeOrIRI getRest(BlankNodeOrIRI list) {
+ return (BlankNodeOrIRI) tc.filter(list, RDF.rest, null).next().getObject();
}
- private RdfTerm getFirstEntry(final BlankNodeOrIri listRdfTerm) {
+ private RDFTerm getFirstEntry(final BlankNodeOrIRI listRdfTerm) {
try {
return tc.filter(listRdfTerm, RDF.first, null).next().getObject();
} catch (final NullPointerException e) {
@@ -250,7 +250,7 @@ public class RdfList extends AbstractList<RdfTerm> {
Serializer.getInstance().serialize(fileOutputStream, graphNode.getNodeContext(), SupportedFormat.N_TRIPLE);
fileOutputStream.flush();
logger.warn("GraphNode: " + graphNode);
- final Iterator<Iri> properties = graphNode.getProperties();
+ final Iterator<IRI> properties = graphNode.getProperties();
while (properties.hasNext()) {
logger.warn("available: " + properties.next());
}
@@ -265,7 +265,7 @@ public class RdfList extends AbstractList<RdfTerm> {
}
}
- public BlankNodeOrIri getListRdfTerm() {
+ public BlankNodeOrIRI getListRdfTerm() {
return firstList;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/SeeAlsoExpander.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/SeeAlsoExpander.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/SeeAlsoExpander.java
index 9bcc652..fb1c646 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/SeeAlsoExpander.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/SeeAlsoExpander.java
@@ -23,9 +23,9 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.locks.Lock;
-import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.RDFTerm;
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.ontologies.RDFS;
@@ -56,10 +56,10 @@ public class SeeAlsoExpander {
* @return a new GraphNode over the union of the original and all expansion graphs
*/
public GraphNode expand(GraphNode node, int recursion) {
- Set<Iri> alreadyVisited = new HashSet();
+ Set<IRI> alreadyVisited = new HashSet();
Set<Graph> resultTripleCollections = new HashSet<Graph>();
resultTripleCollections.add(node.getGraph());
- for (Iri uriRef : expand(node, alreadyVisited, recursion)) {
+ for (IRI uriRef : expand(node, alreadyVisited, recursion)) {
try {
resultTripleCollections.add(tcManager.getGraph(uriRef));
} catch (NoSuchEntityException e) {
@@ -72,16 +72,16 @@ public class SeeAlsoExpander {
}
- private Set<Iri> getSeeAlsoObjectUris(GraphNode node) {
- Set<Iri> result = new HashSet<Iri>();
+ private Set<IRI> getSeeAlsoObjectUris(GraphNode node) {
+ Set<IRI> result = new HashSet<IRI>();
Lock l = node.readLock();
l.lock();
try {
- Iterator<RdfTerm> objects = node.getObjects(RDFS.seeAlso);
+ Iterator<RDFTerm> objects = node.getObjects(RDFS.seeAlso);
while (objects.hasNext()) {
- RdfTerm next = objects.next();
- if (next instanceof Iri) {
- result.add((Iri)next);
+ RDFTerm next = objects.next();
+ if (next instanceof IRI) {
+ result.add((IRI)next);
}
}
} finally {
@@ -90,15 +90,15 @@ public class SeeAlsoExpander {
return result;
}
- private Set<Iri> expand(GraphNode node, Set<Iri> alreadyVisited, int recursion) {
- Set<Iri> rdfSeeAlsoTargets = getSeeAlsoObjectUris(node);
- Set<Iri> result = new HashSet<Iri>();
+ private Set<IRI> expand(GraphNode node, Set<IRI> alreadyVisited, int recursion) {
+ Set<IRI> rdfSeeAlsoTargets = getSeeAlsoObjectUris(node);
+ Set<IRI> result = new HashSet<IRI>();
result.addAll(rdfSeeAlsoTargets);
recursion++;
if (recursion > 0) {
rdfSeeAlsoTargets.removeAll(alreadyVisited);
alreadyVisited.addAll(rdfSeeAlsoTargets);
- for (Iri target : rdfSeeAlsoTargets) {
+ for (IRI target : rdfSeeAlsoTargets) {
try {
result.addAll(expand(new GraphNode(node.getNode(),
tcManager.getGraph(target)), alreadyVisited, recursion));
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UnionGraph.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UnionGraph.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UnionGraph.java
index d2bf031..acd72ad 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UnionGraph.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UnionGraph.java
@@ -27,11 +27,11 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
-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.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.commons.rdf.impl.utils.AbstractGraph;
/**
@@ -70,8 +70,8 @@ public class UnionGraph extends AbstractGraph {
}
@Override
- public Iterator<Triple> performFilter(final BlankNodeOrIri subject,
- final Iri predicate, final RdfTerm object) {
+ public Iterator<Triple> performFilter(final BlankNodeOrIRI subject,
+ final IRI predicate, final RDFTerm object) {
if (baseTripleCollections.length == 0) {
return new HashSet<Triple>(0).iterator();
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UriMutatingGraph.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UriMutatingGraph.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UriMutatingGraph.java
index 6834726..5513dca 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UriMutatingGraph.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/UriMutatingGraph.java
@@ -22,12 +22,12 @@ package org.apache.clerezza.rdf.utils;
import java.util.Collection;
import java.util.Iterator;
import java.util.concurrent.locks.ReadWriteLock;
-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.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.AbstractGraph;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleImmutableGraph;
@@ -57,13 +57,13 @@ public class UriMutatingGraph implements Graph {
targetPrefixLength= targetPrefix.length();
}
- private <R extends RdfTerm> R toTargetRdfTerm(final R sourceRdfTerm) {
- if (sourceRdfTerm instanceof Iri) {
- final Iri sourceIri = (Iri) sourceRdfTerm;
+ private <R extends RDFTerm> R toTargetRdfTerm(final R sourceRdfTerm) {
+ if (sourceRdfTerm instanceof IRI) {
+ final IRI sourceIri = (IRI) sourceRdfTerm;
if (sourceIri.getUnicodeString().startsWith(sourcePrefix)) {
final String uriRest = sourceIri.getUnicodeString()
.substring(sourcePrefixLength);
- return (R) new Iri(targetPrefix+uriRest);
+ return (R) new IRI(targetPrefix+uriRest);
}
}
return sourceRdfTerm;
@@ -77,13 +77,13 @@ public class UriMutatingGraph implements Graph {
triple.getPredicate(), toTargetRdfTerm(triple.getObject()));
}
- private <R extends RdfTerm> R toSourceRdfTerm(final R targetRdfTerm) {
- if (targetRdfTerm instanceof Iri) {
- final Iri sourceIri = (Iri) targetRdfTerm;
+ private <R extends RDFTerm> R toSourceRdfTerm(final R targetRdfTerm) {
+ if (targetRdfTerm instanceof IRI) {
+ final IRI sourceIri = (IRI) targetRdfTerm;
if (sourceIri.getUnicodeString().startsWith(targetPrefix)) {
final String uriRest = sourceIri.getUnicodeString()
.substring(targetPrefixLength);
- return (R) new Iri(sourcePrefix+uriRest);
+ return (R) new IRI(sourcePrefix+uriRest);
}
}
return targetRdfTerm;
@@ -98,7 +98,7 @@ public class UriMutatingGraph implements Graph {
}
@Override
- public Iterator<Triple> filter(BlankNodeOrIri subject, Iri predicate, RdfTerm object) {
+ public Iterator<Triple> filter(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
final Iterator<Triple> baseIter = base.filter(toSourceRdfTerm(subject),
predicate, toSourceRdfTerm(object));
return new WrappedIteraror(baseIter);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/graphnodeprovider/GraphNodeProvider.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/graphnodeprovider/GraphNodeProvider.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/graphnodeprovider/GraphNodeProvider.java
index a8c59f2..57c5169 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/graphnodeprovider/GraphNodeProvider.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/graphnodeprovider/GraphNodeProvider.java
@@ -18,7 +18,7 @@ package org.apache.clerezza.rdf.utils.graphnodeprovider;
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.utils.GraphNode;
/**
@@ -34,18 +34,18 @@ public interface GraphNodeProvider {
* Get a GraphNode for the specified resource, see class comments for
* details.
*/
- GraphNode get(Iri uriRef);
+ GraphNode get(IRI uriRef);
/**
* Get a GraphNode for the specified resource, The resource is assumed to be
- * local, i.e. the method behaves like get(Iri) for a Uri with an
- * authority section contained in the Set retuned by
- * <code>org.apache.clerezza.platform.config.PlatformConfig#getBaseUris()</code>
+ * local, i.e. the method behaves like get(IRI) for a Uri with an
+ authority section contained in the Set retuned by
+ <code>org.apache.clerezza.platform.config.PlatformConfig#getBaseUris()</code>
*/
- GraphNode getLocal(Iri uriRef);
+ GraphNode getLocal(IRI uriRef);
/**
* return true iff getLocal(uriRef).getNodeContext.size > 0
*/
- boolean existsLocal(Iri uriRef);
+ boolean existsLocal(IRI uriRef);
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/BaseSmusher.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/BaseSmusher.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/BaseSmusher.java
index f296849..90f3c26 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/BaseSmusher.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/BaseSmusher.java
@@ -23,10 +23,10 @@ import java.util.Set;
import java.util.concurrent.locks.Lock;
import org.apache.clerezza.commons.rdf.BlankNode;
import org.apache.clerezza.commons.rdf.Graph;
-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.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
import org.apache.clerezza.rdf.ontologies.OWL;
@@ -49,12 +49,12 @@ public class BaseSmusher {
* @param equivalenceSets sets of equivalent resources
* @param addOwlSameAs whether owl:sameAs statements should be added
*/
- public void smush(Graph mGraph, Set<Set<BlankNodeOrIri>> equivalenceSets, boolean addOwlSameAs) {
- Map<BlankNodeOrIri, BlankNodeOrIri> current2ReplacementMap = new HashMap<BlankNodeOrIri, BlankNodeOrIri>();
+ public void smush(Graph mGraph, Set<Set<BlankNodeOrIRI>> equivalenceSets, boolean addOwlSameAs) {
+ Map<BlankNodeOrIRI, BlankNodeOrIRI> current2ReplacementMap = new HashMap<BlankNodeOrIRI, BlankNodeOrIRI>();
final Graph owlSameAsGraph = new SimpleGraph();
- for (Set<BlankNodeOrIri> equivalenceSet : equivalenceSets) {
- final BlankNodeOrIri replacement = getReplacementFor(equivalenceSet, owlSameAsGraph);
- for (BlankNodeOrIri current : equivalenceSet) {
+ for (Set<BlankNodeOrIRI> equivalenceSet : equivalenceSets) {
+ final BlankNodeOrIRI replacement = getReplacementFor(equivalenceSet, owlSameAsGraph);
+ for (BlankNodeOrIRI current : equivalenceSet) {
if (!current.equals(replacement)) {
current2ReplacementMap.put(current, replacement);
}
@@ -66,11 +66,11 @@ public class BaseSmusher {
try {
for (Iterator<Triple> it = mGraph.iterator(); it.hasNext();) {
final Triple triple = it.next();
- final BlankNodeOrIri subject = triple.getSubject();
- BlankNodeOrIri subjectReplacement = current2ReplacementMap.get(subject);
- final RdfTerm object = triple.getObject();
+ final BlankNodeOrIRI subject = triple.getSubject();
+ BlankNodeOrIRI subjectReplacement = current2ReplacementMap.get(subject);
+ final RDFTerm object = triple.getObject();
@SuppressWarnings(value = "element-type-mismatch")
- RdfTerm objectReplacement = current2ReplacementMap.get(object);
+ RDFTerm objectReplacement = current2ReplacementMap.get(object);
if ((subjectReplacement != null) || (objectReplacement != null)) {
it.remove();
if (subjectReplacement == null) {
@@ -91,12 +91,12 @@ public class BaseSmusher {
}
}
- private BlankNodeOrIri getReplacementFor(Set<BlankNodeOrIri> equivalenceSet,
+ private BlankNodeOrIRI getReplacementFor(Set<BlankNodeOrIRI> equivalenceSet,
Graph owlSameAsGraph) {
- final Set<Iri> uriRefs = new HashSet<Iri>();
- for (BlankNodeOrIri nonLiteral : equivalenceSet) {
- if (nonLiteral instanceof Iri) {
- uriRefs.add((Iri) nonLiteral);
+ final Set<IRI> uriRefs = new HashSet<IRI>();
+ for (BlankNodeOrIRI nonLiteral : equivalenceSet) {
+ if (nonLiteral instanceof IRI) {
+ uriRefs.add((IRI) nonLiteral);
}
}
switch (uriRefs.size()) {
@@ -105,10 +105,10 @@ public class BaseSmusher {
case 0:
return new BlankNode();
}
- final Iri preferedIri = getPreferedIri(uriRefs);
- final Iterator<Iri> uriRefIter = uriRefs.iterator();
+ final IRI preferedIri = getPreferedIri(uriRefs);
+ final Iterator<IRI> uriRefIter = uriRefs.iterator();
while (uriRefIter.hasNext()) {
- Iri uriRef = uriRefIter.next();
+ IRI uriRef = uriRefIter.next();
if (!uriRef.equals(preferedIri)) {
owlSameAsGraph.add(new TripleImpl(uriRef, OWL.sameAs, preferedIri));
}
@@ -125,8 +125,8 @@ public class BaseSmusher {
* @param uriRefs
* @return
*/
- protected Iri getPreferedIri(Set<Iri> uriRefs) {
- final Iterator<Iri> uriRefIter = uriRefs.iterator();
+ protected IRI getPreferedIri(Set<IRI> uriRefs) {
+ final Iterator<IRI> uriRefIter = uriRefs.iterator();
//instead of an arbitrary one we might either decide lexicographically
//or look at their frequency in mGraph
return uriRefIter.next();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/IfpSmusher.java
----------------------------------------------------------------------
diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/IfpSmusher.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/IfpSmusher.java
index 5b3b410..7ce925a 100644
--- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/IfpSmusher.java
+++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/smushing/IfpSmusher.java
@@ -26,10 +26,10 @@ import java.util.Map;
import java.util.Set;
import org.apache.clerezza.commons.rdf.Graph;
-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.ontologies.OWL;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.slf4j.Logger;
@@ -56,34 +56,34 @@ public class IfpSmusher extends BaseSmusher {
* @param tBox
*/
public void smush(Graph mGraph, Graph tBox) {
- final Set<Iri> ifps = getIfps(tBox);
- final Map<PredicateObject, Set<BlankNodeOrIri>> ifp2nodesMap = new HashMap<PredicateObject, Set<BlankNodeOrIri>>();
+ final Set<IRI> ifps = getIfps(tBox);
+ final Map<PredicateObject, Set<BlankNodeOrIRI>> ifp2nodesMap = new HashMap<PredicateObject, Set<BlankNodeOrIRI>>();
for (Iterator<Triple> it = mGraph.iterator(); it.hasNext();) {
final Triple triple = it.next();
- final Iri predicate = triple.getPredicate();
+ final IRI predicate = triple.getPredicate();
if (!ifps.contains(predicate)) {
continue;
}
final PredicateObject po = new PredicateObject(predicate, triple.getObject());
- Set<BlankNodeOrIri> equivalentNodes = ifp2nodesMap.get(po);
+ Set<BlankNodeOrIRI> equivalentNodes = ifp2nodesMap.get(po);
if (equivalentNodes == null) {
- equivalentNodes = new HashSet<BlankNodeOrIri>();
+ equivalentNodes = new HashSet<BlankNodeOrIRI>();
ifp2nodesMap.put(po, equivalentNodes);
}
equivalentNodes.add(triple.getSubject());
}
- Set<Set<BlankNodeOrIri>> unitedEquivalenceSets = uniteSetsWithCommonElement(ifp2nodesMap.values());
+ Set<Set<BlankNodeOrIRI>> unitedEquivalenceSets = uniteSetsWithCommonElement(ifp2nodesMap.values());
smush(mGraph, unitedEquivalenceSets, true);
}
- private Set<Iri> getIfps(Graph tBox) {
+ private Set<IRI> getIfps(Graph tBox) {
final Iterator<Triple> ifpDefinitions = tBox.filter(null, RDF.type,
OWL.InverseFunctionalProperty);
- final Set<Iri> ifps = new HashSet<Iri>();
+ final Set<IRI> ifps = new HashSet<IRI>();
while (ifpDefinitions.hasNext()) {
final Triple triple = ifpDefinitions.next();
- ifps.add((Iri) triple.getSubject());
+ ifps.add((IRI) triple.getSubject());
}
return ifps;
}
@@ -130,10 +130,10 @@ public class IfpSmusher extends BaseSmusher {
class PredicateObject {
- final Iri predicate;
- final RdfTerm object;
+ final IRI predicate;
+ final RDFTerm object;
- public PredicateObject(Iri predicate, RdfTerm object) {
+ public PredicateObject(IRI predicate, RDFTerm object) {
this.predicate = predicate;
this.object = object;
}
[5/9] clerezza git commit: CLEREZZA-983: Adapted to new casing of
rdf-core (part 1)
Posted by re...@apache.org.
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java
index 1079a9d..274b7e5 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java
@@ -33,10 +33,10 @@ import java.util.NoSuchElementException;
import java.util.concurrent.locks.Lock;
import org.apache.clerezza.rdf.core.LiteralFactory;
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.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
@@ -59,24 +59,24 @@ import org.apache.clerezza.commons.rdf.Literal;
public abstract class TcAccessController {
private final TcManager tcManager;
- private final Iri permissionGraphName = new Iri("urn:x-localinstance:/ImmutableGraph-access.ImmutableGraph");
+ private final IRI permissionGraphName = new IRI("urn:x-localinstance:/ImmutableGraph-access.ImmutableGraph");
//we can't rely on ontology plugin in rdf core
private String ontologyNamespace = "http://clerezza.apache.org/2010/07/10/graphpermssions#";
- private final Iri readPermissionListProperty = new Iri(ontologyNamespace + "readPermissionList");
- private final Iri readWritePermissionListProperty = new Iri(ontologyNamespace + "readWritePermissionList");
+ private final IRI readPermissionListProperty = new IRI(ontologyNamespace + "readPermissionList");
+ private final IRI readWritePermissionListProperty = new IRI(ontologyNamespace + "readWritePermissionList");
/**
* The first item in the subject RDF list.
*/
- public static final Iri first = new Iri("http://www.w3.org/1999/02/22-rdf-syntax-ns#first");
+ public static final IRI first = new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#first");
/**
* The rest of the subject RDF list after the first item.
*/
- public static final Iri rest = new Iri("http://www.w3.org/1999/02/22-rdf-syntax-ns#rest");
- public static final Iri rdfNil = new Iri("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil");
- private final Map<Iri, Collection<Permission>> readPermissionCache =
- Collections.synchronizedMap(new HashMap<Iri, Collection<Permission>>());
- private final Map<Iri, Collection<Permission>> readWritePermissionCache =
- Collections.synchronizedMap(new HashMap<Iri, Collection<Permission>>());
+ public static final IRI rest = new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#rest");
+ public static final IRI rdfNil = new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil");
+ private final Map<IRI, Collection<Permission>> readPermissionCache =
+ Collections.synchronizedMap(new HashMap<IRI, Collection<Permission>>());
+ private final Map<IRI, Collection<Permission>> readWritePermissionCache =
+ Collections.synchronizedMap(new HashMap<IRI, Collection<Permission>>());
/**
*
@@ -86,7 +86,7 @@ public abstract class TcAccessController {
this.tcManager = getTcManager();
}
- public void checkReadPermission(Iri GraphUri) {
+ public void checkReadPermission(IRI GraphUri) {
if (GraphUri.equals(permissionGraphName)) {
//This is world readable, as this prevents as from doingf things as
//priviledged during verfification
@@ -111,7 +111,7 @@ public abstract class TcAccessController {
}
}
- public void checkReadWritePermission(Iri GraphUri) {
+ public void checkReadWritePermission(IRI GraphUri) {
SecurityManager security = System.getSecurityManager();
if (security != null) {
//will AllPermissions the rest is obsolete
@@ -143,7 +143,7 @@ public abstract class TcAccessController {
* @param GraphUri
* @param permissionDescriptions
*/
- public void setRequiredReadPermissionStrings(Iri GraphUri,
+ public void setRequiredReadPermissionStrings(IRI GraphUri,
Collection<String> permissionDescriptions) {
readPermissionCache.remove(GraphUri);
final Graph permissionMGraph = getOrCreatePermisionGraph();
@@ -151,7 +151,7 @@ public abstract class TcAccessController {
l.lock();
try {
removeExistingRequiredReadPermissions(GraphUri, permissionMGraph);
- final BlankNodeOrIri permissionList = createList(permissionDescriptions.iterator(), permissionMGraph);
+ final BlankNodeOrIRI permissionList = createList(permissionDescriptions.iterator(), permissionMGraph);
permissionMGraph.add(new TripleImpl(GraphUri,
readPermissionListProperty, permissionList));
} finally {
@@ -166,7 +166,7 @@ public abstract class TcAccessController {
* @param GraphUri
* @param permissionDescriptions
*/
- public void setRequiredReadPermissions(Iri GraphUri,
+ public void setRequiredReadPermissions(IRI GraphUri,
Collection<Permission> permissions) {
Collection<String> permissionStrings = new ArrayList<String>();
for (Permission permission : permissions) {
@@ -183,7 +183,7 @@ public abstract class TcAccessController {
* @param GraphUri
* @param permissionDescriptions
*/
- public void setRequiredReadWritePermissionStrings(Iri GraphUri,
+ public void setRequiredReadWritePermissionStrings(IRI GraphUri,
Collection<String> permissionDescriptions) {
readWritePermissionCache.remove(GraphUri);
final Graph permissionMGraph = getOrCreatePermisionGraph();
@@ -191,7 +191,7 @@ public abstract class TcAccessController {
l.lock();
try {
removeExistingRequiredReadPermissions(GraphUri, permissionMGraph);
- final BlankNodeOrIri permissionList = createList(permissionDescriptions.iterator(), permissionMGraph);
+ final BlankNodeOrIRI permissionList = createList(permissionDescriptions.iterator(), permissionMGraph);
permissionMGraph.add(new TripleImpl(GraphUri,
readWritePermissionListProperty, permissionList));
} finally {
@@ -207,7 +207,7 @@ public abstract class TcAccessController {
* @param GraphUri
* @param permissionDescriptions
*/
- public void setRequiredReadWritePermissions(Iri GraphUri,
+ public void setRequiredReadWritePermissions(IRI GraphUri,
Collection<Permission> permissions) {
Collection<String> permissionStrings = new ArrayList<String>();
for (Permission permission : permissions) {
@@ -224,7 +224,7 @@ public abstract class TcAccessController {
* @param GraphUri
* @return the collection of permissions
*/
- public Collection<Permission> getRequiredReadPermissions(Iri GraphUri) {
+ public Collection<Permission> getRequiredReadPermissions(IRI GraphUri) {
Collection<Permission> result = readPermissionCache.get(GraphUri);
if (result == null) {
result = new ArrayList<Permission>();
@@ -245,7 +245,7 @@ public abstract class TcAccessController {
* @param GraphUri
* @return the collection of permissions
*/
- public Collection<Permission> getRequiredReadWritePermissions(Iri GraphUri) {
+ public Collection<Permission> getRequiredReadWritePermissions(IRI GraphUri) {
Collection<Permission> result = readWritePermissionCache.get(GraphUri);
if (result == null) {
result = new ArrayList<Permission>();
@@ -258,7 +258,7 @@ public abstract class TcAccessController {
return result;
}
- private BlankNodeOrIri createList(Iterator<String> iterator, Graph permissionMGraph) {
+ private BlankNodeOrIRI createList(Iterator<String> iterator, Graph permissionMGraph) {
if (!iterator.hasNext()) {
return rdfNil;
}
@@ -272,23 +272,23 @@ public abstract class TcAccessController {
}
//called withiong write-lock
- private void removeExistingRequiredReadPermissions(Iri GraphUri,
+ private void removeExistingRequiredReadPermissions(IRI GraphUri,
Graph permissionMGraph) {
try {
Triple t = permissionMGraph.filter(GraphUri, readPermissionListProperty, null).next();
- RdfTerm list = t.getObject();
- removeList((BlankNodeOrIri) list, permissionMGraph);
+ RDFTerm list = t.getObject();
+ removeList((BlankNodeOrIRI) list, permissionMGraph);
permissionMGraph.remove(t);
} catch (NoSuchElementException e) {
//There was no existing to remove
}
}
- private void removeList(BlankNodeOrIri list, Graph permissionMGraph) {
+ private void removeList(BlankNodeOrIRI list, Graph permissionMGraph) {
try {
Triple t = permissionMGraph.filter(list, rest, null).next();
- RdfTerm restList = t.getObject();
- removeList((BlankNodeOrIri) restList, permissionMGraph);
+ RDFTerm restList = t.getObject();
+ removeList((BlankNodeOrIRI) restList, permissionMGraph);
permissionMGraph.remove(t);
Iterator<Triple> iter = permissionMGraph.filter(list, first, null);
iter.next();
@@ -298,20 +298,20 @@ public abstract class TcAccessController {
}
}
- private Collection<String> getRequiredReadWritePermissionStrings(final Iri GraphUri) {
+ private Collection<String> getRequiredReadWritePermissionStrings(final IRI GraphUri) {
return getRequiredPermissionStrings(GraphUri, readWritePermissionListProperty);
}
- private Collection<String> getRequiredReadPermissionStrings(final Iri GraphUri) {
+ private Collection<String> getRequiredReadPermissionStrings(final IRI GraphUri) {
return getRequiredPermissionStrings(GraphUri, readPermissionListProperty);
}
- private Collection<String> getRequiredPermissionStrings(final Iri GraphUri, Iri property) {
+ private Collection<String> getRequiredPermissionStrings(final IRI GraphUri, IRI property) {
try {
final Graph permissionMGraph = tcManager.getMGraph(permissionGraphName);
Lock l = permissionMGraph.getLock().readLock();
l.lock();
try {
Triple t = permissionMGraph.filter(GraphUri, property, null).next();
- BlankNodeOrIri list = (BlankNodeOrIri) t.getObject();
+ BlankNodeOrIRI list = (BlankNodeOrIRI) t.getObject();
LinkedList<String> result = new LinkedList<String>();
readList(list, permissionMGraph, result);
return result;
@@ -325,12 +325,12 @@ public abstract class TcAccessController {
}
}
- private void readList(BlankNodeOrIri list, Graph permissionMGraph, LinkedList<String> target) {
+ private void readList(BlankNodeOrIRI list, Graph permissionMGraph, LinkedList<String> target) {
if (list.equals(rdfNil)) {
return;
}
Triple restTriple = permissionMGraph.filter(list, rest, null).next();
- BlankNodeOrIri restList = (BlankNodeOrIri) restTriple.getObject();
+ BlankNodeOrIRI restList = (BlankNodeOrIRI) restTriple.getObject();
readList(restList, permissionMGraph, target);
Triple firstTriple = permissionMGraph.filter(list, first, null).next();
Literal firstValue = (Literal) firstTriple.getObject();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/WriteBlockedGraph.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/WriteBlockedGraph.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/WriteBlockedGraph.java
index 76a8b79..542215d 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/WriteBlockedGraph.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/WriteBlockedGraph.java
@@ -22,11 +22,11 @@ import java.util.AbstractCollection;
import java.util.Collection;
import java.util.Iterator;
-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.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.ReadOnlyException;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.clerezza.commons.rdf.event.FilterTriple;
@@ -57,7 +57,7 @@ public class WriteBlockedGraph extends AbstractGraph
}
@Override
- protected Iterator<Triple> performFilter(BlankNodeOrIri subject, Iri predicate, RdfTerm object) {
+ protected Iterator<Triple> performFilter(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
final Iterator<Triple> baseIter = triples.filter(subject, predicate, object);
return new Iterator<Triple>() {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/PrivilegedGraphWrapper.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/PrivilegedGraphWrapper.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/PrivilegedGraphWrapper.java
index 5e1968c..72e42cd 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/PrivilegedGraphWrapper.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/PrivilegedGraphWrapper.java
@@ -24,12 +24,12 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.concurrent.locks.ReadWriteLock;
import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleImmutableGraph;
-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.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.event.FilterTriple;
import org.apache.clerezza.commons.rdf.event.GraphListener;
@@ -49,8 +49,8 @@ public class PrivilegedGraphWrapper implements Graph {
}
@Override
- public Iterator<Triple> filter(final BlankNodeOrIri subject, final Iri predicate,
- final RdfTerm object) {
+ public Iterator<Triple> filter(final BlankNodeOrIRI subject, final IRI predicate,
+ final RDFTerm object) {
return AccessController.doPrivileged(new PrivilegedAction<Iterator<Triple>>() {
@Override
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactory.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactory.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactory.java
index 9ee6979..c96207a 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactory.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactory.java
@@ -31,7 +31,7 @@ import java.util.Set;
import org.apache.clerezza.rdf.core.InvalidLiteralTypeException;
import org.apache.clerezza.rdf.core.LiteralFactory;
import org.apache.clerezza.rdf.core.NoConvertorException;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.impl.util.Base64;
import org.apache.clerezza.rdf.core.impl.util.W3CDateFormat;
import org.apache.clerezza.commons.rdf.Literal;
@@ -46,14 +46,14 @@ import org.apache.clerezza.commons.rdf.Literal;
public class SimpleLiteralFactory extends LiteralFactory {
private static final String XSD = "http://www.w3.org/2001/XMLSchema#";
- final private static Iri xsdInteger = xsd("integer");
- final private static Iri xsdInt = xsd("int");
- final private static Iri xsdShort = xsd("short");
- final private static Iri xsdByte = xsd("byte");
- final private static Iri xsdLong = xsd("long");
+ final private static IRI xsdInteger = xsd("integer");
+ final private static IRI xsdInt = xsd("int");
+ final private static IRI xsdShort = xsd("short");
+ final private static IRI xsdByte = xsd("byte");
+ final private static IRI xsdLong = xsd("long");
- final private static Set<Iri> decimalTypes = new HashSet<Iri>();
+ final private static Set<IRI> decimalTypes = new HashSet<IRI>();
final private static Map<Class<?>, TypeConverter<?>> typeConverterMap = new HashMap<Class<?>, TypeConverter<?>>();
final static Class<? extends byte[]> byteArrayType;
@@ -72,15 +72,15 @@ public class SimpleLiteralFactory extends LiteralFactory {
typeConverterMap.put(Long.class, new LongConverter());
typeConverterMap.put(Double.class, new DoubleConverter());
typeConverterMap.put(Float.class, new FloatConverter());
- typeConverterMap.put(Iri.class, new UriRefConverter());
+ typeConverterMap.put(IRI.class, new UriRefConverter());
}
- final private static Iri xsdDouble =xsd("double");
- final private static Iri xsdFloat =xsd("float");
- final private static Iri xsdAnyURI =xsd("anyURI");
+ final private static IRI xsdDouble =xsd("double");
+ final private static IRI xsdFloat =xsd("float");
+ final private static IRI xsdAnyURI =xsd("anyURI");
- final private static Iri xsd(String name) {
- return new Iri(XSD+name);
+ final private static IRI xsd(String name) {
+ return new IRI(XSD+name);
}
private static interface TypeConverter<T> {
@@ -90,7 +90,7 @@ public class SimpleLiteralFactory extends LiteralFactory {
private static class ByteArrayConverter implements TypeConverter<byte[]> {
- private static final Iri base64Uri =xsd("base64Binary");
+ private static final IRI base64Uri =xsd("base64Binary");
@Override
public Literal createLiteral(byte[] value) {
@@ -109,7 +109,7 @@ public class SimpleLiteralFactory extends LiteralFactory {
}
private static class DateConverter implements TypeConverter<Date> {
- private static final Iri dateTimeUri =xsd("dateTime");
+ private static final IRI dateTimeUri =xsd("dateTime");
private static final DateFormat DATE_FORMAT = new W3CDateFormat();
@Override
@@ -134,7 +134,7 @@ public class SimpleLiteralFactory extends LiteralFactory {
private static class BooleanConverter implements TypeConverter<Boolean> {
- private static final Iri booleanUri =xsd("boolean");
+ private static final IRI booleanUri =xsd("boolean");
public static final TypedLiteralImpl TRUE = new TypedLiteralImpl("true", booleanUri);
public static final TypedLiteralImpl FALSE = new TypedLiteralImpl("false", booleanUri);
@@ -157,7 +157,7 @@ public class SimpleLiteralFactory extends LiteralFactory {
private static class StringConverter implements TypeConverter<String> {
- private static final Iri stringUri =xsd("string");
+ private static final IRI stringUri =xsd("string");
@Override
public Literal createLiteral(String value) {
@@ -261,21 +261,21 @@ public class SimpleLiteralFactory extends LiteralFactory {
}
}
- private static class UriRefConverter implements TypeConverter<Iri> {
+ private static class UriRefConverter implements TypeConverter<IRI> {
@Override
- public Literal createLiteral(Iri value) {
+ public Literal createLiteral(IRI value) {
return new TypedLiteralImpl(value.getUnicodeString(), xsdAnyURI);
}
@Override
- public Iri createObject(Literal literal) {
+ public IRI createObject(Literal literal) {
if (!literal.getDataType().equals(xsdAnyURI)) {
- throw new InvalidLiteralTypeException(Iri.class, literal.getDataType());
+ throw new InvalidLiteralTypeException(IRI.class, literal.getDataType());
}
- return new Iri(literal.getLexicalForm());
+ return new IRI(literal.getLexicalForm());
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/Parser.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/Parser.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/Parser.java
index bd28749..5fe7341 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/Parser.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/Parser.java
@@ -34,7 +34,7 @@ import java.util.logging.Level;
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.SimpleMGraph;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.component.ComponentContext;
@@ -206,7 +206,7 @@ public class Parser {
* @throws UnsupportedFormatException
*/
public ImmutableGraph parse(InputStream serializedGraph,
- String formatIdentifier, Iri baseUri) throws UnsupportedFormatException {
+ String formatIdentifier, IRI baseUri) throws UnsupportedFormatException {
Graph graph = new SimpleMGraph();
parse(graph, serializedGraph, formatIdentifier, baseUri);
return graph.getImmutableGraph();
@@ -225,7 +225,7 @@ public class Parser {
* @throws UnsupportedFormatException
*/
public void parse(Graph target, InputStream serializedGraph,
- String formatIdentifier, Iri baseUri) throws UnsupportedFormatException {
+ String formatIdentifier, IRI baseUri) throws UnsupportedFormatException {
String deParameterizedIdentifier;
int semicolonPos = formatIdentifier.indexOf(';');
if (semicolonPos > -1) {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/ParsingProvider.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/ParsingProvider.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/ParsingProvider.java
index 24da826..3998beb 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/ParsingProvider.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/serializedform/ParsingProvider.java
@@ -21,7 +21,7 @@ package org.apache.clerezza.rdf.core.serializedform;
import java.io.InputStream;
import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
/**
* An instance of this class parses RDF-ImmutableGraph from one or more serialization
@@ -44,6 +44,6 @@ public interface ParsingProvider {
* @param baseUri the baseUri for interpreting relative uris, may be null
*/
void parse(Graph target, InputStream serializedGraph,
- String formatIdentifier, Iri baseUri);
+ String formatIdentifier, IRI baseUri);
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/SolutionMapping.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/SolutionMapping.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/SolutionMapping.java
index 1868ec1..60d1805 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/SolutionMapping.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/SolutionMapping.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.rdf.core.sparql;
import org.apache.clerezza.rdf.core.sparql.query.Variable;
import java.util.Map;
-import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.RDFTerm;
/**
* A set of mapping from variable names to solutions.
@@ -35,7 +35,7 @@ import org.apache.clerezza.commons.rdf.RdfTerm;
*
* @author rbn
*/
-public interface SolutionMapping extends Map<Variable, RdfTerm> {
+public interface SolutionMapping extends Map<Variable, RDFTerm> {
/**
* Should be the equivalent to this:
@@ -46,5 +46,5 @@ public interface SolutionMapping extends Map<Variable, RdfTerm> {
* @param name
* @return
*/
- public RdfTerm get(String name);
+ public RDFTerm get(String name);
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParser.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParser.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParser.java
index 4ada2b8..b77d93a 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParser.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParser.java
@@ -22,7 +22,7 @@ import java.io.StringReader;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-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.rdf.core.sparql.query.AlternativeGraphPattern;
import org.apache.clerezza.rdf.core.sparql.query.DataSet;
@@ -66,8 +66,8 @@ public class SparqlPreParser {
* @return
* @throws ParseException
*/
- public Set<Iri> getReferredGraphs(String queryString, Iri defaultGraph) throws ParseException {
- Set<Iri> referredGraphs;
+ public Set<IRI> getReferredGraphs(String queryString, IRI defaultGraph) throws ParseException {
+ Set<IRI> referredGraphs;
JavaCCGeneratedSparqlPreParser parser = new JavaCCGeneratedSparqlPreParser(new StringReader(queryString));
SparqlUnit sparqlUnit;
sparqlUnit = parser.parse();
@@ -79,7 +79,7 @@ public class SparqlPreParser {
referredGraphs = dataSet.getDefaultGraphs();
referredGraphs.addAll(dataSet.getNamedGraphs());
} else {
- referredGraphs = new HashSet<Iri>();
+ referredGraphs = new HashSet<IRI>();
}
GroupGraphPattern queryPattern = q.getQueryPattern();
if (queryPattern != null) {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/DataSet.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/DataSet.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/DataSet.java
index f35a609..649b883 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/DataSet.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/DataSet.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.rdf.core.sparql.query;
import java.util.Set;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
/**
* This interface definition is not yet stable and may change in future.
@@ -34,7 +34,7 @@ public interface DataSet {
* an empty set if no default ImmutableGraph is specified,
* otherwise a set of their UriRefs
*/
- public Set<Iri> getDefaultGraphs();
+ public Set<IRI> getDefaultGraphs();
/**
*
@@ -42,5 +42,5 @@ public interface DataSet {
* an empty set if no named ImmutableGraph is specified,
* otherwise a set of their UriRefs
*/
- public Set<Iri> getNamedGraphs();
+ public Set<IRI> getNamedGraphs();
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/FunctionCall.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/FunctionCall.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/FunctionCall.java
index 387ced6..39e2161 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/FunctionCall.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/FunctionCall.java
@@ -19,26 +19,26 @@
package org.apache.clerezza.rdf.core.sparql.query;
import java.util.List;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
/**
* Defines a function call which is one form of {@link Expression}.
- * A function call has a name of type {@link Iri} and a list of arguments,
+ * A function call has a name of type {@link IRI} and a list of arguments,
* where each argument is an {@link Expression}.
*
* @author hasan
*/
public class FunctionCall implements Expression {
- private final Iri name;
+ private final IRI name;
private final List<Expression> arguments;
- public FunctionCall(Iri name, List<Expression> arguments) {
+ public FunctionCall(IRI name, List<Expression> arguments) {
this.name = name;
this.arguments = arguments;
}
- public Iri getName() {
+ public IRI getName() {
return name;
};
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/GroupGraphPattern.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/GroupGraphPattern.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/GroupGraphPattern.java
index 787cbdd..da13f13 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/GroupGraphPattern.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/GroupGraphPattern.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.rdf.core.sparql.query;
import java.util.List;
import java.util.Set;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
/**
* Defines a group ImmutableGraph pattern.
@@ -58,7 +58,7 @@ public interface GroupGraphPattern extends GraphPattern {
* @return
* all graphs referred in this ImmutableGraph pattern.
*/
- public Set<Iri> getReferredGraphs();
+ public Set<IRI> getReferredGraphs();
/**
* @return
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/InlineData.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/InlineData.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/InlineData.java
index 49e0b68..3040813 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/InlineData.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/InlineData.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.rdf.core.sparql.query;
import java.util.List;
-import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.RDFTerm;
/**
*
@@ -27,5 +27,5 @@ import org.apache.clerezza.commons.rdf.RdfTerm;
*/
public interface InlineData extends GraphPattern {
public List<Variable> getVariables();
- public List<List<RdfTerm>> getValues();
+ public List<List<RDFTerm>> getValues();
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/PredicatePath.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/PredicatePath.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/PredicatePath.java
index 9c0989d..9b926d1 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/PredicatePath.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/PredicatePath.java
@@ -18,20 +18,20 @@
*/
package org.apache.clerezza.rdf.core.sparql.query;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
/**
*
* @author hasan
*/
public class PredicatePath implements PropertyPathExpression {
- private Iri predicatePath;
+ private IRI predicatePath;
- public PredicatePath(Iri predicatePath) {
+ public PredicatePath(IRI predicatePath) {
this.predicatePath = predicatePath;
}
- public Iri getPredicatePath() {
+ public IRI getPredicatePath() {
return predicatePath;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/ResourceOrVariable.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/ResourceOrVariable.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/ResourceOrVariable.java
index e9e14aa..0f00bc9 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/ResourceOrVariable.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/ResourceOrVariable.java
@@ -18,19 +18,19 @@
*/
package org.apache.clerezza.rdf.core.sparql.query;
-import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.RDFTerm;
/**
- * Wraps either a {@link RdfTerm} or a {@link Variable}
+ * Wraps either a {@link RDFTerm} or a {@link Variable}
*
* @author hasan
*/
public class ResourceOrVariable {
- private final RdfTerm resource;
+ private final RDFTerm resource;
private final Variable variable;
- public ResourceOrVariable(RdfTerm resource) {
+ public ResourceOrVariable(RDFTerm resource) {
if (resource == null) {
throw new IllegalArgumentException("Invalid resource: null");
}
@@ -49,7 +49,7 @@ public class ResourceOrVariable {
/**
*
* @return
- * true if it is a {@link Variable}, false if it is a {@link RdfTerm}
+ * true if it is a {@link Variable}, false if it is a {@link RDFTerm}
*/
public boolean isVariable() {
return resource == null;
@@ -60,7 +60,7 @@ public class ResourceOrVariable {
* @return
* the wrapped Resource if it is a Resource, null otherwise
*/
- public RdfTerm getResource() {
+ public RDFTerm getResource() {
return resource;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/UriRefExpression.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/UriRefExpression.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/UriRefExpression.java
index 8d6206b..5910ac2 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/UriRefExpression.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/UriRefExpression.java
@@ -18,22 +18,22 @@
*/
package org.apache.clerezza.rdf.core.sparql.query;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
/**
- * Wraps a {@link Iri} in an {@link Expression}.
+ * Wraps a {@link IRI} in an {@link Expression}.
*
* @author hasan
*/
public class UriRefExpression implements Expression {
- private final Iri uriRef;
+ private final IRI uriRef;
- public UriRefExpression(Iri uriRef) {
+ public UriRefExpression(IRI uriRef) {
this.uriRef = uriRef;
}
- public Iri getUriRef() {
+ public IRI getUriRef() {
return uriRef;
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/UriRefOrVariable.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/UriRefOrVariable.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/UriRefOrVariable.java
index a0e007f..803c1bc 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/UriRefOrVariable.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/UriRefOrVariable.java
@@ -18,10 +18,10 @@
*/
package org.apache.clerezza.rdf.core.sparql.query;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
/**
- * Wraps either a {@link Iri} or a {@link Variable}.
+ * Wraps either a {@link IRI} or a {@link Variable}.
*
* @author rbn
*/
@@ -31,13 +31,13 @@ public class UriRefOrVariable extends ResourceOrVariable {
super(variable);
}
- public UriRefOrVariable(Iri resource) {
+ public UriRefOrVariable(IRI resource) {
super(resource);
}
@Override
- public Iri getResource() {
- return (Iri)super.getResource();
+ public IRI getResource() {
+ return (IRI)super.getResource();
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleDataSet.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleDataSet.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleDataSet.java
index 1e1ddbe..354f5b0 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleDataSet.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleDataSet.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.rdf.core.sparql.query.impl;
import java.util.HashSet;
import java.util.Set;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.query.DataSet;
/**
@@ -28,24 +28,24 @@ import org.apache.clerezza.rdf.core.sparql.query.DataSet;
* @author hasan
*/
public class SimpleDataSet implements DataSet {
- private Set<Iri> defaultGraphs = new HashSet<Iri>();
- private Set<Iri> namedGraphs = new HashSet<Iri>();
+ private Set<IRI> defaultGraphs = new HashSet<IRI>();
+ private Set<IRI> namedGraphs = new HashSet<IRI>();
@Override
- public Set<Iri> getDefaultGraphs() {
+ public Set<IRI> getDefaultGraphs() {
return defaultGraphs;
}
@Override
- public Set<Iri> getNamedGraphs() {
+ public Set<IRI> getNamedGraphs() {
return namedGraphs;
}
- public void addDefaultGraph(Iri defaultGraph) {
+ public void addDefaultGraph(IRI defaultGraph) {
defaultGraphs.add(defaultGraph);
}
- public void addNamedGraph(Iri namedGraph) {
+ public void addNamedGraph(IRI namedGraph) {
namedGraphs.add(namedGraph);
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleGroupGraphPattern.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleGroupGraphPattern.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleGroupGraphPattern.java
index b9d74db..cd893d2 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleGroupGraphPattern.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleGroupGraphPattern.java
@@ -23,7 +23,7 @@ import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.query.AlternativeGraphPattern;
import org.apache.clerezza.rdf.core.sparql.query.BasicGraphPattern;
import org.apache.clerezza.rdf.core.sparql.query.Expression;
@@ -189,8 +189,8 @@ public class SimpleGroupGraphPattern implements GroupGraphPattern {
}
@Override
- public Set<Iri> getReferredGraphs() {
- Set<Iri> referredGraphs = new HashSet<Iri>();
+ public Set<IRI> getReferredGraphs() {
+ Set<IRI> referredGraphs = new HashSet<IRI>();
if (subSelect != null) {
GroupGraphPattern queryPattern = subSelect.getQueryPattern();
referredGraphs.addAll(queryPattern.getReferredGraphs());
@@ -202,8 +202,8 @@ public class SimpleGroupGraphPattern implements GroupGraphPattern {
return referredGraphs;
}
- private Set<Iri> getReferredGraphs(GraphPattern graphPattern) {
- Set<Iri> referredGraphs = new HashSet<Iri>();
+ private Set<IRI> getReferredGraphs(GraphPattern graphPattern) {
+ Set<IRI> referredGraphs = new HashSet<IRI>();
if (graphPattern instanceof GraphGraphPattern) {
GraphGraphPattern graphGraphPattern = (GraphGraphPattern) graphPattern;
UriRefOrVariable ImmutableGraph = graphGraphPattern.getGraph();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleInlineData.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleInlineData.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleInlineData.java
index 8b193e7..3b49f02 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleInlineData.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleInlineData.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.rdf.core.sparql.query.impl;
import java.util.ArrayList;
import java.util.List;
-import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.RDFTerm;
import org.apache.clerezza.rdf.core.sparql.query.InlineData;
import org.apache.clerezza.rdf.core.sparql.query.Variable;
@@ -31,7 +31,7 @@ import org.apache.clerezza.rdf.core.sparql.query.Variable;
public class SimpleInlineData implements InlineData {
private List<Variable> variables = new ArrayList<Variable>();
- private List<List<RdfTerm>> values = new ArrayList<List<RdfTerm>>();
+ private List<List<RDFTerm>> values = new ArrayList<List<RDFTerm>>();
@Override
public List<Variable> getVariables() {
@@ -39,7 +39,7 @@ public class SimpleInlineData implements InlineData {
}
@Override
- public List<List<RdfTerm>> getValues() {
+ public List<List<RDFTerm>> getValues() {
return values;
}
@@ -47,7 +47,7 @@ public class SimpleInlineData implements InlineData {
variables.add(variable);
}
- public void addValues(List<RdfTerm> values) {
+ public void addValues(List<RDFTerm> values) {
this.values.add(values);
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimplePropertyPathPattern.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimplePropertyPathPattern.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimplePropertyPathPattern.java
index 7a77138..36ed721 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimplePropertyPathPattern.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimplePropertyPathPattern.java
@@ -18,8 +18,8 @@
*/
package org.apache.clerezza.rdf.core.sparql.query.impl;
-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.rdf.core.sparql.query.PropertyPathExpression;
import org.apache.clerezza.rdf.core.sparql.query.PropertyPathExpressionOrVariable;
import org.apache.clerezza.rdf.core.sparql.query.PropertyPathPattern;
@@ -58,17 +58,17 @@ public class SimplePropertyPathPattern implements PropertyPathPattern {
new ResourceOrVariable(object));
}
- public SimplePropertyPathPattern(BlankNodeOrIri subject, Variable propertyPathExpression, Variable object) {
+ public SimplePropertyPathPattern(BlankNodeOrIRI subject, Variable propertyPathExpression, Variable object) {
this(new ResourceOrVariable(subject), new PropertyPathExpressionOrVariable(propertyPathExpression),
new ResourceOrVariable(object));
}
- public SimplePropertyPathPattern(Variable subject, Variable propertyPathExpression, RdfTerm object) {
+ public SimplePropertyPathPattern(Variable subject, Variable propertyPathExpression, RDFTerm object) {
this(new ResourceOrVariable(subject), new PropertyPathExpressionOrVariable(propertyPathExpression),
new ResourceOrVariable(object));
}
- public SimplePropertyPathPattern(BlankNodeOrIri subject, Variable propertyPathExpression, RdfTerm object) {
+ public SimplePropertyPathPattern(BlankNodeOrIRI subject, Variable propertyPathExpression, RDFTerm object) {
this(new ResourceOrVariable(subject), new PropertyPathExpressionOrVariable(propertyPathExpression),
new ResourceOrVariable(object));
}
@@ -78,17 +78,17 @@ public class SimplePropertyPathPattern implements PropertyPathPattern {
new ResourceOrVariable(object));
}
- public SimplePropertyPathPattern(BlankNodeOrIri subject, PropertyPathExpression propertyPathExpression, Variable object) {
+ public SimplePropertyPathPattern(BlankNodeOrIRI subject, PropertyPathExpression propertyPathExpression, Variable object) {
this(new ResourceOrVariable(subject), new PropertyPathExpressionOrVariable(propertyPathExpression),
new ResourceOrVariable(object));
}
- public SimplePropertyPathPattern(Variable subject, PropertyPathExpression propertyPathExpression, RdfTerm object) {
+ public SimplePropertyPathPattern(Variable subject, PropertyPathExpression propertyPathExpression, RDFTerm object) {
this(new ResourceOrVariable(subject), new PropertyPathExpressionOrVariable(propertyPathExpression),
new ResourceOrVariable(object));
}
- public SimplePropertyPathPattern(BlankNodeOrIri subject, PropertyPathExpression propertyPathExpression, RdfTerm object) {
+ public SimplePropertyPathPattern(BlankNodeOrIRI subject, PropertyPathExpression propertyPathExpression, RDFTerm object) {
this(new ResourceOrVariable(subject), new PropertyPathExpressionOrVariable(propertyPathExpression),
new ResourceOrVariable(object));
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleQuery.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleQuery.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleQuery.java
index 7a60d8f..7f8407b 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleQuery.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleQuery.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core.sparql.query.impl;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.query.DataSet;
import org.apache.clerezza.rdf.core.sparql.query.GroupGraphPattern;
import org.apache.clerezza.rdf.core.sparql.query.InlineData;
@@ -49,14 +49,14 @@ public abstract class SimpleQuery implements Query {
return inlineData;
}
- public void addDefaultGraph(Iri defaultGraph) {
+ public void addDefaultGraph(IRI defaultGraph) {
if (dataSet == null) {
dataSet = new SimpleDataSet();
}
dataSet.addDefaultGraph(defaultGraph);
}
- public void addNamedGraph(Iri namedGraph) {
+ public void addNamedGraph(IRI namedGraph) {
if (dataSet == null) {
dataSet = new SimpleDataSet();
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleStringQuerySerializer.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleStringQuerySerializer.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleStringQuerySerializer.java
index a27d12b..18266f6 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleStringQuerySerializer.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleStringQuerySerializer.java
@@ -21,8 +21,8 @@ package org.apache.clerezza.rdf.core.sparql.query.impl;
import java.util.List;
import java.util.Set;
import org.apache.clerezza.commons.rdf.BlankNode;
-import org.apache.clerezza.commons.rdf.RdfTerm;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.StringQuerySerializer;
import org.apache.clerezza.rdf.core.sparql.query.AlternativeGraphPattern;
import org.apache.clerezza.rdf.core.sparql.query.AskQuery;
@@ -92,10 +92,10 @@ public class SimpleStringQuerySerializer extends StringQuerySerializer {
private void appendDataSet(StringBuffer s, SimpleQuery q) {
DataSet dataSet = q.getDataSet();
if (dataSet != null) {
- for (Iri dg : dataSet.getDefaultGraphs()) {
+ for (IRI dg : dataSet.getDefaultGraphs()) {
s.append("FROM ").append(dg.toString()).append("\n");
}
- for (Iri ng : dataSet.getNamedGraphs()) {
+ for (IRI ng : dataSet.getNamedGraphs()) {
s.append("FROM NAMED ").append(ng.toString()).append("\n");
}
}
@@ -186,7 +186,7 @@ public class SimpleStringQuerySerializer extends StringQuerySerializer {
if (n.isVariable()) {
appendVariable(s, n.getVariable());
} else {
- RdfTerm r = n.getResource();
+ RDFTerm r = n.getResource();
if (r instanceof BlankNode) {
s.append("_:").append(r.toString().replace("@", "."));
} else {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleTriplePattern.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleTriplePattern.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleTriplePattern.java
index 1067e8b..adad648 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleTriplePattern.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/query/impl/SimpleTriplePattern.java
@@ -18,9 +18,9 @@
*/
package org.apache.clerezza.rdf.core.sparql.query.impl;
-import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
-import org.apache.clerezza.commons.rdf.RdfTerm;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.query.ResourceOrVariable;
import org.apache.clerezza.rdf.core.sparql.query.TriplePattern;
import org.apache.clerezza.rdf.core.sparql.query.UriRefOrVariable;
@@ -58,37 +58,37 @@ public class SimpleTriplePattern implements TriplePattern {
new ResourceOrVariable(object));
}
- public SimpleTriplePattern(BlankNodeOrIri subject, Variable predicate, Variable object) {
+ public SimpleTriplePattern(BlankNodeOrIRI subject, Variable predicate, Variable object) {
this(new ResourceOrVariable(subject), new UriRefOrVariable(predicate),
new ResourceOrVariable(object));
}
- public SimpleTriplePattern(Variable subject, Iri predicate, Variable object) {
+ public SimpleTriplePattern(Variable subject, IRI predicate, Variable object) {
this(new ResourceOrVariable(subject), new UriRefOrVariable(predicate),
new ResourceOrVariable(object));
}
- public SimpleTriplePattern(BlankNodeOrIri subject, Iri predicate, Variable object) {
+ public SimpleTriplePattern(BlankNodeOrIRI subject, IRI predicate, Variable object) {
this(new ResourceOrVariable(subject), new UriRefOrVariable(predicate),
new ResourceOrVariable(object));
}
- public SimpleTriplePattern(Variable subject, Variable predicate, RdfTerm object) {
+ public SimpleTriplePattern(Variable subject, Variable predicate, RDFTerm object) {
this(new ResourceOrVariable(subject), new UriRefOrVariable(predicate),
new ResourceOrVariable(object));
}
- public SimpleTriplePattern(BlankNodeOrIri subject, Variable predicate, RdfTerm object) {
+ public SimpleTriplePattern(BlankNodeOrIRI subject, Variable predicate, RDFTerm object) {
this(new ResourceOrVariable(subject), new UriRefOrVariable(predicate),
new ResourceOrVariable(object));
}
- public SimpleTriplePattern(Variable subject, Iri predicate, RdfTerm object) {
+ public SimpleTriplePattern(Variable subject, IRI predicate, RDFTerm object) {
this(new ResourceOrVariable(subject), new UriRefOrVariable(predicate),
new ResourceOrVariable(object));
}
- public SimpleTriplePattern(BlankNodeOrIri subject, Iri predicate, RdfTerm object) {
+ public SimpleTriplePattern(BlankNodeOrIRI subject, IRI predicate, RDFTerm object) {
this(new ResourceOrVariable(subject), new UriRefOrVariable(predicate),
new ResourceOrVariable(object));
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/Update.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/Update.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/Update.java
index 4c13613..944f3b9 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/Update.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/Update.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.rdf.core.sparql.update;
import java.util.Set;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.TcProvider;
/**
@@ -38,7 +38,7 @@ public interface Update {
* the specified tcProvider is used to get the named graphs referred in the SPARQL {@link Update}.
* @return a set of graphs referred in the {@link Update}.
*/
- public Set<Iri> getReferredGraphs(Iri defaultGraph, TcProvider tcProvider);
+ public Set<IRI> getReferredGraphs(IRI defaultGraph, TcProvider tcProvider);
public void addOperation(UpdateOperation updateOperation);
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/UpdateOperation.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/UpdateOperation.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/UpdateOperation.java
index ba6b54e..b09d305 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/UpdateOperation.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/UpdateOperation.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.rdf.core.sparql.update;
import java.util.Set;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.TcProvider;
/**
@@ -41,7 +41,7 @@ public interface UpdateOperation {
* the specified tcProvider is used to get the named graphs referred as input graphs in this operation.
* @return a set of graphs referred as input graphs in this operation.
*/
- public Set<Iri> getInputGraphs(Iri defaultGraph, TcProvider tcProvider);
+ public Set<IRI> getInputGraphs(IRI defaultGraph, TcProvider tcProvider);
/**
*
@@ -52,5 +52,5 @@ public interface UpdateOperation {
* the specified tcProvider is used to get the named graphs referred as destination graphs in this operation.
* @return a set of graphs referred as destination graphs in this operation.
*/
- public Set<Iri> getDestinationGraphs(Iri defaultGraph, TcProvider tcProvider);
+ public Set<IRI> getDestinationGraphs(IRI defaultGraph, TcProvider tcProvider);
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/BaseUpdateOperation.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/BaseUpdateOperation.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/BaseUpdateOperation.java
index 5aa0bdd..bc12710 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/BaseUpdateOperation.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/BaseUpdateOperation.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.rdf.core.sparql.update.impl;
import java.util.HashSet;
import java.util.Set;
-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.rdf.core.sparql.update.UpdateOperation;
@@ -30,8 +30,8 @@ import org.apache.clerezza.rdf.core.sparql.update.UpdateOperation;
*/
public abstract class BaseUpdateOperation implements UpdateOperation {
- protected Set<Iri> inputGraphs = new HashSet<Iri>();
- protected Set<Iri> destinationGraphs = new HashSet<Iri>();
+ protected Set<IRI> inputGraphs = new HashSet<IRI>();
+ protected Set<IRI> destinationGraphs = new HashSet<IRI>();
protected GraphSpec inputGraphSpec = GraphSpec.GRAPH;
protected GraphSpec destinationGraphSpec = GraphSpec.GRAPH;
@@ -52,14 +52,14 @@ public abstract class BaseUpdateOperation implements UpdateOperation {
}
@Override
- public Set<Iri> getInputGraphs(Iri defaultGraph, TcProvider tcProvider) {
+ public Set<IRI> getInputGraphs(IRI defaultGraph, TcProvider tcProvider) {
return getGraphs(defaultGraph, tcProvider, inputGraphSpec, inputGraphs);
}
- private Set<Iri> getGraphs(Iri defaultGraph, TcProvider tcProvider, GraphSpec graphSpec, Set<Iri> graphs) {
+ private Set<IRI> getGraphs(IRI defaultGraph, TcProvider tcProvider, GraphSpec graphSpec, Set<IRI> graphs) {
switch (graphSpec) {
case DEFAULT:
- Set<Iri> result = new HashSet<Iri>();
+ Set<IRI> result = new HashSet<IRI>();
result.add(defaultGraph);
return result;
case NAMED:
@@ -71,15 +71,15 @@ public abstract class BaseUpdateOperation implements UpdateOperation {
}
@Override
- public Set<Iri> getDestinationGraphs(Iri defaultGraph, TcProvider tcProvider) {
+ public Set<IRI> getDestinationGraphs(IRI defaultGraph, TcProvider tcProvider) {
return getGraphs(defaultGraph, tcProvider, destinationGraphSpec, destinationGraphs);
}
- public void addInputGraph(Iri ImmutableGraph) {
+ public void addInputGraph(IRI ImmutableGraph) {
inputGraphs.add(ImmutableGraph);
}
- public void addDestinationGraph(Iri ImmutableGraph) {
+ public void addDestinationGraph(IRI ImmutableGraph) {
destinationGraphs.add(ImmutableGraph);
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/ClearOrDropOperation.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/ClearOrDropOperation.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/ClearOrDropOperation.java
index eb68e56..2b356af 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/ClearOrDropOperation.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/ClearOrDropOperation.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.rdf.core.sparql.update.impl;
import java.util.Set;
-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.rdf.core.sparql.update.UpdateOperation;
@@ -43,14 +43,14 @@ public class ClearOrDropOperation extends BaseUpdateOperation {
return silent;
}
- public void setDestinationGraph(Iri destination) {
+ public void setDestinationGraph(IRI destination) {
destinationGraphSpec = UpdateOperation.GraphSpec.GRAPH;
destinationGraphs.clear();
destinationGraphs.add(destination);
}
- public Iri getDestinationGraph(Iri defaultGraph, TcProvider tcProvider) {
- Set<Iri> result = getDestinationGraphs(defaultGraph, tcProvider);
+ public IRI getDestinationGraph(IRI defaultGraph, TcProvider tcProvider) {
+ Set<IRI> result = getDestinationGraphs(defaultGraph, tcProvider);
if (result.isEmpty()) {
return null;
} else {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/CreateOperation.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/CreateOperation.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/CreateOperation.java
index 3196043..090f423 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/CreateOperation.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/CreateOperation.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core.sparql.update.impl;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
/**
*
@@ -40,12 +40,12 @@ public class CreateOperation extends BaseUpdateOperation {
return silent;
}
- public void setDestinationGraph(Iri destination) {
+ public void setDestinationGraph(IRI destination) {
destinationGraphs.clear();
destinationGraphs.add(destination);
}
- public Iri getDestinationGraph() {
+ public IRI getDestinationGraph() {
if (destinationGraphs.isEmpty()) {
return null;
} else {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/LoadOperation.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/LoadOperation.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/LoadOperation.java
index f0de8fc..8dfc69f 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/LoadOperation.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/LoadOperation.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.rdf.core.sparql.update.impl;
import java.util.Set;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.update.UpdateOperation;
/**
@@ -31,11 +31,11 @@ import org.apache.clerezza.rdf.core.sparql.update.UpdateOperation;
*/
public class LoadOperation extends SimpleUpdateOperation {
- public void setSource(Iri source) {
+ public void setSource(IRI source) {
setInputGraph(source);
}
- public Iri getSource() {
+ public IRI getSource() {
return getInputGraph(null);
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/ModifyOperation.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/ModifyOperation.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/ModifyOperation.java
index c3ca5ce..97ce39b 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/ModifyOperation.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/ModifyOperation.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.rdf.core.sparql.update.impl;
import java.util.HashSet;
import java.util.Set;
-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.rdf.core.sparql.query.GroupGraphPattern;
import org.apache.clerezza.rdf.core.sparql.query.impl.SimpleDataSet;
@@ -36,13 +36,13 @@ import org.apache.clerezza.rdf.core.sparql.update.UpdateOperation;
* @author hasan
*/
public class ModifyOperation implements UpdateOperation {
- private Iri fallbackGraph = null;
+ private IRI fallbackGraph = null;
private UpdateOperationWithQuads deleteOperation = null;
private UpdateOperationWithQuads insertOperation = null;
private SimpleDataSet dataSet = null;
private GroupGraphPattern queryPattern = null;
- public void setFallbackGraph(Iri fallbackGraph) {
+ public void setFallbackGraph(IRI fallbackGraph) {
this.fallbackGraph = fallbackGraph;
}
@@ -58,14 +58,14 @@ public class ModifyOperation implements UpdateOperation {
this.dataSet = dataSet;
}
- public void addGraphToDataSet(Iri ImmutableGraph) {
+ public void addGraphToDataSet(IRI ImmutableGraph) {
if (dataSet == null) {
dataSet = new SimpleDataSet();
}
dataSet.addDefaultGraph(ImmutableGraph);
}
- public void addNamedGraphToDataSet(Iri namedGraph) {
+ public void addNamedGraphToDataSet(IRI namedGraph) {
if (dataSet == null) {
dataSet = new SimpleDataSet();
}
@@ -77,8 +77,8 @@ public class ModifyOperation implements UpdateOperation {
}
@Override
- public Set<Iri> getInputGraphs(Iri defaultGraph, TcProvider tcProvider) {
- Set<Iri> graphs = new HashSet<Iri>();
+ public Set<IRI> getInputGraphs(IRI defaultGraph, TcProvider tcProvider) {
+ Set<IRI> graphs = new HashSet<IRI>();
if (dataSet != null) {
graphs.addAll(dataSet.getDefaultGraphs());
graphs.addAll(dataSet.getNamedGraphs());
@@ -97,9 +97,9 @@ public class ModifyOperation implements UpdateOperation {
}
@Override
- public Set<Iri> getDestinationGraphs(Iri defaultGraph, TcProvider tcProvider) {
- Set<Iri> graphs = new HashSet<Iri>();
- Iri dfltGraph = (fallbackGraph != null) ? fallbackGraph : defaultGraph;
+ public Set<IRI> getDestinationGraphs(IRI defaultGraph, TcProvider tcProvider) {
+ Set<IRI> graphs = new HashSet<IRI>();
+ IRI dfltGraph = (fallbackGraph != null) ? fallbackGraph : defaultGraph;
if (deleteOperation != null) {
graphs.addAll(deleteOperation.getDestinationGraphs(dfltGraph, tcProvider));
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/SimpleUpdate.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/SimpleUpdate.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/SimpleUpdate.java
index 626bfc5..c91ee95 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/SimpleUpdate.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/SimpleUpdate.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-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.rdf.core.sparql.update.Update;
import org.apache.clerezza.rdf.core.sparql.update.UpdateOperation;
@@ -35,8 +35,8 @@ public class SimpleUpdate implements Update {
protected List<UpdateOperation> operations = new ArrayList<UpdateOperation>();
@Override
- public Set<Iri> getReferredGraphs(Iri defaultGraph, TcProvider tcProvider) {
- Set<Iri> referredGraphs = new HashSet<Iri>();
+ public Set<IRI> getReferredGraphs(IRI defaultGraph, TcProvider tcProvider) {
+ Set<IRI> referredGraphs = new HashSet<IRI>();
for (UpdateOperation operation : operations) {
referredGraphs.addAll(operation.getInputGraphs(defaultGraph, tcProvider));
referredGraphs.addAll(operation.getDestinationGraphs(defaultGraph, tcProvider));
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/SimpleUpdateOperation.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/SimpleUpdateOperation.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/SimpleUpdateOperation.java
index 72c87d4..6042536 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/SimpleUpdateOperation.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/SimpleUpdateOperation.java
@@ -19,7 +19,7 @@
package org.apache.clerezza.rdf.core.sparql.update.impl;
import java.util.Set;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.update.UpdateOperation;
/**
@@ -44,14 +44,14 @@ public class SimpleUpdateOperation extends BaseUpdateOperation {
return silent;
}
- public void setInputGraph(Iri source) {
+ public void setInputGraph(IRI source) {
inputGraphSpec = UpdateOperation.GraphSpec.GRAPH;
inputGraphs.clear();
inputGraphs.add(source);
}
- public Iri getInputGraph(Iri defaultGraph) {
- Set<Iri> result = getInputGraphs(defaultGraph, null);
+ public IRI getInputGraph(IRI defaultGraph) {
+ Set<IRI> result = getInputGraphs(defaultGraph, null);
if (result.isEmpty()) {
return null;
} else {
@@ -59,14 +59,14 @@ public class SimpleUpdateOperation extends BaseUpdateOperation {
}
}
- public void setDestinationGraph(Iri destination) {
+ public void setDestinationGraph(IRI destination) {
destinationGraphSpec = UpdateOperation.GraphSpec.GRAPH;
destinationGraphs.clear();
destinationGraphs.add(destination);
}
- public Iri getDestinationGraph(Iri defaultGraph) {
- Set<Iri> result = getDestinationGraphs(defaultGraph, null);
+ public IRI getDestinationGraph(IRI defaultGraph) {
+ Set<IRI> result = getDestinationGraphs(defaultGraph, null);
if (result.isEmpty()) {
return null;
} else {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/UpdateOperationWithQuads.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/UpdateOperationWithQuads.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/UpdateOperationWithQuads.java
index a0a412d..5b2ea57 100644
--- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/UpdateOperationWithQuads.java
+++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/sparql/update/impl/UpdateOperationWithQuads.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-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.rdf.core.sparql.query.TriplePattern;
import org.apache.clerezza.rdf.core.sparql.query.UriRefOrVariable;
@@ -57,13 +57,13 @@ public class UpdateOperationWithQuads implements UpdateOperation {
}
@Override
- public Set<Iri> getInputGraphs(Iri defaultGraph, TcProvider tcProvider) {
- return new HashSet<Iri>();
+ public Set<IRI> getInputGraphs(IRI defaultGraph, TcProvider tcProvider) {
+ return new HashSet<IRI>();
}
@Override
- public Set<Iri> getDestinationGraphs(Iri defaultGraph, TcProvider tcProvider) {
- Set<Iri> graphs = new HashSet<Iri>();
+ public Set<IRI> getDestinationGraphs(IRI defaultGraph, TcProvider tcProvider) {
+ Set<IRI> graphs = new HashSet<IRI>();
if (defaultQuad != null) {
graphs.add(defaultGraph);
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedQueryParser.jj
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedQueryParser.jj b/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedQueryParser.jj
index f8711c6..c41426e 100644
--- a/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedQueryParser.jj
+++ b/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedQueryParser.jj
@@ -42,8 +42,8 @@ import java.util.regex.Pattern;
import org.apache.clerezza.commons.rdf.BlankNode;
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.Iri;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.LiteralFactory;
import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
import org.apache.clerezza.commons.rdf.impl.utils.TypedLiteralImpl;
@@ -81,14 +81,14 @@ import org.apache.clerezza.rdf.core.sparql.query.impl.SimpleTriplePattern;
*/
class JavaCCGeneratedQueryParser {
- private static final Iri RDF_TYPE =
- new Iri("http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
- private static final Iri RDF_FIRST =
- new Iri("http://www.w3.org/1999/02/22-rdf-syntax-ns#first");
- private static final Iri RDF_REST =
- new Iri("http://www.w3.org/1999/02/22-rdf-syntax-ns#rest");
- private static final Iri RDF_NIL =
- new Iri("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil");
+ private static final IRI RDF_TYPE =
+ new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
+ private static final IRI RDF_FIRST =
+ new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#first");
+ private static final IRI RDF_REST =
+ new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#rest");
+ private static final IRI RDF_NIL =
+ new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil");
/** A RegEx pattern for separating out a namespace from a prefixed name. */
private static final Pattern pfxNamePattern = Pattern.compile("([^:]*):(.*)");
@@ -200,16 +200,16 @@ class JavaCCGeneratedQueryParser {
return bNode;
}
- private Iri createUriRef(String r) throws ParseException {
+ private IRI createUriRef(String r) throws ParseException {
// Create an IRI directly if the string does not start with a prefix
Matcher m = pfxNamePattern.matcher(r);
if (!m.matches()) {
// either a normal IRI, or one with a BASE
- return isRelative(r) ? new Iri(base + r) : new Iri(r);
+ return isRelative(r) ? new IRI(base + r) : new IRI(r);
}
// extract the prefix, and attempt to convert to a URI before creating the reference
String ns = prefixes.get(m.group(1));
- return ns == null ? new Iri(r) : new Iri(ns + m.group(2));
+ return ns == null ? new IRI(r) : new IRI(ns + m.group(2));
}
/**
@@ -386,7 +386,7 @@ private void DatasetClause() : {} {
/* [10] DefaultGraphClause ::= SourceSelector */
private void DefaultGraphClause() : {
- Iri defaultGraph; } {
+ IRI defaultGraph; } {
defaultGraph=SourceSelector() {
((SimpleQuery) query).addDefaultGraph(defaultGraph); }
@@ -394,15 +394,15 @@ private void DefaultGraphClause() : {
/* [11] NamedGraphClause ::= 'NAMED' SourceSelector */
private void NamedGraphClause() : {
- Iri namedGraph; } {
+ IRI namedGraph; } {
<NAMED> namedGraph=SourceSelector() {
((SimpleQuery) query).addNamedGraph(namedGraph); }
}
/* [12] SourceSelector ::= IRIref */
-private Iri SourceSelector() : {
- Iri graph; } {
+private IRI SourceSelector() : {
+ IRI graph; } {
graph=IRIref() {
return graph; }
@@ -572,7 +572,7 @@ private Expression Constraint() : {
/* [28] FunctionCall ::= IRIref ArgList */
private FunctionCall FunctionCall() : {
- Iri name;
+ IRI name;
List<Expression> arguments;} {
name=IRIref()
@@ -761,14 +761,14 @@ private ResourceOrVariable VarOrTerm() : {
/* [43] VarOrIRIref ::= Var | IRIref */
private UriRefOrVariable VarOrIRIref() : {
Variable var;
- Iri Iri; } {
+ IRI IRI; } {
(
var=Var() {
return new UriRefOrVariable(var); }
|
- Iri=IRIref() {
- return new UriRefOrVariable(Iri); }
+ IRI=IRIref() {
+ return new UriRefOrVariable(IRI); }
)
}
@@ -783,7 +783,7 @@ private Variable Var() : {
/* [45] GraphTerm ::= IRIref | RDFLiteral | NumericLiteral | BooleanLiteral | BlankNode | NIL */
private ResourceOrVariable GraphTerm() : {
ResourceOrVariable bNode = null;
- RdfTerm r = null; } {
+ RDFTerm r = null; } {
(r=IRIref() | r=RDFLiteral() | r=NumericLiteral() | r=BooleanLiteral() | bNode=BlankNode() | <NIL> {
r = RDF_NIL; }) {
@@ -1046,22 +1046,22 @@ private BuiltInCall RegexExpression() : {
/* [59] IRIrefOrFunction ::= IRIref ArgList? */
private Expression IRIrefOrFunction() : {
- Iri Iri;
+ IRI IRI;
List<Expression> args; } {
- Iri=IRIref()
+ IRI=IRIref()
(
args=ArgList() {
- return new FunctionCall(Iri, args); }
+ return new FunctionCall(IRI, args); }
)? {
- return new UriRefExpression(Iri); }
+ return new UriRefExpression(IRI); }
}
/* [60] RDFLiteral ::= String ( LANGTAG | ( '^^' IRIref ) )? */
private Literal RDFLiteral() : {
Token t;
String s;
- Iri type; } {
+ IRI type; } {
s = String()
(
@@ -1143,19 +1143,19 @@ private String String() : {
}
/* [67] IRIref ::= IRI_REF | PrefixedName */
-private Iri IRIref() : {
- Iri Iri;
+private IRI IRIref() : {
+ IRI IRI;
Token t; } {
t=<IRI_REF> {
return createUriRef(unquote(t.image)); }
|
- Iri=PrefixedName() {
- return Iri; }
+ IRI=PrefixedName() {
+ return IRI; }
}
/* [68] PrefixedName ::= PNAME_LN | PNAME_NS */
-private Iri PrefixedName() : {
+private IRI PrefixedName() : {
Token t; } {
( t=<PNAME_LN> | t=<PNAME_NS> ) {