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 2012/12/26 23:50:24 UTC
svn commit: r1426081 -
/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
Author: andy
Date: Wed Dec 26 22:50:24 2012
New Revision: 1426081
URL: http://svn.apache.org/viewvc?rev=1426081&view=rev
Log:
Reorder statics in file; preferred first.
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java?rev=1426081&r1=1426080&r2=1426081&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java Wed Dec 26 22:50:24 2012
@@ -48,6 +48,82 @@ import com.hp.hpl.jena.sparql.core.Quad
*/
public class RiotReader
{
+ /** Parse a file, sending output to a RDFParserOutput sink.
+ * Must be in a triples syntax.
+ * @param filename
+ * @param dest Where to send the triples from the parser.
+ */
+ public static void parse(String filename, RDFParserOutput dest)
+ { parse(filename, null, null, dest) ; }
+
+ /** Parse a file, sending output to a RDFParserOutput sink.
+ * Must be in a triples syntax.
+ * @param filename
+ * @param lang Language, or null for "guess from URL" (e.g. file extension)
+ * @param baseIRI Base IRI, or null for based on input filename
+ * @param dest Where to send the triples from the parser.
+ */
+ public static void parse(String filename, Lang lang, String baseIRI, RDFParserOutput dest)
+ {
+ if ( lang == null )
+ lang = filenameToLang(filename, NTriples) ;
+
+ InputStream in = IO.openFile(filename) ;
+ String base = chooseBaseIRI(baseIRI, filename) ;
+ parse(in, lang, base, dest) ;
+ IO.close(in) ;
+ }
+
+ /** Parse an InputStream, using RDFParserOutput as the destination for the parser output.
+ * @param in Source for bytes to parse.
+ * @param lang Language.
+ * @param baseIRI Base IRI.
+ * @param dest Where to send the triples from the parser.
+ */
+ public static void parse(InputStream in, Lang lang, String baseIRI, RDFParserOutput dest)
+ {
+ LangRIOT parser = RiotReader.createParser(in, lang, baseIRI, dest) ;
+ parser.parse() ;
+ }
+
+ // -------- Parsers
+
+ /** Create a parser */
+ public static LangRIOT createParser(InputStream input, Lang lang, String baseIRI, RDFParserOutput dest)
+ {
+ if ( lang == RDFXML )
+ {
+ if ( baseIRI != null )
+ baseIRI = IRIResolver.resolveString(baseIRI) ;
+ return LangRDFXML.create(input, baseIRI, baseIRI, ErrorHandlerFactory.getDefaultErrorHandler(), dest) ;
+ }
+ Tokenizer tokenizer = ( lang == RDFJSON ) ?
+ new TokenizerJSON(PeekReader.makeUTF8(input)) :
+ TokenizerFactory.makeTokenizerUTF8(input) ;
+ return createParser(tokenizer, lang, baseIRI, dest) ;
+ }
+
+ /** Create a parser */
+ public static LangRIOT createParser(Tokenizer tokenizer, Lang lang, String baseIRI, RDFParserOutput dest)
+ {
+ if ( RDFLanguages.sameLang(RDFXML, lang) )
+ throw new RiotException("Not possible - can't parse RDF/XML from a RIOT token stream") ;
+ if ( RDFLanguages.sameLang(Turtle, lang) || RDFLanguages.sameLang(N3, lang) )
+ return createParserTurtle(tokenizer, baseIRI, dest) ;
+ if ( RDFLanguages.sameLang(NTriples, lang) )
+ return createParserNTriples(tokenizer, dest) ;
+ if ( RDFLanguages.sameLang(RDFJSON, lang) )
+ // But it must be a JSON tokenizer ...
+ return createParserRdfJson(tokenizer, dest) ;
+
+ if ( RDFLanguages.sameLang(NQuads, lang) )
+ return createParserNQuads(tokenizer, dest) ;
+ if ( RDFLanguages.sameLang(TriG, lang) )
+ return createParserTriG(tokenizer, baseIRI, dest) ;
+
+ return null ;
+ }
+
/** Parse a file, sending triples to a sink.
* Must be in a triples syntax.
* @param filename
@@ -120,82 +196,10 @@ public class RiotReader
parse(in, lang, baseIRI, dest) ;
}
- /** Parse a file, sending output to a RDFParserOutput sink.
- * Must be in a triples syntax.
- * @param filename
- * @param dest Where to send the triples from the parser.
- */
- public static void parse(String filename, RDFParserOutput dest)
- { parse(filename, null, null, dest) ; }
- /** Parse a file, sending output to a RDFParserOutput sink.
- * Must be in a triples syntax.
- * @param filename
- * @param lang Language, or null for "guess from URL" (e.g. file extension)
- * @param baseIRI Base IRI, or null for based on input filename
- * @param dest Where to send the triples from the parser.
- */
- public static void parse(String filename, Lang lang, String baseIRI, RDFParserOutput dest)
- {
- if ( lang == null )
- lang = filenameToLang(filename, NTriples) ;
-
- InputStream in = IO.openFile(filename) ;
- String base = chooseBaseIRI(baseIRI, filename) ;
- parse(in, lang, base, dest) ;
- IO.close(in) ;
- }
-
- /** Parse an InputStream, using RDFParserOutput as the destination for the parser output.
- * @param in Source for bytes to parse.
- * @param lang Language.
- * @param baseIRI Base IRI.
- * @param dest Where to send the triples from the parser.
- */
- public static void parse(InputStream in, Lang lang, String baseIRI, RDFParserOutput dest)
- {
- LangRIOT parser = RiotReader.createParser(in, lang, baseIRI, dest) ;
- parser.parse() ;
- }
// -------- Parsers
- /** Create a parser */
- public static LangRIOT createParser(InputStream input, Lang lang, String baseIRI, RDFParserOutput dest)
- {
- if ( lang == RDFXML )
- {
- if ( baseIRI != null )
- baseIRI = IRIResolver.resolveString(baseIRI) ;
- return LangRDFXML.create(input, baseIRI, baseIRI, ErrorHandlerFactory.getDefaultErrorHandler(), dest) ;
- }
- Tokenizer tokenizer = ( lang == RDFJSON ) ?
- new TokenizerJSON(PeekReader.makeUTF8(input)) :
- TokenizerFactory.makeTokenizerUTF8(input) ;
- return createParser(tokenizer, lang, baseIRI, dest) ;
- }
- /** Create a parser */
- public static LangRIOT createParser(Tokenizer tokenizer, Lang lang, String baseIRI, RDFParserOutput dest)
- {
- if ( RDFLanguages.sameLang(RDFXML, lang) )
- throw new RiotException("Not possible - can't parse RDF/XML from a RIOT token stream") ;
- if ( RDFLanguages.sameLang(Turtle, lang) || RDFLanguages.sameLang(N3, lang) )
- return createParserTurtle(tokenizer, baseIRI, dest) ;
- if ( RDFLanguages.sameLang(NTriples, lang) )
- return createParserNTriples(tokenizer, dest) ;
- if ( RDFLanguages.sameLang(RDFJSON, lang) )
- // But it must be a JSON tokenizer ...
- return createParserRdfJson(tokenizer, dest) ;
-
- if ( RDFLanguages.sameLang(NQuads, lang) )
- return createParserNQuads(tokenizer, dest) ;
- if ( RDFLanguages.sameLang(TriG, lang) )
- return createParserTriG(tokenizer, baseIRI, dest) ;
-
- return null ;
- }
-
-
// TODO create a Tokenizer version of this method
public static Iterator<Triple> createIteratorTriples(InputStream input, Lang lang, String baseIRI)
{