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 23:35:16 UTC
[1/2] jena git commit: JENA-1051: Restore UNWISE characters as
warnings (tests need it).
Repository: jena
Updated Branches:
refs/heads/master 2c3e8fe1b -> dea95d9bb
JENA-1051: Restore UNWISE characters as warnings (tests need it).
Also JENA-1052.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/96c54d4f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/96c54d4f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/96c54d4f
Branch: refs/heads/master
Commit: 96c54d4f1df92f810a71eaab0599642753af96bc
Parents: 2c3e8fe
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Oct 21 22:33:43 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Oct 21 22:33:43 2015 +0100
----------------------------------------------------------------------
.../apache/jena/riot/system/IRIResolver.java | 23 +++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/96c54d4f/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 61762ab..3941a65 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
@@ -68,7 +68,7 @@ public abstract class IRIResolver
// setErrorWarning(iriFactory, ViolationCodes.PERCENT_ENCODING_SHOULD_BE_UPPERCASE, false, false) ;
// setErrorWarning(iriFactory, ViolationCodes.SCHEME_PATTERN_MATCH_FAILED, false, false) ;
- // NFC tests are not well understood and these cause confusion.
+ // NFC tests are not well understood by general developers and these cause confusion.
// See JENA-864
//iriFactory.setIsError(ViolationCodes.NOT_NFC, false) ;
//iriFactory.setIsError(ViolationCodes.NOT_NFKC, false) ;
@@ -76,8 +76,11 @@ public abstract class IRIResolver
// ** Applies to various unicode blocks.
// setErrorWarning(iriFactory, ViolationCodes.COMPATIBILITY_CHARACTER, false, false) ;
- // Moderate it -- allow unwise chars.
- setErrorWarning(iriFactory, ViolationCodes.UNWISE_CHARACTER, false, false) ;
+ // This causes test failures.
+ // The tests catch warnings and a warning is expected.
+ // testing/RIOT/Lang/TurtleStd/turtle-eval-bad-02.ttl and 03 and TriG
+ // > as \u003C and < \u003E
+ // setErrorWarning(iriFactory, ViolationCodes.UNWISE_CHARACTER, false, false) ;
setErrorWarning(iriFactory, ViolationCodes.UNDEFINED_UNICODE_CHARACTER, false, false) ;
if ( ShowResolverSetup ) {
@@ -449,6 +452,20 @@ public abstract class IRIResolver
return resolveSilentNoCache(uriStr) ;
}
+// @Override
+// 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) ;
+// }
+// } ;
+// return resolvedIRIs.getOrFill(relURI, filler) ;
+// }
+
+
private IRI resolveSilentNoCache(String uriStr) {
IRI x = IRIResolver.iriFactory.create(uriStr) ;
if ( SysRIOT.StrictAbsURINoNormalization ) {
[2/2] jena git commit: Removed commented old code
Posted by an...@apache.org.
Removed commented old code
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/dea95d9b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/dea95d9b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/dea95d9b
Branch: refs/heads/master
Commit: dea95d9bb114138669ea0534eabaefc15d52bc57
Parents: 96c54d4
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Oct 21 22:35:06 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Oct 21 22:35:06 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/riot/system/IRIResolver.java | 14 --------------
1 file changed, 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/dea95d9b/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 3941a65..ffd5cd7 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
@@ -452,20 +452,6 @@ public abstract class IRIResolver
return resolveSilentNoCache(uriStr) ;
}
-// @Override
-// 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) ;
-// }
-// } ;
-// return resolvedIRIs.getOrFill(relURI, filler) ;
-// }
-
-
private IRI resolveSilentNoCache(String uriStr) {
IRI x = IRIResolver.iriFactory.create(uriStr) ;
if ( SysRIOT.StrictAbsURINoNormalization ) {