You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2015/04/14 15:13:53 UTC
[78/87] [abbrv] clerezza git commit: CLEREZZA-983: Adapted to new
casing of rdf-core (part 1)
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/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());
}