You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2018/01/15 11:48:07 UTC
[02/10] jena git commit: Use RIOT-wide global IRIResolver.iriFactory.
Use RIOT-wide global IRIResolver.iriFactory.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ed34030f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ed34030f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ed34030f
Branch: refs/heads/master
Commit: ed34030fc9a75095a14e310159f3a314417d6647
Parents: ca760f7
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Jan 13 17:13:26 2018 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Jan 13 17:13:26 2018 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/riot/system/PrefixMapBase.java | 3 +--
.../src/main/java/org/apache/jena/riot/system/PrefixMapStd.java | 3 +--
.../org/apache/jena/sparql/expr/nodevalue/NodeFunctions.java | 3 ++-
.../org/apache/jena/query/TestParameterizedSparqlString.java | 4 ++--
jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java | 3 ++-
.../java/org/apache/jena/riot/system/AbstractTestPrefixMap.java | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ed34030f/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapBase.java b/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapBase.java
index d4d8fc4..63623af 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapBase.java
@@ -27,7 +27,6 @@ import java.util.function.BiConsumer ;
import org.apache.jena.atlas.lib.Pair;
import org.apache.jena.iri.IRI;
-import org.apache.jena.iri.IRIFactory;
import org.apache.jena.shared.PrefixMapping ;
/**
@@ -65,7 +64,7 @@ public abstract class PrefixMapBase implements PrefixMap {
@Override
public void add(String prefix, String iriString) {
- this.add(prefix, IRIFactory.iriImplementation().create(iriString));
+ this.add(prefix, IRIResolver.iriFactory.create(iriString));
}
@Override
http://git-wip-us.apache.org/repos/asf/jena/blob/ed34030f/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapStd.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapStd.java b/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapStd.java
index 557d07d..4c15108 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapStd.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/PrefixMapStd.java
@@ -24,7 +24,6 @@ import java.util.Map ;
import org.apache.jena.atlas.lib.Pair ;
import org.apache.jena.iri.IRI ;
-import org.apache.jena.iri.IRIFactory ;
/**
* Default implementation of a {@link PrefixMap}, this implementation
@@ -66,7 +65,7 @@ public class PrefixMapStd extends PrefixMapBase {
@Override
public void add(String prefix, String iriString) {
prefix = canonicalPrefix(prefix);
- IRI iri = IRIFactory.iriImplementation().create(iriString);
+ IRI iri = IRIResolver.iriFactory.create(iriString);
prefixes.put(prefix, iri);
uriToPrefix.put(iriString, prefix) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/ed34030f/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeFunctions.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeFunctions.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeFunctions.java
index 9949ca8..15ef5a7 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeFunctions.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeFunctions.java
@@ -28,6 +28,7 @@ import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.iri.IRI ;
import org.apache.jena.iri.IRIFactory ;
import org.apache.jena.iri.Violation ;
+import org.apache.jena.riot.system.IRIResolver;
import org.apache.jena.sparql.expr.ExprEvalException ;
import org.apache.jena.sparql.expr.ExprTypeException ;
import org.apache.jena.sparql.expr.NodeValue ;
@@ -348,7 +349,7 @@ public class NodeFunctions {
return node.isLiteral() ;
}
- private static final IRIFactory iriFactory = IRIFactory.iriImplementation() ;
+ private static final IRIFactory iriFactory = IRIResolver.iriFactory;
public static boolean warningsForIRIs = false ;
// -------- IRI
http://git-wip-us.apache.org/repos/asf/jena/blob/ed34030f/jena-arq/src/test/java/org/apache/jena/query/TestParameterizedSparqlString.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/query/TestParameterizedSparqlString.java b/jena-arq/src/test/java/org/apache/jena/query/TestParameterizedSparqlString.java
index d3a6250..a3afcf1 100644
--- a/jena-arq/src/test/java/org/apache/jena/query/TestParameterizedSparqlString.java
+++ b/jena-arq/src/test/java/org/apache/jena/query/TestParameterizedSparqlString.java
@@ -25,8 +25,8 @@ import java.util.TimeZone ;
import org.apache.jena.datatypes.TypeMapper ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
-import org.apache.jena.iri.IRIFactory ;
import org.apache.jena.rdf.model.* ;
+import org.apache.jena.riot.system.IRIResolver;
import org.apache.jena.shared.impl.PrefixMappingImpl ;
import org.apache.jena.sparql.ARQException ;
import org.apache.jena.sparql.syntax.Element ;
@@ -1129,7 +1129,7 @@ public class TestParameterizedSparqlString {
query.append("SELECT *");
query.append('\n');
query.append("WHERE { ?s ");
- query.appendIri(IRIFactory.iriImplementation().construct("http://example.org"));
+ query.appendIri(IRIResolver.iriFactory.construct("http://example.org"));
query.append(" ?o }");
test(query, new String[] { "SELECT", "*", "\n", "WHERE", "?s", "<http://example.org>", "?o" }, new String[] {});
http://git-wip-us.apache.org/repos/asf/jena/blob/ed34030f/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java
index b9dfee1..b976e0a 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java
@@ -27,6 +27,7 @@ import org.apache.jena.riot.ErrorHandlerTestLib.ExWarning ;
import org.apache.jena.riot.checker.CheckerIRI ;
import org.apache.jena.riot.system.Checker ;
import org.apache.jena.riot.system.ErrorHandler ;
+import org.apache.jena.riot.system.IRIResolver ;
import org.apache.jena.riot.system.RiotLib ;
import org.junit.Test ;
@@ -35,7 +36,7 @@ public class TestIRI extends BaseTest
static protected final ErrorHandler handler = new ErrorHandlerTestLib.ErrorHandlerEx() ;
static protected final Checker checker = new Checker(new ErrorHandlerTestLib.ErrorHandlerEx()) ;
- static IRIFactory factory = IRIFactory.iriImplementation() ;
+ static IRIFactory factory = IRIResolver.iriFactory;
@Test public void iri1() { testIRI("http://example/") ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/ed34030f/jena-arq/src/test/java/org/apache/jena/riot/system/AbstractTestPrefixMap.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/system/AbstractTestPrefixMap.java b/jena-arq/src/test/java/org/apache/jena/riot/system/AbstractTestPrefixMap.java
index 0ddfe8f..09d27f1 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/system/AbstractTestPrefixMap.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/system/AbstractTestPrefixMap.java
@@ -27,7 +27,7 @@ import org.junit.Test ;
*
*/
public abstract class AbstractTestPrefixMap extends BaseTest {
- protected IRIFactory factory = IRIFactory.iriImplementation();
+ protected IRIFactory factory = IRIResolver.iriFactory;
/**
* Gets the prefix map implementation to test, each call should result in a