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/17 12:34:19 UTC
[2/7] jena git commit: Implement Lang:rdf/null for reading and
writing.
Implement Lang:rdf/null for reading and writing.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/32479232
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/32479232
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/32479232
Branch: refs/heads/master
Commit: 324792325e7ba589f08bbc68a5b5d08e2c39190d
Parents: 8662d41
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Oct 17 10:45:42 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Oct 17 10:45:42 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/riot/RDFDataMgr.java | 9 ++--
.../java/org/apache/jena/riot/RDFLanguages.java | 2 +-
.../org/apache/jena/riot/RDFParserRegistry.java | 17 +++++--
.../org/apache/jena/riot/lang/LangNull.java | 49 --------------------
4 files changed, 19 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/32479232/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 d48fb0c..844169d 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
@@ -36,7 +36,6 @@ import org.apache.jena.rdf.model.ModelFactory ;
import org.apache.jena.riot.lang.PipedQuadsStream ;
import org.apache.jena.riot.lang.PipedRDFIterator ;
import org.apache.jena.riot.lang.PipedTriplesStream ;
-import org.apache.jena.riot.lang.RiotParsers ;
import org.apache.jena.riot.system.RiotLib ;
import org.apache.jena.riot.system.StreamRDF ;
import org.apache.jena.riot.system.StreamRDFLib ;
@@ -1218,11 +1217,13 @@ public class RDFDataMgr
* @param baseIRI Base IRI
* @return Iterator over the triples
*/
+ @SuppressWarnings("deprecation")
public static Iterator<Triple> createIteratorTriples(InputStream input, Lang lang, String baseIRI)
{
// Special case N-Triples, because the RIOT reader has a pull interface
if ( RDFLanguages.sameLang(RDFLanguages.NTRIPLES, lang) )
- return new IteratorResourceClosing<>(RiotParsers.createParserNTriples(input, null), input);
+ // Should be only use. Migrate the necessary code here when removing deprecated code.
+ return new IteratorResourceClosing<>(org.apache.jena.riot.lang.RiotParsers.createParserNTriples(input, null), input);
// Otherwise, we have to spin up a thread to deal with it
PipedRDFIterator<Triple> it = new PipedRDFIterator<>();
PipedTriplesStream out = new PipedTriplesStream(it);
@@ -1238,11 +1239,13 @@ public class RDFDataMgr
* @param baseIRI Base IRI
* @return Iterator over the quads
*/
+ @SuppressWarnings("deprecation")
public static Iterator<Quad> createIteratorQuads(InputStream input, Lang lang, String baseIRI)
{
// Special case N-Quads, because the RIOT reader has a pull interface
if ( RDFLanguages.sameLang(RDFLanguages.NQUADS, lang) )
- return new IteratorResourceClosing<>(RiotParsers.createParserNQuads(input, null), input);
+ // Should be only use. Migrate the necessary code here when removing deprecated code.
+ return new IteratorResourceClosing<>(org.apache.jena.riot.lang.RiotParsers.createParserNQuads(input, null), input);
// Otherwise, we have to spin up a thread to deal with it
final PipedRDFIterator<Quad> it = new PipedRDFIterator<>();
final PipedQuadsStream out = new PipedQuadsStream(it);
http://git-wip-us.apache.org/repos/asf/jena/blob/32479232/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
index 9764aa5..0ab7d6f 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
@@ -147,7 +147,7 @@ public class RDFLanguages
/** The "null" language */
public static final Lang RDFNULL = LangBuilder.create("rdf/null", "null/rdf")
- .addAltNames("NULL", "null")
+ .addAltNames("NULL", "null")
.build() ;
// ---- Central registry
http://git-wip-us.apache.org/repos/asf/jena/blob/32479232/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java
index e88d14a..2bb6f5d 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java
@@ -28,10 +28,7 @@ import java.util.Set ;
import org.apache.jena.atlas.lib.DS ;
import org.apache.jena.atlas.lib.InternalErrorException ;
import org.apache.jena.atlas.web.ContentType ;
-import org.apache.jena.riot.lang.JsonLDReader ;
-import org.apache.jena.riot.lang.LangRIOT ;
-import org.apache.jena.riot.lang.ReaderTriX ;
-import org.apache.jena.riot.lang.RiotParsers ;
+import org.apache.jena.riot.lang.* ;
import org.apache.jena.riot.system.ErrorHandler ;
import org.apache.jena.riot.system.ErrorHandlerFactory ;
import org.apache.jena.riot.system.ParserProfile ;
@@ -66,7 +63,8 @@ public class RDFParserRegistry
private static ReaderRIOTFactory parserFactoryJsonLD = new ReaderRIOTFactoryJSONLD() ;
private static ReaderRIOTFactory parserFactoryThrift = new ReaderRIOTFactoryThrift() ;
private static ReaderRIOTFactory parserFactoryTriX = new ReaderRIOTFactoryTriX() ;
-
+ private static ReaderRIOTFactory parserFactoryRDFNULL = new ReaderRIOTFactoryRDFNULL() ;
+
private static boolean initialized = false ;
static { init() ; }
public static void init()
@@ -96,6 +94,8 @@ public class RDFParserRegistry
registerLangQuads(TRIG, parserFactory) ;
registerLangQuads(THRIFT, parserFactoryThrift) ;
registerLangQuads(TRIX, parserFactoryTriX) ;
+
+ registerLangQuads(RDFNULL, parserFactoryRDFNULL) ;
}
/** Register a language and it's parser factory.
@@ -244,5 +244,12 @@ public class RDFParserRegistry
return new ReaderTriX() ;
}
}
+
+ private static class ReaderRIOTFactoryRDFNULL implements ReaderRIOTFactory {
+ @Override
+ public ReaderRIOT create(Lang language) {
+ return new ReaderRDFNULL() ;
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/32479232/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNull.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNull.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNull.java
deleted file mode 100644
index a47c426..0000000
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNull.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.riot.lang;
-
-import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.system.ParserProfile ;
-
-/** Dummy language */
-public class LangNull implements LangRIOT
-{
-
- @Override
- public ParserProfile getProfile()
- {
- return null ;
- }
-
- @Override
- public void setProfile(ParserProfile profile)
- {}
-
- @Override
- public void parse()
- {}
-
- @Override
- public Lang getLang()
- {
- return Lang.RDFNULL ;
- }
-
-}
-