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 2013/03/06 18:35:46 UTC
svn commit: r1453448 - in
/jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot:
RDFDataMgr.java out/NQuadsWriter.java out/NTriplesWriter.java
out/SinkQuadOutput.java out/SinkTripleOutput.java
Author: andy
Date: Wed Mar 6 17:35:45 2013
New Revision: 1453448
URL: http://svn.apache.org/r1453448
Log:
RDFDatMgr is the preferred way to write an iterators of triples or quads.
Leave SinkTripleOutput and SinkQuadOutput for special cases where more control needed.
Modified:
jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/RDFDataMgr.java
jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NQuadsWriter.java
jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NTriplesWriter.java
jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/SinkQuadOutput.java
jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/SinkTripleOutput.java
Modified: jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/RDFDataMgr.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/RDFDataMgr.java?rev=1453448&r1=1453447&r2=1453448&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/RDFDataMgr.java (original)
+++ jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/RDFDataMgr.java Wed Mar 6 17:35:45 2013
@@ -19,6 +19,7 @@
package org.apache.jena.riot;
import java.io.* ;
+import java.util.Iterator ;
import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.io.PeekReader ;
@@ -31,16 +32,20 @@ import org.apache.jena.riot.stream.Strea
import org.apache.jena.riot.system.* ;
import org.apache.jena.riot.tokens.Tokenizer ;
import org.apache.jena.riot.tokens.TokenizerFactory ;
+import org.apache.jena.riot.writer.NQuadsWriter ;
+import org.apache.jena.riot.writer.NTriplesWriter ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
import com.hp.hpl.jena.graph.Graph ;
+import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
+import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.util.Context ;
import com.hp.hpl.jena.sparql.util.Symbol ;
@@ -1024,6 +1029,25 @@ public class RDFDataMgr
write$(out, dataset, serialization) ;
}
+ /** Write an iterator of triples (in N-Triples)
+ * @param out
+ * @param iterator
+ */
+ public static void writeTriples(OutputStream out, Iterator<Triple> iterator)
+ {
+ NTriplesWriter.write(out, iterator) ;
+ }
+
+
+ /** Write an iterator of quads (in N-Quads)
+ * @param out
+ * @param iterator
+ */
+ public static void writeQuads(OutputStream out, Iterator<Quad> iterator)
+ {
+ NQuadsWriter.write(out, iterator) ;
+ }
+
/** Create a writer for an RDF language
* @param lang Language for the seralization.
* @return WriterGraphRIOT
Modified: jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NQuadsWriter.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NQuadsWriter.java?rev=1453448&r1=1453447&r2=1453448&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NQuadsWriter.java (original)
+++ jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NQuadsWriter.java Wed Mar 6 17:35:45 2013
@@ -21,12 +21,8 @@ package org.apache.jena.riot.out;
import java.io.OutputStream ;
import java.util.Iterator ;
-import org.apache.jena.atlas.iterator.Iter ;
-import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
-import org.apache.jena.riot.system.Prologue ;
-import org.apache.jena.riot.system.SyntaxLabels ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
@@ -34,7 +30,7 @@ import com.hp.hpl.jena.sparql.core.Quad
public class NQuadsWriter
{
- /** @deprecated Use {@link RDFDataMgr#write(OutputStream, DatasetGraph, Lang)}
+ /** @deprecated Use {@linkplain RDFDataMgr#write(OutputStream, DatasetGraph, Lang)}
* with {@code Lang.NQUADS}.
*/
@Deprecated
@@ -43,7 +39,7 @@ public class NQuadsWriter
RDFDataMgr.write(out, dsg, Lang.NQUADS) ;
}
- /** @deprecated Use {@link RDFDataMgr#write(OutputStream, Dataset, Lang)}
+ /** @deprecated Use {@linkplain RDFDataMgr#write(OutputStream, Dataset, Lang)}
* with {@code Lang.NQUADS}.
*/
@Deprecated
@@ -52,11 +48,10 @@ public class NQuadsWriter
RDFDataMgr.write(out, dsg, Lang.NQUADS) ;
}
+ /** @deprecated Use {@linkplain RDFDataMgr#writeQuads} */
+ @Deprecated
public static void write(OutputStream out, Iterator<Quad> iter)
{
- Prologue prologue = Prologue.create(null, null) ; // (null, graph.getPrefixMapping()) ;
- // Write prologue.
- Sink<Quad> sink = new SinkQuadOutput(out, prologue, SyntaxLabels.createNodeToLabel()) ;
- Iter.sendToSink(iter, sink) ;
+ RDFDataMgr.writeQuads(out, iter) ;
}
}
Modified: jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NTriplesWriter.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NTriplesWriter.java?rev=1453448&r1=1453447&r2=1453448&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NTriplesWriter.java (original)
+++ jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/NTriplesWriter.java Wed Mar 6 17:35:45 2013
@@ -21,12 +21,8 @@ package org.apache.jena.riot.out;
import java.io.OutputStream ;
import java.util.Iterator ;
-import org.apache.jena.atlas.iterator.Iter ;
-import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
-import org.apache.jena.riot.system.Prologue ;
-import org.apache.jena.riot.system.SyntaxLabels ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Triple ;
@@ -34,7 +30,7 @@ import com.hp.hpl.jena.graph.Triple ;
public class NTriplesWriter
{
/** @deprecated
- * Use {@link RDFDataMgr#write(OutputStream, Graph, Lang)}
+ * Use {@linkplain RDFDataMgr#write(OutputStream, Graph, Lang)}
* with {@code Lang.NTRIPLES}
*/
@Deprecated
@@ -43,11 +39,10 @@ public class NTriplesWriter
RDFDataMgr.write(out, graph, Lang.NTRIPLES) ;
}
+ /** @deprecated Use {@linkplain RDFDataMgr#writeTriples} */
+ @Deprecated
public static void write(OutputStream out, Iterator<Triple> iter)
{
- Prologue prologue = Prologue.create(null, null) ; // (null, graph.getPrefixMapping()) ;
- //NodeToLabel.createBNodeByLabelEncoded() ;
- Sink<Triple> sink = new SinkTripleOutput(out, prologue, SyntaxLabels.createNodeToLabel()) ;
- Iter.sendToSink(iter, sink) ;
+ RDFDataMgr.writeTriples(out, iter) ;
}
}
Modified: jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/SinkQuadOutput.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/SinkQuadOutput.java?rev=1453448&r1=1453447&r2=1453448&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/SinkQuadOutput.java (original)
+++ jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/SinkQuadOutput.java Wed Mar 6 17:35:45 2013
@@ -23,13 +23,18 @@ import java.io.OutputStream ;
import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.io.WriterI ;
import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.riot.system.Prologue ;
import org.apache.jena.riot.system.SyntaxLabels ;
+import org.apache.jena.riot.writer.WriterStreamRDFTuples ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.core.Quad ;
-/** A class that print quads, N-Quads style */
+/** A class that print quads, N-Quads style *
+ * @see WriterStreamRDFTuples
+ * @see RDFDataMgr#writeTriples
+ */
public class SinkQuadOutput implements Sink<Quad>
{
private Prologue prologue = null ;
@@ -37,6 +42,8 @@ public class SinkQuadOutput implements S
private NodeToLabel labelPolicy = null ;
private NodeFormatter nodeFmt = new NodeFormatterNT() ;
+ /** @deprecated Use {@linkplain RDFDataMgr#writeTriples} */
+ @Deprecated
public SinkQuadOutput(OutputStream outs)
{
this(outs, null, SyntaxLabels.createNodeToLabel()) ;
Modified: jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/SinkTripleOutput.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/SinkTripleOutput.java?rev=1453448&r1=1453447&r2=1453448&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/SinkTripleOutput.java (original)
+++ jena/branches/arq-riot-output/src/main/java/org/apache/jena/riot/out/SinkTripleOutput.java Wed Mar 6 17:35:45 2013
@@ -23,21 +23,31 @@ import java.io.OutputStream ;
import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.io.WriterI ;
import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.riot.system.Prologue ;
import org.apache.jena.riot.system.SyntaxLabels ;
+import org.apache.jena.riot.writer.WriterStreamRDFTuples ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
-/** A class that print triples, N-triples style */
+/** A class that print triples, N-triples style
+ *
+ * @see WriterStreamRDFTuples
+ * @see RDFDataMgr#writeTriples
+ */
public class SinkTripleOutput implements Sink<Triple>
{
+ // WriterStreamRDFTuples
+
private Prologue prologue = null ;
private final WriterI out ;
private NodeToLabel labelPolicy = null ;
private NodeFormatter nodeFmt = new NodeFormatterNT() ;
+ /** @deprecated Use {@linkplain RDFDataMgr#writeTriples} */
+ @Deprecated
public SinkTripleOutput(OutputStream outs)
{
this(outs, null, SyntaxLabels.createNodeToLabel()) ;