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 2015/10/21 18:46:20 UTC
[01/10] jena git commit: JENA-1051: RDF/XML choose(fix) base URI.
Repository: jena
Updated Branches:
refs/heads/master 3437e9e78 -> 0fb84388c
JENA-1051: RDF/XML choose(fix) base URI.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/53c258f0
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/53c258f0
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/53c258f0
Branch: refs/heads/master
Commit: 53c258f0bff0bb8a5337e485becd88ab78e97b6c
Parents: 3437e9e
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Oct 21 13:05:21 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Oct 21 17:43:41 2015 +0100
----------------------------------------------------------------------
jena-arq/src/main/java/org/apache/jena/riot/lang/RiotParsers.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/53c258f0/jena-arq/src/main/java/org/apache/jena/riot/lang/RiotParsers.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/RiotParsers.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/RiotParsers.java
index 8e83ef3..3a315fc 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/RiotParsers.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/RiotParsers.java
@@ -185,7 +185,7 @@ public class RiotParsers {
if ( lang == RDFXML )
{
if ( baseIRI != null )
- baseIRI = IRIResolver.resolveString(baseIRI) ;
+ baseIRI = SysRIOT.chooseBaseIRI(baseIRI) ;
return LangRDFXML.create(input, baseIRI, baseIRI, ErrorHandlerFactory.getDefaultErrorHandler(), dest) ;
} else if ( lang == CSV){
return new LangCSV (input, baseIRI, baseIRI, ErrorHandlerFactory.getDefaultErrorHandler(), dest);
[07/10] jena git commit: JENA-1051: Use IRI factory from IRIResolver.
Posted by an...@apache.org.
JENA-1051: Use IRI factory from IRIResolver.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/1cb87dfa
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/1cb87dfa
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/1cb87dfa
Branch: refs/heads/master
Commit: 1cb87dfa9820daa3f6f48a013aecde485b6b15dd
Parents: b5e80a6
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Oct 21 15:58:48 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Oct 21 17:44:46 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/riot/out/NodeFmtLib.java | 8 ++------
.../main/java/org/apache/jena/riot/out/NodeFormatterTTL.java | 5 ++---
.../src/main/java/org/apache/jena/sparql/util/FmtUtils.java | 4 ++--
3 files changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/1cb87dfa/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFmtLib.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFmtLib.java b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFmtLib.java
index 70094e7..bb10d25 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFmtLib.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFmtLib.java
@@ -28,13 +28,9 @@ import org.apache.jena.atlas.lib.Chars ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.iri.IRI ;
-import org.apache.jena.iri.IRIFactory ;
import org.apache.jena.iri.IRIRelativize ;
import org.apache.jena.rdf.model.RDFNode ;
-import org.apache.jena.riot.system.PrefixMap ;
-import org.apache.jena.riot.system.PrefixMapFactory ;
-import org.apache.jena.riot.system.Prologue ;
-import org.apache.jena.riot.system.RiotChars ;
+import org.apache.jena.riot.system.* ;
import org.apache.jena.shared.PrefixMapping ;
import org.apache.jena.sparql.ARQConstants ;
import org.apache.jena.sparql.core.Quad ;
@@ -223,7 +219,7 @@ public class NodeFmtLib
{
if ( base == null )
return null ;
- IRI baseIRI = IRIFactory.jenaImplementation().construct(base) ;
+ IRI baseIRI = IRIResolver.iriFactory.construct(base) ;
IRI rel = baseIRI.relativize(uri, relFlags) ;
String r = null ;
try { r = rel.toASCIIString() ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/1cb87dfa/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterTTL.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterTTL.java b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterTTL.java
index 3cd6d44..c4b2fbe 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterTTL.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterTTL.java
@@ -25,9 +25,8 @@ import org.apache.jena.atlas.lib.Pair ;
import org.apache.jena.datatypes.xsd.XSDDatatype ;
import org.apache.jena.graph.Node ;
import org.apache.jena.iri.IRI ;
-import org.apache.jena.iri.IRIFactory ;
import org.apache.jena.iri.IRIRelativize ;
-import org.apache.jena.riot.out.NodeToLabel ;
+import org.apache.jena.riot.system.IRIResolver ;
import org.apache.jena.riot.system.PrefixMap ;
import org.apache.jena.riot.system.PrefixMapFactory ;
import org.apache.jena.riot.system.RiotChars ;
@@ -51,7 +50,7 @@ public class NodeFormatterTTL extends NodeFormatterNT
this.prefixMap = prefixMap ;
this.baseIRI = baseIRI ;
this.iriResolver =
- baseIRI != null ? IRIFactory.jenaImplementation().construct(baseIRI) : null ;
+ baseIRI != null ? IRIResolver.iriFactory.construct(baseIRI) : null ;
}
@Override
http://git-wip-us.apache.org/repos/asf/jena/blob/1cb87dfa/jena-arq/src/main/java/org/apache/jena/sparql/util/FmtUtils.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/FmtUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/FmtUtils.java
index aa1500c..c9dcae0 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/FmtUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/FmtUtils.java
@@ -27,11 +27,11 @@ import org.apache.jena.graph.Node ;
import org.apache.jena.graph.Node_Literal ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.iri.IRI ;
-import org.apache.jena.iri.IRIFactory ;
import org.apache.jena.iri.IRIRelativize ;
import org.apache.jena.rdf.model.Model ;
import org.apache.jena.rdf.model.RDFNode ;
import org.apache.jena.rdf.model.Resource ;
+import org.apache.jena.riot.system.IRIResolver ;
import org.apache.jena.shared.PrefixMapping ;
import org.apache.jena.sparql.ARQConstants ;
import org.apache.jena.sparql.ARQInternalErrorException ;
@@ -462,7 +462,7 @@ public class FmtUtils
{
if ( hasScheme(uri) )
return uri ;
- IRI baseIRI = IRIFactory.jenaImplementation().construct(base) ;
+ IRI baseIRI = IRIResolver.iriFactory.construct(base) ;
IRI rel = baseIRI.relativize(uri, relFlags) ;
String r = rel.toString() ;
return r ;
[06/10] jena git commit: JENA-1051: Deprecate RDF 1.0 IRI factories
Posted by an...@apache.org.
JENA-1051: Deprecate RDF 1.0 IRI factories
jenaImplementation(), semanticWebImplementation()
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b5e80a67
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b5e80a67
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b5e80a67
Branch: refs/heads/master
Commit: b5e80a67d20fb9310b491a3642eff18aec8ec0da
Parents: 053b79f
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Oct 21 15:02:20 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Oct 21 17:44:32 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/iri/IRIFactory.java | 19 ++++++++++++++++---
.../test/java/org/apache/jena/iri/MoreTests.java | 6 +++++-
.../org/apache/jena/iri/TestErrorMessages.java | 5 +----
.../java/org/apache/jena/iri/TestIRIFactory.java | 1 +
4 files changed, 23 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b5e80a67/jena-iri/src/main/java/org/apache/jena/iri/IRIFactory.java
----------------------------------------------------------------------
diff --git a/jena-iri/src/main/java/org/apache/jena/iri/IRIFactory.java b/jena-iri/src/main/java/org/apache/jena/iri/IRIFactory.java
index 2c0eedc..d3f4f19 100644
--- a/jena-iri/src/main/java/org/apache/jena/iri/IRIFactory.java
+++ b/jena-iri/src/main/java/org/apache/jena/iri/IRIFactory.java
@@ -154,17 +154,30 @@ public class IRIFactory extends IRIFactoryImpl
* not in error, can be used
* interoperably in RDF/XML, SPARQL, N3
* and N-Triple.
+ * <p>
+ * This is the support for RDF 1.0 / RDF 2004 which includes "RDF URI References"
+ * (they are very broad and allow spaces, for example; the IRI RFC was not finalized
+ * when the RDF 1.1 specs were published).
+ * Nowadays, IRIs are strongly preferred by the semantic web standards.
+
* @return A factory suitable for Semantic Web applications.
+ * @deprecated Use {@link #iriImplementation()}
*/
+ @Deprecated
static public IRIFactory semanticWebImplementation() {
return theSemWebFactory;
}
/**
- * For use by Jena team only.
- * This method reflects the current IRI support
- * in Jena, which is a moving target at present.
+ * For use by Jena intenal use only.
+ * <p>
+ * This is the support for RDF 1.0 / RDF 2004 which includes "RDF URI References"
+ * (they are very broad and allow spaces, for example; the IRI RFC was not finalized
+ * when the RDF 1.1 specs were published).
+ * Nowadays, IRIs are strongly preferred by the semantic web standards.
* @return A factory suitable for Jena.
+ * @deprecated Use {@link #iriImplementation()}
*/
+ @Deprecated
static public IRIFactory jenaImplementation() {
return jenaFactory;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/b5e80a67/jena-iri/src/test/java/org/apache/jena/iri/MoreTests.java
----------------------------------------------------------------------
diff --git a/jena-iri/src/test/java/org/apache/jena/iri/MoreTests.java b/jena-iri/src/test/java/org/apache/jena/iri/MoreTests.java
index c02217a..75bf18b 100644
--- a/jena-iri/src/test/java/org/apache/jena/iri/MoreTests.java
+++ b/jena-iri/src/test/java/org/apache/jena/iri/MoreTests.java
@@ -47,7 +47,8 @@ public class MoreTests extends TestCase {
public void testRelativizeFrag1() {
- IRIFactory f = IRIFactory.jenaImplementation();
+ @SuppressWarnings("deprecation")
+ IRIFactory f = IRIFactory.jenaImplementation();
IRI base = f.create("http://example.org/somefolder/mybase.rdf");
IRI frag = f.create("http://example.org#foo");
IRI rel = base.relativize(frag);
@@ -58,6 +59,7 @@ public class MoreTests extends TestCase {
}
public void testRelativizeFrag2() {
+ @SuppressWarnings("deprecation")
IRIFactory f = IRIFactory.jenaImplementation();
IRI base = f.create("http://example.org/somefolder/mybase.rdf");
IRI frag = f.create("http://example.org/#foo");
@@ -68,6 +70,7 @@ public class MoreTests extends TestCase {
}
public void testXPointer() {
+ @SuppressWarnings("deprecation")
IRIFactory f = IRIFactory.jenaImplementation();
IRI base = f.create("http://example.org/");
IRI frag = base.resolve("http://eg.com/test.txt#xpointer(/unit[5])");
@@ -80,6 +83,7 @@ public class MoreTests extends TestCase {
}
public void testNotIDN() {
+ @SuppressWarnings("deprecation")
IRIFactory f = IRIFactory.jenaImplementation();
IRI base = f.create("http://example.org/");
IRI frag = base.resolve("outbind://4-00000000C45F478BF9F2A048A7A59DE"+
http://git-wip-us.apache.org/repos/asf/jena/blob/b5e80a67/jena-iri/src/test/java/org/apache/jena/iri/TestErrorMessages.java
----------------------------------------------------------------------
diff --git a/jena-iri/src/test/java/org/apache/jena/iri/TestErrorMessages.java b/jena-iri/src/test/java/org/apache/jena/iri/TestErrorMessages.java
index e384523..ce08494 100644
--- a/jena-iri/src/test/java/org/apache/jena/iri/TestErrorMessages.java
+++ b/jena-iri/src/test/java/org/apache/jena/iri/TestErrorMessages.java
@@ -76,15 +76,12 @@ public class TestErrorMessages extends TestCase
return rslt.toString();
}
-
-
-
private void printErrorMessages(Violation v) {
System.err.println(v.getShortMessage());
}
-
+ @SuppressWarnings("deprecation")
static public IRIFactory f = IRIFactory.jenaImplementation();
@Override
http://git-wip-us.apache.org/repos/asf/jena/blob/b5e80a67/jena-iri/src/test/java/org/apache/jena/iri/TestIRIFactory.java
----------------------------------------------------------------------
diff --git a/jena-iri/src/test/java/org/apache/jena/iri/TestIRIFactory.java b/jena-iri/src/test/java/org/apache/jena/iri/TestIRIFactory.java
index 94489f5..ebdcb16 100644
--- a/jena-iri/src/test/java/org/apache/jena/iri/TestIRIFactory.java
+++ b/jena-iri/src/test/java/org/apache/jena/iri/TestIRIFactory.java
@@ -29,6 +29,7 @@ public class TestIRIFactory {
return new JUnit4TestAdapter(TestIRIFactory.class);
}
+ @SuppressWarnings("deprecation")
private static IRIFactory iriFactory = IRIFactory.jenaImplementation();
@Test
[04/10] jena git commit: JENA-1051: Add tests for different ways to
write file names.
Posted by an...@apache.org.
JENA-1051: Add tests for different ways to write file names.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/42de599e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/42de599e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/42de599e
Branch: refs/heads/master
Commit: 42de599e745dd6c9d9f565e313c9c8b1fcff06d6
Parents: a0e5f23
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Oct 21 13:08:15 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Oct 21 17:44:17 2015 +0100
----------------------------------------------------------------------
.../apache/jena/riot/TestJenaReaderRIOT.java | 143 +++++++++++++------
1 file changed, 96 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/42de599e/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java b/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java
index 5e90bd9..2d6f146 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java
@@ -21,8 +21,10 @@ package org.apache.jena.riot;
import java.io.FileInputStream ;
import java.io.IOException ;
import java.io.StringReader ;
+import java.nio.file.Paths ;
import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.atlas.lib.IRILib ;
import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.atlas.web.TypedInputStream ;
import org.apache.jena.rdf.model.Model ;
@@ -127,70 +129,117 @@ public class TestJenaReaderRIOT extends BaseTest
@Test public void read_input_2() throws IOException
{ jenaread_stream("D.rdf", "RDF/XML") ; }
+ private static String plainRelFnTTL = directory+"/D.ttl" ;
+ private static String plainRelFnRDFXML = directory+"/D.rdf" ;
+
+ // Ways to pass in the filename.
+ // The RDF/XML path is slightly different so test it as well.
+
+ @Test public void read_url_1() {
+ modelRead(plainRelFnTTL) ;
+ }
+
+ @Test public void read_url_1x() {
+ modelRead(plainRelFnRDFXML) ;
+ }
+
+ @Test public void read_url_2() {
+ modelRead("file:"+plainRelFnTTL) ;
+ }
+
+ @Test public void read_url_2x() {
+ modelRead("file:"+plainRelFnRDFXML) ;
+ }
+
+ @Test public void read_url_3() {
+ String cwd = Paths.get(".").toAbsolutePath().normalize().toString() ;
+ modelRead("file:"+cwd+"/"+plainRelFnTTL) ;
+ }
+
+ @Test public void read_url_3x() {
+ String cwd = Paths.get(".").toAbsolutePath().normalize().toString() ;
+ modelRead("file:"+cwd+"/"+plainRelFnRDFXML) ;
+ }
+
+ @Test public void read_url_4() {
+ String cwd = Paths.get(".").toAbsolutePath().normalize().toString() ;
+ String fn = "file:"+cwd+"/"+plainRelFnTTL ;
+ String fn2 = IRILib.filenameToIRI(fn) ;
+ modelRead(fn2) ;
+ }
+
+ @Test public void read_url_4x() {
+ String cwd = Paths.get(".").toAbsolutePath().normalize().toString() ;
+ String fn = "file:"+cwd+"/"+plainRelFnRDFXML ;
+ String fn2 = IRILib.filenameToIRI(fn) ;
+ modelRead(fn2) ;
+ }
+
+ private static Model modelRead(String fn) {
+ Model m = ModelFactory.createDefaultModel();
+ m.read(fn) ;
+ return m ;
+ }
+
+ // -----------------------------------------
+
private static String filename(String filename) { return directory+"/"+filename ; }
- private static void jenaread_stream(String filename, String lang) throws IOException
- {
- filename = filename(filename) ;
-
+ private static void jenaread_stream(String filename, String lang) throws IOException {
+ filename = filename(filename);
+
// Read with a base
- try(FileInputStream in0 = new FileInputStream(filename)) {
- Model m0 = ModelFactory.createDefaultModel() ;
- RDFDataMgr.read(m0, in0, "http://example/base2", RDFLanguages.nameToLang(lang)) ;
+ try (FileInputStream in0 = new FileInputStream(filename)) {
+ Model m0 = ModelFactory.createDefaultModel();
+ RDFDataMgr.read(m0, in0, "http://example/base2", RDFLanguages.nameToLang(lang));
}
// Read again, but without base
- try(FileInputStream in1 = new FileInputStream(filename)) {
- Model m1 = ModelFactory.createDefaultModel() ;
- RDFDataMgr.read(m1, in1, RDFLanguages.nameToLang(lang)) ;
+ try (FileInputStream in1 = new FileInputStream(filename)) {
+ Model m1 = ModelFactory.createDefaultModel();
+ RDFDataMgr.read(m1, in1, RDFLanguages.nameToLang(lang));
}
-
- // Fail because Jena core does a look up of lang with ModelCom builtin in RDFReaderF, then calls RIOReader().
- // 1/ Fix Jena - remove RDFReaderF
- // 2/ Change RDFReaderF to pass in the language name.
-
+
// Read via Jena API.
- Model m2 = ModelFactory.createDefaultModel() ;
- try(FileInputStream in2 = new FileInputStream(filename)) {
- m2.read(in2, "http://example/base3", lang) ;
+ Model m2 = ModelFactory.createDefaultModel();
+ try (FileInputStream in2 = new FileInputStream(filename)) {
+ m2.read(in2, "http://example/base3", lang);
}
-
- String x = FileUtils.readWholeFileAsUTF8(filename) ;
- Model m3 = ModelFactory.createDefaultModel() ;
- m2.read(new StringReader(x), "http://example/base4", lang) ;
+
+ String x = FileUtils.readWholeFileAsUTF8(filename);
+ Model m3 = ModelFactory.createDefaultModel();
+ m2.read(new StringReader(x), "http://example/base4", lang);
}
- private static void jenaread(String dataurl)
- {
- dataurl = filename(dataurl) ;
- Model m = ModelFactory.createDefaultModel() ;
- m.read(dataurl) ;
- assertTrue(m.size() != 0 ) ;
+ private static void jenaread(String dataurl) {
+ dataurl = filename(dataurl);
+ Model m = ModelFactory.createDefaultModel();
+ m.read(dataurl);
+ assertTrue(m.size() != 0);
}
- private static void jenaread(String dataurl, String lang)
- {
+ private static void jenaread(String dataurl, String lang) {
// read via WebReader to make sure the test setup is right.
- dataurl = filename(dataurl) ;
-
- Model m0 = ModelFactory.createDefaultModel() ;
- RDFDataMgr.read(m0, dataurl, RDFLanguages.nameToLang(lang)) ;
- assertTrue(m0.size() != 0 ) ;
-
- Model m1 = ModelFactory.createDefaultModel() ;
- new RDFReaderFactoryRIOT().getReader(lang).read(m1, dataurl) ;
- assertTrue(m1.size() != 0 ) ;
-
+ dataurl = filename(dataurl);
+
+ Model m0 = ModelFactory.createDefaultModel();
+ RDFDataMgr.read(m0, dataurl, RDFLanguages.nameToLang(lang));
+ assertTrue(m0.size() != 0);
+
+ Model m1 = ModelFactory.createDefaultModel();
+ new RDFReaderFactoryRIOT().getReader(lang).read(m1, dataurl);
+ assertTrue(m1.size() != 0);
+
// Read via Jena model API.
- Model m2 = ModelFactory.createDefaultModel() ;
- // The range of names for mode.read is less - canonicalise the language name.
- String x = RDFLanguages.nameToLang(lang).getName() ;
- m2.read(dataurl, x) ;
- assertTrue(m2.size() != 0 ) ;
+ Model m2 = ModelFactory.createDefaultModel();
+ // The range of names for mode.read is less - canonicalise the language
+ // name.
+ String x = RDFLanguages.nameToLang(lang).getName();
+ m2.read(dataurl, x);
+ assertTrue(m2.size() != 0);
}
- private static void jenaread(String dataurl, String lang, String base)
- {
+ private static void jenaread(String dataurl, String lang, String base) {
dataurl = filename(dataurl) ;
Model m1 = ModelFactory.createDefaultModel() ;
Model m2 = ModelFactory.createDefaultModel() ;
[09/10] jena git commit: JENA-1051: Preserve original strict mode
setting.
Posted by an...@apache.org.
JENA-1051: Preserve original strict mode setting.
For chaining commands in one JVM process.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/629ee4b8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/629ee4b8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/629ee4b8
Branch: refs/heads/master
Commit: 629ee4b83699fc3f63571314b9f90aac45a4de7c
Parents: 31583c5
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Oct 21 17:07:04 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Oct 21 17:45:09 2015 +0100
----------------------------------------------------------------------
jena-arq/src/main/java/riotcmd/CmdLangParse.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/629ee4b8/jena-arq/src/main/java/riotcmd/CmdLangParse.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/riotcmd/CmdLangParse.java b/jena-arq/src/main/java/riotcmd/CmdLangParse.java
index cb83416..1e0a935 100644
--- a/jena-arq/src/main/java/riotcmd/CmdLangParse.java
+++ b/jena-arq/src/main/java/riotcmd/CmdLangParse.java
@@ -126,8 +126,14 @@ public abstract class CmdLangParse extends CmdGeneral
@Override
protected void exec() {
+ boolean oldStrictValue = RIOT.isStrictMode() ;
if ( modLangParse.strictMode() )
- RIOT.setStrictMode(true) ;
+ RIOT.setStrictMode(true) ;
+ try { exec$() ; }
+ finally { RIOT.setStrictMode(oldStrictValue) ; }
+ }
+
+ protected void exec$() {
if ( modLangParse.getRDFSVocab() != null )
setup = new InferenceSetupRDFS(modLangParse.getRDFSVocab()) ;
[08/10] jena git commit: JENA-1051: Better strict mode setting and
testing.
Posted by an...@apache.org.
JENA-1051: Better strict mode setting and testing.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/31583c52
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/31583c52
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/31583c52
Branch: refs/heads/master
Commit: 31583c5234579afdad0e15ef81d75844d5a96eb9
Parents: 1cb87df
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Oct 21 16:00:06 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Oct 21 17:45:03 2015 +0100
----------------------------------------------------------------------
jena-arq/src/main/java/org/apache/jena/riot/RIOT.java | 4 ++++
.../org/apache/jena/riot/system/ParserProfileBase.java | 4 ++--
.../main/java/org/apache/jena/riot/system/RiotLib.java | 7 ++-----
.../org/apache/jena/riot/langsuite/LangTestCase.java | 13 ++++---------
4 files changed, 12 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/31583c52/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java b/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java
index e6dac18..8cbd105 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java
@@ -51,6 +51,10 @@ public class RIOT {
SysRIOT.StrictXSDLexicialForms = state ;
}
+ public static boolean isStrictMode() {
+ return SysRIOT.strictMode ;
+ }
+
public static void init() {
if ( initialized )
return ;
http://git-wip-us.apache.org/repos/asf/jena/blob/31583c52/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java
index 7146b79..d6c85fe 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java
@@ -24,8 +24,8 @@ import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.iri.IRI ;
+import org.apache.jena.riot.RIOT ;
import org.apache.jena.riot.RiotException ;
-import org.apache.jena.riot.SysRIOT ;
import org.apache.jena.riot.lang.LabelToNode ;
import org.apache.jena.riot.tokens.Token ;
import org.apache.jena.riot.tokens.TokenType ;
@@ -39,7 +39,7 @@ public class ParserProfileBase implements ParserProfile {
protected ErrorHandler errorHandler ;
protected Prologue prologue ;
protected LabelToNode labelMapping ;
- protected boolean strictMode = SysRIOT.strictMode ;
+ protected boolean strictMode = RIOT.isStrictMode() ;
public ParserProfileBase(Prologue prologue, ErrorHandler errorHandler) {
this(prologue, errorHandler, SyntaxLabels.createLabelToNode()) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/31583c52/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java b/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
index 54fe37f..31d23c8 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
@@ -38,10 +38,7 @@ import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.query.ARQ ;
-import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.RDFLanguages ;
-import org.apache.jena.riot.SysRIOT ;
-import org.apache.jena.riot.WriterDatasetRIOT ;
+import org.apache.jena.riot.* ;
import org.apache.jena.riot.lang.LabelToNode ;
import org.apache.jena.riot.tokens.Token ;
import org.apache.jena.riot.tokens.Tokenizer ;
@@ -117,7 +114,7 @@ public class RiotLib
{
if ( sameLang(NTRIPLES, lang) || sameLang(NQUADS, lang) )
{
- boolean checking = SysRIOT.strictMode ;
+ boolean checking = RIOT.isStrictMode() ;
// If strict mode, do checking e.g. URIs
return profile(baseIRI, false, checking, handler) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/31583c52/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java b/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java
index 903558c..1d7a3ce 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java
@@ -19,7 +19,7 @@
package org.apache.jena.riot.langsuite;
import org.apache.jena.atlas.legacy.BaseTest2 ;
-import org.apache.jena.riot.SysRIOT ;
+import org.apache.jena.riot.RIOT ;
import org.apache.jena.riot.system.ErrorHandlerFactory ;
import org.apache.jena.sparql.junit.EarlReport ;
import org.apache.jena.sparql.junit.EarlTestCase ;
@@ -33,7 +33,6 @@ public abstract class LangTestCase extends EarlTestCase
protected abstract void _tearDown() ;
protected boolean sysRIOT_strictMode ;
- protected boolean sysRIOT_strictXSDLexicialForms ;
@Override
final public void setUpTest()
@@ -45,11 +44,8 @@ public abstract class LangTestCase extends EarlTestCase
// If the test suite is sloppy, with IRIs that are not good practice, you may need
// to run with warnings as not-errors ....
//BaseTest.setTestLogging(ErrorHandlerFactory.errorHandlerStd) ;
- sysRIOT_strictMode = SysRIOT.strictMode ;
- sysRIOT_strictXSDLexicialForms = SysRIOT.StrictXSDLexicialForms ;
-
- SysRIOT.strictMode = true ;
- SysRIOT.StrictXSDLexicialForms = true ;
+ sysRIOT_strictMode = RIOT.isStrictMode() ;
+ RIOT.setStrictMode(true) ;
_setUp() ;
}
@@ -57,8 +53,7 @@ public abstract class LangTestCase extends EarlTestCase
final public void tearDownTest()
{
_tearDown() ;
- SysRIOT.strictMode = sysRIOT_strictMode ;
- SysRIOT.StrictXSDLexicialForms = sysRIOT_strictXSDLexicialForms ;
+ RIOT.setStrictMode(sysRIOT_strictMode) ;
BaseTest2.unsetTestLogging() ;
}
[05/10] jena git commit: JENA-1051: Update to JUnit4.
Posted by an...@apache.org.
JENA-1051: Update to JUnit4.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/053b79fa
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/053b79fa
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/053b79fa
Branch: refs/heads/master
Commit: 053b79fa886b9e1c1980c4d5f53d6b1d89326bf3
Parents: 42de599
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Oct 21 14:09:52 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Oct 21 17:44:25 2015 +0100
----------------------------------------------------------------------
.../jena/riot/adapters/TS_RIOTAdapters.java | 4 +-
.../jena/riot/adapters/TestFileManager.java | 83 ++++++--------------
2 files changed, 23 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/053b79fa/jena-arq/src/test/java/org/apache/jena/riot/adapters/TS_RIOTAdapters.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/adapters/TS_RIOTAdapters.java b/jena-arq/src/test/java/org/apache/jena/riot/adapters/TS_RIOTAdapters.java
index 85c1359..54e3051 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/adapters/TS_RIOTAdapters.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/adapters/TS_RIOTAdapters.java
@@ -28,7 +28,5 @@ import org.junit.runners.Suite ;
public class TS_RIOTAdapters
-{
-
-}
+{}
http://git-wip-us.apache.org/repos/asf/jena/blob/053b79fa/jena-arq/src/test/java/org/apache/jena/riot/adapters/TestFileManager.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/adapters/TestFileManager.java b/jena-arq/src/test/java/org/apache/jena/riot/adapters/TestFileManager.java
index fc30cd3..9a4255c 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/adapters/TestFileManager.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/adapters/TestFileManager.java
@@ -20,17 +20,17 @@ package org.apache.jena.riot.adapters;
import java.io.InputStream ;
-import junit.framework.TestCase ;
-import junit.framework.TestSuite ;
+import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.rdf.model.Model ;
import org.apache.jena.riot.stream.TestLocationMapper ;
import org.apache.jena.shared.NotFoundException ;
import org.apache.jena.util.FileManager ;
import org.apache.jena.util.LocationMapper ;
+import org.junit.Test ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
-public class TestFileManager extends TestCase
+public class TestFileManager extends BaseTest
{
static Logger log = LoggerFactory.getLogger(TestFileManager.class) ;
public static final String testingDir = "testing/RIOT/FileManager" ;
@@ -39,18 +39,7 @@ public class TestFileManager extends TestCase
static final String fileModel = "foo.ttl" ;
static final String zipname = testingDir+"/fmgr-test.zip" ;
- public TestFileManager( String name )
- {
- super(name);
- }
-
- public static TestSuite suite()
- {
- return new TestSuite( TestFileManager.class );
- }
-
- public void testFileManagerFileLocator()
- {
+ @Test public void testFileManagerFileLocator() {
FileManager fileManager = new FileManager() ;
fileManager.addLocatorFile() ;
InputStream in = fileManager.open(testingDir+"/"+filename) ;
@@ -58,8 +47,7 @@ public class TestFileManager extends TestCase
closeInputStream(in) ;
}
- public void testFileManagerFileLocatorWithDir()
- {
+ @Test public void testFileManagerFileLocatorWithDir() {
FileManager fileManager = new FileManager() ;
fileManager.addLocatorFile(testingDir) ;
InputStream in = fileManager.open(filename) ;
@@ -68,8 +56,7 @@ public class TestFileManager extends TestCase
}
- public void testFileManagerNoFile()
- {
+ @Test public void testFileManagerNoFile() {
FileManager fileManager = new FileManager() ;
fileManager.addLocatorFile() ;
try {
@@ -80,8 +67,7 @@ public class TestFileManager extends TestCase
} catch (NotFoundException ex) {}
}
- public void testFileManagerLocatorClassLoader()
- {
+ @Test public void testFileManagerLocatorClassLoader() {
FileManager fileManager = new FileManager() ;
fileManager.addLocatorClassLoader(fileManager.getClass().getClassLoader()) ;
InputStream in = fileManager.open("java/lang/String.class") ;
@@ -89,8 +75,7 @@ public class TestFileManager extends TestCase
closeInputStream(in) ;
}
- public void testFileManagerLocatorClassLoaderNotFound()
- {
+ @Test public void testFileManagerLocatorClassLoaderNotFound() {
FileManager fileManager = new FileManager() ;
fileManager.addLocatorClassLoader(fileManager.getClass().getClassLoader()) ;
try {
@@ -100,8 +85,7 @@ public class TestFileManager extends TestCase
} catch (NotFoundException ex) {}
}
- public void testFileManagerLocatorZip()
- {
+ @Test public void testFileManagerLocatorZip() {
FileManager fileManager = new FileManager() ;
try {
fileManager.addLocatorZip(zipname) ;
@@ -114,8 +98,7 @@ public class TestFileManager extends TestCase
closeInputStream(in) ;
}
- public void testFileManagerLocatorZipNonFound()
- {
+ @Test public void testFileManagerLocatorZipNonFound() {
FileManager fileManager = new FileManager() ;
try {
fileManager.addLocatorZip(zipname) ;
@@ -128,8 +111,7 @@ public class TestFileManager extends TestCase
} catch (NotFoundException ex) {}
}
- public void testFileManagerClone()
- {
+ @Test public void testFileManagerClone() {
FileManager fileManager1 = new FileManager() ;
FileManager fileManager2 = fileManager1.clone() ;
@@ -149,8 +131,7 @@ public class TestFileManager extends TestCase
}
- public void testLocationMappingURLtoFileOpen()
- {
+ @Test public void testLocationMappingURLtoFileOpen() {
LocationMapper locMap = new LocationMapper(TestLocationMapper.mapping) ;
FileManager fileManager = new FileManager(locMap) ;
fileManager.addLocatorFile() ;
@@ -159,8 +140,7 @@ public class TestFileManager extends TestCase
closeInputStream(in) ;
}
- public void testLocationMappingURLtoFileOpenNotFound()
- {
+ @Test public void testLocationMappingURLtoFileOpenNotFound() {
LocationMapper locMap = new LocationMapper(TestLocationMapper.mapping) ;
FileManager fileManager = new FileManager(locMap) ;
fileManager.addLocatorClassLoader(fileManager.getClass().getClassLoader()) ;
@@ -171,8 +151,7 @@ public class TestFileManager extends TestCase
} catch (NotFoundException ex) {}
}
- public void testCache1()
- {
+ @Test public void testCache1() {
FileManager fileManager = new FileManager() ;
fileManager.addLocatorFile(testingDir) ;
Model m1 = fileManager.loadModel(fileModel) ;
@@ -180,8 +159,7 @@ public class TestFileManager extends TestCase
assertNotSame(m1, m2) ;
}
- public void testCache2()
- {
+ @Test public void testCache2() {
FileManager.setGlobalFileManager(AdapterFileManager.get()) ;
FileManager fileManager = FileManager.get() ;
@@ -192,8 +170,7 @@ public class TestFileManager extends TestCase
assertSame(m1, m2) ;
}
- public void testCache3()
- {
+ @Test public void testCache3() {
FileManager fileManager = FileManager.get() ;
fileManager.addLocatorFile(testingDir) ;
fileManager.setModelCaching(true) ;
@@ -214,29 +191,13 @@ public class TestFileManager extends TestCase
assertNotSame(m3, m4) ;
}
-// public void testFileManagerLocatorURL()
-// {
-// FileManager fileManager = new FileManager() ;
-// fileManager.addLocatorURL() ;
-// InputStream in = fileManager.open("http:///www.bbc.co.uk/") ;
-// //assertNotNull(in) ;
-// // Proxies matter.
-// if ( in == null )
-// log.warn("Failed to contact http:///www.bbc.co.uk/: maybe due to proxy issues") ;
-//
-// try { if ( in != null ) in.close() ; }
-// catch (Exception ex) {}
-// }
-
-
// -------- Helpers
- private void closeInputStream(InputStream in)
- {
- try {
- if ( in != null )
- in.close() ;
- }
- catch (Exception ex) {}
+ private void closeInputStream(InputStream in) {
+ try {
+ if ( in != null )
+ in.close();
+ }
+ catch (Exception ex) {}
}
}
[10/10] jena git commit: JENA-1051: Move strictness handling into
SysRiot.
Posted by an...@apache.org.
JENA-1051: Move strictness handling into SysRiot.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0fb84388
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0fb84388
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0fb84388
Branch: refs/heads/master
Commit: 0fb84388cab68e39f5043b1592a6ed868847a207
Parents: 629ee4b
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Oct 21 17:24:41 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Oct 21 17:45:27 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/riot/RIOT.java | 9 ---------
.../main/java/org/apache/jena/riot/SysRIOT.java | 11 +++++++++++
.../jena/riot/system/ParserProfileBase.java | 4 ++--
.../org/apache/jena/riot/system/RiotLib.java | 7 +++++--
jena-arq/src/main/java/riotcmd/CmdLangParse.java | 6 +++---
.../apache/jena/riot/langsuite/LangTestCase.java | 8 ++++----
jena-arq/src/test/java/riotcmd/rdflangtest.java | 19 +++++++++----------
7 files changed, 34 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0fb84388/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java b/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java
index 8cbd105..d0e80e9 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java
@@ -46,15 +46,6 @@ public class RIOT {
/** The root package name for RIOT */
public static final String PATH = "org.apache.jena.riot" ;
- public static void setStrictMode(boolean state) {
- SysRIOT.strictMode = state ;
- SysRIOT.StrictXSDLexicialForms = state ;
- }
-
- public static boolean isStrictMode() {
- return SysRIOT.strictMode ;
- }
-
public static void init() {
if ( initialized )
return ;
http://git-wip-us.apache.org/repos/asf/jena/blob/0fb84388/jena-arq/src/main/java/org/apache/jena/riot/SysRIOT.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/SysRIOT.java b/jena-arq/src/main/java/org/apache/jena/riot/SysRIOT.java
index 49a24ef..94c094a 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/SysRIOT.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/SysRIOT.java
@@ -32,12 +32,23 @@ public class SysRIOT
private static Logger riotLogger = LoggerFactory.getLogger(riotLoggerName) ;
public static boolean StrictXSDLexicialForms = false ;
+ public static boolean StrictBaseURINoResolve = false ;
public static boolean strictMode = false ;
public static final String BNodeGenIdPrefix = "genid" ;
public static final boolean isWindows = (File.pathSeparatorChar == ';' ) ;
+ public static void setStrictMode(boolean state) {
+ SysRIOT.strictMode = state ;
+ SysRIOT.StrictXSDLexicialForms = state ;
+ SysRIOT.StrictBaseURINoResolve = state ;
+ }
+
+ public static boolean isStrictMode() {
+ return SysRIOT.strictMode ;
+ }
+
static public String fmtMessage(String message, long line, long col)
{
if ( col == -1 && line == -1 )
http://git-wip-us.apache.org/repos/asf/jena/blob/0fb84388/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java
index d6c85fe..3299c46 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java
@@ -24,8 +24,8 @@ import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.iri.IRI ;
-import org.apache.jena.riot.RIOT ;
import org.apache.jena.riot.RiotException ;
+import org.apache.jena.riot.SysRIOT ;
import org.apache.jena.riot.lang.LabelToNode ;
import org.apache.jena.riot.tokens.Token ;
import org.apache.jena.riot.tokens.TokenType ;
@@ -39,7 +39,7 @@ public class ParserProfileBase implements ParserProfile {
protected ErrorHandler errorHandler ;
protected Prologue prologue ;
protected LabelToNode labelMapping ;
- protected boolean strictMode = RIOT.isStrictMode() ;
+ protected boolean strictMode = SysRIOT.isStrictMode() ;
public ParserProfileBase(Prologue prologue, ErrorHandler errorHandler) {
this(prologue, errorHandler, SyntaxLabels.createLabelToNode()) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/0fb84388/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java b/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
index 31d23c8..0455295 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
@@ -38,7 +38,10 @@ import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.query.ARQ ;
-import org.apache.jena.riot.* ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.SysRIOT ;
+import org.apache.jena.riot.WriterDatasetRIOT ;
import org.apache.jena.riot.lang.LabelToNode ;
import org.apache.jena.riot.tokens.Token ;
import org.apache.jena.riot.tokens.Tokenizer ;
@@ -114,7 +117,7 @@ public class RiotLib
{
if ( sameLang(NTRIPLES, lang) || sameLang(NQUADS, lang) )
{
- boolean checking = RIOT.isStrictMode() ;
+ boolean checking = SysRIOT.isStrictMode() ;
// If strict mode, do checking e.g. URIs
return profile(baseIRI, false, checking, handler) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/0fb84388/jena-arq/src/main/java/riotcmd/CmdLangParse.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/riotcmd/CmdLangParse.java b/jena-arq/src/main/java/riotcmd/CmdLangParse.java
index 1e0a935..064ff3b 100644
--- a/jena-arq/src/main/java/riotcmd/CmdLangParse.java
+++ b/jena-arq/src/main/java/riotcmd/CmdLangParse.java
@@ -126,11 +126,11 @@ public abstract class CmdLangParse extends CmdGeneral
@Override
protected void exec() {
- boolean oldStrictValue = RIOT.isStrictMode() ;
+ boolean oldStrictValue = SysRIOT.isStrictMode() ;
if ( modLangParse.strictMode() )
- RIOT.setStrictMode(true) ;
+ SysRIOT.setStrictMode(true) ;
try { exec$() ; }
- finally { RIOT.setStrictMode(oldStrictValue) ; }
+ finally { SysRIOT.setStrictMode(oldStrictValue) ; }
}
protected void exec$() {
http://git-wip-us.apache.org/repos/asf/jena/blob/0fb84388/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java b/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java
index 1d7a3ce..9fb9e42 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java
@@ -19,7 +19,7 @@
package org.apache.jena.riot.langsuite;
import org.apache.jena.atlas.legacy.BaseTest2 ;
-import org.apache.jena.riot.RIOT ;
+import org.apache.jena.riot.SysRIOT ;
import org.apache.jena.riot.system.ErrorHandlerFactory ;
import org.apache.jena.sparql.junit.EarlReport ;
import org.apache.jena.sparql.junit.EarlTestCase ;
@@ -44,8 +44,8 @@ public abstract class LangTestCase extends EarlTestCase
// If the test suite is sloppy, with IRIs that are not good practice, you may need
// to run with warnings as not-errors ....
//BaseTest.setTestLogging(ErrorHandlerFactory.errorHandlerStd) ;
- sysRIOT_strictMode = RIOT.isStrictMode() ;
- RIOT.setStrictMode(true) ;
+ sysRIOT_strictMode = SysRIOT.isStrictMode() ;
+ SysRIOT.setStrictMode(true) ;
_setUp() ;
}
@@ -53,7 +53,7 @@ public abstract class LangTestCase extends EarlTestCase
final public void tearDownTest()
{
_tearDown() ;
- RIOT.setStrictMode(sysRIOT_strictMode) ;
+ SysRIOT.setStrictMode(sysRIOT_strictMode) ;
BaseTest2.unsetTestLogging() ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/0fb84388/jena-arq/src/test/java/riotcmd/rdflangtest.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/riotcmd/rdflangtest.java b/jena-arq/src/test/java/riotcmd/rdflangtest.java
index 2db4df7..5fafa91 100644
--- a/jena-arq/src/test/java/riotcmd/rdflangtest.java
+++ b/jena-arq/src/test/java/riotcmd/rdflangtest.java
@@ -18,6 +18,8 @@
package riotcmd;
+import arq.cmdline.ModEngine ;
+import arq.cmdline.ModSymbol ;
import jena.cmd.ArgDecl ;
import jena.cmd.CmdException ;
import jena.cmd.CmdGeneral ;
@@ -32,7 +34,6 @@ import org.apache.jena.rdf.model.Model ;
import org.apache.jena.rdf.model.Resource ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
-import org.apache.jena.riot.RIOT ;
import org.apache.jena.riot.langsuite.FactoryTestRiot ;
import org.apache.jena.riot.langsuite.VocabLangRDF ;
import org.apache.jena.sparql.expr.E_Function ;
@@ -46,8 +47,6 @@ import org.apache.jena.system.JenaSystem ;
import org.apache.jena.vocabulary.DC ;
import org.apache.jena.vocabulary.DCTerms ;
import org.apache.jena.vocabulary.RDF ;
-import arq.cmdline.ModEngine ;
-import arq.cmdline.ModSymbol ;
/** A program to execute RDF language test suites
*
@@ -114,13 +113,13 @@ public class rdflangtest extends CmdGeneral
// Paradoxical naming - the boolean is a visibility flag.
BaseTest2.setTestLogging() ;
- if ( contains(strictDecl) )
- {
- cmdStrictMode = true ;
- // Which will apply to reading the manifest!
- ARQ.setStrictMode() ;
- RIOT.setStrictMode(true) ;
- }
+// if ( contains(strictDecl) ) {
+// // Always done in test setups.
+// cmdStrictMode = true ;
+// // Which will apply to reading the manifest!
+// ARQ.setStrictMode() ;
+// SysRIOT.setStrictMode(true) ;
+// }
NodeValue.VerboseWarnings = false ;
E_Function.WarnOnUnknownFunction = false ;
[03/10] jena git commit: JENA-1051: Use functions and casts to reduce
use of bare nulls.
Posted by an...@apache.org.
JENA-1051: Use functions and casts to reduce use of bare nulls.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a0e5f231
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a0e5f231
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a0e5f231
Branch: refs/heads/master
Commit: a0e5f2319a4998ddba82aa089319becbaaa11a18
Parents: ebc14ed
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Oct 21 13:07:44 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Oct 21 17:44:11 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/riot/RDFDataMgr.java | 87 ++++++++++++--------
1 file changed, 52 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a0e5f231/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
index 844169d..38444a7 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
@@ -102,7 +102,7 @@ public class RDFDataMgr
* @throws RiotNotFoundException if the location is not found - the graph is unchanged.
* @see #read(Graph,String,Lang,Context)
*/
- public static void read(Graph graph, String uri) { read(graph, uri, null, null, null) ; }
+ public static void read(Graph graph, String uri) { read(graph, uri, defaultBase(uri), defaultLang(uri), (Context)null) ; }
/** Read triples into a Model from the given location, with a hint of the language (MIME type)
* @param model Destination for the RDF read.
@@ -120,7 +120,7 @@ public class RDFDataMgr
* @throws RiotNotFoundException if the location is not found - the graph is unchanged.
* @see #read(Graph,String,Lang,Context)
*/
- public static void read(Graph graph, String uri, Lang hintLang) { read(graph, uri, hintLang, null) ; }
+ public static void read(Graph graph, String uri, Lang hintLang) { read(graph, uri, hintLang, (Context)null) ; }
/** Read triples into a Model from the given location, with hint of language and with some parameters for the reader
* @see #read(Model,String,String,Lang,Context)
@@ -142,7 +142,7 @@ public class RDFDataMgr
* @param hintLang Hint for the syntax
* @throws RiotNotFoundException if the location is not found - the graph is unchanged.
*/
- public static void read(Graph graph, String uri, String base, Lang hintLang) { read(graph, uri, base, hintLang, null) ; }
+ public static void read(Graph graph, String uri, String base, Lang hintLang) { read(graph, uri, base, hintLang, (Context)null) ; }
/** Read triples into a Model from the given location, with some parameters for the reader
* @see #read(Model,String,String,Lang,Context)
@@ -160,7 +160,7 @@ public class RDFDataMgr
* @param context Content object to control reading process.
* @throws RiotNotFoundException if the location is not found - the graph is unchanged.
*/
- public static void read(Graph graph, String uri, Context context) { read(graph, uri, null, context) ; }
+ public static void read(Graph graph, String uri, Context context) { read(graph, uri, defaultLang(uri), context) ; }
/** Read triples into a Model from the given location, with hint of language and the with some parameters for the reader
* @see #read(Model,String,String,Lang,Context)
@@ -171,7 +171,7 @@ public class RDFDataMgr
* @throws RiotNotFoundException if the location is not found - the model is unchanged.
*/
public static void read(Model model, String uri, Lang hintLang, Context context)
- { read(model, uri, uri, hintLang, context) ; }
+ { read(model, uri, defaultBase(uri), hintLang, context) ; }
/** Read triples into a Model from the given location, with hint of language and with some parameters for the reader
* @see #read(Graph,String,String,Lang,Context)
@@ -182,7 +182,7 @@ public class RDFDataMgr
* @throws RiotNotFoundException if the location is not found - the graph is unchanged.
*/
public static void read(Graph graph, String uri, Lang hintLang, Context context)
- { read(graph, uri, uri, hintLang, context) ; }
+ { read(graph, uri, defaultBase(uri), hintLang, context) ; }
/** Read triples into a Model from the given location, with hint of language
* and with some parameters for the reader.
@@ -230,7 +230,7 @@ public class RDFDataMgr
* @param in InputStream
* @param lang Language syntax
*/
- public static void read(Graph graph, InputStream in, Lang lang) { read(graph, in, null, lang) ; }
+ public static void read(Graph graph, InputStream in, Lang lang) { read(graph, in, defaultBase(), lang) ; }
/** Read triples into a Model with bytes from an InputStream.
* A base URI and a syntax can be provided.
@@ -256,7 +256,7 @@ public class RDFDataMgr
public static void read(Graph graph, InputStream in, String base, Lang lang) {
Objects.requireNonNull(in, "InputStream is null") ;
StreamRDF dest = StreamRDFLib.graph(graph) ;
- process(dest, new TypedInputStream(in), base, lang, null) ;
+ process(dest, new TypedInputStream(in), base, lang, (Context)null) ;
}
/** Read triples into a model with chars from an Reader.
@@ -285,7 +285,7 @@ public class RDFDataMgr
@Deprecated
public static void read(Graph graph, Reader in, String base, Lang lang) {
StreamRDF dest = StreamRDFLib.graph(graph) ;
- process(dest, in, base, lang, null) ;
+ process(dest, in, base, lang, (Context)null) ;
}
/** Read triples into a model with chars from a StringReader.
@@ -297,7 +297,7 @@ public class RDFDataMgr
public static void read(Model model, StringReader in, String base, Lang lang) {
Graph g = model.getGraph() ;
StreamRDF dest = StreamRDFLib.graph(g) ;
- process(dest, in, base, lang, null) ;
+ process(dest, in, base, lang, (Context)null) ;
}
/** Read triples into a model with chars from a StringReader.
@@ -308,7 +308,7 @@ public class RDFDataMgr
*/
public static void read(Graph graph, StringReader in, String base, Lang lang) {
StreamRDF dest = StreamRDFLib.graph(graph) ;
- process(dest, in, base, lang, null) ;
+ process(dest, in, base, lang, (Context)null) ;
}
private static Model createModel() { return ModelFactory.createDefaultModel() ; }
@@ -417,7 +417,7 @@ public class RDFDataMgr
* @param uri URI to read from (includes file: and a plain file name).
*/
public static void read(DatasetGraph dataset, String uri) {
- read(dataset, uri, null) ;
+ read(dataset, uri, defaultLang(uri)) ;
}
/** Read quads or triples into a Dataset from the given location, with hint of language.
@@ -437,7 +437,7 @@ public class RDFDataMgr
* @param hintLang Language syntax
*/
public static void read(DatasetGraph dataset, String uri, Lang hintLang) {
- read(dataset, uri, hintLang, null) ;
+ read(dataset, uri, hintLang, (Context)null) ;
}
/** Read quads or triples into a Dataset from the given location, with hint of language.
@@ -459,7 +459,7 @@ public class RDFDataMgr
* @param hintLang Language syntax
*/
public static void read(DatasetGraph dataset, String uri, String base, Lang hintLang) {
- read(dataset, uri, base, hintLang, null) ;
+ read(dataset, uri, base, hintLang, (Context)null) ;
}
@@ -480,7 +480,7 @@ public class RDFDataMgr
* @param hintLang Language syntax
*/
public static void read(DatasetGraph dataset, String uri, Lang hintLang, Context context) {
- read(dataset, uri, uri, hintLang, context) ;
+ read(dataset, uri, defaultBase(uri), hintLang, context) ;
}
/** Read quads or triples into a Dataset from the given location.
@@ -495,7 +495,7 @@ public class RDFDataMgr
*/
public static void read(Dataset dataset, String uri, String base, Lang hintLang, Context context) {
- read(dataset.asDatasetGraph(), uri, uri, hintLang, context) ;
+ read(dataset.asDatasetGraph(), uri, defaultBase(uri), hintLang, context) ;
}
/** Read quads or triples into a Dataset from the given location.
@@ -529,7 +529,7 @@ public class RDFDataMgr
* @param lang Language syntax
*/
public static void read(DatasetGraph dataset, InputStream in, Lang lang) {
- read(dataset, in, null, lang) ;
+ read(dataset, in, defaultBase(), lang) ;
}
/** Read quads or triples into a dataset with bytes from an input stream.
@@ -551,7 +551,7 @@ public class RDFDataMgr
public static void read(DatasetGraph dataset, InputStream in, String base, Lang lang) {
Objects.requireNonNull(in, "InputStream is null") ;
StreamRDF dest = StreamRDFLib.dataset(dataset) ;
- process(dest, new TypedInputStream(in), base, lang, null) ;
+ process(dest, new TypedInputStream(in), base, lang, (Context)null) ;
}
/** Read quads into a dataset with chars from an Reader.
@@ -580,7 +580,7 @@ public class RDFDataMgr
@Deprecated
public static void read(DatasetGraph dataset, Reader in, String base, Lang lang) {
StreamRDF dest = StreamRDFLib.dataset(dataset) ;
- process(dest, in, base, lang, null) ;
+ process(dest, in, base, lang, (Context)null) ;
}
/** Read quads into a dataset with chars from a StringReader.
@@ -606,7 +606,7 @@ public class RDFDataMgr
*/
public static void read(DatasetGraph dataset, StringReader in, String base, Lang lang) {
StreamRDF dest = StreamRDFLib.dataset(dataset) ;
- process(dest, in, base, lang, null) ;
+ process(dest, in, base, lang, (Context)null) ;
}
/** Read RDF data.
@@ -614,7 +614,7 @@ public class RDFDataMgr
* @param uri URI to read from (includes file: and a plain file name).
*/
public static void parse(StreamRDF sink, String uri) {
- parse(sink, uri, null) ;
+ parse(sink, uri, defaultLang(uri)) ;
}
/** Read RDF data.
@@ -623,7 +623,7 @@ public class RDFDataMgr
* @param lang Hint for the syntax
*/
public static void parse(StreamRDF sink, String uri, Lang lang) {
- parse(sink, uri, lang, null) ;
+ parse(sink, uri, lang, (Context)null) ;
}
@@ -634,7 +634,7 @@ public class RDFDataMgr
* @param context Content object to control reading process.
*/
public static void parse(StreamRDF sink, String uri, Lang hintLang, Context context) {
- parse(sink, uri, uri, hintLang, context) ;
+ parse(sink, uri, defaultBase(uri), hintLang, context) ;
}
/** Read RDF data.
@@ -644,7 +644,7 @@ public class RDFDataMgr
* @param hintLang Hint for the syntax
*/
public static void parse(StreamRDF sink, String uri, String base, Lang hintLang) {
- parse(sink, uri, base, hintLang, null) ;
+ parse(sink, uri, base, hintLang, (Context)null) ;
}
/** Read RDF data.
@@ -674,7 +674,7 @@ public class RDFDataMgr
* @param lang Syntax for the stream.
*/
public static void parse(StreamRDF sink, InputStream in, Lang lang) {
- parse(sink, in, null, lang, null) ;
+ parse(sink, in, defaultBase(), lang, (Context)null) ;
}
/** Read RDF data.
@@ -684,7 +684,7 @@ public class RDFDataMgr
* @param hintLang Hint for the syntax
*/
public static void parse(StreamRDF sink, InputStream in, String base, Lang hintLang) {
- parse(sink, in, base, hintLang, null) ;
+ parse(sink, in, base, hintLang, (Context)null) ;
}
/** Read RDF data.
@@ -704,7 +704,7 @@ public class RDFDataMgr
* @param lang Syntax for the stream.
*/
public static void parse(StreamRDF sink, StringReader in, Lang lang) {
- parse(sink, in, null, lang, null) ;
+ parse(sink, in, defaultBase(), lang, (Context)null) ;
}
/** Read RDF data.
@@ -714,7 +714,7 @@ public class RDFDataMgr
* @param hintLang Hint for the syntax
*/
public static void parse(StreamRDF sink, StringReader in, String base, Lang hintLang) {
- parse(sink, in, base, hintLang, null) ;
+ parse(sink, in, base, hintLang, (Context)null) ;
}
/** Read RDF data.
@@ -736,7 +736,7 @@ public class RDFDataMgr
*/
@Deprecated
public static void parse(StreamRDF sink, Reader in, Lang lang) {
- parse(sink, in, null, lang, null) ;
+ parse(sink, in, defaultBase(), lang, (Context)null) ;
}
/** Read RDF data.
@@ -748,7 +748,7 @@ public class RDFDataMgr
*/
@Deprecated
public static void parse(StreamRDF sink, Reader in, String base, Lang hintLang) {
- parse(sink, in, base, hintLang, null) ;
+ parse(sink, in, base, hintLang, (Context)null) ;
}
/** Read RDF data.
@@ -769,7 +769,7 @@ public class RDFDataMgr
* @param in Bytes to read. This must include the content type.
*/
public static void parse(StreamRDF sink, TypedInputStream in) {
- parse(sink, in, (String)null) ;
+ parse(sink, in, defaultBase()) ;
}
@@ -897,6 +897,23 @@ public class RDFDataMgr
return r.create(lang) ;
}
+ // Operations to remove "null"s in the code.
+
+ /** Default base - no known URI. e.g. input streams */
+ private static String defaultBase() {
+ return null ;
+ }
+
+ /** Default base - URI present */
+ private static String defaultBase(String uri) {
+ return uri ;
+ }
+
+ /** Default lang - usually left as unknow so that extended content negotation happens */
+ private static Lang defaultLang(String uri) {
+ return null;
+ }
+
/** Determine the Lang, given the URI target, any content type header string and a hint */
public static Lang determineLang(String target, String ctStr, Lang hintLang) {
ContentType ct = WebContent.determineCT(ctStr, hintLang, target) ;
@@ -1192,22 +1209,22 @@ public class RDFDataMgr
private static void write$(OutputStream out, Graph graph, RDFFormat serialization) {
WriterGraphRIOT w = createGraphWriter$(serialization);
- w.write(out, graph, RiotLib.prefixMap(graph), null, null);
+ w.write(out, graph, RiotLib.prefixMap(graph), null, (Context)null);
}
private static void write$(Writer out, Graph graph, RDFFormat serialization) {
WriterGraphRIOT w = createGraphWriter$(serialization);
- w.write(out, graph, RiotLib.prefixMap(graph), null, null);
+ w.write(out, graph, RiotLib.prefixMap(graph), null, (Context)null);
}
private static void write$(OutputStream out, DatasetGraph dataset, RDFFormat serialization) {
WriterDatasetRIOT w = createDatasetWriter$(serialization);
- w.write(out, dataset, RiotLib.prefixMap(dataset), null, null);
+ w.write(out, dataset, RiotLib.prefixMap(dataset), null, (Context)null);
}
private static void write$(Writer out, DatasetGraph dataset, RDFFormat serialization) {
WriterDatasetRIOT w = createDatasetWriter$(serialization);
- w.write(out, dataset, RiotLib.prefixMap(dataset), null, null);
+ w.write(out, dataset, RiotLib.prefixMap(dataset), null, (Context)null);
}
/**
[02/10] jena git commit: JENA-1051: Use Java8 lambdas.
Posted by an...@apache.org.
JENA-1051: Use Java8 lambdas.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ebc14ed7
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ebc14ed7
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ebc14ed7
Branch: refs/heads/master
Commit: ebc14ed72f2bb0a0e22a21e2463575db3d914a0c
Parents: 53c258f
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Oct 21 13:06:45 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Oct 21 17:44:05 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/riot/system/IRIResolver.java | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ebc14ed7/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java b/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
index a4a1433..e7d18b9 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java
@@ -341,12 +341,7 @@ public abstract class IRIResolver
public IRI resolveSilent(final String uriStr) {
if ( resolvedIRIs == null )
return iriFactory.create(uriStr) ;
- Callable<IRI> filler = new Callable<IRI>() {
- @Override
- public IRI call() throws Exception {
- return iriFactory.create(uriStr) ;
- }
- } ;
+ Callable<IRI> filler = () -> iriFactory.create(uriStr) ;
IRI iri = resolvedIRIs.getOrFill(uriStr, filler) ;
return iri ;
}
@@ -432,12 +427,8 @@ public abstract class IRIResolver
public IRI resolveSilent(final String relURI) {
if ( resolvedIRIs == null )
return iriFactory.create(relURI) ;
- Callable<IRI> filler = new Callable<IRI>() {
- @Override
- public IRI call() throws Exception {
- return base.create(relURI) ;
- }
- } ;
+ IRI x = IRIResolver.iriFactory.create(relURI) ;
+ Callable<IRI> filler = () -> base.create(x) ;
return resolvedIRIs.getOrFill(relURI, filler) ;
}
}