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/30 21:17:23 UTC
svn commit: r1426986 - in /jena:
Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/
trunk/jena-arq/src-examples/arq/examples/riot/
trunk/jena-arq/src/main/java/org/apache/jena/riot/
trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/ tru...
Author: andy
Date: Sun Dec 30 20:17:22 2012
New Revision: 1426986
URL: http://svn.apache.org/viewvc?rev=1426986&view=rev
Log:
Rename preferred language constants to be uppercase.
Move out adapter classes from main RIOT package.
Added:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderFactoryRIOT.java
- copied, changed from r1426206, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderFactoryRIOT.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java
- copied, changed from r1425325, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderRIOT.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_ARP.java
- copied, changed from r1422690, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderRIOT_ARP.java
Removed:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderFactoryRIOT.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderRIOT.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderRIOT_ARP.java
Modified:
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TriGWriter.java
jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_1.java
jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_2.java
jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_3.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/SysRIOT.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNQuads.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNTriples.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTriG.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtle.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/Lang.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java
jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java
jena/trunk/jena-arq/src/main/java/riotcmd/infer.java
jena/trunk/jena-arq/src/main/java/riotcmd/nquads.java
jena/trunk/jena-arq/src/main/java/riotcmd/ntriples.java
jena/trunk/jena-arq/src/main/java/riotcmd/riot.java
jena/trunk/jena-arq/src/main/java/riotcmd/trig.java
jena/trunk/jena-arq/src/main/java/riotcmd/turtle.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLang.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTurtle.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkLoader.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java
jena/trunk/jena-tdb/src/main/java/tdb/tdbloader.java
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TriGWriter.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TriGWriter.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TriGWriter.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_writer/TriGWriter.java Sun Dec 30 20:17:22 2012
@@ -48,7 +48,7 @@ public class TriGWriter
Tokenizer tokenizer = TokenizerFactory.makeTokenizerUTF8(new FileInputStream("D.trig")) ;
StreamRDF sink = StreamRDFLib.dataset(dsg) ;
- RiotReader.createParser(tokenizer, RDFLanguages.TriG, null, sink).parse() ;
+ RiotReader.createParser(tokenizer, RDFLanguages.TRIG, null, sink).parse() ;
write(System.out, DatasetFactory.create(dsg)) ;
}
Modified: jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_1.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_1.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_1.java (original)
+++ jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_1.java Sun Dec 30 20:17:22 2012
@@ -55,6 +55,6 @@ public class ExRIOT_1
// Read some data but also give a hint for the synatx if it is not
// discovered by inspectying the file or by HTTP content negotiation.
- RDFDataMgr.read(m2, "some-more-data.out", RDFLanguages.Turtle) ;
+ RDFDataMgr.read(m2, "some-more-data.out", RDFLanguages.TURTLE) ;
}
}
Modified: jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_2.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_2.java (original)
+++ jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_2.java Sun Dec 30 20:17:22 2012
@@ -50,7 +50,7 @@ public class ExRIOT_2
// RIOT controls the conversion from bytes to java chars.
InputStream in = new FileInputStream("data.trig") ;
- RiotReader.parse(in, RDFLanguages.TriG, "http://example/base", noWhere) ;
+ RiotReader.parse(in, RDFLanguages.TRIG, "http://example/base", noWhere) ;
// --- Or create a parser and do the parsing as separate steps.
String baseURI = "http://example/base" ;
@@ -58,7 +58,7 @@ public class ExRIOT_2
// It is always better to use an InputStream, rather than a Java Reader.
// The parsers will do the necessary character set conversion.
in = new FileInputStream("data.trig") ;
- LangRIOT parser = RiotReader.createParser(in, RDFLanguages.TriG, "http://example/base", noWhere) ;
+ LangRIOT parser = RiotReader.createParser(in, RDFLanguages.TRIG, "http://example/base", noWhere) ;
// Parser to first error or warning.
ErrorHandler errHandler = ErrorHandlerFactory.errorHandlerStrict ;
Modified: jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_3.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_3.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_3.java (original)
+++ jena/trunk/jena-arq/src-examples/arq/examples/riot/ExRIOT_3.java Sun Dec 30 20:17:22 2012
@@ -18,7 +18,7 @@
package arq.examples.riot;
-import static org.apache.jena.riot.RDFLanguages.TriG ;
+import static org.apache.jena.riot.RDFLanguages.TRIG ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.riot.RIOT ;
@@ -46,6 +46,6 @@ public class ExRIOT_3
Dataset ds2 = DatasetFactory.createMem() ;
// read in data, indicating the syntax in case the remote end does not
// correctly provide the HTTP content type.
- RDFDataMgr.read(ds2, "http://host/data2.unknown", TriG) ;
+ RDFDataMgr.read(ds2, "http://host/data2.unknown", TRIG) ;
}
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java Sun Dec 30 20:17:22 2012
@@ -20,6 +20,7 @@ package org.apache.jena.riot;
import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.atlas.web.TypedInputStream ;
+import org.apache.jena.riot.adapters.RDFReaderRIOT ;
import org.apache.jena.riot.stream.StreamManager ;
import org.apache.jena.riot.system.JenaWriterRdfJson ;
import org.slf4j.Logger ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java Sun Dec 30 20:17:22 2012
@@ -29,6 +29,8 @@ import org.apache.jena.atlas.web.Content
* a content type, some alternative content types,
* and a list of associated file extensions.
* Names, content types and file extensions must be unique to one language.
+ * To create a Lang constant, use {@link LangBuilder} and
+ * register with {@link RDFLanguages}.
*/
public class Lang
{
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java Sun Dec 30 20:17:22 2012
@@ -66,7 +66,7 @@ public class RDFLanguages
.build() ;
/** Turtle */
- public static final Lang Turtle = LangBuilder.create(strLangTurtle, contentTypeTurtle)
+ public static final Lang TURTLE = LangBuilder.create(strLangTurtle, contentTypeTurtle)
.addAltNames("TTL")
.addAltContentTypes(contentTypeTurtleAlt1, contentTypeTurtleAlt2)
.addFileExtensions("ttl")
@@ -79,7 +79,7 @@ public class RDFLanguages
.build() ;
/** N-Triples */
- public static final Lang NTriples = LangBuilder.create(strLangNTriples, contentTypeNTriples)
+ public static final Lang NTRIPLES = LangBuilder.create(strLangNTriples, contentTypeNTriples)
.addAltNames("NT", "NTriples", "NTriple", "N-Triple", "N-Triples")
.addAltContentTypes(contentTypeNTriplesAlt)
.addFileExtensions("nt")
@@ -92,13 +92,13 @@ public class RDFLanguages
.build() ;
/** TriG */
- public static final Lang TriG = LangBuilder.create(strLangTriG, contentTypeTriG)
+ public static final Lang TRIG = LangBuilder.create(strLangTriG, contentTypeTriG)
.addAltContentTypes(contentTypeTriGAlt1, contentTypeTriGAlt2)
.addFileExtensions("trig")
.build() ;
/** N-Quads */
- public static final Lang NQuads = LangBuilder.create(strLangNQuads, contentTypeNQuads)
+ public static final Lang NQUADS = LangBuilder.create(strLangNQuads, contentTypeNQuads)
.addAltNames("NQ", "NQuads", "NQuad", "N-Quad", "N-Quads")
.addAltContentTypes(contentTypeNQuadsAlt1, contentTypeNQuadsAlt2)
.addFileExtensions("nq")
@@ -127,14 +127,12 @@ public class RDFLanguages
initialized = true ;
initStandard() ;
Lang.RDFXML = RDFLanguages.RDFXML ;
- Lang.NTRIPLES = RDFLanguages.NTriples ;
+ Lang.NTRIPLES = RDFLanguages.NTRIPLES ;
Lang.N3 = RDFLanguages.N3 ;
- Lang.TURTLE = RDFLanguages.Turtle ;
+ Lang.TURTLE = RDFLanguages.TURTLE ;
Lang.RDFJSON = RDFLanguages.RDFJSON ;
- Lang.NQUADS = RDFLanguages.NQuads ;
- Lang.TRIG = RDFLanguages.TriG ;
-
-
+ Lang.NQUADS = RDFLanguages.NQUADS ;
+ Lang.TRIG = RDFLanguages.TRIG ;
}
// ----------------------
@@ -142,11 +140,12 @@ public class RDFLanguages
private static void initStandard()
{
register(RDFXML) ;
- register(Turtle) ;
- register(NTriples) ;
+ register(TURTLE) ;
+ register(N3) ;
+ register(NTRIPLES) ;
register(RDFJSON) ;
- register(TriG) ;
- register(NQuads) ;
+ register(TRIG) ;
+ register(NQUADS) ;
}
/** Register a language.
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java Sun Dec 30 20:17:22 2012
@@ -18,12 +18,13 @@
package org.apache.jena.riot;
-import static org.apache.jena.riot.RDFLanguages.NQuads ;
-import static org.apache.jena.riot.RDFLanguages.NTriples ;
+import static org.apache.jena.riot.RDFLanguages.NQUADS ;
+import static org.apache.jena.riot.RDFLanguages.NTRIPLES ;
import static org.apache.jena.riot.RDFLanguages.RDFJSON ;
import static org.apache.jena.riot.RDFLanguages.RDFXML ;
-import static org.apache.jena.riot.RDFLanguages.TriG ;
-import static org.apache.jena.riot.RDFLanguages.Turtle ;
+import static org.apache.jena.riot.RDFLanguages.TRIG ;
+import static org.apache.jena.riot.RDFLanguages.N3 ;
+import static org.apache.jena.riot.RDFLanguages.TURTLE ;
import java.io.InputStream ;
import java.util.Map ;
@@ -80,33 +81,34 @@ public class RDFParserRegistry
registerShortNameForLang("RDFXML", RDFXML) ;
registerShortNameForLang("RDF/XML-ABBREV", RDFXML) ;
- registerShortNameForLang("N-TRIPLE", NTriples) ;
- registerShortNameForLang("N-TRIPLES", NTriples) ;
- registerShortNameForLang("NTRIPLE", NTriples) ;
- registerShortNameForLang("NTRIPLES", NTriples) ;
- registerShortNameForLang("NT", NTriples) ;
+ registerShortNameForLang("N-TRIPLE", NTRIPLES) ;
+ registerShortNameForLang("N-TRIPLES", NTRIPLES) ;
+ registerShortNameForLang("NTRIPLE", NTRIPLES) ;
+ registerShortNameForLang("NTRIPLES", NTRIPLES) ;
+ registerShortNameForLang("NT", NTRIPLES) ;
- registerShortNameForLang("TURTLE", Turtle) ;
- registerShortNameForLang("TTL", Turtle) ;
+ registerShortNameForLang("TURTLE", TURTLE) ;
+ registerShortNameForLang("TTL", TURTLE) ;
registerShortNameForLang("RDF/JSON", RDFJSON) ;
registerShortNameForLang("RDFJSON", RDFJSON) ;
- registerShortNameForLang("N-QUADS", NQuads) ;
- registerShortNameForLang("NQUADS", NQuads) ;
- registerShortNameForLang("N-QUAD", NQuads) ;
- registerShortNameForLang("NQUAD", NQuads) ;
- registerShortNameForLang("NQ", NQuads) ;
+ registerShortNameForLang("N-QUADS", NQUADS) ;
+ registerShortNameForLang("NQUADS", NQUADS) ;
+ registerShortNameForLang("N-QUAD", NQUADS) ;
+ registerShortNameForLang("NQUAD", NQUADS) ;
+ registerShortNameForLang("NQ", NQUADS) ;
- registerShortNameForLang("TRIG", TriG) ;
+ registerShortNameForLang("TRIG", TRIG) ;
registerLangTriples(RDFXML, parserFactory) ;
- registerLangTriples(NTriples, parserFactory) ;
- registerLangTriples(Turtle, parserFactory) ;
+ registerLangTriples(NTRIPLES, parserFactory) ;
+ registerLangTriples(N3, parserFactory) ;
+ registerLangTriples(TURTLE, parserFactory) ;
registerLangTriples(RDFJSON, parserFactory) ;
- registerLangQuads(NQuads, parserFactory) ;
- registerLangQuads(TriG, parserFactory) ;
+ registerLangQuads(NQUADS, parserFactory) ;
+ registerLangQuads(TRIG, parserFactory) ;
}
/** Register a Jena IO name */
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=1426986&r1=1426985&r2=1426986&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 Sun Dec 30 20:17:22 2012
@@ -18,7 +18,14 @@
package org.apache.jena.riot;
-import static org.apache.jena.riot.RDFLanguages.* ;
+import static org.apache.jena.riot.RDFLanguages.N3 ;
+import static org.apache.jena.riot.RDFLanguages.NQUADS ;
+import static org.apache.jena.riot.RDFLanguages.NTRIPLES ;
+import static org.apache.jena.riot.RDFLanguages.RDFJSON ;
+import static org.apache.jena.riot.RDFLanguages.RDFXML ;
+import static org.apache.jena.riot.RDFLanguages.TRIG ;
+import static org.apache.jena.riot.RDFLanguages.TURTLE ;
+import static org.apache.jena.riot.RDFLanguages.filenameToLang ;
import java.io.InputStream ;
import java.util.Iterator ;
@@ -27,7 +34,6 @@ import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.io.PeekReader ;
import org.apache.jena.atlas.iterator.IteratorResourceClosing ;
import org.apache.jena.atlas.json.io.parser.TokenizerJSON ;
-import org.apache.jena.atlas.lib.IRILib ;
import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.riot.lang.* ;
import org.apache.jena.riot.system.* ;
@@ -41,8 +47,12 @@ import com.hp.hpl.jena.sparql.core.Quad
/** Operations to access RIOT parsers and send the output to
* a ParserOutput (triples or quads as appropriate).
- * Operations to send to a sink (special case of a ParserOutput).
- * @see RDFDataMgr for reading from a location, including web access and content negotation.
+ * This class is probably not what you want to use.
+ * It is public to give maximum compatibility.
+ * Please consider it likely to move into org.apache.jena.riot.system.
+ *
+ * @see RDFDataMgr for reading from a location, including web access and content negotation.
+ *
*/
public class RiotReader
{
@@ -75,10 +85,10 @@ public class RiotReader
public static void parse(String filename, Lang lang, String baseIRI, StreamRDF dest)
{
if ( lang == null )
- lang = filenameToLang(filename, NTriples) ;
+ lang = filenameToLang(filename, NTRIPLES) ;
InputStream in = IO.openFile(filename) ;
- String base = chooseBaseIRI(baseIRI, filename) ;
+ String base = SysRIOT.chooseBaseIRI(baseIRI, filename) ;
parse(in, lang, base, dest) ;
IO.close(in) ;
}
@@ -127,17 +137,17 @@ public class RiotReader
{
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) )
+ if ( RDFLanguages.sameLang(TURTLE, lang) || RDFLanguages.sameLang(N3, lang) )
return createParserTurtle(tokenizer, baseIRI, dest) ;
- if ( RDFLanguages.sameLang(NTriples, lang) )
+ 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) )
+ if ( RDFLanguages.sameLang(NQUADS, lang) )
return createParserNQuads(tokenizer, dest) ;
- if ( RDFLanguages.sameLang(TriG, lang) )
+ if ( RDFLanguages.sameLang(TRIG, lang) )
return createParserTriG(tokenizer, baseIRI, dest) ;
return null ;
@@ -219,7 +229,7 @@ public class RiotReader
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) )
+ if ( RDFLanguages.sameLang(RDFLanguages.NTRIPLES, lang) )
{
return new IteratorResourceClosing<Triple>(createParserNTriples(input, null), input);
}
@@ -236,7 +246,7 @@ public class RiotReader
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.NTriples, lang) )
+ if ( RDFLanguages.sameLang(RDFLanguages.NTRIPLES, lang) )
{
return new IteratorResourceClosing<Quad>(createParserNQuads(input, null), input);
}
@@ -259,7 +269,7 @@ public class RiotReader
/** Create a parser for Turtle, with default behaviour */
public static LangTurtle createParserTurtle(Tokenizer tokenizer, String baseIRI, StreamRDF dest)
{
- LangTurtle parser = new LangTurtle(tokenizer, RiotLib.profile(RDFLanguages.Turtle, baseIRI), dest) ;
+ LangTurtle parser = new LangTurtle(tokenizer, RiotLib.profile(RDFLanguages.TURTLE, baseIRI), dest) ;
return parser ;
}
@@ -267,7 +277,7 @@ public class RiotReader
public static LangRDFXML createParserRDFXML(InputStream input, String baseIRI, StreamRDF dest)
{
if ( baseIRI == null )
- baseIRI = chooseBaseIRI() ;
+ baseIRI = SysRIOT.chooseBaseIRI() ;
LangRDFXML parser = LangRDFXML.create(input, baseIRI, baseIRI, ErrorHandlerFactory.getDefaultErrorHandler(), dest) ;
return parser ;
}
@@ -295,7 +305,7 @@ public class RiotReader
/** Create a parser for TriG, with default behaviour */
public static LangTriG createParserTriG(Tokenizer tokenizer, String baseIRI, StreamRDF dest)
{
- LangTriG parser = new LangTriG(tokenizer, RiotLib.profile(RDFLanguages.TriG, baseIRI), dest) ;
+ LangTriG parser = new LangTriG(tokenizer, RiotLib.profile(RDFLanguages.TRIG, baseIRI), dest) ;
return parser ;
}
@@ -309,7 +319,7 @@ public class RiotReader
/** Create a parser for N-Triples, with default behaviour */
public static LangNTriples createParserNTriples(Tokenizer tokenizer, StreamRDF dest)
{
- LangNTriples parser = new LangNTriples(tokenizer, RiotLib.profile(RDFLanguages.NTriples, null), dest) ;
+ LangNTriples parser = new LangNTriples(tokenizer, RiotLib.profile(RDFLanguages.NTRIPLES, null), dest) ;
return parser ;
}
@@ -323,22 +333,7 @@ public class RiotReader
/** Create a parser for NQuads, with default behaviour */
public static LangNQuads createParserNQuads(Tokenizer tokenizer, StreamRDF dest)
{
- LangNQuads parser = new LangNQuads(tokenizer, RiotLib.profile(RDFLanguages.NQuads, null), dest) ;
+ LangNQuads parser = new LangNQuads(tokenizer, RiotLib.profile(RDFLanguages.NQUADS, null), dest) ;
return parser ;
}
-
- public static String chooseBaseIRI()
- {
- return IRIResolver.chooseBaseURI().toString() ;
- }
-
- public static String chooseBaseIRI(String baseIRI, String filename)
- {
- if ( baseIRI != null )
- return baseIRI ;
- if ( filename == null || filename.equals("-") )
- return "http://localhost/stdin/" ;
- String x = IRILib.filenameToIRI(filename) ;
- return x ;
- }
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/SysRIOT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/SysRIOT.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/SysRIOT.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/SysRIOT.java Sun Dec 30 20:17:22 2012
@@ -18,6 +18,8 @@
package org.apache.jena.riot;
+import org.apache.jena.atlas.lib.IRILib ;
+import org.apache.jena.riot.system.IRIResolver ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -48,15 +50,26 @@ public class SysRIOT
return riotLogger ;
}
-// public static void wireIntoJena()
-// {
-// RIOT.init() ;
-// IO_Jena.wireIntoJena() ;
-// }
-//
-// public static void resetJenaReaders()
-// {
-// IO_Jena.resetJenaReaders() ;
-// }
+ public static String chooseBaseIRI()
+ {
+ return IRIResolver.chooseBaseURI().toString() ;
+ }
+
+ public static String filename2baseIRI(String filename)
+ {
+ if ( filename == null || filename.equals("-") )
+ return "http://localhost/stdin/" ;
+ String x = IRILib.filenameToIRI(filename) ;
+ return x ;
+ }
+ /** Choose base IRI, from a given one and a filename.
+ * Prefer the given base ; turn any filename into an IRI.
+ */
+ public static String chooseBaseIRI(String baseIRI, String filename)
+ {
+ if ( baseIRI != null )
+ return baseIRI ;
+ return filename2baseIRI(filename) ;
+ }
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebContent.java Sun Dec 30 20:17:22 2012
@@ -108,19 +108,19 @@ public class WebContent
mapContentTypeToLang.put(contentTypeN3, RDFLanguages.N3);
mapContentTypeToLang.put(contentTypeN3Alt1, RDFLanguages.N3);
mapContentTypeToLang.put(contentTypeN3Alt2, RDFLanguages.N3);
- mapContentTypeToLang.put(contentTypeTurtle, RDFLanguages.Turtle) ;
- mapContentTypeToLang.put(contentTypeTurtleAlt1, RDFLanguages.Turtle) ;
- mapContentTypeToLang.put(contentTypeTurtleAlt2, RDFLanguages.Turtle) ;
- mapContentTypeToLang.put(contentTypeNTriples, RDFLanguages.NTriples) ; // text/plain
- mapContentTypeToLang.put(contentTypeNTriplesAlt, RDFLanguages.NTriples) ;
+ mapContentTypeToLang.put(contentTypeTurtle, RDFLanguages.TURTLE) ;
+ mapContentTypeToLang.put(contentTypeTurtleAlt1, RDFLanguages.TURTLE) ;
+ mapContentTypeToLang.put(contentTypeTurtleAlt2, RDFLanguages.TURTLE) ;
+ mapContentTypeToLang.put(contentTypeNTriples, RDFLanguages.NTRIPLES) ; // text/plain
+ mapContentTypeToLang.put(contentTypeNTriplesAlt, RDFLanguages.NTRIPLES) ;
mapContentTypeToLang.put(contentTypeRdfJson, RDFLanguages.RDFJSON) ;
- mapContentTypeToLang.put(contentTypeNQuads, RDFLanguages.NQuads) ;
- mapContentTypeToLang.put(contentTypeNQuadsAlt1, RDFLanguages.NQuads) ;
- mapContentTypeToLang.put(contentTypeNQuadsAlt2, RDFLanguages.NQuads) ;
- mapContentTypeToLang.put(contentTypeTriG, RDFLanguages.TriG) ;
- mapContentTypeToLang.put(contentTypeTriGAlt1, RDFLanguages.TriG) ;
- mapContentTypeToLang.put(contentTypeTriGAlt2, RDFLanguages.TriG) ;
+ mapContentTypeToLang.put(contentTypeNQuads, RDFLanguages.NQUADS) ;
+ mapContentTypeToLang.put(contentTypeNQuadsAlt1, RDFLanguages.NQUADS) ;
+ mapContentTypeToLang.put(contentTypeNQuadsAlt2, RDFLanguages.NQUADS) ;
+ mapContentTypeToLang.put(contentTypeTriG, RDFLanguages.TRIG) ;
+ mapContentTypeToLang.put(contentTypeTriGAlt1, RDFLanguages.TRIG) ;
+ mapContentTypeToLang.put(contentTypeTriGAlt2, RDFLanguages.TRIG) ;
}
@@ -141,13 +141,13 @@ public class WebContent
private static Map<Lang, String> mapLangToContentType = new HashMap<Lang, String>() ;
static {
mapLangToContentType.put(RDFLanguages.N3, contentTypeN3) ;
- mapLangToContentType.put(RDFLanguages.Turtle, contentTypeTurtle) ;
- mapLangToContentType.put(RDFLanguages.NTriples, contentTypeNTriples) ;
+ mapLangToContentType.put(RDFLanguages.TURTLE, contentTypeTurtle) ;
+ mapLangToContentType.put(RDFLanguages.NTRIPLES, contentTypeNTriples) ;
mapLangToContentType.put(RDFLanguages.RDFXML, contentTypeRDFXML) ;
mapLangToContentType.put(RDFLanguages.RDFJSON, contentTypeRdfJson) ;
- mapLangToContentType.put(RDFLanguages.NQuads, contentTypeNQuads) ;
- mapLangToContentType.put(RDFLanguages.TriG, contentTypeTriG) ;
+ mapLangToContentType.put(RDFLanguages.NQUADS, contentTypeNQuads) ;
+ mapLangToContentType.put(RDFLanguages.TRIG, contentTypeTriG) ;
}
public static String mapLangToContentType(Lang lang) { return mapLangToContentType.get(lang) ; }
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderFactoryRIOT.java (from r1426206, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderFactoryRIOT.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderFactoryRIOT.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderFactoryRIOT.java&p1=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderFactoryRIOT.java&r1=1426206&r2=1426986&rev=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderFactoryRIOT.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderFactoryRIOT.java Sun Dec 30 20:17:22 2012
@@ -16,11 +16,15 @@
* limitations under the License.
*/
-package org.apache.jena.riot;
+package org.apache.jena.riot.adapters;
+
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFLanguages ;
import com.hp.hpl.jena.rdf.model.RDFReader ;
import com.hp.hpl.jena.rdf.model.RDFReaderF ;
+/** Adapter to old style Jena reader factory */
public class RDFReaderFactoryRIOT implements RDFReaderF
{
public RDFReaderFactoryRIOT() {}
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java (from r1425325, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderRIOT.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java&p1=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderRIOT.java&r1=1425325&r2=1426986&rev=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderRIOT.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT.java Sun Dec 30 20:17:22 2012
@@ -16,12 +16,15 @@
* limitations under the License.
*/
-package org.apache.jena.riot;
+package org.apache.jena.riot.adapters;
import java.io.InputStream ;
import java.io.Reader ;
import java.util.Locale ;
+import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RDFLanguages ;
+
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.RDFErrorHandler ;
import com.hp.hpl.jena.rdf.model.RDFReader ;
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_ARP.java (from r1422690, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderRIOT_ARP.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_ARP.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_ARP.java&p1=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderRIOT_ARP.java&r1=1422690&r2=1426986&rev=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderRIOT_ARP.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_ARP.java Sun Dec 30 20:17:22 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.riot;
+package org.apache.jena.riot.adapters;
import java.io.File ;
import java.io.InputStream ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNQuads.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNQuads.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNQuads.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNQuads.java Sun Dec 30 20:17:22 2012
@@ -43,7 +43,7 @@ public class LangNQuads extends LangNTup
}
@Override
- public Lang getLang() { return RDFLanguages.NQuads ; }
+ public Lang getLang() { return RDFLanguages.NQUADS ; }
/** Method to parse the whole stream of triples, sending each to the sink */
@Override
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNTriples.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNTriples.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNTriples.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangNTriples.java Sun Dec 30 20:17:22 2012
@@ -43,7 +43,7 @@ public final class LangNTriples extends
}
@Override
- public Lang getLang() { return RDFLanguages.NTriples ; }
+ public Lang getLang() { return RDFLanguages.NTRIPLES ; }
/** Method to parse the whole stream of triples, sending each to the sink */
@Override
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTriG.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTriG.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTriG.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTriG.java Sun Dec 30 20:17:22 2012
@@ -57,7 +57,7 @@ public class LangTriG extends LangTurtle
}
@Override
- public Lang getLang() { return RDFLanguages.TriG ; }
+ public Lang getLang() { return RDFLanguages.TRIG ; }
@Override
protected final void oneTopLevelElement()
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtle.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtle.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtle.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtle.java Sun Dec 30 20:17:22 2012
@@ -39,7 +39,7 @@ public class LangTurtle extends LangTurt
}
@Override
- public Lang getLang() { return RDFLanguages.Turtle ; }
+ public Lang getLang() { return RDFLanguages.TURTLE ; }
@Override
protected final void oneTopLevelElement()
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java Sun Dec 30 20:17:22 2012
@@ -18,8 +18,8 @@
package org.apache.jena.riot.system;
-import static org.apache.jena.riot.RDFLanguages.NQuads ;
-import static org.apache.jena.riot.RDFLanguages.NTriples ;
+import static org.apache.jena.riot.RDFLanguages.NQUADS ;
+import static org.apache.jena.riot.RDFLanguages.NTRIPLES ;
import static org.apache.jena.riot.RDFLanguages.RDFJSON ;
import static org.apache.jena.riot.RDFLanguages.sameLang ;
import org.apache.jena.atlas.logging.Log ;
@@ -62,7 +62,7 @@ public class RiotLib
return skolomizedBNodes && iri.startsWith(bNodeLabelStart) ;
}
- static ParserProfile profile = profile(RDFLanguages.Turtle, null, null) ;
+ static ParserProfile profile = profile(RDFLanguages.TURTLE, null, null) ;
static {
PrefixMap pmap = profile.getPrologue().getPrefixMap() ;
pmap.add("rdf", ARQConstants.rdfPrefix) ;
@@ -95,7 +95,7 @@ public class RiotLib
public static ParserProfile profile(Lang lang, String baseIRI, ErrorHandler handler)
{
- if ( sameLang(NTriples, lang) || sameLang(NQuads, lang) )
+ if ( sameLang(NTRIPLES, lang) || sameLang(NQUADS, lang) )
return profile(baseIRI, false, false, handler) ;
if ( sameLang(RDFJSON, lang) )
return profile(baseIRI, false, true, handler) ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/Lang.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/Lang.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/Lang.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/Lang.java Sun Dec 30 20:17:22 2012
@@ -27,15 +27,15 @@ public class Lang
/** @deprecated Use constant from {@link RDFLanguages} */
@Deprecated public static final org.apache.jena.riot.Lang RDFXML = RDFLanguages.RDFXML ;
/** @deprecated Use constant from {@link RDFLanguages} */
- @Deprecated public static final org.apache.jena.riot.Lang NTRIPLES = RDFLanguages.NTriples ;
+ @Deprecated public static final org.apache.jena.riot.Lang NTRIPLES = RDFLanguages.NTRIPLES ;
/** @deprecated Use constant from {@link RDFLanguages} */
@Deprecated public static final org.apache.jena.riot.Lang N3 = RDFLanguages.N3 ;
/** @deprecated Use constant from {@link RDFLanguages} */
- @Deprecated public static final org.apache.jena.riot.Lang TURTLE = RDFLanguages.Turtle ;
+ @Deprecated public static final org.apache.jena.riot.Lang TURTLE = RDFLanguages.TURTLE ;
/** @deprecated Use constant from {@link RDFLanguages} */
@Deprecated public static final org.apache.jena.riot.Lang RDFJSON = RDFLanguages.RDFJSON ;
/** @deprecated Use constant from {@link RDFLanguages} */
- @Deprecated public static final org.apache.jena.riot.Lang NQUADS = RDFLanguages.NQuads ;
+ @Deprecated public static final org.apache.jena.riot.Lang NQUADS = RDFLanguages.NQUADS ;
/** @deprecated Use constant from {@link RDFLanguages} */
- @Deprecated public static final org.apache.jena.riot.Lang TRIG = RDFLanguages.TriG ;
+ @Deprecated public static final org.apache.jena.riot.Lang TRIG = RDFLanguages.TRIG ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java Sun Dec 30 20:17:22 2012
@@ -18,8 +18,8 @@
package org.openjena.riot;
-import static org.apache.jena.riot.RDFLanguages.NQuads ;
-import static org.apache.jena.riot.RDFLanguages.TriG ;
+import static org.apache.jena.riot.RDFLanguages.NQUADS ;
+import static org.apache.jena.riot.RDFLanguages.TRIG ;
import java.io.InputStream ;
import java.util.Iterator ;
@@ -202,7 +202,7 @@ public class RiotReader
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) )
+ if ( RDFLanguages.sameLang(RDFLanguages.NTRIPLES, lang) )
{
return new IteratorResourceClosing<Triple>(createParserNTriples(input, null), input);
}
@@ -225,9 +225,9 @@ public class RiotReader
/** Create a parser for a quads language */
public static LangRIOT createParserQuads(Tokenizer tokenizer, Lang lang, String baseIRI, StreamRDF dest)
{
- if ( RDFLanguages.sameLang(NQuads, lang) )
+ if ( RDFLanguages.sameLang(NQUADS, lang) )
return createParserNQuads(tokenizer, dest) ;
- if ( RDFLanguages.sameLang(TriG, lang) )
+ if ( RDFLanguages.sameLang(TRIG, lang) )
return createParserTriG(tokenizer, baseIRI, dest) ;
// try to do via triples to quads extension.
@@ -239,7 +239,7 @@ public class RiotReader
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.NTriples, lang) )
+ if ( RDFLanguages.sameLang(RDFLanguages.NTRIPLES, lang) )
{
return new IteratorResourceClosing<Quad>(createParserNQuads(input, null), input);
}
@@ -262,7 +262,7 @@ public class RiotReader
/** Create a parser for Turtle, with default behaviour */
public static LangTurtle createParserTurtle(Tokenizer tokenizer, String baseIRI, StreamRDF dest)
{
- LangTurtle parser = new LangTurtle(tokenizer, RiotLib.profile(RDFLanguages.Turtle, baseIRI), dest) ;
+ LangTurtle parser = new LangTurtle(tokenizer, RiotLib.profile(RDFLanguages.TURTLE, baseIRI), dest) ;
return parser ;
}
@@ -300,7 +300,7 @@ public class RiotReader
{
if ( baseIRI == null )
baseIRI = chooseBaseIRI() ;
- LangTriG parser = new LangTriG(tokenizer, RiotLib.profile(RDFLanguages.TriG, baseIRI), dest) ;
+ LangTriG parser = new LangTriG(tokenizer, RiotLib.profile(RDFLanguages.TRIG, baseIRI), dest) ;
return parser ;
}
@@ -314,7 +314,7 @@ public class RiotReader
/** Create a parser for N-Triples, with default behaviour */
public static LangNTriples createParserNTriples(Tokenizer tokenizer, StreamRDF dest)
{
- LangNTriples parser = new LangNTriples(tokenizer, RiotLib.profile(RDFLanguages.NTriples, null), dest) ;
+ LangNTriples parser = new LangNTriples(tokenizer, RiotLib.profile(RDFLanguages.NTRIPLES, null), dest) ;
return parser ;
}
@@ -328,7 +328,7 @@ public class RiotReader
/** Create a parser for NQuads, with default behaviour */
public static LangNQuads createParserNQuads(Tokenizer tokenizer, StreamRDF dest)
{
- LangNQuads parser = new LangNQuads(tokenizer, RiotLib.profile(RDFLanguages.NQuads, null), dest) ;
+ LangNQuads parser = new LangNQuads(tokenizer, RiotLib.profile(RDFLanguages.NQUADS, null), dest) ;
return parser ;
}
Modified: jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java Sun Dec 30 20:17:22 2012
@@ -226,7 +226,7 @@ public abstract class CmdLangParse exten
protected void parseRIOT(String baseURI, String filename, InputStream in)
{
- baseURI = RiotReader.chooseBaseIRI(baseURI, filename) ;
+ baseURI = SysRIOT.chooseBaseIRI(baseURI, filename) ;
boolean checking = true ;
if ( modLangParse.explicitChecking() ) checking = true ;
@@ -247,7 +247,7 @@ public abstract class CmdLangParse exten
// TODO skipOnBadterm
}
- Lang lang = selectLang(filename, RDFLanguages.NQuads) ;
+ Lang lang = selectLang(filename, RDFLanguages.NQUADS) ;
LangHandler handler = dispatch.get(lang) ;
if ( handler == null )
throw new CmdException("Undefined language: "+lang) ;
@@ -313,7 +313,7 @@ public abstract class CmdLangParse exten
{
if ( checking )
{
- if ( parser.getLang() == RDFLanguages.NTriples || parser.getLang() == RDFLanguages.NQuads )
+ if ( parser.getLang() == RDFLanguages.NTRIPLES || parser.getLang() == RDFLanguages.NQUADS )
parser.setProfile(RiotLib.profile(baseURI, false, true, errHandler)) ;
else
parser.setProfile(RiotLib.profile(baseURI, true, true, errHandler)) ;
Modified: jena/trunk/jena-arq/src/main/java/riotcmd/infer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/infer.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/infer.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/infer.java Sun Dec 30 20:17:22 2012
@@ -144,7 +144,7 @@ public class infer extends CmdGeneral
private void processFile(String filename, Sink<Quad> qsink)
{
- Lang lang = filename.equals("-") ? RDFLanguages.NQuads : RDFLanguages.filenameToLang(filename, RDFLanguages.NQuads) ;
+ Lang lang = filename.equals("-") ? RDFLanguages.NQUADS : RDFLanguages.filenameToLang(filename, RDFLanguages.NQUADS) ;
String baseURI = IRILib.filenameToIRI(filename) ;
StreamRDF sink = StreamRDFLib.sinkQuads(qsink) ;
Modified: jena/trunk/jena-arq/src/main/java/riotcmd/nquads.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/nquads.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/nquads.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/nquads.java Sun Dec 30 20:17:22 2012
@@ -44,5 +44,5 @@ public class nquads extends CmdLangParse
@Override
protected Lang selectLang(String filename, Lang lang)
- { return RDFLanguages.NQuads ; }
+ { return RDFLanguages.NQUADS ; }
}
Modified: jena/trunk/jena-arq/src/main/java/riotcmd/ntriples.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/ntriples.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/ntriples.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/ntriples.java Sun Dec 30 20:17:22 2012
@@ -44,5 +44,5 @@ public class ntriples extends CmdLangPar
@Override
protected Lang selectLang(String filename, Lang lang)
- { return RDFLanguages.NTriples ; }
+ { return RDFLanguages.NTRIPLES ; }
}
Modified: jena/trunk/jena-arq/src/main/java/riotcmd/riot.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/riot.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/riot.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/riot.java Sun Dec 30 20:17:22 2012
@@ -41,7 +41,7 @@ public class riot extends CmdLangParse
@Override
protected Lang selectLang(String filename, Lang dftLang)
{
- return RDFLanguages.filenameToLang(filename, RDFLanguages.NQuads) ;
+ return RDFLanguages.filenameToLang(filename, RDFLanguages.NQUADS) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/riotcmd/trig.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/trig.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/trig.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/trig.java Sun Dec 30 20:17:22 2012
@@ -44,5 +44,5 @@ public class trig extends CmdLangParse
@Override
protected Lang selectLang(String filename, Lang lang)
- { return RDFLanguages.TriG ; }
+ { return RDFLanguages.TRIG ; }
}
Modified: jena/trunk/jena-arq/src/main/java/riotcmd/turtle.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/turtle.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/turtle.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/turtle.java Sun Dec 30 20:17:22 2012
@@ -44,5 +44,5 @@ public class turtle extends CmdLangParse
@Override
protected Lang selectLang(String filename, Lang dftLang)
- { return RDFLanguages.Turtle ; }
+ { return RDFLanguages.TURTLE ; }
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java Sun Dec 30 20:17:22 2012
@@ -25,6 +25,7 @@ import java.io.StringReader ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.atlas.web.TypedInputStream ;
+import org.apache.jena.riot.adapters.RDFReaderFactoryRIOT ;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.Test ;
@@ -98,7 +99,7 @@ public class TestJenaReaderRIOT extends
{
StringReader s = new StringReader(x) ;
Model m = ModelFactory.createDefaultModel() ;
- RDFDataMgr.read(m, s, null, RDFLanguages.NTriples) ;
+ RDFDataMgr.read(m, s, null, RDFLanguages.NTRIPLES) ;
}
StringReader s1 = new StringReader("<s> <p> <p> .") ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java Sun Dec 30 20:17:22 2012
@@ -26,14 +26,14 @@ public class TestLangRIOT extends BaseTe
{
@BeforeClass public static void beforeClass() { RDFLanguages.init() ; }
- @Test public void lang_01() { test(RDFLanguages.NTriples, "NT") ; }
- @Test public void lang_02() { test(RDFLanguages.NTriples, "N-Triples") ; }
- @Test public void lang_03() { test(RDFLanguages.NTriples, "N-TRIPLES") ; }
- @Test public void lang_04() { test(RDFLanguages.NTriples, "NTRIPLE") ; }
- @Test public void lang_05() { test(RDFLanguages.NTriples, "NTRIPLES") ; }
+ @Test public void lang_01() { test(RDFLanguages.NTRIPLES, "NT") ; }
+ @Test public void lang_02() { test(RDFLanguages.NTRIPLES, "N-Triples") ; }
+ @Test public void lang_03() { test(RDFLanguages.NTRIPLES, "N-TRIPLES") ; }
+ @Test public void lang_04() { test(RDFLanguages.NTRIPLES, "NTRIPLE") ; }
+ @Test public void lang_05() { test(RDFLanguages.NTRIPLES, "NTRIPLES") ; }
- @Test public void lang_11() { test(RDFLanguages.Turtle, "TTL") ; }
- @Test public void lang_12() { test(RDFLanguages.Turtle, "TUrtLE") ; }
+ @Test public void lang_11() { test(RDFLanguages.TURTLE, "TTL") ; }
+ @Test public void lang_12() { test(RDFLanguages.TURTLE, "TUrtLE") ; }
@Test public void lang_21() { test(RDFLanguages.RDFXML, "RDF/XML") ; }
@Test public void lang_22() { test(RDFLanguages.RDFXML, "RDFXML") ; }
@@ -42,17 +42,17 @@ public class TestLangRIOT extends BaseTe
@Test public void lang_30() { test(RDFLanguages.RDFJSON, "RDFJSON") ; }
@Test public void lang_31() { test(RDFLanguages.RDFJSON, "RDF/json") ; }
- @Test public void lang_40() { test(RDFLanguages.NQuads, "N-QUADS") ; }
- @Test public void lang_41() { test(RDFLanguages.NQuads, "NQuads") ; }
+ @Test public void lang_40() { test(RDFLanguages.NQUADS, "N-QUADS") ; }
+ @Test public void lang_41() { test(RDFLanguages.NQUADS, "NQuads") ; }
- @Test public void lang_50() { test(RDFLanguages.TriG, "TriG") ; }
- @Test public void lang_51() { test(RDFLanguages.TriG, "trig") ; }
- @Test public void lang_52() { test(RDFLanguages.TriG, "TRIG") ; }
+ @Test public void lang_50() { test(RDFLanguages.TRIG, "TriG") ; }
+ @Test public void lang_51() { test(RDFLanguages.TRIG, "trig") ; }
+ @Test public void lang_52() { test(RDFLanguages.TRIG, "TRIG") ; }
- @Test public void guess_01() { guess("D.nt", RDFLanguages.NTriples) ; }
- @Test public void guess_02() { guess("D.ttl.nt", RDFLanguages.NTriples) ; }
+ @Test public void guess_01() { guess("D.nt", RDFLanguages.NTRIPLES) ; }
+ @Test public void guess_02() { guess("D.ttl.nt", RDFLanguages.NTRIPLES) ; }
- @Test public void guess_03() { guess("D.ttl", RDFLanguages.Turtle) ; }
+ @Test public void guess_03() { guess("D.ttl", RDFLanguages.TURTLE) ; }
@Test public void guess_04() { guess("D.rdf", RDFLanguages.RDFXML) ; }
@Test public void guess_05() { guess("D.owl", RDFLanguages.RDFXML) ; }
@@ -60,8 +60,8 @@ public class TestLangRIOT extends BaseTe
@Test public void guess_06() { guess("D.rj", RDFLanguages.RDFJSON) ; }
@Test public void guess_07() { guess("D.json", RDFLanguages.RDFJSON) ; }
- @Test public void guess_08() { guess("D.nq", RDFLanguages.NQuads) ; }
- @Test public void guess_09() { guess("D.trig", RDFLanguages.TriG) ; }
+ @Test public void guess_08() { guess("D.nq", RDFLanguages.NQUADS) ; }
+ @Test public void guess_09() { guess("D.trig", RDFLanguages.TRIG) ; }
private void test(Lang expected, String string)
{
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadData.java Sun Dec 30 20:17:22 2012
@@ -54,8 +54,8 @@ public class TestReadData extends BaseTe
@Test public void read_01() { read("D.nq") ; }
@Test public void read_02() { read("D.trig") ; }
- @Test public void read_03() { read("D.nq", RDFLanguages.NQuads) ; }
- @Test public void read_04() { read("D.trig", RDFLanguages.TriG) ; }
+ @Test public void read_03() { read("D.nq", RDFLanguages.NQUADS) ; }
+ @Test public void read_04() { read("D.trig", RDFLanguages.TRIG) ; }
@Test public void read_11() { read("D.nq", "N-Quads") ; }
@@ -64,8 +64,8 @@ public class TestReadData extends BaseTe
@Test public void read_14() { read("D.trig", "TriG") ; }
@Test public void read_15() { read("D.trig", "trig") ; }
- @Test public void read_21() { read("D-nq", RDFLanguages.NQuads) ; }
- @Test public void read_22() { read("D-trig", RDFLanguages.TriG) ; }
+ @Test public void read_21() { read("D-nq", RDFLanguages.NQUADS) ; }
+ @Test public void read_22() { read("D-trig", RDFLanguages.TRIG) ; }
@Test public void read_23() { read("D-nq", "NQuads") ; }
@Test public void read_24() { read("D-trig", "TRIG") ; }
@@ -76,20 +76,20 @@ public class TestReadData extends BaseTe
{ read_stream("D.trig", "trig") ; }
@Test public void load_01() { RDFDataMgr.loadModel(filename("D.nt")) ; }
- @Test public void load_02() { RDFDataMgr.loadModel(filename("D.nt"), RDFLanguages.NTriples) ; }
- @Test public void load_03() { RDFDataMgr.loadModel(filename("D-nt"), RDFLanguages.NTriples) ; }
+ @Test public void load_02() { RDFDataMgr.loadModel(filename("D.nt"), RDFLanguages.NTRIPLES) ; }
+ @Test public void load_03() { RDFDataMgr.loadModel(filename("D-nt"), RDFLanguages.NTRIPLES) ; }
@Test public void load_04() { RDFDataMgr.loadDataset(filename("D.nq")) ; }
- @Test public void load_05() { RDFDataMgr.loadDataset(filename("D.nq"), RDFLanguages.NQuads) ; }
- @Test public void load_06() { RDFDataMgr.loadDataset(filename("D-nq"), RDFLanguages.NQuads) ; }
+ @Test public void load_05() { RDFDataMgr.loadDataset(filename("D.nq"), RDFLanguages.NQUADS) ; }
+ @Test public void load_06() { RDFDataMgr.loadDataset(filename("D-nq"), RDFLanguages.NQUADS) ; }
@Test public void load_11() { RDFDataMgr.loadGraph(filename("D.nt")) ; }
- @Test public void load_12() { RDFDataMgr.loadGraph(filename("D.nt"), RDFLanguages.NTriples) ; }
- @Test public void load_13() { RDFDataMgr.loadGraph(filename("D-nt"), RDFLanguages.NTriples) ; }
+ @Test public void load_12() { RDFDataMgr.loadGraph(filename("D.nt"), RDFLanguages.NTRIPLES) ; }
+ @Test public void load_13() { RDFDataMgr.loadGraph(filename("D-nt"), RDFLanguages.NTRIPLES) ; }
@Test public void load_14() { RDFDataMgr.loadDatasetGraph(filename("D.nq")) ; }
- @Test public void load_15() { RDFDataMgr.loadDatasetGraph(filename("D.nq"), RDFLanguages.NQuads) ; }
- @Test public void load_16() { RDFDataMgr.loadDatasetGraph(filename("D-nq"), RDFLanguages.NQuads) ; }
+ @Test public void load_15() { RDFDataMgr.loadDatasetGraph(filename("D.nq"), RDFLanguages.NQUADS) ; }
+ @Test public void load_16() { RDFDataMgr.loadDatasetGraph(filename("D-nq"), RDFLanguages.NQUADS) ; }
private static String filename(String filename) { return directory+"/"+filename ; }
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLang.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLang.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLang.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLang.java Sun Dec 30 20:17:22 2012
@@ -35,13 +35,13 @@ public class TestLang extends BaseTest
static { RDFLanguages.init() ; }
@Test public void lang_01()
- { assertEquals(RDFLanguages.Turtle, RDFLanguages.shortnameToLang("TTL")) ; }
+ { assertEquals(RDFLanguages.TURTLE, RDFLanguages.shortnameToLang("TTL")) ; }
@Test public void lang_02()
- { assertEquals(RDFLanguages.Turtle, RDFLanguages.shortnameToLang("ttl")) ; }
+ { assertEquals(RDFLanguages.TURTLE, RDFLanguages.shortnameToLang("ttl")) ; }
@Test public void lang_03()
- { assertEquals(RDFLanguages.Turtle, RDFLanguages.shortnameToLang("Turtle")) ; }
+ { assertEquals(RDFLanguages.TURTLE, RDFLanguages.shortnameToLang("Turtle")) ; }
@Test public void lang_04()
{ assertEquals(RDFLanguages.RDFXML, RDFLanguages.shortnameToLang(FileUtils.langXML)) ; }
@@ -50,17 +50,17 @@ public class TestLang extends BaseTest
{ assertEquals(RDFLanguages.RDFXML, RDFLanguages.shortnameToLang(FileUtils.langXMLAbbrev)) ; }
@Test public void lang_06()
- { assertEquals(RDFLanguages.NTriples, RDFLanguages.shortnameToLang(FileUtils.langNTriple)) ; }
+ { assertEquals(RDFLanguages.NTRIPLES, RDFLanguages.shortnameToLang(FileUtils.langNTriple)) ; }
@Test public void lang_07()
- { assertEquals(RDFLanguages.NTriples, RDFLanguages.shortnameToLang(WebContent.langNTriples)) ; }
+ { assertEquals(RDFLanguages.NTRIPLES, RDFLanguages.shortnameToLang(WebContent.langNTriples)) ; }
@Test public void lang_08()
- { assertEquals(RDFLanguages.NQuads, RDFLanguages.shortnameToLang(WebContent.langNQuads)) ; }
+ { assertEquals(RDFLanguages.NQUADS, RDFLanguages.shortnameToLang(WebContent.langNQuads)) ; }
@Test public void lang_09()
- { assertEquals(RDFLanguages.TriG, RDFLanguages.shortnameToLang(WebContent.langTriG)) ; }
+ { assertEquals(RDFLanguages.TRIG, RDFLanguages.shortnameToLang(WebContent.langTriG)) ; }
@Test public void lang_10()
{ assertEquals(RDFLanguages.RDFJSON, RDFLanguages.shortnameToLang("RDF/JSON")) ; }
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java Sun Dec 30 20:17:22 2012
@@ -49,7 +49,7 @@ public class TestLangNTriples extends Te
StringReader r = new StringReader(s) ;
Model m = ModelFactory.createDefaultModel() ;
- RDFDataMgr.read(m, r, null, RDFLanguages.NTriples) ;
+ RDFDataMgr.read(m, r, null, RDFLanguages.NTRIPLES) ;
assertEquals(1, m.size()) ;
String x = m.listStatements().next().getSubject().getId().getLabelString() ;
@@ -57,7 +57,7 @@ public class TestLangNTriples extends Te
// reset - reread - new bNode.
r = new StringReader(s) ;
- RDFDataMgr.read(m, r, null, RDFLanguages.NTriples) ;
+ RDFDataMgr.read(m, r, null, RDFLanguages.NTRIPLES) ;
assertEquals(2, m.size()) ;
}
@@ -112,7 +112,7 @@ public class TestLangNTriples extends Te
{
StringReader r = new StringReader(string) ;
Model model = ModelFactory.createDefaultModel() ;
- RDFDataMgr.read(model, r, null, RDFLanguages.NTriples) ;
+ RDFDataMgr.read(model, r, null, RDFLanguages.NTRIPLES) ;
return model ;
}
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java Sun Dec 30 20:17:22 2012
@@ -519,7 +519,7 @@ public class TestLangRdfJson extends Bas
{
StringReader r = new StringReader(string) ;
Model model = ModelFactory.createDefaultModel() ;
- RDFDataMgr.read(model, r, null, RDFLanguages.NTriples) ;
+ RDFDataMgr.read(model, r, null, RDFLanguages.NTRIPLES) ;
return model ;
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTurtle.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTurtle.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTurtle.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTurtle.java Sun Dec 30 20:17:22 2012
@@ -54,7 +54,7 @@ public class TestLangTurtle extends Base
String s = "_:a <http://example/p> 'foo' . " ;
StringReader r = new StringReader(s) ;
Model m = ModelFactory.createDefaultModel() ;
- RDFDataMgr.read(m, r, null, RDFLanguages.Turtle) ;
+ RDFDataMgr.read(m, r, null, RDFLanguages.TURTLE) ;
assertEquals(1, m.size()) ;
String x = m.listStatements().next().getSubject().getId().getLabelString() ;
@@ -62,7 +62,7 @@ public class TestLangTurtle extends Base
// reset - reread - new bNode.
r = new StringReader(s) ;
- RDFDataMgr.read(m, r, null, RDFLanguages.Turtle) ;
+ RDFDataMgr.read(m, r, null, RDFLanguages.TURTLE) ;
assertEquals(2, m.size()) ;
}
@@ -72,7 +72,7 @@ public class TestLangTurtle extends Base
String s = "_:a <http://example/p> 'foo' . _:a <http://example/p> 'foo' ." ;
StringReader r = new StringReader(s) ;
Model m = ModelFactory.createDefaultModel() ;
- RDFDataMgr.read(m, r, null, RDFLanguages.Turtle) ;
+ RDFDataMgr.read(m, r, null, RDFLanguages.TURTLE) ;
assertEquals(1, m.size()) ;
}
@@ -81,7 +81,7 @@ public class TestLangTurtle extends Base
{
Model model = ModelFactory.createDefaultModel() ;
StringReader reader = new StringReader("@prefix x: <http://example/x>.") ;
- RDFDataMgr.read(model, reader, null, RDFLanguages.Turtle) ;
+ RDFDataMgr.read(model, reader, null, RDFLanguages.TURTLE) ;
assertEquals(1, model.getNsPrefixMap().size()) ;
assertEquals("http://example/x", model.getNsPrefixURI("x")) ;
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java Sun Dec 30 20:17:22 2012
@@ -74,16 +74,16 @@ public class FactoryTestRiot extends Tes
baseIRI = baseIRI+x ;
if ( r.equals(VocabLangRDF.TestPositiveSyntaxTTL) )
- return new UnitTestSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.Turtle, report) ;
+ return new UnitTestSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.TURTLE, report) ;
if ( r.equals(VocabLangRDF.TestNegativeSyntaxTTL) )
- return new UnitTestBadSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.Turtle, report) ;
+ return new UnitTestBadSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.TURTLE, report) ;
if ( r.equals(VocabLangRDF.TestPositiveSyntaxNT) )
- return new UnitTestSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.NTriples, report) ;
+ return new UnitTestSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.NTRIPLES, report) ;
if ( r.equals(VocabLangRDF.TestNegativeSyntaxNT) )
- return new UnitTestBadSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.NTriples, report) ;
+ return new UnitTestBadSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.NTRIPLES, report) ;
if ( r.equals(VocabLangRDF.TestPositiveSyntaxRJ) )
return new UnitTestSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.RDFJSON, report) ;
@@ -97,16 +97,16 @@ public class FactoryTestRiot extends Tes
// Eval.
if ( r.equals(VocabLangRDF.TestEvalTTL) )
- return new UnitTestEval(testName, item.getURI(), input.getURI(), result.getURI(), baseIRI, RDFLanguages.Turtle, report) ;
+ return new UnitTestEval(testName, item.getURI(), input.getURI(), result.getURI(), baseIRI, RDFLanguages.TURTLE, report) ;
if ( r.equals(VocabLangRDF.TestNegativeEvalTTL) )
- return new UnitTestBadEval(testName, item.getURI(), input.getURI(), RDFLanguages.Turtle, report) ;
+ return new UnitTestBadEval(testName, item.getURI(), input.getURI(), RDFLanguages.TURTLE, report) ;
if ( r.equals(VocabLangRDF.TestEvalNT) )
- return new UnitTestEval(testName, item.getURI(), input.getURI(), result.getURI(), baseIRI, RDFLanguages.NTriples, report) ;
+ return new UnitTestEval(testName, item.getURI(), input.getURI(), result.getURI(), baseIRI, RDFLanguages.NTRIPLES, report) ;
if ( r.equals(VocabLangRDF.TestNegativeEvalNT) )
- return new UnitTestBadEval(testName, item.getURI(), input.getURI(), RDFLanguages.NTriples, report) ;
+ return new UnitTestBadEval(testName, item.getURI(), input.getURI(), RDFLanguages.NTRIPLES, report) ;
if ( r.equals(VocabLangRDF.TestEvalRJ) )
return new UnitTestEval(testName, item.getURI(), input.getURI(), result.getURI(), baseIRI, RDFLanguages.RDFJSON, report) ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java Sun Dec 30 20:17:22 2012
@@ -20,12 +20,14 @@ package org.apache.jena.riot.langsuite;
import java.io.InputStream ;
-import org.apache.jena.riot.* ;
+import org.apache.jena.riot.Lang ;
+import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RDFLanguages ;
+import org.apache.jena.riot.RiotException ;
import org.apache.jena.riot.stream.StreamManager ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
-import com.hp.hpl.jena.rdf.model.RDFReader ;
import com.hp.hpl.jena.sparql.junit.EarlReport ;
import com.hp.hpl.jena.util.FileUtils ;
@@ -57,7 +59,6 @@ public class UnitTestEval extends LangTe
public void runTestForReal()
{
Model model = ModelFactory.createDefaultModel() ;
- RDFReader rdfreader = new RDFReaderRIOT() ;
try {
if ( baseIRI != null )
RDFDataMgr.read(model, input, baseIRI, lang) ;
@@ -68,7 +69,7 @@ public class UnitTestEval extends LangTe
Model results = ModelFactory.createDefaultModel() ;
// Directly get an N-triples reader
InputStream in = StreamManager.get().open(output) ;
- RDFDataMgr.read(results, in, null, RDFLanguages.NTriples) ;
+ RDFDataMgr.read(results, in, null, RDFLanguages.NTRIPLES) ;
boolean b = model.isIsomorphicWith(results) ;
if ( !b )
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java Sun Dec 30 20:17:22 2012
@@ -61,8 +61,8 @@ public class FusekiLib
static {
mapLangToWriterName.put(RDFLanguages.N3, WebContent.langN3) ;
mapLangToWriterName.put(RDFLanguages.RDFJSON, WebContent.langRdfJson) ;
- mapLangToWriterName.put(RDFLanguages.Turtle, WebContent.langTurtle) ;
- mapLangToWriterName.put(RDFLanguages.NTriples, WebContent.langNTriples) ;
+ mapLangToWriterName.put(RDFLanguages.TURTLE, WebContent.langTurtle) ;
+ mapLangToWriterName.put(RDFLanguages.NTRIPLES, WebContent.langNTriples) ;
mapLangToWriterName.put(RDFLanguages.RDFXML, WebContent.langRDFXML) ;
}
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java Sun Dec 30 20:17:22 2012
@@ -68,7 +68,7 @@ public class REST_Quads extends SPARQL_R
TypedOutputStream out = new TypedOutputStream(output, mediaType) ;
Lang lang = FusekiLib.langFromContentType(mediaType.getContentType()) ;
if ( lang == null )
- lang = RDFLanguages.TriG ;
+ lang = RDFLanguages.TRIG ;
if ( action.verbose )
log.info(format("[%d] Get: Content-Type=%s, Charset=%s => %s",
@@ -80,9 +80,9 @@ public class REST_Quads extends SPARQL_R
try {
DatasetGraph dsg = action.getActiveDSG() ;
- if ( lang == RDFLanguages.NQuads )
+ if ( lang == RDFLanguages.NQUADS )
RiotWriter.writeNQuads(out, dsg) ;
- else if ( lang == RDFLanguages.TriG )
+ else if ( lang == RDFLanguages.TRIG )
errorBadRequest("TriG - Not implemented (yet) : "+mediaType) ;
else
errorBadRequest("No handled: "+mediaType) ;
@@ -122,7 +122,7 @@ public class REST_Quads extends SPARQL_R
MediaType mediaType = MediaType.create(x) ;
Lang lang = FusekiLib.langFromContentType(mediaType.getContentType()) ;
if ( lang == null )
- lang = RDFLanguages.TriG ;
+ lang = RDFLanguages.TRIG ;
if ( action.verbose )
log.info(format("[%d] Post: Content-Type=%s, Charset=%s => %s",
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java Sun Dec 30 20:17:22 2012
@@ -74,7 +74,7 @@ public class DataValidator extends Valid
String syntax = FusekiLib.safeParameter(httpRequest, paramSyntax) ;
if ( syntax == null || syntax.equals("") )
- syntax = RDFLanguages.NQuads.getName() ;
+ syntax = RDFLanguages.NQUADS.getName() ;
Lang language = RDFLanguages.shortnameToLang(syntax) ;
if ( language == null )
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkLoader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkLoader.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkLoader.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkLoader.java Sun Dec 30 20:17:22 2012
@@ -146,7 +146,7 @@ public class BulkLoader
{
loadLogger.info("Load: from input stream -- "+Utils.nowAsString()) ;
dest.startBulk() ;
- RiotReader.parse(input, RDFLanguages.NTriples, null, dest) ;
+ RiotReader.parse(input, RDFLanguages.NTRIPLES, null, dest) ;
dest.finishBulk() ;
}
@@ -167,7 +167,7 @@ public class BulkLoader
{
loadLogger.info("Load: from input stream -- "+Utils.nowAsString()) ;
dest.startBulk() ;
- RiotReader.parse(input, RDFLanguages.NQuads, null, dest) ;
+ RiotReader.parse(input, RDFLanguages.NQUADS, null, dest) ;
dest.finishBulk() ;
}
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java Sun Dec 30 20:17:22 2012
@@ -120,7 +120,7 @@ public class CmdNodeTableBuilder extends
for( String filename : datafiles)
{
- Lang lang = RDFLanguages.filenameToLang(filename, RDFLanguages.NQuads) ;
+ Lang lang = RDFLanguages.filenameToLang(filename, RDFLanguages.NQUADS) ;
if ( lang == null )
// Does not happen due to default above.
cmdError("File suffix not recognized: " +filename) ;
Modified: jena/trunk/jena-tdb/src/main/java/tdb/tdbloader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/tdb/tdbloader.java?rev=1426986&r1=1426985&r2=1426986&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/tdb/tdbloader.java (original)
+++ jena/trunk/jena-tdb/src/main/java/tdb/tdbloader.java Sun Dec 30 20:17:22 2012
@@ -104,7 +104,7 @@ public class tdbloader extends CmdTDBGra
boolean allTriples = true ;
for ( String url : urls )
{
- Lang lang = RDFLanguages.filenameToLang(url, RDFLanguages.NQuads) ;
+ Lang lang = RDFLanguages.filenameToLang(url, RDFLanguages.NQUADS) ;
if ( lang != null && RDFLanguages.isQuads(lang) )
{
allTriples = false ;
@@ -129,7 +129,7 @@ public class tdbloader extends CmdTDBGra
{
for ( String url : urls )
{
- Lang lang = RDFLanguages.filenameToLang(url, RDFLanguages.NQuads) ;
+ Lang lang = RDFLanguages.filenameToLang(url, RDFLanguages.NQUADS) ;
if ( lang == null )
// Does not happen due to default above.
cmdError("File suffix not recognized: " +url) ;