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:29 UTC
[10/10] jena git commit: JENA-1051: Move strictness handling into
SysRiot.
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 ;