Author: andy
Date: Wed Jul 23 17:44:40 2014
New Revision: 1612890
URL: http://svn.apache.org/r1612890
Log:
Clean use of deprecated
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotWriter.java
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java?rev=1612890&r1=1612889&r2=1612890&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java
(original)
+++
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterRegistry.java
Wed Jul 23 17:44:40 2014
@@ -27,8 +27,10 @@ import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RIOT ;
import org.apache.jena.riot.RiotException ;
+import org.apache.jena.riot.out.CharSpace ;
import org.apache.jena.riot.out.JsonLDWriter ;
import org.apache.jena.riot.system.RiotLib ;
+import org.apache.jena.riot.writer.* ;
public class RDFWriterRegistry
{
@@ -45,58 +47,56 @@ public class RDFWriterRegistry
// Writing a graph
static WriterGraphRIOTFactory wgfactory = new WriterGraphRIOTFactory() {
- @SuppressWarnings("deprecation")
@Override
public WriterGraphRIOT create(RDFFormat serialization)
{
// Built-ins
+
if ( Lib.equal(RDFFormat.TURTLE_PRETTY, serialization) )
- return RiotWriter.createTurtle() ;
+ return new TurtleWriter() ;
if ( Lib.equal(RDFFormat.TURTLE_BLOCKS, serialization) )
- return RiotWriter.createTurtleStreaming() ;
+ return new TurtleWriterBlocks() ;
if ( Lib.equal(RDFFormat.TURTLE_FLAT, serialization) )
- return RiotWriter.createTurtleFlat() ;
+ return new TurtleWriterFlat() ;
+
if ( Lib.equal(RDFFormat.NTRIPLES_UTF8, serialization) )
- return RiotWriter.createNTriples() ;
+ return new NTriplesWriter() ;
if ( Lib.equal(RDFFormat.NTRIPLES_ASCII, serialization) )
- return RiotWriter.createNTriplesASCII() ;
+ return new NTriplesWriter(CharSpace.ASCII) ;
+
if ( Lib.equal(RDFFormat.RDFJSON, serialization) )
- return RiotWriter.createRDFJSON() ;
+ return new RDFJSONWriter() ;
if ( Lib.equal(RDFFormat.RDFXML_PRETTY, serialization) )
- return RiotWriter.createRDFXMLAbbrev() ;
+ return new RDFXMLAbbrevWriter() ;
if ( Lib.equal(RDFFormat.RDFXML_PLAIN, serialization) )
- return RiotWriter.createRDFXMLPlain() ;
+ return new RDFXMLPlainWriter() ;
WriterDatasetRIOT dsw = wdsfactory.create(serialization) ;
if ( dsw != null )
return RiotLib.adapter(dsw) ;
return null ;
}} ;
-
// Writing a dataset
static WriterDatasetRIOTFactory wdsfactory = new
WriterDatasetRIOTFactory() {
- @SuppressWarnings("deprecation")
@Override
public WriterDatasetRIOT create(RDFFormat serialization)
{
if ( Lib.equal(RDFFormat.TRIG_PRETTY, serialization) )
- return RiotWriter.createTrig() ;
+ return new TriGWriter() ;
if ( Lib.equal(RDFFormat.TRIG_BLOCKS, serialization) )
- return RiotWriter.createTrigStreaming() ;
+ return new TriGWriterBlocks() ;
if ( Lib.equal(RDFFormat.TRIG_FLAT, serialization) )
- return RiotWriter.createTrigFlat() ;
+ return new TriGWriterFlat() ;
if ( Lib.equal(RDFFormat.NQUADS_UTF8, serialization) )
- return RiotWriter.createNQuads() ;
+ return new NQuadsWriter() ;
if ( Lib.equal(RDFFormat.NQUADS_ASCII, serialization) )
- return RiotWriter.createNQuadsASCII() ;
+ return new NQuadsWriter(CharSpace.ASCII) ;
if ( Lib.equal(RDFFormat.RDFNULL, serialization) )
- return RiotWriter.createRDFNULL() ;
+ return NullWriter.factory.create(RDFFormat.RDFNULL) ;
return null ;
}} ;
-
-
static WriterDatasetRIOTFactory wdsJsonldfactory = new
WriterDatasetRIOTFactory() {
//private static class WriterDatasetJSONLDFactory implements
WriterDatasetRIOTFactory {
@Override
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotWriter.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotWriter.java?rev=1612890&r1=1612889&r2=1612890&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotWriter.java
(original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RiotWriter.java Wed
Jul 23 17:44:40 2014
@@ -21,7 +21,6 @@ package org.apache.jena.riot;
import java.io.OutputStream ;
import java.util.Iterator ;
-import org.apache.jena.riot.out.CharSpace ;
import org.apache.jena.riot.writer.* ;
import com.hp.hpl.jena.graph.Triple ;
@@ -46,84 +45,85 @@ public class RiotWriter
@deprecated Use {@linkplain RDFDataMgr#createGraphWriter(Lang)}
*/
@Deprecated
- public static WriterGraphRIOT createTurtle() { return new
TurtleWriter() ; }
+ public static WriterGraphRIOT createTurtle() { return
RDFDataMgr.createGraphWriter(RDFFormat.TURTLE) ; }
/** Create a streaming Turtle writer
* @deprecated Use {@linkplain RDFDataMgr#createGraphWriter(RDFFormat)}
and <tt>RDFFormat.TURTLE_BLOCKS</tt>
*/
@Deprecated
- public static WriterGraphRIOT createTurtleStreaming() { return new
TurtleWriterBlocks() ; }
+ public static WriterGraphRIOT createTurtleStreaming() { return
RDFDataMgr.createGraphWriter(RDFFormat.TURTLE_BLOCKS) ; }
/** Create a streaming Turtle writer
* @deprecated Use {@linkplain RDFDataMgr#createGraphWriter(RDFFormat)}
and <tt>RDFFormat.TURTLE_FLAT</tt>
*/
@Deprecated
- public static WriterGraphRIOT createTurtleFlat() { return new
TurtleWriterFlat() ; }
+ public static WriterGraphRIOT createTurtleFlat() { return
RDFDataMgr.createGraphWriter(RDFFormat.TURTLE_FLAT) ; }
/** Create am N-Triples writer
* @deprecated Use {@linkplain RDFDataMgr#createGraphWriter(Lang)}
*/
@Deprecated
- public static WriterGraphRIOT createNTriples() { return new
NTriplesWriter() ; }
+ public static WriterGraphRIOT createNTriples() { return
RDFDataMgr.createGraphWriter(RDFFormat.NTRIPLES) ; }
/** Create an N-Triples writer, restricted to ASCII characters in the
output.
* Other chars escaped in \ u sequences.
* @deprecated Use {@linkplain RDFDataMgr#createGraphWriter(RDFFormat)}
and <tt>RDFFormat.NTRIPLES_ASCII</tt>
*/
@Deprecated
- public static WriterGraphRIOT createNTriplesASCII() { return new
NTriplesWriter(CharSpace.ASCII) ; }
+ public static WriterGraphRIOT createNTriplesASCII() { return
RDFDataMgr.createGraphWriter(RDFFormat.NTRIPLES_ASCII) ; }
/** Create an RDF/XML writer which pretty-prints
* @deprecated Use {@linkplain RDFDataMgr#createGraphWriter(RDFFormat)}
and <tt>RDFFormat.RDFXML_ABBREV</tt>
*/
@Deprecated
- public static WriterGraphRIOT createRDFXMLAbbrev() { return new
RDFXMLAbbrevWriter() ; }
+ public static WriterGraphRIOT createRDFXMLAbbrev() { return
RDFDataMgr.createGraphWriter(RDFFormat.RDFXML_ABBREV) ; }
/** Create an RDF/XML writer which pretty-prints
* @deprecated Use {@linkplain RDFDataMgr#createGraphWriter(RDFFormat)}
and <tt>RDFFormat.RDFXML_PLAIN</tt>
*/
@Deprecated
- public static WriterGraphRIOT createRDFXMLPlain() { return new
RDFXMLPlainWriter() ; }
+ public static WriterGraphRIOT createRDFXMLPlain() { return
RDFDataMgr.createGraphWriter(RDFFormat.RDFXML_PLAIN) ; }
/** Create an RDF/JSON writer
* @deprecated Use {@linkplain RDFDataMgr#createGraphWriter(Lang)} and
<tt>Lang.RDFJSON</tt>
*/
@Deprecated
- public static WriterGraphRIOT createRDFJSON() { return new
RDFJSONWriter() ; }
-
+ public static WriterGraphRIOT createRDFJSON() { return
RDFDataMgr.createGraphWriter(RDFFormat.RDFJSON) ; }
/** Create a TriG writer
- * @deprecated Use {@linkplain RDFDataMgr#createGraphWriter(Lang)} and
<tt>Lang.TRIG</tt>
+ * @deprecated Use {@linkplain RDFDataMgr#createDatasetWriter(Lang)} and
<tt>Lang.TRIG</tt>
*/
@Deprecated
- public static WriterDatasetRIOT createTrig() { return new
TriGWriter() ; }
+ public static WriterDatasetRIOT createTrig() { return
RDFDataMgr.createDatasetWriter(RDFFormat.TRIG) ; }
/** Create a streaming TriG writer
- * @deprecated Use {@linkplain RDFDataMgr#createGraphWriter(RDFFormat)}
and <tt>RDFFormat.TRIG_BLOCKS</tt>
+ * @deprecated Use {@linkplain RDFDataMgr#createDatasetWriter(RDFFormat)}
and <tt>RDFFormat.TRIG_BLOCKS</tt>
*/
@Deprecated
- public static WriterDatasetRIOT createTrigStreaming() { return new
TriGWriterBlocks() ; }
+ public static WriterDatasetRIOT createTrigStreaming() { return
RDFDataMgr.createDatasetWriter(RDFFormat.TRIG_BLOCKS) ; }
/** Create a streaming TriG writer with one quad per line.
- * @deprecated Use {@linkplain RDFDataMgr#createGraphWriter(RDFFormat)}
and <tt>RDFFormat.TRIG_FLAT</tt>
+ * @deprecated Use {@linkplain RDFDataMgr#createDatasetWriter(RDFFormat)}
and <tt>RDFFormat.TRIG_FLAT</tt>
*/
@Deprecated
- public static WriterDatasetRIOT createTrigFlat() { return new
TriGWriterFlat() ; }
+ public static WriterDatasetRIOT createTrigFlat() { return
RDFDataMgr.createDatasetWriter(RDFFormat.TRIG_FLAT) ; }
/** Create an N-Quads writer
- * @deprecated Use {@linkplain RDFDataMgr#createGraphWriter(Lang)} and
<tt>Lang.NQUADS</tt>
+ * @deprecated Use {@linkplain RDFDataMgr#createDatasetWriter(Lang)} and
<tt>Lang.NQUADS</tt>
*/
@Deprecated
- public static WriterDatasetRIOT createNQuads() { return new
NQuadsWriter() ; }
+ public static WriterDatasetRIOT createNQuads() { return
RDFDataMgr.createDatasetWriter(RDFFormat.NQUADS) ; }
/** Create an N-Quads writer, restricted to ASCII characters in the
output.
* Other chars escaped in \ u sequences.
* @deprecated Use {@linkplain RDFDataMgr#createGraphWriter(RDFFormat)}
and <tt>RDFFormat.NQUADS_ASCII</tt>
*/
@Deprecated
- public static WriterDatasetRIOT createNQuadsASCII() { return new
NQuadsWriter(CharSpace.ASCII) ; }
+ public static WriterDatasetRIOT createNQuadsASCII() { return
RDFDataMgr.createDatasetWriter(RDFFormat.NQUADS_ASCII) ; }
- /** Create a sink writer */
+ /** Create a sink writer
+ * @deprecated Use {@linkplain RDFDataMgr#createDatasetWriter(RDFFormat)}
and <tt>RDFFormat.RDFNULL</tt>
+ */
@Deprecated
- public static WriterDatasetRIOT createRDFNULL() { return
NullWriter.factory.create(RDFFormat.RDFNULL) ; }
+ public static WriterDatasetRIOT createRDFNULL() { return
RDFDataMgr.createDatasetWriter(RDFFormat.RDFNULL) ; }
}
