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:51 UTC
[76/87] [abbrv] clerezza git commit: CLEREZZA-983: Adapted to new
casing of rdf-core (part 1)
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedSparqlPreParser.jj
----------------------------------------------------------------------
diff --git a/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedSparqlPreParser.jj b/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedSparqlPreParser.jj
index 35050c0..4ef0976 100644
--- a/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedSparqlPreParser.jj
+++ b/rdf/core/src/main/javacc/org/apache/clerezza/rdf/core/sparql/JavaCCGeneratedSparqlPreParser.jj
@@ -41,8 +41,8 @@ import java.util.regex.Pattern;
import org.apache.clerezza.commons.rdf.BlankNode;
import org.apache.clerezza.commons.rdf.Language;
import org.apache.clerezza.commons.rdf.Literal;
-import org.apache.clerezza.commons.rdf.RdfTerm;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.RDFTerm;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.LiteralFactory;
import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
import org.apache.clerezza.commons.rdf.impl.utils.TypedLiteralImpl;
@@ -115,14 +115,14 @@ import org.apache.clerezza.rdf.core.sparql.update.impl.UpdateOperationWithQuads;
*/
class JavaCCGeneratedSparqlPreParser {
- private static final Iri RDF_TYPE =
- new Iri("http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
- private static final Iri RDF_FIRST =
- new Iri("http://www.w3.org/1999/02/22-rdf-syntax-ns#first");
- private static final Iri RDF_REST =
- new Iri("http://www.w3.org/1999/02/22-rdf-syntax-ns#rest");
- private static final Iri RDF_NIL =
- new Iri("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil");
+ private static final IRI RDF_TYPE =
+ new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#type");
+ private static final IRI RDF_FIRST =
+ new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#first");
+ private static final IRI RDF_REST =
+ new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#rest");
+ private static final IRI RDF_NIL =
+ new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil");
/** A RegEx pattern for separating out a namespace from a prefixed name. */
private static final Pattern pfxNamePattern = Pattern.compile("([^:]*):(.*)");
@@ -134,17 +134,17 @@ class JavaCCGeneratedSparqlPreParser {
private class GraphRefAllSpec {
GraphSpec graphSpec;
- Iri graph;
+ IRI graph;
public void setGraphSpec(GraphSpec graphSpec) {
this.graphSpec = graphSpec;
}
public GraphSpec getGraphSpec() {
return this.graphSpec;
}
- public void setGraph(Iri graph){
+ public void setGraph(IRI graph){
this.graph = graph;
}
- public Iri getGraph() {
+ public IRI getGraph() {
return this.graph;
}
}
@@ -287,16 +287,16 @@ class JavaCCGeneratedSparqlPreParser {
return bNode;
}
- private Iri createUriRef(String r) throws ParseException {
+ private IRI createUriRef(String r) throws ParseException {
// Create an IRI directly if the string does not start with a prefix
Matcher m = pfxNamePattern.matcher(r);
if (!m.matches()) {
// either a normal IRI, or one with a BASE
- return isRelative(r) ? new Iri(base + r) : new Iri(r);
+ return isRelative(r) ? new IRI(base + r) : new IRI(r);
}
// extract the prefix, and attempt to convert to a URI before creating the reference
String ns = prefixes.get(m.group(1));
- return ns == null ? new Iri(r) : new Iri(ns + m.group(2));
+ return ns == null ? new IRI(r) : new IRI(ns + m.group(2));
}
/**
@@ -558,7 +558,7 @@ private Query ConstructQuery() : {
return query; }
}
-/* [11] DescribeQuery ::= 'DESCRIBE' ( VarOrIri+ | '*' ) DatasetClause* WhereClause? SolutionModifier */
+/* [11] DescribeQuery ::= 'DESCRIBE' ( VarOrIRI+ | '*' ) DatasetClause* WhereClause? SolutionModifier */
private Query DescribeQuery() : {
Query query;
UriRefOrVariable node; } {
@@ -566,7 +566,7 @@ private Query DescribeQuery() : {
<DESCRIBE> {
query = new SimpleDescribeQuery(); }
(
- ( node=VarOrIri() {
+ ( node=VarOrIRI() {
((SimpleDescribeQuery) query).addResourceToDescribe(node); } )+
|
"*" {
@@ -597,7 +597,7 @@ private void DatasetClause(Query query) : {} {
/* [14] DefaultGraphClause ::= SourceSelector */
private void DefaultGraphClause(Query query) : {
- Iri defaultGraph; } {
+ IRI defaultGraph; } {
defaultGraph=SourceSelector() {
((SimpleQuery) query).addDefaultGraph(defaultGraph); }
@@ -605,17 +605,17 @@ private void DefaultGraphClause(Query query) : {
/* [15] NamedGraphClause ::= 'NAMED' SourceSelector */
private void NamedGraphClause(Query query) : {
- Iri namedGraph; } {
+ IRI namedGraph; } {
<NAMED> namedGraph=SourceSelector() {
((SimpleQuery) query).addNamedGraph(namedGraph); }
}
/* [16] SourceSelector ::= iri */
-private Iri SourceSelector() : {
- Iri graph; } {
+private IRI SourceSelector() : {
+ IRI graph; } {
- graph=Iri() {
+ graph=IRI() {
return graph; }
}
@@ -781,7 +781,7 @@ private void Update1(Update update) : {
/* [31] Load ::= 'LOAD' 'SILENT'? iri ( 'INTO' GraphRef )? */
private UpdateOperation Load() : {
- Iri uriRef;
+ IRI uriRef;
LoadOperation operation; } {
<LOAD> {
operation = new LoadOperation(); }
@@ -789,7 +789,7 @@ private UpdateOperation Load() : {
<SILENT> {
operation.setSilent(true); }
)?
- uriRef = Iri() {
+ uriRef = IRI() {
operation.setSource(uriRef); }
(
<INTO>
@@ -834,7 +834,7 @@ private UpdateOperation Drop() : {
/* [34] Create ::= 'CREATE' 'SILENT'? GraphRef */
private UpdateOperation Create() : {
- Iri uriRef;
+ IRI uriRef;
CreateOperation operation; } {
<CREATE> {
operation = new CreateOperation(); }
@@ -927,7 +927,7 @@ private UpdateOperation DeleteWhere() : {
/* [41] Modify ::= ( 'WITH' iri )? ( DeleteClause InsertClause? | InsertClause ) UsingClause* 'WHERE' GroupGraphPattern */
private UpdateOperation Modify() : {
- Iri fallbackGraph = null;
+ IRI fallbackGraph = null;
UpdateOperationWithQuads deleteOperation = null;
UpdateOperationWithQuads insertOperation = null;
SimpleDataSet dataSet = new SimpleDataSet();
@@ -935,7 +935,7 @@ private UpdateOperation Modify() : {
ModifyOperation operation; } {
(
<WITH>
- fallbackGraph = Iri()
+ fallbackGraph = IRI()
)?
(
deleteOperation = DeleteClause()
@@ -986,21 +986,21 @@ private UpdateOperationWithQuads InsertClause() : {
/* [44] UsingClause ::= 'USING' ( iri | 'NAMED' iri ) */
private void UsingClause(SimpleDataSet dataSet) : {
- Iri graph; } {
+ IRI graph; } {
<USING>
(
- graph = Iri() {
+ graph = IRI() {
dataSet.addDefaultGraph(graph); }
|
<NAMED>
- graph = Iri() {
+ graph = IRI() {
dataSet.addNamedGraph(graph); }
)
}
/* [45] GraphOrDefault ::= 'DEFAULT_T' | 'GRAPH'? iri */
private GraphRefAllSpec GraphOrDefault() : {
- Iri uriRef;
+ IRI uriRef;
GraphRefAllSpec graphRefAllSpec = new GraphRefAllSpec(); } {
(
<DEFAULT_T> {
@@ -1009,7 +1009,7 @@ private GraphRefAllSpec GraphOrDefault() : {
(
<GRAPH>
)?
- uriRef = Iri() {
+ uriRef = IRI() {
graphRefAllSpec.setGraph(uriRef);
graphRefAllSpec.setGraphSpec(GraphSpec.GRAPH); }
) {
@@ -1017,16 +1017,16 @@ private GraphRefAllSpec GraphOrDefault() : {
}
/* [46] GraphRef ::= 'GRAPH' iri */
-private Iri GraphRef() : {
- Iri uriRef; } {
+private IRI GraphRef() : {
+ IRI uriRef; } {
<GRAPH>
- uriRef = Iri() {
+ uriRef = IRI() {
return uriRef; }
}
/* [47] GraphRefAll ::= GraphRef | 'DEFAULT_T' | 'NAMED' | 'ALL' */
private GraphRefAllSpec GraphRefAll() : {
- Iri uriRef;
+ IRI uriRef;
GraphRefAllSpec graphRefAllSpec = new GraphRefAllSpec(); } {
(
uriRef = GraphRef() {
@@ -1076,13 +1076,13 @@ private void Quads(UpdateOperationWithQuads operation) : {
)*
}
-/* [51] QuadsNotTriples ::= 'GRAPH' VarOrIri '{' TriplesTemplate? '}' */
+/* [51] QuadsNotTriples ::= 'GRAPH' VarOrIRI '{' TriplesTemplate? '}' */
private void QuadsNotTriples(UpdateOperationWithQuads operation) : {
UriRefOrVariable graph;
Set<TriplePattern> triplePatterns = null; } {
<GRAPH>
- graph=VarOrIri()
+ graph=VarOrIRI()
"{"
(
triplePatterns=TriplesTemplate()
@@ -1184,18 +1184,18 @@ private void OptionalGraphPattern(GroupGraphPattern groupGraphPattern) : {
((SimpleGroupGraphPattern) groupGraphPattern).addOptionalGraphPattern(optional); }
}
-/* [58] GraphGraphPattern ::= 'GRAPH' VarOrIri GroupGraphPattern */
+/* [58] GraphGraphPattern ::= 'GRAPH' VarOrIRI GroupGraphPattern */
private void GraphGraphPattern(GroupGraphPattern groupGraphPattern) : {
UriRefOrVariable graph;
GroupGraphPattern g; } {
<GRAPH>
- graph=VarOrIri()
+ graph=VarOrIRI()
g=GroupGraphPattern() {
((SimpleGroupGraphPattern) groupGraphPattern).addGraphPattern(new SimpleGraphGraphPattern(graph, g)); }
}
-/* [59] ServiceGraphPattern ::= 'SERVICE' 'SILENT'? VarOrIri GroupGraphPattern */
+/* [59] ServiceGraphPattern ::= 'SERVICE' 'SILENT'? VarOrIRI GroupGraphPattern */
private void ServiceGraphPattern(GroupGraphPattern groupGraphPattern) : {
UriRefOrVariable service;
GroupGraphPattern g;
@@ -1206,7 +1206,7 @@ private void ServiceGraphPattern(GroupGraphPattern groupGraphPattern) : {
<SILENT> {
silent = true; }
)?
- service=VarOrIri()
+ service=VarOrIRI()
g=GroupGraphPattern() {
SimpleServiceGraphPattern simpleServiceGraphPattern;
simpleServiceGraphPattern = new SimpleServiceGraphPattern(service, g);
@@ -1255,14 +1255,14 @@ private InlineData DataBlock() : {
/* [63] InlineDataOneVar ::= Var '{' DataBlockValue* '}' */
private void InlineDataOneVar(InlineData inlineData) : {
Variable var;
- RdfTerm val; } {
+ RDFTerm val; } {
var=Var() {
((SimpleInlineData) inlineData).addVariable(var); }
"{"
(
val=DataBlockValue() {
- List<RdfTerm> values = new ArrayList<RdfTerm>();
+ List<RDFTerm> values = new ArrayList<RDFTerm>();
values.add(val);
((SimpleInlineData) inlineData).addValues(values); }
)*
@@ -1272,7 +1272,7 @@ private void InlineDataOneVar(InlineData inlineData) : {
/* [64] InlineDataFull ::= ( NIL | '(' Var* ')' ) '{' ( '(' DataBlockValue* ')' | NIL )* '}' */
private void InlineDataFull(InlineData inlineData) : {
Variable var;
- RdfTerm val; } {
+ RDFTerm val; } {
(
<NIL>
|
@@ -1288,7 +1288,7 @@ private void InlineDataFull(InlineData inlineData) : {
(
(
"(" {
- List<RdfTerm> values = new ArrayList<RdfTerm>(); }
+ List<RDFTerm> values = new ArrayList<RDFTerm>(); }
(
val=DataBlockValue() {
values.add(val); }
@@ -1298,15 +1298,15 @@ private void InlineDataFull(InlineData inlineData) : {
)
|
<NIL> {
- ((SimpleInlineData) inlineData).addValues(new ArrayList<RdfTerm>()); }
+ ((SimpleInlineData) inlineData).addValues(new ArrayList<RDFTerm>()); }
)*
"}"
}
/* [65] DataBlockValue ::= iri | RDFLiteral | NumericLiteral | BooleanLiteral | 'UNDEF' */
-private RdfTerm DataBlockValue() : {
- RdfTerm r = null; } {
- (r=Iri() | r=RDFLiteral() | r=NumericLiteral() | r=BooleanLiteral() | <UNDEF> ) {
+private RDFTerm DataBlockValue() : {
+ RDFTerm r = null; } {
+ (r=IRI() | r=RDFLiteral() | r=NumericLiteral() | r=BooleanLiteral() | <UNDEF> ) {
return r; }
}
@@ -1359,10 +1359,10 @@ private Expression Constraint() : {
/* [70] FunctionCall ::= iri ArgList */
private FunctionCall FunctionCall() : {
- Iri name;
+ IRI name;
List<Expression> arguments; } {
- name=Iri()
+ name=IRI()
arguments=ArgList() {
return new FunctionCall(name, arguments); }
}
@@ -1477,11 +1477,11 @@ private void PropertyListNotEmpty(ResourceOrVariable subject, Set<TriplePattern>
)*
}
-/* [78] Verb ::= VarOrIri | 'a' */
+/* [78] Verb ::= VarOrIRI | 'a' */
private UriRefOrVariable Verb() : {
UriRefOrVariable predicate; } {
- predicate=VarOrIri() {
+ predicate=VarOrIRI() {
return predicate; }
| "a" {
return new UriRefOrVariable(RDF_TYPE); }
@@ -1685,10 +1685,10 @@ private String PathMod() : {} {
/* [94] PathPrimary ::= iri | 'a' | '!' PathNegatedPropertySet | '(' Path ')' */
private PropertyPathExpression PathPrimary() : {
PropertyPathExpression ppe;
- Iri uriRef; } {
+ IRI uriRef; } {
(
- uriRef=Iri() {
+ uriRef=IRI() {
return new PredicatePath(uriRef); }
|
"a" {
@@ -1731,10 +1731,10 @@ private PropertyPathExpression PathNegatedPropertySet() : {
/* [96] PathOneInPropertySet ::= iri | 'a' | '^' ( iri | 'a' ) */
private PropertyPathExpression PathOneInPropertySet() : {
- Iri uriRef; } {
+ IRI uriRef; } {
(
- uriRef=Iri() {
+ uriRef=IRI() {
return new PredicatePath(uriRef); }
|
"a" {
@@ -1742,7 +1742,7 @@ private PropertyPathExpression PathOneInPropertySet() : {
|
"^"
(
- uriRef=Iri() {
+ uriRef=IRI() {
return new UnaryPropertyPathOperation("^", new PredicatePath(uriRef)); }
|
"a" {
@@ -1863,16 +1863,16 @@ private ResourceOrVariable VarOrTerm() : {
)
}
-/* [107] VarOrIri ::= Var | iri */
-private UriRefOrVariable VarOrIri() : {
+/* [107] VarOrIRI ::= Var | iri */
+private UriRefOrVariable VarOrIRI() : {
Variable var;
- Iri uriRef; } {
+ IRI uriRef; } {
(
var=Var() {
return new UriRefOrVariable(var); }
|
- uriRef=Iri() {
+ uriRef=IRI() {
return new UriRefOrVariable(uriRef); }
)
}
@@ -1885,12 +1885,12 @@ private Variable Var() : {
return createVariable(t.image); }
}
-/* [109] GraphTerm ::= Iri | RDFLiteral | NumericLiteral | BooleanLiteral | BlankNode | NIL */
+/* [109] GraphTerm ::= IRI | RDFLiteral | NumericLiteral | BooleanLiteral | BlankNode | NIL */
private ResourceOrVariable GraphTerm() : {
ResourceOrVariable bNode = null;
- RdfTerm r = null; } {
+ RDFTerm r = null; } {
- (r=Iri() | r=RDFLiteral() | r=NumericLiteral() | r=BooleanLiteral() | bNode=BlankNode() | <NIL> {
+ (r=IRI() | r=RDFLiteral() | r=NumericLiteral() | r=BooleanLiteral() | bNode=BlankNode() | <NIL> {
r = RDF_NIL; }) {
if (bNode == null) {
return new ResourceOrVariable(r);
@@ -2057,7 +2057,7 @@ private Expression PrimaryExpression() : {
e=BuiltInCall()
*/
|
- e=IriOrFunction()
+ e=IRIOrFunction()
|
l=RDFLiteral()
|
@@ -2283,12 +2283,12 @@ private Expression NotExistsFunc() : {
return patternExistenceCondition; }
}
-/* [128] IriOrFunction ::= iri ArgList? */
-private Expression IriOrFunction() : {
- Iri uriRef;
+/* [128] IRIOrFunction ::= iri ArgList? */
+private Expression IRIOrFunction() : {
+ IRI uriRef;
List<Expression> args; } {
- uriRef=Iri()
+ uriRef=IRI()
(
args=ArgList() {
return new FunctionCall(uriRef, args); }
@@ -2300,7 +2300,7 @@ private Expression IriOrFunction() : {
private Literal RDFLiteral() : {
Token t;
String s;
- Iri type; } {
+ IRI type; } {
s = String()
(
@@ -2309,7 +2309,7 @@ private Literal RDFLiteral() : {
|
(
"^^"
- type=Iri() {
+ type=IRI() {
return new TypedLiteralImpl(s, type); }
)
)? {
@@ -2400,8 +2400,8 @@ private String String() : {
}
/* [136] iri ::= IRIREF | PrefixedName */
-private Iri Iri() : {
- Iri uriRef;
+private IRI IRI() : {
+ IRI uriRef;
Token t; } {
t=<IRIREF> {
@@ -2412,7 +2412,7 @@ private Iri Iri() : {
}
/* [137] PrefixedName ::= PNAME_LN | PNAME_NS */
-private Iri PrefixedName() : {
+private IRI PrefixedName() : {
Token t; } {
( t=<PNAME_LN> | t=<PNAME_NS> ) {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/LiteralFactoryTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/LiteralFactoryTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/LiteralFactoryTest.java
index e333535..f0dbd79 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/LiteralFactoryTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/LiteralFactoryTest.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.rdf.core;
import org.apache.clerezza.commons.rdf.Literal;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import java.util.Arrays;
import java.util.Date;
import org.junit.Test;
@@ -52,7 +52,7 @@ public class LiteralFactoryTest {
bytes[i] = i;
}
Literal literal = LiteralFactory.getInstance().createTypedLiteral(bytes);
- Assert.assertEquals(new Iri("http://www.w3.org/2001/XMLSchema#base64Binary"),
+ Assert.assertEquals(new IRI("http://www.w3.org/2001/XMLSchema#base64Binary"),
literal.getDataType());
//we are using bytes.getClass() but there should be a way to get
//that instance of Class without getting it from an instance
@@ -69,7 +69,7 @@ public class LiteralFactoryTest {
public void dateConversion() {
Date date = new Date();
Literal literal = LiteralFactory.getInstance().createTypedLiteral(date);
- Assert.assertEquals(new Iri("http://www.w3.org/2001/XMLSchema#dateTime"),
+ Assert.assertEquals(new IRI("http://www.w3.org/2001/XMLSchema#dateTime"),
literal.getDataType());
Date dateBack = LiteralFactory.getInstance().createObject(Date.class, literal);
Assert.assertEquals(date.getTime(), dateBack.getTime());
@@ -83,7 +83,7 @@ public class LiteralFactoryTest {
public void stringConversion() {
String value = "Hello world";
Literal literal = LiteralFactory.getInstance().createTypedLiteral(value);
- Assert.assertEquals(new Iri("http://www.w3.org/2001/XMLSchema#string"),
+ Assert.assertEquals(new IRI("http://www.w3.org/2001/XMLSchema#string"),
literal.getDataType());
String valueBack = LiteralFactory.getInstance().createObject(String.class, literal);
Assert.assertEquals(value, valueBack);
@@ -97,7 +97,7 @@ public class LiteralFactoryTest {
public void intConversion() {
int value = 3;
Literal literal = LiteralFactory.getInstance().createTypedLiteral(value);
- Assert.assertEquals(new Iri("http://www.w3.org/2001/XMLSchema#int"),
+ Assert.assertEquals(new IRI("http://www.w3.org/2001/XMLSchema#int"),
literal.getDataType());
Integer valueBack = LiteralFactory.getInstance().createObject(Integer.class, literal);
Assert.assertEquals(value, valueBack.intValue());
@@ -111,7 +111,7 @@ public class LiteralFactoryTest {
public void longConversion() {
long value = 332314646;
Literal literal = LiteralFactory.getInstance().createTypedLiteral(value);
- Assert.assertEquals(new Iri("http://www.w3.org/2001/XMLSchema#long"),
+ Assert.assertEquals(new IRI("http://www.w3.org/2001/XMLSchema#long"),
literal.getDataType());
Long valueBack = LiteralFactory.getInstance().createObject(Long.class, literal);
Assert.assertEquals(value, valueBack.longValue());
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/UriRefTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/UriRefTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/UriRefTest.java
index 27ab33e..71d6846 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/UriRefTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/UriRefTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import org.junit.Test;
@@ -39,11 +39,11 @@ public class UriRefTest {
public void uriRefEqualityTest() {
try {
String uriRefString = "http://example.org/üöä";
- Iri uriRef1 = new Iri(uriRefString);
- Iri uriRef2 = new Iri(uriRefString);
+ IRI uriRef1 = new IRI(uriRefString);
+ IRI uriRef2 = new IRI(uriRefString);
Assert.assertEquals(uriRef1, uriRef2);
- Iri uriRef3 =
- new Iri(URLEncoder.encode(uriRefString, "utf-8"));
+ IRI uriRef3 =
+ new IRI(URLEncoder.encode(uriRefString, "utf-8"));
Assert.assertFalse(uriRef1.equals(uriRef3));
} catch (UnsupportedEncodingException ex) {
logger.error("Exception {} ", ex);
@@ -53,7 +53,7 @@ public class UriRefTest {
@Test
public void toStringTest() {
String uriRefString = "http://example.org/üöä";
- Iri uriRef = new Iri(uriRefString);
+ IRI uriRef = new IRI(uriRefString);
Assert.assertEquals("<"+uriRefString+">", uriRef.toString());
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
index 35bf406..bd11974 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.commons.rdf.Triple;
import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.providers.WeightedA;
import org.apache.clerezza.rdf.core.access.providers.WeightedDummy;
import org.apache.clerezza.rdf.core.access.security.TcPermission;
@@ -57,8 +57,8 @@ public class SecurityTest {
////needed to unbind because this is injected with META-INF/services - file
TcManager.getInstance().unbindWeightedTcProvider(new WeightedA());
TcManager.getInstance().bindWeightedTcProvider(new WeightedDummy());
- TcManager.getInstance().createGraph(new Iri("http://example.org/ImmutableGraph/alreadyexists"));
- TcManager.getInstance().createGraph(new Iri("http://example.org/read/ImmutableGraph"));
+ TcManager.getInstance().createGraph(new IRI("http://example.org/ImmutableGraph/alreadyexists"));
+ TcManager.getInstance().createGraph(new IRI("http://example.org/read/ImmutableGraph"));
}
@AfterClass
@@ -112,69 +112,69 @@ public class SecurityTest {
@Test(expected=NoSuchEntityException.class)
public void testAcessGraph() {
- TcManager.getInstance().getImmutableGraph(new Iri("http://example.org/permitted"));
+ TcManager.getInstance().getImmutableGraph(new IRI("http://example.org/permitted"));
}
@Test(expected=AccessControlException.class)
public void testNoWildCard() {
- TcManager.getInstance().getImmutableGraph(new Iri("http://example.org/permitted/subthing"));
+ TcManager.getInstance().getImmutableGraph(new IRI("http://example.org/permitted/subthing"));
}
@Test(expected=NoSuchEntityException.class)
public void testAllowedArea() {
- TcManager.getInstance().getImmutableGraph(new Iri("http://example.org/area/allowed/something"));
+ TcManager.getInstance().getImmutableGraph(new IRI("http://example.org/area/allowed/something"));
}
@Test(expected=AccessControlException.class)
public void testAcessForbiddenGraph() {
- TcManager.getInstance().getImmutableGraph(new Iri("http://example.org/forbidden"));
+ TcManager.getInstance().getImmutableGraph(new IRI("http://example.org/forbidden"));
}
@Test(expected=NoSuchEntityException.class)
public void testCustomPermissions() {
- Iri graphUri = new Iri("http://example.org/custom");
+ IRI graphUri = new IRI("http://example.org/custom");
TcManager.getInstance().getTcAccessController().setRequiredReadPermissionStrings(graphUri,
Collections.singletonList("(java.io.FilePermission \"/etc\" \"write\")"));
//new FilePermission("/etc", "write").toString()));
- Graph ag = TcManager.getInstance().getGraph(new Iri("urn:x-localinstance:/ImmutableGraph-access.ImmutableGraph"));
+ Graph ag = TcManager.getInstance().getGraph(new IRI("urn:x-localinstance:/ImmutableGraph-access.ImmutableGraph"));
System.out.print(ag.toString());
TcManager.getInstance().getMGraph(graphUri);
}
@Test(expected=AccessControlException.class)
public void testCustomPermissionsIncorrect() {
- Iri graphUri = new Iri("http://example.org/custom");
+ IRI graphUri = new IRI("http://example.org/custom");
TcManager.getInstance().getTcAccessController().setRequiredReadPermissionStrings(graphUri,
Collections.singletonList("(java.io.FilePermission \"/etc\" \"write\")"));
//new FilePermission("/etc", "write").toString()));
- Graph ag = TcManager.getInstance().getGraph(new Iri("urn:x-localinstance:/ImmutableGraph-access.ImmutableGraph"));
+ Graph ag = TcManager.getInstance().getGraph(new IRI("urn:x-localinstance:/ImmutableGraph-access.ImmutableGraph"));
System.out.print(ag.toString());
TcManager.getInstance().createGraph(graphUri);
}
@Test
public void testCustomReadWritePermissions() {
- Iri graphUri = new Iri("http://example.org/read-write-custom");
+ IRI graphUri = new IRI("http://example.org/read-write-custom");
TcManager.getInstance().getTcAccessController().setRequiredReadWritePermissionStrings(graphUri,
Collections.singletonList("(java.io.FilePermission \"/etc\" \"write\")"));
//new FilePermission("/etc", "write").toString()));
- Graph ag = TcManager.getInstance().getGraph(new Iri("urn:x-localinstance:/ImmutableGraph-access.ImmutableGraph"));
+ Graph ag = TcManager.getInstance().getGraph(new IRI("urn:x-localinstance:/ImmutableGraph-access.ImmutableGraph"));
System.out.print(ag.toString());
TcManager.getInstance().createGraph(graphUri);
}
@Test(expected=EntityAlreadyExistsException.class)
public void testCreateMGraph() {
- TcManager.getInstance().createGraph(new Iri("http://example.org/ImmutableGraph/alreadyexists"));
+ TcManager.getInstance().createGraph(new IRI("http://example.org/ImmutableGraph/alreadyexists"));
}
@Test(expected=AccessControlException.class)
public void testCreateMGraphWithoutWritePermission() {
- TcManager.getInstance().createGraph(new Iri("http://example.org/read/ImmutableGraph"));
+ TcManager.getInstance().createGraph(new IRI("http://example.org/read/ImmutableGraph"));
}
@Test(expected=ReadOnlyException.class)
public void testAddTripleToMGraph() {
- Graph graph = TcManager.getInstance().getMGraph(new Iri("http://example.org/read/ImmutableGraph"));
- Triple triple = new TripleImpl(new Iri("http://example.org/definition/isNonLiteral"), new Iri("http://example.org/definition/isTest"), new PlainLiteralImpl("test"));
+ Graph graph = TcManager.getInstance().getMGraph(new IRI("http://example.org/read/ImmutableGraph"));
+ Triple triple = new TripleImpl(new IRI("http://example.org/definition/isNonLiteral"), new IRI("http://example.org/definition/isTest"), new PlainLiteralImpl("test"));
graph.add(triple);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java
index 6e3ab07..181e36f 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/TcManagerTest.java
@@ -27,7 +27,7 @@ import org.mockito.Mockito;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.clerezza.commons.rdf.Triple;
import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.providers.WeightedA;
import org.apache.clerezza.rdf.core.access.providers.WeightedA1;
import org.apache.clerezza.rdf.core.access.providers.WeightedAHeavy;
@@ -50,10 +50,10 @@ import static org.junit.Assert.*;
*/
public class TcManagerTest {
- public static Iri uriRefAHeavy = new Iri("http://example.org/aHeavy");
- public static Iri uriRefB = new Iri("http://example.org/b");;
- public static final Iri uriRefA = new Iri("http://example.org/a");
- public static final Iri uriRefA1 = new Iri("http://example.org/a1");
+ public static IRI uriRefAHeavy = new IRI("http://example.org/aHeavy");
+ public static IRI uriRefB = new IRI("http://example.org/b");;
+ public static final IRI uriRefA = new IRI("http://example.org/a");
+ public static final IRI uriRefA1 = new IRI("http://example.org/a1");
private TcManager graphAccess;
private QueryEngine queryEngine;
private final WeightedA weightedA = new WeightedA();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java
index 0216dd6..624a80d 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA.java
@@ -24,7 +24,7 @@ import java.util.Set;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
@@ -37,14 +37,14 @@ import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
* @author reto
*/
public class WeightedA implements WeightedTcProvider {
- private Set<Iri> mGraphList = new HashSet<Iri>();
+ private Set<IRI> mGraphList = new HashSet<IRI>();
@Override
public int getWeight() {
return 5;
}
@Override
- public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
+ public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
if (name.equals(TcManagerTest.uriRefA)) {
Graph mResult = new SimpleMGraph();
mResult.add(new TripleImpl(TcManagerTest.uriRefA,
@@ -56,48 +56,48 @@ public class WeightedA implements WeightedTcProvider {
}
@Override
- public Graph getMGraph(Iri name) throws NoSuchEntityException {
+ public Graph getMGraph(IRI name) throws NoSuchEntityException {
throw new NoSuchEntityException(name);
}
@Override
- public Graph getGraph(Iri name) throws NoSuchEntityException {
+ public Graph getGraph(IRI name) throws NoSuchEntityException {
return getImmutableGraph(name);
}
@Override
- public Graph createGraph(Iri name) {
+ public Graph createGraph(IRI name) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public ImmutableGraph createImmutableGraph(Iri name, Graph triples) {
+ public ImmutableGraph createImmutableGraph(IRI name, Graph triples) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public void deleteGraph(Iri name) throws NoSuchEntityException,
+ public void deleteGraph(IRI name) throws NoSuchEntityException,
EntityUndeletableException {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> getNames(ImmutableGraph ImmutableGraph) {
+ public Set<IRI> getNames(ImmutableGraph ImmutableGraph) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> listGraphs() {
+ public Set<IRI> listGraphs() {
return Collections.singleton(TcManagerTest.uriRefA);
}
@Override
- public Set<Iri> listMGraphs() {
+ public Set<IRI> listMGraphs() {
return mGraphList;
}
@Override
- public Set<Iri> listImmutableGraphs() {
+ public Set<IRI> listImmutableGraphs() {
return listGraphs();
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java
index f121cdf..9053e02 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedA1.java
@@ -24,7 +24,7 @@ import java.util.Set;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
@@ -38,14 +38,14 @@ import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
* @author reto
*/
public class WeightedA1 implements WeightedTcProvider {
- private Set<Iri> mGraphList = new HashSet<Iri>();
+ private Set<IRI> mGraphList = new HashSet<IRI>();
@Override
public int getWeight() {
return 5;
}
@Override
- public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
+ public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
if (name.equals(TcManagerTest.uriRefA)) {
Graph mResult = new SimpleMGraph();
mResult.add(new TripleImpl(TcManagerTest.uriRefA1,
@@ -57,48 +57,48 @@ public class WeightedA1 implements WeightedTcProvider {
}
@Override
- public Graph getMGraph(Iri name) throws NoSuchEntityException {
+ public Graph getMGraph(IRI name) throws NoSuchEntityException {
throw new NoSuchEntityException(name);
}
@Override
- public Graph getGraph(Iri name) throws NoSuchEntityException {
+ public Graph getGraph(IRI name) throws NoSuchEntityException {
return getImmutableGraph(name);
}
@Override
- public Graph createGraph(Iri name) {
+ public Graph createGraph(IRI name) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public ImmutableGraph createImmutableGraph(Iri name, Graph triples) {
+ public ImmutableGraph createImmutableGraph(IRI name, Graph triples) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public void deleteGraph(Iri name) throws NoSuchEntityException,
+ public void deleteGraph(IRI name) throws NoSuchEntityException,
EntityUndeletableException {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> getNames(ImmutableGraph ImmutableGraph) {
+ public Set<IRI> getNames(ImmutableGraph ImmutableGraph) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> listImmutableGraphs() {
+ public Set<IRI> listImmutableGraphs() {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> listMGraphs() {
+ public Set<IRI> listMGraphs() {
return mGraphList;
}
@Override
- public Set<Iri> listGraphs() {
+ public Set<IRI> listGraphs() {
return listMGraphs();
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java
index ef9497e..7674ca6 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedAHeavy.java
@@ -25,7 +25,7 @@ import java.util.Set;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
@@ -46,7 +46,7 @@ public class WeightedAHeavy implements WeightedTcProvider {
}
@Override
- public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
+ public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
if (name.equals(TcManagerTest.uriRefA)) {
Graph mResult = new SimpleGraph();
mResult.add(new TripleImpl(TcManagerTest.uriRefAHeavy,
@@ -57,47 +57,47 @@ public class WeightedAHeavy implements WeightedTcProvider {
}
@Override
- public Graph getMGraph(Iri name) throws NoSuchEntityException {
+ public Graph getMGraph(IRI name) throws NoSuchEntityException {
throw new NoSuchEntityException(name);
}
@Override
- public Graph getGraph(Iri name) throws NoSuchEntityException {
+ public Graph getGraph(IRI name) throws NoSuchEntityException {
return getImmutableGraph(name);
}
@Override
- public Graph createGraph(Iri name) {
+ public Graph createGraph(IRI name) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public ImmutableGraph createImmutableGraph(Iri name, Graph triples) {
+ public ImmutableGraph createImmutableGraph(IRI name, Graph triples) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public void deleteGraph(Iri name) throws NoSuchEntityException,
+ public void deleteGraph(IRI name) throws NoSuchEntityException,
EntityUndeletableException {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> getNames(ImmutableGraph ImmutableGraph) {
+ public Set<IRI> getNames(ImmutableGraph ImmutableGraph) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> listGraphs() {
+ public Set<IRI> listGraphs() {
return Collections.singleton(TcManagerTest.uriRefA);
}
@Override
- public Set<Iri> listMGraphs() {
- return new HashSet<Iri>();
+ public Set<IRI> listMGraphs() {
+ return new HashSet<IRI>();
}
@Override
- public Set<Iri> listImmutableGraphs() {
+ public Set<IRI> listImmutableGraphs() {
return listGraphs();
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java
index d528fbd..68ad4cf 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedBlight.java
@@ -24,7 +24,7 @@ import java.util.Set;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
@@ -44,7 +44,7 @@ public class WeightedBlight implements WeightedTcProvider {
}
@Override
- public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
+ public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
if (name.equals(TcManagerTest.uriRefB)) {
Graph mResult = new SimpleMGraph();
mResult.add(new TripleImpl(TcManagerTest.uriRefB, TcManagerTest.uriRefB, TcManagerTest.uriRefB));
@@ -59,48 +59,48 @@ public class WeightedBlight implements WeightedTcProvider {
}
@Override
- public Graph getMGraph(Iri name) throws NoSuchEntityException {
+ public Graph getMGraph(IRI name) throws NoSuchEntityException {
throw new NoSuchEntityException(name);
}
@Override
- public Graph getGraph(Iri name) throws NoSuchEntityException {
+ public Graph getGraph(IRI name) throws NoSuchEntityException {
return getImmutableGraph(name);
}
@Override
- public Graph createGraph(Iri name) {
+ public Graph createGraph(IRI name) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public ImmutableGraph createImmutableGraph(Iri name, Graph triples) {
+ public ImmutableGraph createImmutableGraph(IRI name, Graph triples) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public void deleteGraph(Iri name) throws NoSuchEntityException,
+ public void deleteGraph(IRI name) throws NoSuchEntityException,
EntityUndeletableException {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> getNames(ImmutableGraph ImmutableGraph) {
+ public Set<IRI> getNames(ImmutableGraph ImmutableGraph) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> listImmutableGraphs() {
+ public Set<IRI> listImmutableGraphs() {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> listMGraphs() {
- return new HashSet<Iri>();
+ public Set<IRI> listMGraphs() {
+ return new HashSet<IRI>();
}
@Override
- public Set<Iri> listGraphs() {
+ public Set<IRI> listGraphs() {
return listMGraphs();
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java
index 64c164d..5d616fb 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/access/providers/WeightedDummy.java
@@ -26,7 +26,7 @@ import java.util.Set;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.commons.rdf.Graph;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.EntityAlreadyExistsException;
import org.apache.clerezza.rdf.core.access.EntityUndeletableException;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
@@ -40,10 +40,10 @@ import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleMGraph;
*/
public class WeightedDummy implements WeightedTcProvider {
- private Map<Iri, Graph> tripleMap = new HashMap<Iri, Graph>();
+ private Map<IRI, Graph> tripleMap = new HashMap<IRI, Graph>();
@Override
- public ImmutableGraph createImmutableGraph(Iri name, Graph triples)
+ public ImmutableGraph createImmutableGraph(IRI name, Graph triples)
throws EntityAlreadyExistsException {
if ((name == null) || (name.getUnicodeString() == null)
|| (name.getUnicodeString().trim().length() == 0)) {
@@ -69,7 +69,7 @@ public class WeightedDummy implements WeightedTcProvider {
}
@Override
- public Graph createGraph(Iri name) throws EntityAlreadyExistsException {
+ public Graph createGraph(IRI name) throws EntityAlreadyExistsException {
if ((name == null) || (name.getUnicodeString() == null)
|| (name.getUnicodeString().trim().length() == 0)) {
throw new IllegalArgumentException("Name must not be null");
@@ -88,7 +88,7 @@ public class WeightedDummy implements WeightedTcProvider {
}
@Override
- public void deleteGraph(Iri name)
+ public void deleteGraph(IRI name)
throws NoSuchEntityException, EntityUndeletableException {
if (tripleMap.remove(name) == null) {
throw new NoSuchEntityException(name);
@@ -96,7 +96,7 @@ public class WeightedDummy implements WeightedTcProvider {
}
@Override
- public ImmutableGraph getImmutableGraph(Iri name) throws NoSuchEntityException {
+ public ImmutableGraph getImmutableGraph(IRI name) throws NoSuchEntityException {
Graph Graph = tripleMap.get(name);
if (Graph == null) {
throw new NoSuchEntityException(name);
@@ -107,7 +107,7 @@ public class WeightedDummy implements WeightedTcProvider {
}
@Override
- public Graph getMGraph(Iri name) throws NoSuchEntityException {
+ public Graph getMGraph(IRI name) throws NoSuchEntityException {
Graph Graph = tripleMap.get(name);
if (Graph == null) {
throw new NoSuchEntityException(name);
@@ -118,13 +118,13 @@ public class WeightedDummy implements WeightedTcProvider {
}
@Override
- public Set<Iri> getNames(ImmutableGraph ImmutableGraph) {
+ public Set<IRI> getNames(ImmutableGraph ImmutableGraph) {
throw new UnsupportedOperationException(
"Not supported yet. equals() has to be implemented first");
}
@Override
- public Graph getGraph(Iri name)
+ public Graph getGraph(IRI name)
throws NoSuchEntityException {
Graph Graph = tripleMap.get(name);
if (Graph == null) {
@@ -140,17 +140,17 @@ public class WeightedDummy implements WeightedTcProvider {
}
@Override
- public Set<Iri> listImmutableGraphs() {
+ public Set<IRI> listImmutableGraphs() {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
- public Set<Iri> listMGraphs() {
- return new HashSet<Iri>();
+ public Set<IRI> listMGraphs() {
+ return new HashSet<IRI>();
}
@Override
- public Set<Iri> listGraphs() {
+ public Set<IRI> listGraphs() {
return listMGraphs();
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactoryTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactoryTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactoryTest.java
index 36d3584..e8b16b8 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactoryTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/impl/util/SimpleLiteralFactoryTest.java
@@ -21,7 +21,7 @@ package org.apache.clerezza.rdf.core.impl.util;
import junit.framework.Assert;
import org.apache.clerezza.rdf.core.impl.util.SimpleLiteralFactory;
import org.apache.clerezza.commons.rdf.Literal;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.junit.Test;
/**
@@ -30,12 +30,12 @@ import org.junit.Test;
*/
public class SimpleLiteralFactoryTest {
- final private static Iri xsdInteger =
- new Iri("http://www.w3.org/2001/XMLSchema#integer");
- final private static Iri xsdInt =
- new Iri("http://www.w3.org/2001/XMLSchema#int");
- final private static Iri xsdLong =
- new Iri("http://www.w3.org/2001/XMLSchema#long");
+ final private static IRI xsdInteger =
+ new IRI("http://www.w3.org/2001/XMLSchema#integer");
+ final private static IRI xsdInt =
+ new IRI("http://www.w3.org/2001/XMLSchema#int");
+ final private static IRI xsdLong =
+ new IRI("http://www.w3.org/2001/XMLSchema#long");
SimpleLiteralFactory simpleLiteralFactory = new SimpleLiteralFactory();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/ParserTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/ParserTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/ParserTest.java
index 2919ba4..2745026 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/ParserTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/ParserTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.clerezza.rdf.core.serializedform;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.commons.rdf.Graph;
import java.io.InputStream;
import junit.framework.Assert;
@@ -74,7 +74,7 @@ public class ParserTest {
static class ParsingProviderA implements ParsingProvider {
@Override
- public void parse(Graph target, InputStream serializedGraph, String formatIdentifier, Iri baseUri) {
+ public void parse(Graph target, InputStream serializedGraph, String formatIdentifier, IRI baseUri) {
providerAInvoked = true;
}
};
@@ -82,7 +82,7 @@ public class ParserTest {
static class ParsingProviderB implements ParsingProvider {
@Override
- public void parse(Graph target, InputStream serializedGraph, String formatIdentifier, Iri baseUri) {
+ public void parse(Graph target, InputStream serializedGraph, String formatIdentifier, IRI baseUri) {
providerBInvoked = true;
}
};
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/TestServiceManagedProvider.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/TestServiceManagedProvider.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/TestServiceManagedProvider.java
index 6bf5c91..7e7adb7 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/TestServiceManagedProvider.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/serializedform/TestServiceManagedProvider.java
@@ -22,7 +22,7 @@ import java.io.InputStream;
import org.apache.clerezza.commons.rdf.Graph;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
/**
* This class is listed in
@@ -36,7 +36,7 @@ public class TestServiceManagedProvider implements ParsingProvider {
private static boolean parseInvoked;
@Override
- public void parse(Graph target, InputStream serializedGraph, String formatIdentifier, Iri baseUri) {
+ public void parse(Graph target, InputStream serializedGraph, String formatIdentifier, IRI baseUri) {
parseInvoked = true;
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QueryParserTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QueryParserTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QueryParserTest.java
index 69f33bc..f39e338 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QueryParserTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QueryParserTest.java
@@ -24,7 +24,7 @@ import java.util.Set;
import org.junit.Assert;
import org.junit.Test;
import org.apache.clerezza.commons.rdf.Language;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
import org.apache.clerezza.rdf.core.sparql.query.AskQuery;
import org.apache.clerezza.rdf.core.sparql.query.BasicGraphPattern;
@@ -75,7 +75,7 @@ public class QueryParserTest {
Assert.assertTrue(selectQuery.getSelection().get(0)
.equals(new Variable(variable)));
Assert.assertTrue(selectQuery.getDataSet().getDefaultGraphs().toArray()[0]
- .equals(new Iri(defaultGraph)));
+ .equals(new IRI(defaultGraph)));
GraphPattern gp = (GraphPattern) selectQuery.getQueryPattern()
.getGraphPatterns().toArray()[0];
@@ -85,8 +85,8 @@ public class QueryParserTest {
Set<TriplePattern> triplePatterns = bgp.getTriplePatterns();
Assert.assertTrue(triplePatterns.size()==1);
- ResourceOrVariable s = new ResourceOrVariable(new Iri(subject));
- UriRefOrVariable p = new UriRefOrVariable(new Iri(predicate));
+ ResourceOrVariable s = new ResourceOrVariable(new IRI(subject));
+ UriRefOrVariable p = new UriRefOrVariable(new IRI(predicate));
ResourceOrVariable o = new ResourceOrVariable(new Variable(variable));
Assert.assertTrue(triplePatterns.contains(
@@ -187,8 +187,8 @@ public class QueryParserTest {
.getConstructTemplate();
Assert.assertTrue(triplePatterns.size()==1);
- ResourceOrVariable s = new ResourceOrVariable(new Iri(subject1));
- UriRefOrVariable p = new UriRefOrVariable(new Iri(predicate1));
+ ResourceOrVariable s = new ResourceOrVariable(new IRI(subject1));
+ UriRefOrVariable p = new UriRefOrVariable(new IRI(predicate1));
ResourceOrVariable o = new ResourceOrVariable(new Variable(variable1));
Assert.assertTrue(triplePatterns.contains(
@@ -202,7 +202,7 @@ public class QueryParserTest {
Assert.assertTrue(triplePatterns.size()==1);
s = new ResourceOrVariable(new Variable(variable2));
- p = new UriRefOrVariable(new Iri(predicate2));
+ p = new UriRefOrVariable(new IRI(predicate2));
Assert.assertTrue(triplePatterns.contains(
new SimpleTriplePattern(s, p, o)));
@@ -222,7 +222,7 @@ public class QueryParserTest {
Assert.assertTrue(DescribeQuery.class.isAssignableFrom(q.getClass()));
DescribeQuery describeQuery = (DescribeQuery) q;
Assert.assertTrue(describeQuery.getResourcesToDescribe().get(0)
- .getResource().equals(new Iri(resource)));
+ .getResource().equals(new IRI(resource)));
}
@Test
@@ -251,7 +251,7 @@ public class QueryParserTest {
Assert.assertTrue(triplePatterns.size()==1);
Assert.assertTrue(triplePatterns.contains(new SimpleTriplePattern(new Variable(variable),
- new Iri(predicate), new PlainLiteralImpl(object))));
+ new IRI(predicate), new PlainLiteralImpl(object))));
}
@Test
@@ -292,8 +292,8 @@ public class QueryParserTest {
Set<TriplePattern> triplePatterns = bgp.getTriplePatterns();
Assert.assertTrue(triplePatterns.size()==1);
- ResourceOrVariable s = new ResourceOrVariable(new Iri(base+subject));
- UriRefOrVariable p = new UriRefOrVariable(new Iri(prefixUri+predicate));
+ ResourceOrVariable s = new ResourceOrVariable(new IRI(base+subject));
+ UriRefOrVariable p = new UriRefOrVariable(new IRI(prefixUri+predicate));
ResourceOrVariable o = new ResourceOrVariable(new Variable(variable));
Assert.assertTrue(triplePatterns.contains(
@@ -367,7 +367,7 @@ public class QueryParserTest {
Set<TriplePattern> triplePatterns = bgp.getTriplePatterns();
Assert.assertTrue(triplePatterns.size() == 1);
- Assert.assertTrue(triplePatterns.contains(new SimpleTriplePattern(var1, new Iri(prefix1Uri + predicate1),
+ Assert.assertTrue(triplePatterns.contains(new SimpleTriplePattern(var1, new IRI(prefix1Uri + predicate1),
var2)));
GraphPattern gp2 = (GraphPattern) ogp.getOptionalGraphPattern()
@@ -377,7 +377,7 @@ public class QueryParserTest {
triplePatterns = bgp.getTriplePatterns();
Assert.assertTrue(triplePatterns.size() == 1);
- Assert.assertTrue(triplePatterns.contains(new SimpleTriplePattern(var1, new Iri(prefix2Uri + predicate2),
+ Assert.assertTrue(triplePatterns.contains(new SimpleTriplePattern(var1, new IRI(prefix2Uri + predicate2),
var3)));
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QuerySerializerTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QuerySerializerTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QuerySerializerTest.java
index f463ed8..eccf13f 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QuerySerializerTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/QuerySerializerTest.java
@@ -23,7 +23,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.apache.clerezza.rdf.core.LiteralFactory;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.query.BinaryOperation;
import org.apache.clerezza.rdf.core.sparql.query.BuiltInCall;
import org.apache.clerezza.rdf.core.sparql.query.Expression;
@@ -62,12 +62,12 @@ public class QuerySerializerTest {
SimpleSelectQuery selectQuery = new SimpleSelectQuery();
Variable variable = new Variable("title");
selectQuery.addSelection(variable);
- Iri defaultGraph = new Iri("http://example.org/library");
+ IRI defaultGraph = new IRI("http://example.org/library");
selectQuery.addDefaultGraph(defaultGraph);
ResourceOrVariable subject = new ResourceOrVariable(
- new Iri("http://example.org/book/book1"));
+ new IRI("http://example.org/book/book1"));
UriRefOrVariable predicate = new UriRefOrVariable(
- new Iri("http://purl.org/dc/elements/1.1/title"));
+ new IRI("http://purl.org/dc/elements/1.1/title"));
ResourceOrVariable object = new ResourceOrVariable(variable);
TriplePattern triplePattern = new SimpleTriplePattern(subject, predicate, object);
Set<TriplePattern> triplePatterns = new HashSet<TriplePattern>();
@@ -90,16 +90,16 @@ public class QuerySerializerTest {
"WHERE { ?x <http://xmlns.com/foaf/0.1/name> ?name . }";
ResourceOrVariable s = new ResourceOrVariable(
- new Iri("http://example.org/person#Alice"));
+ new IRI("http://example.org/person#Alice"));
UriRefOrVariable p = new UriRefOrVariable(
- new Iri("http://www.w3.org/2001/vcard-rdf/3.0#FN"));
+ new IRI("http://www.w3.org/2001/vcard-rdf/3.0#FN"));
ResourceOrVariable o = new ResourceOrVariable(new Variable("name"));
Set<TriplePattern> constructTriplePatterns = new HashSet<TriplePattern>();
constructTriplePatterns.add(new SimpleTriplePattern(s, p, o));
SimpleConstructQuery constructQuery = new SimpleConstructQuery(constructTriplePatterns);
s = new ResourceOrVariable(new Variable("x"));
- p = new UriRefOrVariable(new Iri("http://xmlns.com/foaf/0.1/name"));
+ p = new UriRefOrVariable(new IRI("http://xmlns.com/foaf/0.1/name"));
Set<TriplePattern> triplePatterns = new HashSet<TriplePattern>();
triplePatterns.add(new SimpleTriplePattern(s, p, o));
@@ -119,7 +119,7 @@ public class QuerySerializerTest {
SimpleDescribeQuery describeQuery = new SimpleDescribeQuery();
describeQuery.addResourceToDescribe(new ResourceOrVariable(
- new Iri("http://example.org/book/book1")));
+ new IRI("http://example.org/book/book1")));
Assert.assertTrue(describeQuery.toString()
.replaceAll("( |\n)+", " ").trim().equals(queryString));
@@ -133,7 +133,7 @@ public class QuerySerializerTest {
ResourceOrVariable s = new ResourceOrVariable(new Variable("x"));
UriRefOrVariable p = new UriRefOrVariable(
- new Iri("http://xmlns.com/foaf/0.1/name"));
+ new IRI("http://xmlns.com/foaf/0.1/name"));
ResourceOrVariable o = new ResourceOrVariable(
LiteralFactory.getInstance().createTypedLiteral("Alice"));
@@ -173,9 +173,9 @@ public class QuerySerializerTest {
Variable x = new Variable("x");
Set<TriplePattern> triplePatterns = new HashSet<TriplePattern>();
triplePatterns.add(new SimpleTriplePattern(x,
- new Iri("http://example.org/ns#price"), price));
+ new IRI("http://example.org/ns#price"), price));
triplePatterns.add(new SimpleTriplePattern(x,
- new Iri("http://purl.org/dc/elements/1.1/title"), title));
+ new IRI("http://purl.org/dc/elements/1.1/title"), title));
SimpleBasicGraphPattern bgp = new SimpleBasicGraphPattern(triplePatterns);
SimpleGroupGraphPattern queryPattern = new SimpleGroupGraphPattern();
@@ -204,13 +204,13 @@ public class QuerySerializerTest {
Variable myType = new Variable("myType");
Set<TriplePattern> triplePatterns = new HashSet<TriplePattern>();
triplePatterns.add(new SimpleTriplePattern(resource,
- new Iri("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"), myType));
+ new IRI("http://www.w3.org/1999/02/22-rdf-syntax-ns#type"), myType));
SimpleBasicGraphPattern bgp = new SimpleBasicGraphPattern(triplePatterns);
SimpleGroupGraphPattern queryPattern = new SimpleGroupGraphPattern();
queryPattern.addGraphPattern(bgp);
BinaryOperation constraint = new BinaryOperation("=",
- resource, new UriRefExpression(new Iri("http://example.org/ontology#special")));
+ resource, new UriRefExpression(new IRI("http://example.org/ontology#special")));
queryPattern.addConstraint(constraint);
selectQuery.setQueryPattern(queryPattern);
@@ -261,13 +261,13 @@ public class QuerySerializerTest {
Variable x = new Variable("x");
Set<TriplePattern> triplePatterns = new HashSet<TriplePattern>();
triplePatterns.add(new SimpleTriplePattern(x,
- new Iri("http://purl.org/dc/elements/1.1/title"), title));
+ new IRI("http://purl.org/dc/elements/1.1/title"), title));
SimpleBasicGraphPattern bgp = new SimpleBasicGraphPattern(triplePatterns);
Set<TriplePattern> triplePatternsOpt = new HashSet<TriplePattern>();
triplePatternsOpt.add(new SimpleTriplePattern(x,
- new Iri("http://example.org/ns#price"), price));
+ new IRI("http://example.org/ns#price"), price));
SimpleBasicGraphPattern bgpOpt =
new SimpleBasicGraphPattern(triplePatternsOpt);
@@ -299,7 +299,7 @@ public class QuerySerializerTest {
Variable x = new Variable("x");
Set<TriplePattern> triplePatterns = new HashSet<TriplePattern>();
triplePatterns.add(new SimpleTriplePattern(
- new Iri("http://localhost/testitem"), p, x));
+ new IRI("http://localhost/testitem"), p, x));
SimpleBasicGraphPattern bgp = new SimpleBasicGraphPattern(triplePatterns);
SimpleGroupGraphPattern queryPattern = new SimpleGroupGraphPattern();
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParserTest.java
----------------------------------------------------------------------
diff --git a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParserTest.java b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParserTest.java
index 8472dc6..a261e09 100644
--- a/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParserTest.java
+++ b/rdf/core/src/test/java/org/apache/clerezza/rdf/core/sparql/SparqlPreParserTest.java
@@ -20,7 +20,7 @@ package org.apache.clerezza.rdf.core.sparql;
import java.util.HashSet;
import java.util.Set;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.junit.Assert;
import org.junit.Test;
@@ -31,14 +31,14 @@ import org.junit.Test;
*/
public class SparqlPreParserTest {
- private final static Iri DEFAULT_GRAPH = new Iri("http://example.org/default.graph");
- private final static Iri NAMED_GRAPH = new Iri("http://example.org/dummy.graph");
- private final static Iri TEST_GRAPH = new Iri("http://example.org/test.graph");
+ private final static IRI DEFAULT_GRAPH = new IRI("http://example.org/default.graph");
+ private final static IRI NAMED_GRAPH = new IRI("http://example.org/dummy.graph");
+ private final static IRI TEST_GRAPH = new IRI("http://example.org/test.graph");
class MyTcManager extends TcManager {
@Override
- public Set<Iri> listGraphs() {
- Set<Iri> result = new HashSet<Iri>();
+ public Set<IRI> listGraphs() {
+ Set<IRI> result = new HashSet<IRI>();
result.add(NAMED_GRAPH);
return result;
}
@@ -57,7 +57,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStrBuilder.toString(), DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStrBuilder.toString(), DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@@ -69,7 +69,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStrBuilder.toString(), DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStrBuilder.toString(), DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs == null);
}
@@ -87,7 +87,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStrBuilder.toString(), DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStrBuilder.toString(), DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
}
@@ -98,7 +98,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@@ -109,7 +109,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@@ -120,7 +120,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
}
@@ -131,7 +131,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@@ -142,7 +142,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(new MyTcManager());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(NAMED_GRAPH));
}
@@ -153,7 +153,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
}
@@ -164,7 +164,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@@ -175,7 +175,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(new MyTcManager());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(NAMED_GRAPH));
}
@@ -186,7 +186,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
}
@@ -197,7 +197,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
}
@@ -208,8 +208,8 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
- Set<Iri> expected = new HashSet<Iri>();
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> expected = new HashSet<IRI>();
expected.add(DEFAULT_GRAPH);
expected.add(TEST_GRAPH);
Assert.assertTrue(referredGraphs.containsAll(expected));
@@ -222,8 +222,8 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
- Set<Iri> expected = new HashSet<Iri>();
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> expected = new HashSet<IRI>();
expected.add(DEFAULT_GRAPH);
expected.add(TEST_GRAPH);
Assert.assertTrue(referredGraphs.containsAll(expected));
@@ -236,8 +236,8 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
- Set<Iri> expected = new HashSet<Iri>();
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> expected = new HashSet<IRI>();
expected.add(DEFAULT_GRAPH);
expected.add(TEST_GRAPH);
Assert.assertTrue(referredGraphs.containsAll(expected));
@@ -250,8 +250,8 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
- Set<Iri> expected = new HashSet<Iri>();
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> expected = new HashSet<IRI>();
expected.add(DEFAULT_GRAPH);
expected.add(TEST_GRAPH);
Assert.assertTrue(referredGraphs.containsAll(expected));
@@ -264,8 +264,8 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
- Set<Iri> expected = new HashSet<Iri>();
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> expected = new HashSet<IRI>();
expected.add(DEFAULT_GRAPH);
expected.add(TEST_GRAPH);
Assert.assertTrue(referredGraphs.containsAll(expected));
@@ -278,8 +278,8 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
- Set<Iri> expected = new HashSet<Iri>();
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> expected = new HashSet<IRI>();
expected.add(DEFAULT_GRAPH);
expected.add(TEST_GRAPH);
Assert.assertTrue(referredGraphs.containsAll(expected));
@@ -293,7 +293,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@@ -304,7 +304,7 @@ public class SparqlPreParserTest {
"INSERT DATA { GRAPH " + TEST_GRAPH.toString() + " { <http://example/book1> ns:price 42 } }";
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
}
@@ -316,7 +316,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@@ -327,7 +327,7 @@ public class SparqlPreParserTest {
"DELETE DATA { GRAPH " + TEST_GRAPH.toString() + " { <http://example/book1> ns:price 42 } }";
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
}
@@ -339,9 +339,9 @@ public class SparqlPreParserTest {
"DELETE DATA { GRAPH " + TEST_GRAPH.toString() + " { <http://example/book1> ns:price 42 } }";
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
- Set<Iri> expected = new HashSet<Iri>();
+ Set<IRI> expected = new HashSet<IRI>();
expected.add(DEFAULT_GRAPH);
expected.add(TEST_GRAPH);
Assert.assertTrue(referredGraphs.containsAll(expected));
@@ -355,7 +355,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@@ -369,11 +369,11 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
- Set<Iri> expected = new HashSet<Iri>();
- expected.add(new Iri("http://example.com/names"));
- expected.add(new Iri("http://example.com/addresses"));
+ Set<IRI> expected = new HashSet<IRI>();
+ expected.add(new IRI("http://example.com/names"));
+ expected.add(new IRI("http://example.com/addresses"));
Assert.assertTrue(referredGraphs.containsAll(expected));
}
@@ -385,7 +385,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(TEST_GRAPH));
}
@@ -397,7 +397,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@@ -410,11 +410,11 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
- Set<Iri> expected = new HashSet<Iri>();
- expected.add(new Iri("http://example/bookStore2"));
- expected.add(new Iri("http://example/bookStore"));
+ Set<IRI> expected = new HashSet<IRI>();
+ expected.add(new IRI("http://example/bookStore2"));
+ expected.add(new IRI("http://example/bookStore"));
Assert.assertTrue(referredGraphs.containsAll(expected));
}
@@ -444,11 +444,11 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
- Set<Iri> expected = new HashSet<Iri>();
- expected.add(new Iri("http://example/bookStore2"));
- expected.add(new Iri("http://example/bookStore"));
+ Set<IRI> expected = new HashSet<IRI>();
+ expected.add(new IRI("http://example/bookStore2"));
+ expected.add(new IRI("http://example/bookStore"));
Assert.assertTrue(referredGraphs.containsAll(expected));
}
@@ -465,7 +465,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
@@ -482,7 +482,7 @@ public class SparqlPreParserTest {
SparqlPreParser parser;
parser = new SparqlPreParser(TcManager.getInstance());
- Set<Iri> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
+ Set<IRI> referredGraphs = parser.getReferredGraphs(queryStr, DEFAULT_GRAPH);
Assert.assertTrue(referredGraphs.toArray()[0].equals(DEFAULT_GRAPH));
}
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/60d73ea7/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java
----------------------------------------------------------------------
diff --git a/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java b/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java
index 388bbdb..a1cec37 100644
--- a/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java
+++ b/rdf/file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileGraph.java
@@ -30,10 +30,10 @@ import java.util.Collection;
import java.util.Iterator;
import org.apache.clerezza.commons.rdf.ImmutableGraph;
-import org.apache.clerezza.commons.rdf.BlankNodeOrIri;
-import org.apache.clerezza.commons.rdf.RdfTerm;
+import org.apache.clerezza.commons.rdf.BlankNodeOrIRI;
+import org.apache.clerezza.commons.rdf.RDFTerm;
import org.apache.clerezza.commons.rdf.Triple;
-import org.apache.clerezza.commons.rdf.Iri;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
@@ -49,7 +49,7 @@ public class FileGraph extends SimpleGraph {
private File file;
private String fileType;
- FileGraph(Iri uri, Parser parser,
+ FileGraph(IRI uri, Parser parser,
Serializer serializer) {
this(new File(URI.create(uri.getUnicodeString())), parser, serializer);
}
@@ -121,9 +121,9 @@ public class FileGraph extends SimpleGraph {
}
@Override
- public Iterator<Triple> filter(final BlankNodeOrIri subject,
- final Iri predicate,
- final RdfTerm object) {
+ public Iterator<Triple> filter(final BlankNodeOrIRI subject,
+ final IRI predicate,
+ final RDFTerm object) {
final Iterator<Triple> baseIter = super.filter(subject, predicate, object);
Iterator<Triple> iterator = new Iterator<Triple>() {