You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by sa...@apache.org on 2012/04/17 04:06:07 UTC
svn commit: r1326880 - in
/incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client:
./ http/
Author: sallen
Date: Tue Apr 17 02:06:07 2012
New Revision: 1326880
URL: http://svn.apache.org/viewvc?rev=1326880&view=rev
Log:
jena-client - use the new streaming UpdateWriter.
Removed:
incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/http/UpdateMode.java
incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/http/UpdateStreamer.java
Modified:
incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/ConnectionBase.java
incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/Inserter.java
incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/http/QuadIteratorEntity.java
incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/http/TripleIteratorEntity.java
incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/http/UpdateRemote.java
Modified: incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/ConnectionBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/ConnectionBase.java?rev=1326880&r1=1326879&r2=1326880&view=diff
==============================================================================
--- incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/ConnectionBase.java (original)
+++ incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/ConnectionBase.java Tue Apr 17 02:06:07 2012
@@ -30,35 +30,35 @@ public abstract class ConnectionBase imp
{
@Override
- public void add(Node graphName, Triple t)
+ public void insert(Node graphName, Triple t)
{
- add(new Quad(graphName, t));
+ insert(new Quad(graphName, t));
}
@Override
- public void add(Iterable<? extends Quad> quads)
+ public void insert(Iterable<? extends Quad> quads)
{
for (Quad q : quads)
{
- add(q);
+ insert(q);
}
}
@Override
- public void add(DatasetGraph dsg)
+ public void insert(DatasetGraph dsg)
{
for (Iterator<Quad> it = dsg.find(); it.hasNext(); )
{
- add(it.next());
+ insert(it.next());
}
}
@Override
- public void add(Node graphName, Graph g)
+ public void insert(Node graphName, Graph g)
{
for (Iterator<Triple> it = g.find(null, null, null); it.hasNext(); )
{
- add(graphName, it.next());
+ insert(graphName, it.next());
}
}
Modified: incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/Inserter.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/Inserter.java?rev=1326880&r1=1326879&r2=1326880&view=diff
==============================================================================
--- incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/Inserter.java (original)
+++ incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/Inserter.java Tue Apr 17 02:06:07 2012
@@ -31,19 +31,19 @@ import com.hp.hpl.jena.sparql.core.Quad;
public interface Inserter
{
// Quads
- void add(Quad q);
- void add(Iterable<? extends Quad> quads);
- void add(DatasetGraph dsg);
- void add(InputStream in, RDFFormat lang); // Lang must be NQUADS or TRIG
- void add(InputStream in, String base, RDFFormat lang); // Lang must be NQUADS or TRIG
+ void insert(Quad q);
+ void insert(Iterable<? extends Quad> quads);
+ void insert(DatasetGraph dsg);
+ void insert(InputStream in, RDFFormat lang); // Lang must be NQUADS or TRIG
+ void insert(InputStream in, String base, RDFFormat lang); // Lang must be NQUADS or TRIG
// Triples
- void add(Node graphName, Triple t);
- void add(Node graphName, Iterable<? extends Triple> triples);
- void add(Node graphName, Graph g);
- void add(Node graphName, InputStream in, RDFFormat lang);
- void add(Node graphName, InputStream in, String base, RDFFormat lang);
- void add(Node graphName, IRI sourceDocument);
+ void insert(Node graphName, Triple t);
+ void insert(Node graphName, Iterable<? extends Triple> triples);
+ void insert(Node graphName, Graph g);
+ void insert(Node graphName, InputStream in, RDFFormat lang);
+ void insert(Node graphName, InputStream in, String base, RDFFormat lang);
+ void insert(Node graphName, IRI sourceDocument);
}
Modified: incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/http/QuadIteratorEntity.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/http/QuadIteratorEntity.java?rev=1326880&r1=1326879&r2=1326880&view=diff
==============================================================================
--- incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/http/QuadIteratorEntity.java (original)
+++ incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/http/QuadIteratorEntity.java Tue Apr 17 02:06:07 2012
@@ -6,10 +6,14 @@ import java.io.OutputStream ;
import java.util.Iterator ;
import org.apache.http.entity.AbstractHttpEntity ;
+import org.openjena.atlas.io.IndentedWriter;
import org.openjena.atlas.iterator.Iter ;
import org.openjena.atlas.lib.NotImplemented ;
import com.hp.hpl.jena.sparql.core.Quad ;
+import com.hp.hpl.jena.sparql.modify.request.UpdateDataWriter;
+import com.hp.hpl.jena.sparql.modify.request.UpdateDataWriter.UpdateMode;
+import com.hp.hpl.jena.sparql.serializer.SerializationContext;
class QuadIteratorEntity extends AbstractHttpEntity
{
@@ -56,7 +60,7 @@ class QuadIteratorEntity extends Abstrac
if (!it.hasNext()) return;
- UpdateStreamer us = new UpdateStreamer(mode, outstream);
+ UpdateDataWriter us = new UpdateDataWriter(mode, new IndentedWriter(outstream), new SerializationContext());
us.open();
Iter.sendToSink(it, us); // us.close() is called by sendToSink
}
Modified: incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/http/TripleIteratorEntity.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/http/TripleIteratorEntity.java?rev=1326880&r1=1326879&r2=1326880&view=diff
==============================================================================
--- incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/http/TripleIteratorEntity.java (original)
+++ incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/http/TripleIteratorEntity.java Tue Apr 17 02:06:07 2012
@@ -6,10 +6,14 @@ import java.io.OutputStream ;
import java.util.Iterator ;
import org.apache.http.entity.AbstractHttpEntity ;
+import org.openjena.atlas.io.IndentedWriter;
import org.openjena.atlas.lib.NotImplemented ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.sparql.modify.request.UpdateDataWriter;
+import com.hp.hpl.jena.sparql.modify.request.UpdateDataWriter.UpdateMode;
+import com.hp.hpl.jena.sparql.serializer.SerializationContext;
class TripleIteratorEntity extends AbstractHttpEntity
{
@@ -58,11 +62,11 @@ class TripleIteratorEntity extends Abstr
if (!it.hasNext()) return;
- UpdateStreamer us = new UpdateStreamer(mode, outstream);
+ UpdateDataWriter us = new UpdateDataWriter(mode, new IndentedWriter(outstream), new SerializationContext());
us.open();
do
{
- us.add(graphName, it.next());
+ us.send(graphName, it.next());
} while (it.hasNext());
us.close(); // Not in a finally block, because it doesn't make sense to try to finish writing if something went wrong
}
Modified: incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/http/UpdateRemote.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/http/UpdateRemote.java?rev=1326880&r1=1326879&r2=1326880&view=diff
==============================================================================
--- incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/http/UpdateRemote.java (original)
+++ incubator/jena/Experimental/jena-client/trunk/src/main/java/org/apache/jena/client/http/UpdateRemote.java Tue Apr 17 02:06:07 2012
@@ -38,6 +38,7 @@ import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.Quad ;
import com.hp.hpl.jena.sparql.modify.request.Target ;
+import com.hp.hpl.jena.sparql.modify.request.UpdateDataWriter.UpdateMode;
import com.hp.hpl.jena.sparql.modify.request.UpdateDrop ;
import com.hp.hpl.jena.sparql.modify.request.UpdateWriter ;
import com.hp.hpl.jena.update.Update ;