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:57 UTC
[5/9] clerezza git commit: CLEREZZA-983: Adapted to new casing of
rdf-core (part 1)
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/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> ) {