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 2015/08/24 12:29:54 UTC
svn commit: r1697350 - in
/jena/Experimental/jena-client/src/main/java/org/apache/jena/client:
AbstractUpdater.java graph/AutoCommitQueryExecution.java
Author: andy
Date: Mon Aug 24 10:29:53 2015
New Revision: 1697350
URL: http://svn.apache.org/r1697350
Log:
Use RDFDataMgr, not RiotReader
Modified:
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/AbstractUpdater.java
jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/AutoCommitQueryExecution.java
Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/AbstractUpdater.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/AbstractUpdater.java?rev=1697350&r1=1697349&r2=1697350&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/AbstractUpdater.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/AbstractUpdater.java Mon Aug 24 10:29:53 2015
@@ -28,8 +28,8 @@ import org.apache.jena.graph.Node;
import org.apache.jena.graph.Triple;
import org.apache.jena.query.ParameterizedSparqlString;
import org.apache.jena.riot.Lang;
+import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.riot.RDFLanguages ;
-import org.apache.jena.riot.RiotReader;
import org.apache.jena.sparql.core.DatasetGraph;
import org.apache.jena.sparql.core.Quad;
import org.apache.jena.update.Update;
@@ -156,7 +156,7 @@ public abstract class AbstractUpdater im
throw new IllegalArgumentException("lang must be a Quad language, or you must call the insert() method with a graph name for Triple languages");
}
- Iterator<Quad> it = RiotReader.createIteratorQuads(in, lang, base);
+ Iterator<Quad> it = RDFDataMgr.createIteratorQuads(in, lang, base);
try
{
insert(it);
@@ -179,13 +179,13 @@ public abstract class AbstractUpdater im
Iterator<Quad> it;
if (RDFLanguages.isTriples(lang))
{
- Iterator<Triple> parser = RiotReader.createIteratorTriples(in, lang, base);
+ Iterator<Triple> parser = RDFDataMgr.createIteratorTriples(in, lang, base);
it = Iter.map(parser, t -> Quad.create(graphName, t));
}
else
{
// We'll allow Quad languages, and ignore the graph specified in the inputstream in favor of the provided one
- Iterator<Quad> parser = RiotReader.createIteratorQuads(in, lang, base);
+ Iterator<Quad> parser = RDFDataMgr.createIteratorQuads(in, lang, base);
it = Iter.map(parser, t -> Quad.create(graphName, t.getSubject(), t.getPredicate(), t.getObject()));
}
@@ -271,7 +271,7 @@ public abstract class AbstractUpdater im
throw new IllegalArgumentException("lang must be a Quad language, or you must call the delete() method with a graph name for Triple languages");
}
- Iterator<Quad> it = RiotReader.createIteratorQuads(in, lang, base);
+ Iterator<Quad> it = RDFDataMgr.createIteratorQuads(in, lang, base);
try
{
delete(it);
@@ -294,13 +294,13 @@ public abstract class AbstractUpdater im
Iterator<Quad> it;
if (RDFLanguages.isTriples(lang))
{
- Iterator<Triple> parser = RiotReader.createIteratorTriples(in, lang, base);
+ Iterator<Triple> parser = RDFDataMgr.createIteratorTriples(in, lang, base);
it = Iter.map(parser, t -> Quad.create(graphName, t));
}
else
{
// We'll allow Quad languages, and ignore the graph specified in the inputstream in favor of the provided one
- Iterator<Quad> parser = RiotReader.createIteratorQuads(in, lang, base);
+ Iterator<Quad> parser = RDFDataMgr.createIteratorQuads(in, lang, base);
it = Iter.map(parser, t -> Quad.create(graphName, t.getSubject(), t.getPredicate(), t.getObject()));
}
Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/AutoCommitQueryExecution.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/AutoCommitQueryExecution.java?rev=1697350&r1=1697349&r2=1697350&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/AutoCommitQueryExecution.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/AutoCommitQueryExecution.java Mon Aug 24 10:29:53 2015
@@ -29,6 +29,7 @@ import org.apache.jena.query.QuerySoluti
import org.apache.jena.query.ReadWrite ;
import org.apache.jena.query.ResultSet ;
import org.apache.jena.rdf.model.Model ;
+import org.apache.jena.sparql.core.Quad ;
import org.apache.jena.sparql.core.Transactional ;
import org.apache.jena.sparql.util.Context ;
@@ -69,6 +70,13 @@ class AutoCommitQueryExecution implement
}
@Override
+ public Iterator<Quad> execConstructQuads() {
+ tx.begin(ReadWrite.READ);
+ openTx = true;
+ return qe.execConstructQuads() ;
+ }
+
+ @Override
public Iterator<Triple> execDescribeTriples()
{
tx.begin(ReadWrite.READ);
@@ -113,6 +121,32 @@ class AutoCommitQueryExecution implement
}
finally
{
+ tx.end();
+ }
+ }
+
+ @Override
+ public Dataset execConstructDataset() {
+ tx.begin(ReadWrite.READ);
+ try
+ {
+ return qe.execConstructDataset();
+ }
+ finally
+ {
+ tx.end();
+ }
+ }
+
+ @Override
+ public Dataset execConstructDataset(Dataset dataset) {
+ tx.begin(ReadWrite.READ);
+ try
+ {
+ return qe.execConstructDataset(dataset);
+ }
+ finally
+ {
tx.end();
}
}