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 2016/07/25 08:36:33 UTC
[1/9] jena git commit: Combine FileManger-style model.read with
RDFDataMgr style processing.
Repository: jena
Updated Branches:
refs/heads/master a3d65142f -> eee87d7ce
Combine FileManger-style model.read with RDFDataMgr style processing.
Call mode.read tso that it can be overriden by OntModlImpl
which does "loadImports".
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/66f1126e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/66f1126e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/66f1126e
Branch: refs/heads/master
Commit: 66f1126eb1e0ac62ab947bda29886f7779eaf81c
Parents: 0b2b0cd
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jul 15 17:07:56 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jul 15 17:07:56 2016 +0100
----------------------------------------------------------------------
.../jena/riot/adapters/AdapterFileManager.java | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/66f1126e/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java b/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
index 96f0f1a..b92e5f5 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
@@ -21,10 +21,12 @@ package org.apache.jena.riot.adapters;
import java.io.InputStream ;
import java.util.Iterator ;
+import org.apache.jena.atlas.web.TypedInputStream ;
import org.apache.jena.rdf.model.Model ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.SysRIOT ;
import org.apache.jena.riot.system.stream.* ;
import org.apache.jena.util.FileManager ;
import org.apache.jena.util.FileUtils ;
@@ -275,11 +277,20 @@ public class AdapterFileManager extends org.apache.jena.util.FileManager
log.debug("Map: " + filenameOrURI + " => " + mappedURI) ;
Lang lang =
- syntax != null
- ? RDFLanguages.nameToLang(syntax)
+ (syntax != null)
+ ? RDFLanguages.nameToLang(syntax)
: RDFLanguages.resourceNameToLang(mappedURI, Lang.RDFXML) ;
-
- RDFDataMgr.read(model, mappedURI, baseURI, lang);
+
+ if ( false ) {
+ RDFDataMgr.read(model, mappedURI, baseURI, lang);
+ } else {
+ if ( baseURI == null )
+ baseURI = SysRIOT.chooseBaseIRI(filenameOrURI) ;
+ try(TypedInputStream in = streamManager.openNoMapOrNull(mappedURI)) {
+ // May be overridden by model implementation.
+ model.read(in, baseURI, lang.getName()) ;
+ }
+ }
return model ;
}
[4/9] jena git commit: Remove unnecessary suppressed warnings.
Posted by an...@apache.org.
Remove unnecessary suppressed warnings.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/3cc29462
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/3cc29462
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/3cc29462
Branch: refs/heads/master
Commit: 3cc29462470f86c07e12581611f0e67ff1cc2a61
Parents: bcd7e40
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jul 24 12:04:34 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Jul 24 12:04:34 2016 +0100
----------------------------------------------------------------------
.../src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java | 1 -
.../src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java | 1 -
.../test/java/org/apache/jena/riot/lang/TestParserFactory.java | 3 ---
.../src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java | 1 -
4 files changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/3cc29462/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java
index 18112fb..a808d2f 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java
@@ -104,7 +104,6 @@ public class TestLangNTriples extends TestLangNTuples
String string = StrUtils.strjoin("\n", strings);
Tokenizer tokenizer = tokenizer(charSpace, string);
StreamRDFCounting sink = StreamRDFLib.count();
- @SuppressWarnings("deprecation")
LangNTriples x = RiotParsers.createParserNTriples(tokenizer, sink);
x.getProfile().setHandler(new ErrorHandlerEx());
x.parse();
http://git-wip-us.apache.org/repos/asf/jena/blob/3cc29462/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java
index 5fef1fe..950d6c3 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java
@@ -446,7 +446,6 @@ public class TestLangRdfJson extends BaseTest
ByteArrayInputStream in = new ByteArrayInputStream(b);
Tokenizer tokenizer = TokenizerFactory.makeTokenizerUTF8(in) ;
StreamRDFCounting sink = StreamRDFLib.count() ;
- @SuppressWarnings("deprecation")
LangRDFJSON parser = RiotParsers.createParserRdfJson(tokenizer, sink) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/3cc29462/jena-arq/src/test/java/org/apache/jena/riot/lang/TestParserFactory.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestParserFactory.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestParserFactory.java
index 413d333..94411b5 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestParserFactory.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestParserFactory.java
@@ -77,7 +77,6 @@ public class TestParserFactory extends BaseTest
// Old style, deprecated.
Tokenizer tokenizer = TokenizerFactory.makeTokenizerString("<x> <p> <q> .") ;
CatchParserOutput sink = new CatchParserOutput() ;
- @SuppressWarnings("deprecation")
LangRIOT parser = RiotParsers.createParserNTriples(tokenizer, sink) ;
parserSetup(parser) ;
parser.parse();
@@ -104,7 +103,6 @@ public class TestParserFactory extends BaseTest
// Old style, deprecated.
Tokenizer tokenizer = TokenizerFactory.makeTokenizerString("<x> <p> <q> .") ;
CatchParserOutput sink = new CatchParserOutput() ;
- @SuppressWarnings("deprecation")
LangRIOT parser = RiotParsers.createParserTurtle(tokenizer, "http://base/", sink) ;
parserSetup(parser) ;
parser.parse();
@@ -130,7 +128,6 @@ public class TestParserFactory extends BaseTest
// Old style, deprecated.
Tokenizer tokenizer = TokenizerFactory.makeTokenizerString("<x> <p> <q> <g>.") ;
CatchParserOutput sink = new CatchParserOutput() ;
- @SuppressWarnings("deprecation")
LangRIOT parser = RiotParsers.createParserNQuads(tokenizer, sink) ;
parserSetup(parser) ;
parser.parse();
http://git-wip-us.apache.org/repos/asf/jena/blob/3cc29462/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java
index 662bdb7..5eeb0b0 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTurtleTerms.java
@@ -243,7 +243,6 @@ public class TestTurtleTerms extends BaseTest
Tokenizer tokenizer = TokenizerFactory.makeTokenizerString(testString) ;
StreamRDF sink = StreamRDFLib.sinkNull() ;
- @SuppressWarnings("deprecation")
LangTurtle parser = RiotParsers.createParserTurtle(tokenizer, "http://base/", sink) ;
PrefixMap prefixMap = parser.getProfile().getPrologue().getPrefixMap() ;
[5/9] jena git commit: JENA-1211: Tests
Posted by an...@apache.org.
JENA-1211: Tests
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ea83371e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ea83371e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ea83371e
Branch: refs/heads/master
Commit: ea83371ee2938fa7828802889067500d5a384818
Parents: 3cc2946
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jul 24 12:23:51 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Jul 24 12:23:51 2016 +0100
----------------------------------------------------------------------
.../test/java/org/apache/jena/riot/lang/TestTriXReader.java | 5 ++++-
jena-arq/testing/RIOT/Lang/TriX/trix-w3c-1.nq | 0
jena-arq/testing/RIOT/Lang/TriX/trix-w3c-1.trix | 2 ++
jena-arq/testing/RIOT/Lang/TriX/trix-w3c-2.nq | 1 +
jena-arq/testing/RIOT/Lang/TriX/trix-w3c-2.trix | 9 +++++++++
5 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ea83371e/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXReader.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXReader.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXReader.java
index c1ef2c3..a1fd70e 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXReader.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestTriXReader.java
@@ -65,7 +65,10 @@ public class TestTriXReader extends BaseTest {
// //{ "trix-ex-2.trix", null }, // Contains <integer>
{ DIR+"/trix-ex-3.trix", null },
{ DIR+"/trix-ex-4.trix", null },
- { DIR+"/trix-ex-5.trix", null }
+ { DIR+"/trix-ex-5.trix", null },
+ // W3C DTD
+ { DIR+"/trix-w3c-1.trix", DIR+"/trix-w3c-1.nq" },
+ { DIR+"/trix-w3c-2.trix", DIR+"/trix-w3c-2.nq" }
});
}
http://git-wip-us.apache.org/repos/asf/jena/blob/ea83371e/jena-arq/testing/RIOT/Lang/TriX/trix-w3c-1.nq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/RIOT/Lang/TriX/trix-w3c-1.nq b/jena-arq/testing/RIOT/Lang/TriX/trix-w3c-1.nq
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/jena/blob/ea83371e/jena-arq/testing/RIOT/Lang/TriX/trix-w3c-1.trix
----------------------------------------------------------------------
diff --git a/jena-arq/testing/RIOT/Lang/TriX/trix-w3c-1.trix b/jena-arq/testing/RIOT/Lang/TriX/trix-w3c-1.trix
new file mode 100644
index 0000000..28cd2ad
--- /dev/null
+++ b/jena-arq/testing/RIOT/Lang/TriX/trix-w3c-1.trix
@@ -0,0 +1,2 @@
+<trix xmlns="http://www.w3.org/2004/03/trix/trix-1/">
+</trix>
http://git-wip-us.apache.org/repos/asf/jena/blob/ea83371e/jena-arq/testing/RIOT/Lang/TriX/trix-w3c-2.nq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/RIOT/Lang/TriX/trix-w3c-2.nq b/jena-arq/testing/RIOT/Lang/TriX/trix-w3c-2.nq
new file mode 100644
index 0000000..8628a30
--- /dev/null
+++ b/jena-arq/testing/RIOT/Lang/TriX/trix-w3c-2.nq
@@ -0,0 +1 @@
+<http://example.org/s> <http://example.org/p> <http://example.org/o> .
http://git-wip-us.apache.org/repos/asf/jena/blob/ea83371e/jena-arq/testing/RIOT/Lang/TriX/trix-w3c-2.trix
----------------------------------------------------------------------
diff --git a/jena-arq/testing/RIOT/Lang/TriX/trix-w3c-2.trix b/jena-arq/testing/RIOT/Lang/TriX/trix-w3c-2.trix
new file mode 100644
index 0000000..77e7537
--- /dev/null
+++ b/jena-arq/testing/RIOT/Lang/TriX/trix-w3c-2.trix
@@ -0,0 +1,9 @@
+<trix>
+ <graph>
+ <triple>
+ <uri>http://example.org/s</uri>
+ <uri>http://example.org/p</uri>
+ <uri>http://example.org/o</uri>
+ </triple>
+ </graph>
+</trix>
[2/9] jena git commit: Reformat
Posted by an...@apache.org.
Reformat
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/415d19b8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/415d19b8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/415d19b8
Branch: refs/heads/master
Commit: 415d19b895013072e14b751e2fff28ebe1392dca
Parents: a3d6514
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Jul 23 10:54:10 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Jul 23 10:54:10 2016 +0100
----------------------------------------------------------------------
.../jena/riot/checker/CheckerBlankNodes.java | 15 ++--
.../apache/jena/riot/checker/CheckerIRI.java | 88 ++++++++------------
2 files changed, 41 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/415d19b8/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerBlankNodes.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerBlankNodes.java b/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerBlankNodes.java
index 4539a1e..ef72d3d 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerBlankNodes.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerBlankNodes.java
@@ -25,8 +25,7 @@ public class CheckerBlankNodes implements NodeChecker
{
private ErrorHandler handler ;
- public CheckerBlankNodes(ErrorHandler handler)
- {
+ public CheckerBlankNodes(ErrorHandler handler) {
this.handler = handler ;
}
@@ -34,13 +33,11 @@ public class CheckerBlankNodes implements NodeChecker
public boolean check(Node node, long line, long col)
{ return node.isBlank() && checkBlank(node, line, col) ; }
- public boolean checkBlank(Node node, long line, long col)
- {
- String x = node.getBlankNodeLabel() ;
- if ( x.indexOf(' ') >= 0 )
- {
- handler.error("Illegal blank node label (contains a space): "+node, line, col) ;
- return false ;
+ public boolean checkBlank(Node node, long line, long col) {
+ String x = node.getBlankNodeLabel() ;
+ if ( x.indexOf(' ') >= 0 ) {
+ handler.error("Illegal blank node label (contains a space): " + node, line, col) ;
+ return false ;
}
return true ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/415d19b8/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerIRI.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerIRI.java b/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerIRI.java
index 5060f3a..2ad61c2 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerIRI.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerIRI.java
@@ -37,13 +37,11 @@ public class CheckerIRI implements NodeChecker
private ErrorHandler handler ;
private IRIFactory iriFactory ;
- public CheckerIRI()
- {
+ public CheckerIRI() {
this(ErrorHandlerFactory.getDefaultErrorHandler(), IRIResolver.iriFactory) ;
}
-
- public CheckerIRI(ErrorHandler handler, IRIFactory iriFactory)
- {
+
+ public CheckerIRI(ErrorHandler handler, IRIFactory iriFactory) {
this.handler = handler ;
this.iriFactory = iriFactory ;
}
@@ -57,12 +55,11 @@ public class CheckerIRI implements NodeChecker
private final Cache<Node, IRI> cache = CacheFactory.createSimpleCache(5000) ;
// abstract
- public final boolean checkURI(Node node, long line, long col)
- {
+ public final boolean checkURI(Node node, long line, long col) {
if ( cache != null && cache.containsKey(node) )
return true ;
-
- IRI iri = iriFactory.create(node.getURI()); // always works - no exceptions.
+
+ IRI iri = iriFactory.create(node.getURI()) ; // always works - no exceptions.
boolean b = checkIRI(iri, line, col) ;
// If OK, put in cache.
if ( cache != null && b )
@@ -70,10 +67,9 @@ public class CheckerIRI implements NodeChecker
return b ;
}
- final public boolean checkIRI(IRI iri, long line, long col)
- {
+ final public boolean checkIRI(IRI iri, long line, long col) {
iriViolations(iri, handler, allowRelativeIRIs, true, line, col) ;
- return ! iri.hasViolation(true) ;
+ return !iri.hasViolation(true) ;
}
/** Process violations on an IRI
@@ -83,8 +79,7 @@ public class CheckerIRI implements NodeChecker
* @param errorHandler The error handler to call on each warning or error.
*
*/
- public static void iriViolations(IRI iri, ErrorHandler errorHandler)
- {
+ public static void iriViolations(IRI iri, ErrorHandler errorHandler) {
iriViolations(iri, errorHandler, -1L, -1L) ;
}
@@ -95,8 +90,7 @@ public class CheckerIRI implements NodeChecker
* @param errorHandler The error handler to call on each warning or error.
*
*/
- public static void iriViolations(IRI iri, ErrorHandler errorHandler, long line, long col)
- {
+ public static void iriViolations(IRI iri, ErrorHandler errorHandler, long line, long col) {
iriViolations(iri, errorHandler, false, true, line, col) ;
}
@@ -107,8 +101,7 @@ public class CheckerIRI implements NodeChecker
* @param errorHandler The error handler to call on each warning or error.
* @param allowRelativeIRIs Allow realtive URIs (discouraged)
*/
- private static void iriViolations(IRI iri, ErrorHandler errorHandler, boolean allowRelativeIRIs)
- {
+ private static void iriViolations(IRI iri, ErrorHandler errorHandler, boolean allowRelativeIRIs) {
iriViolations(iri, errorHandler, allowRelativeIRIs, -1, -1) ;
}
@@ -119,12 +112,10 @@ public class CheckerIRI implements NodeChecker
* @param errorHandler The error handler to call on each warning or error.
* @param allowRelativeIRIs Allow realtive URIs (discouraged)
*/
- private static void iriViolations(IRI iri, ErrorHandler errorHandler, boolean allowRelativeIRIs, long line, long col)
- {
+ private static void iriViolations(IRI iri, ErrorHandler errorHandler, boolean allowRelativeIRIs, long line, long col) {
iriViolations(iri, errorHandler, allowRelativeIRIs, true, line, col) ;
}
-
/** Process violations on an IRI
* Calls the errorhandler on all errors and warnings (as warning).
* Assumes error handler throws exceptions on errors if needbe
@@ -132,58 +123,49 @@ public class CheckerIRI implements NodeChecker
public static void iriViolations(IRI iri, ErrorHandler errorHandler,
boolean allowRelativeIRIs,
boolean includeIRIwarnings,
- long line, long col)
- {
- if ( ! allowRelativeIRIs && iri.isRelative() )
- errorHandler.error("Relative IRI: "+iri, line, col) ;
-
- if ( iri.hasViolation(includeIRIwarnings) )
- {
- Iterator<Violation> iter = iri.violations(includeIRIwarnings) ;
-
+ long line, long col) {
+ if ( !allowRelativeIRIs && iri.isRelative() )
+ errorHandler.error("Relative IRI: " + iri, line, col) ;
+
+ if ( iri.hasViolation(includeIRIwarnings) ) {
+ Iterator<Violation> iter = iri.violations(includeIRIwarnings) ;
+
boolean errorSeen = false ;
boolean warningSeen = false ;
-
+
// What to finally report.
Violation vError = null ;
Violation vWarning = null ;
Violation xvSub = null ;
-
- for ( ; iter.hasNext() ; )
- {
- Violation v = iter.next();
+
+ for ( ; iter.hasNext() ; ) {
+ Violation v = iter.next() ;
int code = v.getViolationCode() ;
boolean isError = v.isError() ;
-
+
// Ignore these.
- if ( code == Violation.LOWERCASE_PREFERRED
- ||
- code == Violation.PERCENT_ENCODING_SHOULD_BE_UPPERCASE
- ||
- code == Violation.SCHEME_PATTERN_MATCH_FAILED
- )
+ if ( code == Violation.LOWERCASE_PREFERRED
+ || code == Violation.PERCENT_ENCODING_SHOULD_BE_UPPERCASE
+ || code == Violation.SCHEME_PATTERN_MATCH_FAILED )
continue ;
// Anything we want to reprioritise?
// [nothing at present]
-
+
// Remember first error and first warning.
- if ( isError )
- {
+ if ( isError ) {
errorSeen = true ;
if ( vError == null )
- // Remember first error
- vError = v ;
- }
- else
- {
+ // Remember first error
+ vError = v ;
+ } else {
warningSeen = true ;
if ( vWarning == null )
vWarning = v ;
}
-
- String msg = v.getShortMessage();
- String iriStr = iri.toString();
+
+ String msg = v.getShortMessage() ;
+ String iriStr = iri.toString() ;
// Ideally, we might want to output all messages relating to this IRI
// then cause the error or continue.
[3/9] jena git commit: JENA-1211: Read both 'TriX' and 'trix';
write 'trix'
Posted by an...@apache.org.
JENA-1211: Read both 'TriX' and 'trix'; write 'trix'
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/bcd7e400
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/bcd7e400
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/bcd7e400
Branch: refs/heads/master
Commit: bcd7e400975b45c36d40636ee06f7930dfbac374
Parents: a3d6514
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jul 24 11:07:13 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Jul 24 11:07:13 2016 +0100
----------------------------------------------------------------------
.../org/apache/jena/riot/lang/ReaderTriX.java | 3 +++
.../java/org/apache/jena/riot/lang/TriX.java | 24 ++++++++++++++++++--
.../jena/riot/writer/StreamWriterTriX.java | 1 +
3 files changed, 26 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/bcd7e400/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java
index 8637e35..ef3404e 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java
@@ -160,6 +160,8 @@ public class ReaderTriX implements ReaderRIOT {
g = null ;
break ;
case TriX.tagTriX:
+ case TriX.tagTriXAlt:
+ // We don't worry about mismatched tags.
state = OUTER ;
break ;
}
@@ -170,6 +172,7 @@ public class ReaderTriX implements ReaderRIOT {
switch (tag) {
case TriX.tagTriX:
+ case TriX.tagTriXAlt:
if ( state != OUTER )
staxErrorOutOfPlaceElement(parser) ;
state = TRIX ;
http://git-wip-us.apache.org/repos/asf/jena/blob/bcd7e400/jena-arq/src/main/java/org/apache/jena/riot/lang/TriX.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/TriX.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/TriX.java
index b229ba4..d6e7170 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/TriX.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/TriX.java
@@ -27,7 +27,9 @@ package org.apache.jena.riot.lang;
public class TriX {
// DTD for TrIX : The schema is a much longer.
+
/*
+ HPL tech report
<!-- TriX: RDF Triples in XML -->
<!ELEMENT TriX (graph*)>
<!ATTLIST TriX xmlns CDATA #FIXED "http://www.w3.org/2004/03/trix/trix-1/">
@@ -39,11 +41,29 @@ public class TriX {
<!ATTLIST plainLiteral xml:lang CDATA #IMPLIED>
<!ELEMENT typedLiteral (#PCDATA)>
<!ATTLIST typedLiteral datatype CDATA #REQUIRED>
- */
+
+
+ W3C DTD
+ <!-- TriX: RDF Triples in XML -->
+ <!ELEMENT trix (graph*)>
+ <!ATTLIST trix xmlns CDATA #FIXED "http://www.w3.org/2004/03/trix/trix-1/">
+ <!ELEMENT graph (uri, triple*)>
+ <!ELEMENT triple ((id|uri|plainLiteral|typedLiteral), uri, (id|uri|plainLiteral|typedLiteral))>
+ <!ELEMENT id (#PCDATA)>
+ <!ELEMENT uri (#PCDATA)>
+ <!ELEMENT plainLiteral (#PCDATA)>
+ <!ATTLIST plainLiteral xml:lang CDATA #IMPLIED>
+ <!ELEMENT typedLiteral (#PCDATA)>
+ <!ATTLIST typedLiteral datatype CDATA #REQUIRED>
+ */
/* Constants for TriX */
public final static String NS = "http://www.w3.org/2004/03/trix/trix-1/" ;
- public final static String tagTriX = "TriX" ;
+
+ /* Element name in the W3C DTD */
+ public final static String tagTriX = "trix" ;
+ /* Element name in the HPL tech report */
+ public final static String tagTriXAlt = "TriX" ;
public final static String tagGraph = "graph" ;
public final static String tagTriple = "triple" ;
http://git-wip-us.apache.org/repos/asf/jena/blob/bcd7e400/jena-arq/src/main/java/org/apache/jena/riot/writer/StreamWriterTriX.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/StreamWriterTriX.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/StreamWriterTriX.java
index 61e105a..7ab2df6 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/writer/StreamWriterTriX.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/StreamWriterTriX.java
@@ -63,6 +63,7 @@ public class StreamWriterTriX implements StreamRDF {
@Override public void start() {
if ( depth == 0 ) {
StreamWriterTriX.startXML(out) ;
+ // Wirte using the element name from the W3C DTD.
StreamWriterTriX.startTag(out, TriX.tagTriX, "xmlns", TriX.NS) ;
out.println() ;
}
[7/9] jena git commit: JENA-1210: Call model.read in
AdapterFileManager.
Posted by an...@apache.org.
JENA-1210: Call model.read in AdapterFileManager.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9e976b64
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9e976b64
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9e976b64
Branch: refs/heads/master
Commit: 9e976b64b88f237ca9d82fe69b8b3de6ef31d434
Parents: 66f1126
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jul 24 20:08:31 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Jul 24 20:08:31 2016 +0100
----------------------------------------------------------------------
.../jena/riot/adapters/AdapterFileManager.java | 21 +++++++++-----------
.../jena/riot/adapters/TestFileManager.java | 19 ++++++++++++++++++
jena-arq/testing/RIOT/FileManager/data.ttl | 7 +++++++
jena-arq/testing/RIOT/FileManager/data1.ttl | 6 ++++++
4 files changed, 41 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/9e976b64/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java b/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
index b92e5f5..bdc3d44 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
@@ -24,7 +24,6 @@ import java.util.Iterator ;
import org.apache.jena.atlas.web.TypedInputStream ;
import org.apache.jena.rdf.model.Model ;
import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.riot.RDFLanguages ;
import org.apache.jena.riot.SysRIOT ;
import org.apache.jena.riot.system.stream.* ;
@@ -277,19 +276,17 @@ public class AdapterFileManager extends org.apache.jena.util.FileManager
log.debug("Map: " + filenameOrURI + " => " + mappedURI) ;
Lang lang =
- (syntax != null)
+ (syntax != null)
? RDFLanguages.nameToLang(syntax)
: RDFLanguages.resourceNameToLang(mappedURI, Lang.RDFXML) ;
-
- if ( false ) {
- RDFDataMgr.read(model, mappedURI, baseURI, lang);
- } else {
- if ( baseURI == null )
- baseURI = SysRIOT.chooseBaseIRI(filenameOrURI) ;
- try(TypedInputStream in = streamManager.openNoMapOrNull(mappedURI)) {
- // May be overridden by model implementation.
- model.read(in, baseURI, lang.getName()) ;
- }
+
+ // Not : RDFDataMgr.read(model, mappedURI, baseURI, lang);
+ // Allow model.read to be overridden e.g. by OntModel which does import processing.
+ if ( baseURI == null )
+ baseURI = SysRIOT.chooseBaseIRI(filenameOrURI) ;
+ try(TypedInputStream in = streamManager.openNoMapOrNull(mappedURI)) {
+ // May be overridden by model implementation.
+ model.read(in, baseURI, lang.getName()) ;
}
return model ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/9e976b64/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 9a4255c..a91431d 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
@@ -21,7 +21,11 @@ package org.apache.jena.riot.adapters;
import java.io.InputStream ;
import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.ontology.Individual ;
+import org.apache.jena.ontology.OntModel ;
+import org.apache.jena.ontology.OntModelSpec ;
import org.apache.jena.rdf.model.Model ;
+import org.apache.jena.rdf.model.ModelFactory ;
import org.apache.jena.riot.stream.TestLocationMapper ;
import org.apache.jena.shared.NotFoundException ;
import org.apache.jena.util.FileManager ;
@@ -130,6 +134,21 @@ public class TestFileManager extends BaseTest
} catch (NotFoundException ex) {}
}
+ @Test public void testFileManagerReadOntModel() {
+ OntModel model = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM) ;
+ FileManager.get().readModel(model, testingDir+"/data.ttl") ;
+ // Check
+ Individual ind = model.getIndividual("http://example.com/individual") ;
+ String t = ind.getOntClass().getURI() ;
+ assertEquals("http://example.com/T", t) ;
+ long c1 = model.size() ;
+
+ model.loadImports();
+
+ long c2 = model.size() ;
+ assertEquals(c1,c2) ;
+ }
+
@Test public void testLocationMappingURLtoFileOpen() {
LocationMapper locMap = new LocationMapper(TestLocationMapper.mapping) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/9e976b64/jena-arq/testing/RIOT/FileManager/data.ttl
----------------------------------------------------------------------
diff --git a/jena-arq/testing/RIOT/FileManager/data.ttl b/jena-arq/testing/RIOT/FileManager/data.ttl
new file mode 100644
index 0000000..c5604c7
--- /dev/null
+++ b/jena-arq/testing/RIOT/FileManager/data.ttl
@@ -0,0 +1,7 @@
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX : <http://example.com/>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
+
+<#> a owl:Ontology ;
+ owl:imports <data1.ttl>
+ .
http://git-wip-us.apache.org/repos/asf/jena/blob/9e976b64/jena-arq/testing/RIOT/FileManager/data1.ttl
----------------------------------------------------------------------
diff --git a/jena-arq/testing/RIOT/FileManager/data1.ttl b/jena-arq/testing/RIOT/FileManager/data1.ttl
new file mode 100644
index 0000000..f63ae02
--- /dev/null
+++ b/jena-arq/testing/RIOT/FileManager/data1.ttl
@@ -0,0 +1,6 @@
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX : <http://example.com/>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
+
+:T a owl:Class .
+:individual a :T .
[6/9] jena git commit: Misplaced start/finish - fix for streaming
oputput
Posted by an...@apache.org.
Misplaced start/finish - fix for streaming oputput
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/09278840
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/09278840
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/09278840
Branch: refs/heads/master
Commit: 0927884002ec8f42c198616eb9b1ee92cd8ba331
Parents: ea83371
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Jul 24 12:24:24 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Jul 24 12:24:24 2016 +0100
----------------------------------------------------------------------
jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/09278840/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java
index ef3404e..6a429ad 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java
@@ -112,7 +112,6 @@ public class ReaderTriX implements ReaderRIOT {
State state = OUTER ;
Node g = null ;
List<Node> terms = new ArrayList<>() ;
- output.start() ;
try {
while(parser.hasNext()) {
int event = parser.next() ;
@@ -229,7 +228,6 @@ public class ReaderTriX implements ReaderRIOT {
} catch (XMLStreamException ex) {
staxError(parser.getLocation(), "XML error: "+ex.getMessage()) ;
}
- output.finish() ;
}
private void add(Collection<Node> acc, Node node, int max, XMLStreamReader parser) {
[9/9] jena git commit: JENA-1211: Merge commit 'refs/pull/158/head'
of github.com:apache/jena
Posted by an...@apache.org.
JENA-1211: Merge commit 'refs/pull/158/head' of github.com:apache/jena
This closes #158.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/eee87d7c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/eee87d7c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/eee87d7c
Branch: refs/heads/master
Commit: eee87d7ce0058d58964da56e890f581d8ae96ac8
Parents: f98a0e9 0927884
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jul 25 09:30:34 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jul 25 09:30:34 2016 +0100
----------------------------------------------------------------------
.../org/apache/jena/riot/lang/ReaderTriX.java | 5 ++--
.../java/org/apache/jena/riot/lang/TriX.java | 24 ++++++++++++++++++--
.../jena/riot/writer/StreamWriterTriX.java | 1 +
.../apache/jena/riot/lang/TestLangNTriples.java | 1 -
.../apache/jena/riot/lang/TestLangRdfJson.java | 1 -
.../jena/riot/lang/TestParserFactory.java | 3 ---
.../apache/jena/riot/lang/TestTriXReader.java | 5 +++-
.../apache/jena/riot/lang/TestTurtleTerms.java | 1 -
jena-arq/testing/RIOT/Lang/TriX/trix-w3c-1.nq | 0
jena-arq/testing/RIOT/Lang/TriX/trix-w3c-1.trix | 2 ++
jena-arq/testing/RIOT/Lang/TriX/trix-w3c-2.nq | 1 +
jena-arq/testing/RIOT/Lang/TriX/trix-w3c-2.trix | 9 ++++++++
12 files changed, 42 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
[8/9] jena git commit: JENA-1210: Merge commit 'refs/pull/159/head'
of github.com:apache/jena
Posted by an...@apache.org.
JENA-1210: Merge commit 'refs/pull/159/head' of github.com:apache/jena
This closes #159.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f98a0e9d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f98a0e9d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f98a0e9d
Branch: refs/heads/master
Commit: f98a0e9de4656d06c8a5914529db24c5dfd45ad7
Parents: 415d19b 9e976b6
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jul 25 09:24:19 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jul 25 09:24:19 2016 +0100
----------------------------------------------------------------------
.../jena/riot/adapters/AdapterFileManager.java | 18 +++++++++++++-----
.../jena/riot/adapters/TestFileManager.java | 19 +++++++++++++++++++
jena-arq/testing/RIOT/FileManager/data.ttl | 7 +++++++
jena-arq/testing/RIOT/FileManager/data1.ttl | 6 ++++++
4 files changed, 45 insertions(+), 5 deletions(-)
----------------------------------------------------------------------