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 2014/06/21 15:43:37 UTC
svn commit: r1604375 - in /jena/trunk/jena-arq/src/main/java:
com/hp/hpl/jena/sparql/algebra/optimize/ com/hp/hpl/jena/sparql/expr/
com/hp/hpl/jena/sparql/modify/ com/hp/hpl/jena/sparql/sse/writers/
org/apache/jena/atlas/io/ org/apache/jena/atlas/lib/ ...
Author: andy
Date: Sat Jun 21 13:43:36 2014
New Revision: 1604375
URL: http://svn.apache.org/r1604375
Log:
JENA-726 : Removing deprecated methods (internal).
Removed:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/GraphStoreEvents.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/IRILib.java
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/Optimize.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprList.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterOp.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/ContentType.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.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/RiotWriter.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/adapters/AdapterFileManager.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/SinkQuadOutput.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/SinkTripleOutput.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotWriter.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/Optimize.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/Optimize.java?rev=1604375&r1=1604374&r2=1604375&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/Optimize.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/Optimize.java Sat Jun 21 13:43:36 2014
@@ -103,15 +103,6 @@ public class Optimize implements Rewrite
public static void setFactory(RewriterFactory aFactory)
{ factory = aFactory ; }
- /** Get the global factory for making optimizers.
- * Ignores it's argument.
- * @deprecated Use {linkplain #getFactory()}.
- */
- @Deprecated
- // If you see this after jena 2.11.2 release, delete this method.
- public static RewriterFactory getFactory(RewriterFactory aFactory)
- { return getFactory() ; }
-
/** Get the global factory for making optimizers */
public static RewriterFactory getFactory()
{ return factory ; }
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprList.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprList.java?rev=1604375&r1=1604374&r2=1604375&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprList.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprList.java Sat Jun 21 13:43:36 2014
@@ -35,22 +35,21 @@ public class ExprList implements Iterabl
public ExprList() { expressions = new ArrayList<Expr>() ; }
- /** @deprecated Deprecated as a public constructor. Use {@linkplain ExprList#copy(ExprList)} instead. */
- @Deprecated
- public ExprList(ExprList other) { this() ; expressions.addAll(other.expressions) ; }
- public ExprList(Expr expr)
- {
+ private ExprList(ExprList other) {
+ this() ;
+ expressions.addAll(other.expressions) ;
+ }
+
+ public ExprList(Expr expr) {
this() ;
expressions.add(expr) ;
}
-
+
public ExprList(List<Expr> x) { expressions = x ; }
- public boolean isSatisfied(Binding binding, ExecutionContext execCxt)
- {
- for (Expr expr : expressions)
- {
- if ( ! expr.isSatisfied(binding, execCxt) )
+ public boolean isSatisfied(Binding binding, ExecutionContext execCxt) {
+ for (Expr expr : expressions) {
+ if ( !expr.isSatisfied(binding, execCxt) )
return false ;
}
return true ;
@@ -62,38 +61,34 @@ public class ExprList implements Iterabl
public ExprList subList(int fromIdx, int toIdx) { return new ExprList(expressions.subList(fromIdx, toIdx)) ; }
public ExprList tail(int fromIdx) { return subList(fromIdx, expressions.size()) ; }
- public Set<Var> getVarsMentioned()
- {
+ public Set<Var> getVarsMentioned() {
Set<Var> x = new HashSet<Var>() ;
varsMentioned(x) ;
return x ;
}
-
- public void varsMentioned(Collection<Var> acc)
- {
+
+ public void varsMentioned(Collection<Var> acc) {
for (Expr expr : expressions)
expr.varsMentioned(acc) ;
}
-
- public ExprList copySubstitute(Binding binding)
- {
+
+ public ExprList copySubstitute(Binding binding) {
ExprList x = new ExprList() ;
- for ( Iterator<Expr> iter = expressions.iterator() ; iter.hasNext() ; )
- {
- Expr expr = iter.next();
+ for (Iterator<Expr> iter = expressions.iterator(); iter.hasNext();) {
+ Expr expr = iter.next() ;
expr = expr.copySubstitute(binding) ;
x.add(expr) ;
}
return x ;
}
- public void addAll(ExprList exprs) { expressions.addAll(exprs.getList()) ; }
- public void add(Expr expr) { expressions.add(expr) ; }
- public List<Expr> getList() { return expressions ; }
+
+ public void addAll(ExprList exprs) { expressions.addAll(exprs.getList()) ; }
+ public void add(Expr expr) { expressions.add(expr) ; }
+ public List<Expr> getList() { return expressions ; }
@Override
- public Iterator<Expr> iterator() { return expressions.iterator() ; }
+ public Iterator<Expr> iterator() { return expressions.iterator() ; }
- public void prepareExprs(Context context)
- {
+ public void prepareExprs(Context context) {
ExprBuild build = new ExprBuild(context) ;
// Give each expression the chance to set up (bind functions)
for (Expr expr : expressions)
@@ -108,33 +103,29 @@ public class ExprList implements Iterabl
public int hashCode() { return expressions.hashCode() ; }
@Override
- public boolean equals(Object other)
- {
+ public boolean equals(Object other) {
if ( this == other ) return true ;
if ( ! ( other instanceof ExprList ) ) return false ;
ExprList exprs = (ExprList)other ;
return expressions.equals(exprs.expressions) ;
}
- public static ExprList splitConjunction(ExprList exprList1)
- {
+
+ public static ExprList splitConjunction(ExprList exprList1) {
ExprList exprList2 = new ExprList() ;
for (Expr expr : exprList1)
split(exprList2, expr) ;
return exprList2 ;
}
-
- private static ExprList splitConjunction(Expr expr)
- {
+
+ private static ExprList splitConjunction(Expr expr) {
ExprList exprList = new ExprList() ;
split(exprList, expr) ;
return exprList ;
}
-
- private static void split(ExprList exprList, Expr expr)
- {
+
+ private static void split(ExprList exprList, Expr expr) {
// Explode &&-chain to exprlist.
- while ( expr instanceof E_LogicalAnd )
- {
+ while (expr instanceof E_LogicalAnd) {
E_LogicalAnd x = (E_LogicalAnd)expr ;
Expr left = x.getArg1() ;
Expr right = x.getArg2() ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterOp.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterOp.java?rev=1604375&r1=1604374&r2=1604375&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterOp.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/writers/WriterOp.java Sat Jun 21 13:43:36 2014
@@ -88,11 +88,6 @@ public class WriterOp
output(iWriter, op, sCxt) ;
}
- /** @deprecated Use {@link #output(OutputStream,Op,SerializationContext)} */
- @Deprecated
- public static void out(OutputStream out, Op op, SerializationContext sCxt)
- { out(out, op, sCxt) ; }
-
public static void output(OutputStream out, Op op, SerializationContext sCxt)
{
output(new IndentedWriter(out), op, sCxt) ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java?rev=1604375&r1=1604374&r2=1604375&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java Sat Jun 21 13:43:36 2014
@@ -262,10 +262,9 @@ public class IndentedWriter extends AWri
return column ;
}
- /** @deprecated Use getAbsoluteIndent() */
- @Deprecated
- public int getIndent() { return currentIndent ; }
- public int getAbsoluteIndent() { return currentIndent ; }
+ /** Get indent from the left hand edge */
+ public int getAbsoluteIndent() { return currentIndent ; }
+ /** Set indent from the left hand edge */
public void setAbsoluteIndent(int x) { currentIndent = x ; }
/** Position past current indent */
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/ContentType.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/ContentType.java?rev=1604375&r1=1604374&r2=1604375&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/ContentType.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/ContentType.java Sat Jun 21 13:43:36 2014
@@ -16,47 +16,53 @@
* limitations under the License.
*/
-package org.apache.jena.atlas.web;
+package org.apache.jena.atlas.web ;
/** A restricted view of MediaType */
public class ContentType
{
- private MediaType mediaType ;
- private static final String charsetParamName = "charset" ;
-
- /** @deprecated use {@linkplain #create(String)} */
- @Deprecated
- public static ContentType parse(String string) { return create(string) ; }
-
- public static ContentType create(String string)
- {
+ private MediaType mediaType ;
+ private static final String charsetParamName = "charset" ;
+
+ public static ContentType create(String string) {
if ( string == null )
return null ;
ContentType ct = new ContentType(MediaType.create(string)) ;
return ct ;
}
-
- public static ContentType create(String ctString, String charset)
- {
+
+ public static ContentType create(String ctString, String charset) {
MediaType.ParsedMediaType x = MediaType.parse(ctString) ;
x.params.put(charsetParamName, charset) ;
return new ContentType(new MediaType(x)) ;
}
-
- private ContentType(MediaType m)
- {
+
+ private ContentType(MediaType m) {
mediaType = m ;
}
-
- public String getContentType() { return mediaType.getContentType() ; }
- public String getCharset() { return mediaType.getCharset() ; }
- public String getType() { return mediaType.getType() ; }
- public String getSubType() { return mediaType.getSubType() ; }
- public String toHeaderString() { return mediaType.toHeaderString() ; }
-
+
+ public String getContentType() {
+ return mediaType.getContentType() ;
+ }
+
+ public String getCharset() {
+ return mediaType.getCharset() ;
+ }
+
+ public String getType() {
+ return mediaType.getType() ;
+ }
+
+ public String getSubType() {
+ return mediaType.getSubType() ;
+ }
+
+ public String toHeaderString() {
+ return mediaType.toHeaderString() ;
+ }
+
@Override
- public int hashCode()
- {
+ public int hashCode() {
final int prime = 31 ;
int result = 1 ;
result = prime * result + ((mediaType == null) ? 0 : mediaType.hashCode()) ;
@@ -64,24 +70,24 @@ public class ContentType
}
@Override
- public boolean equals(Object obj)
- {
- if (this == obj) return true ;
- if (obj == null) return false ;
- if (getClass() != obj.getClass()) return false ;
+ public boolean equals(Object obj) {
+ if ( this == obj )
+ return true ;
+ if ( obj == null )
+ return false ;
+ if ( getClass() != obj.getClass() )
+ return false ;
ContentType other = (ContentType)obj ;
- if (mediaType == null)
- {
- if (other.mediaType != null) return false ;
- } else
- if (!mediaType.equals(other.mediaType)) return false ;
+ if ( mediaType == null ) {
+ if ( other.mediaType != null )
+ return false ;
+ } else if ( !mediaType.equals(other.mediaType) )
+ return false ;
return true ;
}
-
+
@Override
- public String toString()
- {
+ public String toString() {
return mediaType.toString() ;
}
}
-
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java?rev=1604375&r1=1604374&r2=1604375&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java Sat Jun 21 13:43:36 2014
@@ -51,10 +51,6 @@ public class TypedInputStream extends Fi
this.baseURI = baseURI ;
}
- /** @deprecated Use {@link #getContentType} */
- @Deprecated
- public String getMimeType() { return getContentType() ; }
-
public String getContentType() { return mediaType == null ? null : mediaType.getContentType() ; }
public String getCharset() { return mediaType == null ? null : mediaType.getCharset() ; }
public ContentType getMediaType() { return mediaType ; }
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=1604375&r1=1604374&r2=1604375&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 Sat Jun 21 13:43:36 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.riot;
+package org.apache.jena.riot ;
import org.apache.jena.riot.adapters.AdapterFileManager ;
import org.apache.jena.riot.system.IO_JenaReaders ;
@@ -27,41 +27,32 @@ import com.hp.hpl.jena.util.FileManager
public class IO_Jena
{
- private static String riotBase = "http://jena.apache.org/riot/" ;
- private static String streamManagerSymbolStr = riotBase+"streammanager" ;
- public static Symbol streamManagerSymbol = Symbol.create(streamManagerSymbolStr) ;
- private static FileManager coreFileManager = null ;
+ private static String riotBase = "http://jena.apache.org/riot/" ;
+ private static String streamManagerSymbolStr = riotBase + "streammanager" ;
+ public static Symbol streamManagerSymbol = Symbol.create(streamManagerSymbolStr) ;
+ private static FileManager coreFileManager = null ;
- public static void wireIntoJena()
- {
+ public static void wireIntoJena() {
FileManager.setGlobalFileManager(AdapterFileManager.get()) ;
IO_JenaReaders.wireIntoJena() ;
IO_JenaWriters.wireIntoJena() ;
}
- /** @deprecated Use {@linkplain #resetJena} */
- @Deprecated
- public static void resetJenaReaders() { resetJena() ; }
-
- public static void resetJena()
- {
+ public static void resetJena() {
// This forces reinitialization if ever used.
FileManager.setGlobalFileManager(null) ;
IO_JenaReaders.resetJena() ;
IO_JenaWriters.resetJena() ;
}
-
- /** Register for use with Model.read (old style compatibility) */
- public static void registerForModelRead(String name, Class<?> cls)
- {
+
+ /** Register for use with Model.read (old style compatibility) */
+ public static void registerForModelRead(String name, Class<? > cls) {
IO_JenaReaders.registerForModelRead(name, cls) ;
}
-
- /** Register for use with Model.write (old style compatibility) */
- public static void registerForModelWrite(String name, Class<?> cls)
- {
+
+ /** Register for use with Model.write (old style compatibility) */
+ public static void registerForModelWrite(String name, Class<? > cls) {
IO_JenaWriters.registerForModelWrite(name, cls) ;
}
}
-
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=1604375&r1=1604374&r2=1604375&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 Sat Jun 21 13:43:36 2014
@@ -21,13 +21,10 @@ package org.apache.jena.riot;
import java.io.OutputStream ;
import java.util.Iterator ;
-import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.out.CharSpace ;
import org.apache.jena.riot.writer.* ;
-import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.Quad ;
/** Direct call to create writers for specific formats.
@@ -35,38 +32,14 @@ import com.hp.hpl.jena.sparql.core.Quad
*/
public class RiotWriter
{
- // Compatibility stuff
- /** @deprecated Use RDFDataMgr.write(OutputStream, DatasetGraph, Lang.NQUADS) */
- @Deprecated
- public static void writeNQuads(OutputStream out, DatasetGraph dsg)
- {
- RDFDataMgr.write(out, dsg, Lang.NQUADS) ;
- }
-
- public static void writeNQuads(OutputStream out, Iterator<Quad> it)
- {
+ public static void writeNQuads(OutputStream out, Iterator<Quad> it) {
NQuadsWriter.write(out, it) ;
}
- /** @deprecated Use {@linkplain RDFDataMgr#write(OutputStream, Graph, Lang)} with <tt>Lang.NTRIPLES</tt>. */
- @Deprecated
- public static void writeTriples(OutputStream out, Graph graph)
- {
- RDFDataMgr.write(out, graph, Lang.NTRIPLES) ;
- }
-
- public static void writeTriples(OutputStream out, Iterator<Triple> it)
- {
+ public static void writeTriples(OutputStream out, Iterator<Triple> it) {
NTriplesWriter.write(out, it) ;
}
- /** @deprecated Use {@linkplain RDFDataMgr#write(OutputStream, Graph, Lang)} with <tt>Lang.RDFJSON</tt>. */
- @Deprecated
- public static void writeRDFJSON(OutputStream out, Graph graph)
- {
- RDFDataMgr.write(out, graph, Lang.RDFJSON) ;
- }
-
// ---- Create writers
/** Create a Turtle writer
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=1604375&r1=1604374&r2=1604375&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 Sat Jun 21 13:43:36 2014
@@ -203,22 +203,4 @@ public class WebContent
public static boolean isMultiPartForm(ContentType ct) {
return contentTypeMultipartFormData.equalsIgnoreCase(ct.getContentType()) ;
}
-
- /** @deprecated Use {@linkplain RDFLanguages#contentTypeToLang(String)}*/
- @Deprecated
- public static Lang contentTypeToLang(String contentType)
- {
- return RDFLanguages.contentTypeToLang(contentType) ;
- }
-
- /** @deprecated Use {@linkplain Lang#getHeaderString()} */
- @Deprecated
- public static String mapLangToContentType(Lang lang) { return lang.getHeaderString() ; }
-
- /** @deprecated Use {@linkplain RDFLanguages#getCharsetForContentType(String)} */
- @Deprecated
- public static String getCharsetForContentType(String contentType)
- {
- return RDFLanguages.getCharsetForContentType(contentType) ;
- }
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java?rev=1604375&r1=1604374&r2=1604375&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java Sat Jun 21 13:43:36 2014
@@ -206,14 +206,6 @@ public class AdapterFileManager extends
streamManager.addLocator(cLoc) ;
}
- /** Add a URL locator */
- @Override
- @Deprecated
- public void addLocatorURL() {
- Locator loc = new LocatorHTTP() ;
- streamManager.addLocator(loc) ;
- }
-
public void addLocatorHTTP() {
Locator loc = new LocatorHTTP() ;
streamManager.addLocator(loc) ;
@@ -324,11 +316,4 @@ public class AdapterFileManager extends
public TypedStream openNoMapOrNull(String filenameOrURI) {
return AdapterLib.convert(streamManager.openNoMapOrNull(filenameOrURI)) ;
}
-
- /** @deprecated Use mapURI */
- @Deprecated
- @Override
- public String remap(String filenameOrURI) {
- return mapURI(filenameOrURI) ;
- }
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/SinkQuadOutput.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/SinkQuadOutput.java?rev=1604375&r1=1604374&r2=1604375&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/SinkQuadOutput.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/SinkQuadOutput.java Sat Jun 21 13:43:36 2014
@@ -20,12 +20,11 @@ package org.apache.jena.riot.out;
import java.io.OutputStream ;
-import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.io.AWriter ;
+import org.apache.jena.atlas.io.IO ;
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 ;
@@ -42,13 +41,6 @@ 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()) ;
- }
-
public SinkQuadOutput(OutputStream outs, Prologue prologue, NodeToLabel labels)
{
out = IO.wrapUTF8(outs) ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/SinkTripleOutput.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/SinkTripleOutput.java?rev=1604375&r1=1604374&r2=1604375&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/SinkTripleOutput.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/SinkTripleOutput.java Sat Jun 21 13:43:36 2014
@@ -16,85 +16,72 @@
* limitations under the License.
*/
-package org.apache.jena.riot.out;
+package org.apache.jena.riot.out ;
import java.io.OutputStream ;
-import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.io.AWriter ;
+import org.apache.jena.atlas.io.IO ;
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 Prologue prologue = null ;
private final AWriter 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()) ;
- }
-
- public SinkTripleOutput(OutputStream outs, Prologue prologue, NodeToLabel labels)
- {
+ private NodeToLabel labelPolicy = null ;
+
+ private NodeFormatter nodeFmt = new NodeFormatterNT() ;
+
+ public SinkTripleOutput(OutputStream outs, Prologue prologue, NodeToLabel labels) {
out = IO.wrapUTF8(outs) ;
setPrologue(prologue) ;
setLabelPolicy(labels) ;
}
-
+
// Need to do this later sometimes to sort out the plumbing.
- public void setPrologue(Prologue prologue)
- {
+ public void setPrologue(Prologue prologue) {
this.prologue = prologue ;
}
-
- public void setLabelPolicy(NodeToLabel labels)
- {
+
+ public void setLabelPolicy(NodeToLabel labels) {
this.labelPolicy = labels ;
}
-
+
@Override
- public void send(Triple triple)
- {
- Node s = triple.getSubject() ;
- Node p = triple.getPredicate() ;
- Node o = triple.getObject() ;
-
- nodeFmt.format(out, s) ;
- out.print(" ") ;
- nodeFmt.format(out, p) ;
- out.print(" ") ;
- nodeFmt.format(out, o) ;
- out.print(" .\n") ;
+ public void send(Triple triple) {
+ Node s = triple.getSubject() ;
+ Node p = triple.getPredicate() ;
+ Node o = triple.getObject() ;
+
+ nodeFmt.format(out, s) ;
+ out.print(" ") ;
+ nodeFmt.format(out, p) ;
+ out.print(" ") ;
+ nodeFmt.format(out, o) ;
+ out.print(" .\n") ;
}
@Override
- public void flush()
- {
+ public void flush() {
IO.flush(out) ;
}
@Override
- public void close()
- {
+ public void close() {
IO.flush(out) ;
// Don't close the underlying OutputStream that was passed in.
}
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotWriter.java?rev=1604375&r1=1604374&r2=1604375&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotWriter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotWriter.java Sat Jun 21 13:43:36 2014
@@ -21,6 +21,8 @@ package org.openjena.riot;
import java.io.OutputStream ;
import java.util.Iterator ;
+import org.apache.jena.riot.RDFDataMgr ;
+
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
@@ -32,14 +34,11 @@ import com.hp.hpl.jena.sparql.core.Quad
@Deprecated
public class RiotWriter
{
- // Work in progress
- // A class of all the ways to write things - just jumps to right place in code.
-
/** @deprecated Use {@link org.apache.jena.riot.RiotWriter} */
@Deprecated
public static void writeNQuads(OutputStream out, DatasetGraph dsg)
{
- org.apache.jena.riot.RiotWriter.writeNQuads(out, dsg) ;
+ RDFDataMgr.write(out,dsg, org.apache.jena.riot.Lang.NQUADS) ;
}
/** @deprecated Use {@link org.apache.jena.riot.RiotWriter} */
@Deprecated
@@ -51,7 +50,7 @@ public class RiotWriter
@Deprecated
public static void writeTriples(OutputStream out, Graph graph)
{
- org.apache.jena.riot.RiotWriter.writeTriples(out, graph) ;
+ RDFDataMgr.write(out,graph, org.apache.jena.riot.Lang.NTRIPLES) ;
}
/** @deprecated Use {@link org.apache.jena.riot.RiotWriter} */
@Deprecated
@@ -63,6 +62,6 @@ public class RiotWriter
@Deprecated
public static void writeRDFJSON(OutputStream out, Graph graph)
{
- org.apache.jena.riot.RiotWriter.writeRDFJSON(out, graph) ;
+ RDFDataMgr.write(out,graph, org.apache.jena.riot.Lang.RDFJSON) ;
}
}