Author: andy
Date: Sat Jul 19 21:55:16 2014
New Revision: 1611974
URL: http://svn.apache.org/r1611974
Log:
JENA-747 : Use RIOT IRIResolver
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryFactory.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Prologue.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/ParserBase.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateWriter.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/serializer/Serializer.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerResolver.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateFactory.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateOperations.java
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryFactory.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryFactory.java?rev=1611974&r1=1611973&r2=1611974&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryFactory.java
(original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryFactory.java
Sat Jul 19 21:55:16 2014
@@ -18,7 +18,8 @@
package com.hp.hpl.jena.query;
-import com.hp.hpl.jena.n3.IRIResolver ;
+import org.apache.jena.riot.system.IRIResolver ;
+
import com.hp.hpl.jena.sparql.lang.SPARQLParser ;
import com.hp.hpl.jena.sparql.lang.ParserARQ ;
import com.hp.hpl.jena.sparql.lang.SPARQLParserRegistry ;
@@ -128,13 +129,15 @@ public class QueryFactory
if ( query.getResolver() == null )
{
-
- // Sort out the baseURI - if that fails, dump in a dummy one and
continue.
- try { baseURI = IRIResolver.chooseBaseURI(baseURI) ; }
- catch (Exception ex)
- { baseURI = "http://localhost/defaultBase#"; ; }
-
- query.setResolver(new IRIResolver(baseURI)) ;
+ IRIResolver resolver = null ;
+ if ( baseURI != null ) {
+ // Sort out the baseURI - if that fails, dump in a dummy one
and continue.
+ try { resolver = IRIResolver.create(baseURI) ; }
+ catch (Exception ex) {}
+ if ( resolver == null )
+ resolver =
IRIResolver.create("http://localhost/query/defaultBase#";) ;
+ query.setResolver(resolver) ;
+ }
}
return parser.parse(query, queryString) ;
}
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Prologue.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Prologue.java?rev=1611974&r1=1611973&r2=1611974&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Prologue.java
(original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Prologue.java
Sat Jul 19 21:55:16 2014
@@ -18,12 +18,12 @@
package com.hp.hpl.jena.sparql.core;
-import com.hp.hpl.jena.n3.IRIResolver ;
import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.shared.impl.PrefixMappingImpl ;
import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.riot.system.IRIResolver ;
import com.hp.hpl.jena.sparql.util.PrefixMapping2 ;
@@ -68,7 +68,7 @@ public class Prologue
prefixMap.setNsPrefixes(this.prefixMap) ;
String baseURI = null ;
if ( resolver != null)
- baseURI = resolver.getBaseIRI() ;
+ baseURI = resolver.getBaseIRIasString() ;
return new Prologue(prefixMap, baseURI) ;
}
@@ -79,7 +79,7 @@ public class Prologue
prefixMap = new PrefixMapping2(other.prefixMap) ;
seenBaseURI = false ;
if ( other.resolver != null )
- resolver = new IRIResolver(other.resolver.getBaseIRI()) ;
+ resolver = IRIResolver.create(getBaseURI()) ;
}
public Prologue sub(PrefixMapping newMappings) { return sub(newMappings,
null) ; }
@@ -94,7 +94,7 @@ public class Prologue
// New base.
IRIResolver r = resolver ;
if ( base != null )
- r = new IRIResolver(base) ;
+ r = IRIResolver.create(base) ;
return new Prologue(ext, r) ;
}
@@ -110,10 +110,7 @@ public class Prologue
{
if ( resolver == null )
return null ;
-
-// if ( baseURI == null )
-// setDefaultBaseIRI() ;
- return resolver.getBaseIRI();
+ return resolver.getBaseIRIasString();
}
/**
* @param baseURI The baseURI to set.
@@ -121,7 +118,7 @@ public class Prologue
public void setBaseURI(String baseURI)
{
this.seenBaseURI = true ;
- this.resolver = new IRIResolver(baseURI) ;
+ this.resolver = IRIResolver.create(baseURI) ;
}
/**
@@ -133,16 +130,6 @@ public class Prologue
this.resolver = resolver ;
}
-// protected void setDefaultBaseIRI() { setDefaultBaseIRI(null) ; }
-//
-// protected void setDefaultBaseIRI(String base)
-// {
-// if ( baseURI != null )
-// return ;
-//
-// baseURI = IRIResolver.chooseBaseURI(base) ;
-// }
-
// ---- Query prefixes
/** Set a prefix for this query */
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java?rev=1611974&r1=1611973&r2=1611974&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java
Sat Jul 19 21:55:16 2014
@@ -26,10 +26,10 @@ import java.util.concurrent.TimeUnit ;
import org.apache.jena.atlas.lib.AlarmClock ;
import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.riot.system.IRIResolver ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.n3.IRIResolver ;
import com.hp.hpl.jena.query.* ;
import com.hp.hpl.jena.rdf.model.* ;
import com.hp.hpl.jena.shared.PrefixMapping ;
@@ -597,7 +597,7 @@ public class QueryExecutionBase implemen
String baseURI = query.getBaseURI() ;
if ( baseURI == null )
- baseURI = IRIResolver.chooseBaseURI() ;
+ baseURI = IRIResolver.chooseBaseURI().toString() ;
DatasetGraph dsg =
DatasetUtils.createDatasetGraph(query.getDatasetDescription(), baseURI ) ;
return dsg ;
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/ParserBase.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/ParserBase.java?rev=1611974&r1=1611973&r2=1611974&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/ParserBase.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/lang/ParserBase.java
Sat Jul 19 21:55:16 2014
@@ -250,7 +250,7 @@ public class ParserBase
{
if ( getPrologue().getResolver() != null )
try {
- iriStr = getPrologue().getResolver().resolve(iriStr) ;
+ iriStr =
getPrologue().getResolver().resolveSilent(iriStr).toString() ;
} catch (JenaURIException ex)
{ throwParseException(ex.getMessage(), line, column) ; }
}
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateWriter.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateWriter.java?rev=1611974&r1=1611973&r2=1611974&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateWriter.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/request/UpdateWriter.java
Sat Jul 19 21:55:16 2014
@@ -18,30 +18,30 @@
package com.hp.hpl.jena.sparql.modify.request;
-import java.util.Iterator;
-import java.util.List;
+import java.util.Iterator ;
+import java.util.List ;
import org.apache.jena.atlas.io.IndentedWriter ;
import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.atlas.lib.Closeable ;
import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.riot.out.SinkQuadBracedOutput ;
+import org.apache.jena.riot.system.IRIResolver ;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.n3.IRIResolver ;
-import com.hp.hpl.jena.sparql.ARQException;
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.sparql.ARQException ;
import com.hp.hpl.jena.sparql.core.Prologue ;
-import com.hp.hpl.jena.sparql.core.Quad;
-import com.hp.hpl.jena.sparql.modify.request.UpdateDataWriter.UpdateMode;
-import com.hp.hpl.jena.sparql.serializer.FormatterElement;
-import com.hp.hpl.jena.sparql.serializer.PrologueSerializer;
-import com.hp.hpl.jena.sparql.serializer.SerializationContext;
-import com.hp.hpl.jena.sparql.syntax.Element;
-import com.hp.hpl.jena.sparql.util.FmtUtils;
+import com.hp.hpl.jena.sparql.core.Quad ;
+import com.hp.hpl.jena.sparql.modify.request.UpdateDataWriter.UpdateMode ;
+import com.hp.hpl.jena.sparql.serializer.FormatterElement ;
+import com.hp.hpl.jena.sparql.serializer.PrologueSerializer ;
+import com.hp.hpl.jena.sparql.serializer.SerializationContext ;
+import com.hp.hpl.jena.sparql.syntax.Element ;
+import com.hp.hpl.jena.sparql.util.FmtUtils ;
import com.hp.hpl.jena.sparql.util.NodeToLabelMapBNode ;
-import com.hp.hpl.jena.update.Update;
-import com.hp.hpl.jena.update.UpdateRequest;
+import com.hp.hpl.jena.update.Update ;
+import com.hp.hpl.jena.update.UpdateRequest ;
public class UpdateWriter implements Closeable
{
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/serializer/Serializer.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/serializer/Serializer.java?rev=1611974&r1=1611973&r2=1611974&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/serializer/Serializer.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/serializer/Serializer.java
Sat Jul 19 21:55:16 2014
@@ -23,14 +23,13 @@ import java.io.OutputStream ;
import org.apache.jena.atlas.io.IndentedLineBuffer ;
import org.apache.jena.atlas.io.IndentedWriter ;
import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.riot.system.IRIResolver ;
-import com.hp.hpl.jena.n3.IRIResolver ;
import com.hp.hpl.jena.query.Query ;
import com.hp.hpl.jena.query.Syntax ;
import com.hp.hpl.jena.sparql.core.Prologue;
import com.hp.hpl.jena.sparql.util.NodeToLabelMapBNode ;
-
public class Serializer
{
static final int BLOCK_INDENT = 2 ;
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerResolver.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerResolver.java?rev=1611974&r1=1611973&r2=1611974&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerResolver.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerResolver.java
Sat Jul 19 21:55:16 2014
@@ -187,7 +187,7 @@ public class ParseHandlerResolver extend
private String resolveIRI(String iriStr, int line, int column)
{
if ( prologue.getResolver() != null )
- return prologue.getResolver().resolve(iriStr) ;
+ return prologue.getResolver().resolveToStringSilent(iriStr) ;
return iriStr ;
}
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateFactory.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateFactory.java?rev=1611974&r1=1611973&r2=1611974&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateFactory.java
(original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateFactory.java
Sat Jul 19 21:55:16 2014
@@ -25,8 +25,8 @@ import static com.hp.hpl.jena.query.Synt
import java.io.InputStream ;
import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.riot.system.IRIResolver ;
-import com.hp.hpl.jena.n3.IRIResolver ;
import com.hp.hpl.jena.query.Syntax ;
import com.hp.hpl.jena.sparql.core.Prologue ;
import com.hp.hpl.jena.sparql.lang.UpdateParser ;
@@ -127,13 +127,16 @@ public class UpdateFactory
if ( prologue.getResolver() == null )
{
- // Sort out the baseURI - if that fails, dump in a dummy one and
continue.
- try { baseURI = IRIResolver.chooseBaseURI(baseURI) ; }
- catch (Exception ex)
- { baseURI = "http://localhost/defaultBase#"; ; }
- prologue.setResolver(new IRIResolver(baseURI)) ;
+ IRIResolver resolver = null ;
+ if ( baseURI != null ) {
+ // Sort out the baseURI - if that fails, dump in a dummy one
and continue.
+ try { resolver = IRIResolver.create(baseURI) ; }
+ catch (Exception ex) {}
+ if ( resolver == null )
+ resolver =
IRIResolver.create("http://localhost/update/defaultBase#";) ;
+ prologue.setResolver(resolver) ;
+ }
}
-
return parser ;
}
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java?rev=1611974&r1=1611973&r2=1611974&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
Sat Jul 19 21:55:16 2014
@@ -127,7 +127,7 @@ public abstract class IRIResolver
}
/**
- * Create resolve a URI against a base. If baseStr is a relative file IRI
+ * Resolve a URI against a base. If baseStr is a relative file IRI
* then it is first resolved against the current working directory.
*
* @param relStr
@@ -142,7 +142,7 @@ public abstract class IRIResolver
}
/**
- * Create resolve a URI against a base. If baseStr is a relative file IRI
+ * Resolve a URI against a base. If baseStr is a relative file IRI
* then it is first resolved against the current working directory.
*
* @param relStr
@@ -157,7 +157,7 @@ public abstract class IRIResolver
}
/**
- * Create resolve a URI against a base. If baseStr is a relative file IRI
+ * Resolve a URI against a base. If baseStr is a relative file IRI
* then it is first resolved against the current working directory.
*
* @param relStr
@@ -170,6 +170,17 @@ public abstract class IRIResolver
}
/**
+ * Resolve a URI against a base. If baseStr is a relative file IRI
+ * then it is first resolved against the current working directory.
+ *
+ * @param relStr
+ * @return String An absolute URI
+ */
+ static public String resolveStringSilent(String relStr) throws
RiotException {
+ return resolveIRI(relStr).toString() ;
+ }
+
+ /**
* Resolve an IRI against whatever is the base for this process (likely to
* be based on the current working directory of this process at the time of
* initialization of this class).
Modified:
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateOperations.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateOperations.java?rev=1611974&r1=1611973&r2=1611974&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateOperations.java
(original)
+++
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/modify/TestUpdateOperations.java
Sat Jul 19 21:55:16 2014
@@ -41,7 +41,6 @@ public class TestUpdateOperations extend
private GraphStore graphStore() { return GraphStoreFactory.create() ; }
private Node gName = SSE.parseNode("<http://example/g>") ;
-
@Test public void load1() {
GraphStore gs = graphStore() ;
UpdateRequest req = UpdateFactory.create("LOAD <"+DIR+"/D.nt>") ;
