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/08/14 03:29:01 UTC

svn commit: r1372700 - in /jena/Experimental/jena-client: ./ src/main/java/org/apache/jena/client/

Author: sallen
Date: Tue Aug 14 01:29:00 2012
New Revision: 1372700

URL: http://svn.apache.org/viewvc?rev=1372700&view=rev
Log:
jena-client - Add Updater method to take a ParameterizedSparqlString.

Modified:
    jena/Experimental/jena-client/pom.xml
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/Connection.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateQuerier.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateQuerierWrapper.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdaterBase.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdaterWrapper.java

Modified: jena/Experimental/jena-client/pom.xml
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/pom.xml?rev=1372700&r1=1372699&r2=1372700&view=diff
==============================================================================
--- jena/Experimental/jena-client/pom.xml (original)
+++ jena/Experimental/jena-client/pom.xml Tue Aug 14 01:29:00 2012
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.jena</groupId>
   <artifactId>jena-client</artifactId>
-  <version>0.0.6-SNAPSHOT</version>
+  <version>0.0.7-SNAPSHOT</version>
   <name>JenaClient</name>
   <description>A Jena library for interacting with SPARQL endpoints.</description>
   

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/Connection.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/Connection.java?rev=1372700&r1=1372699&r2=1372700&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/Connection.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/Connection.java Tue Aug 14 01:29:00 2012
@@ -52,12 +52,12 @@ public interface Connection extends Tran
     
     QueryStatement createQueryStatement(Query query);
     QueryStatement createQueryStatement(String queryString);
-    QueryStatement createQueryStatement(ParameterizedSparqlString paramQuery);
+    QueryStatement createQueryStatement(ParameterizedSparqlString paramQueryString);
     
     UpdateStatement createUpdateStatement(Update update);
-    UpdateStatement createUpdateStatement(Iterable<? extends Update> update);
+    UpdateStatement createUpdateStatement(Iterable<? extends Update> updates);
     UpdateStatement createUpdateStatement(String updateString);
-    UpdateStatement createUpdateStatement(ParameterizedSparqlString paramUpdate);
+    UpdateStatement createUpdateStatement(ParameterizedSparqlString paramUpdateString);
     
 
     Updater createStreamingUpdater();

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateQuerier.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateQuerier.java?rev=1372700&r1=1372699&r2=1372700&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateQuerier.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateQuerier.java Tue Aug 14 01:29:00 2012
@@ -4,6 +4,7 @@ import java.util.Iterator;
 
 import org.openjena.atlas.lib.Closeable;
 
+import com.hp.hpl.jena.query.ParameterizedSparqlString;
 import com.hp.hpl.jena.update.Update;
 
 // TODO I don't like this name... The idea of this class is it can do all SPARQL 1.1 Update operations,
@@ -18,6 +19,12 @@ public interface UpdateQuerier extends C
     void update(String updateQuery);
     
     /**
+     * Execute an update query by parsing from a ParameterizedSparqlString.
+     * @param paramUpdateString The update request as a ParameterizedSparqlString.
+     */
+    void update(ParameterizedSparqlString paramUpdateString);
+    
+    /**
      * Execute an update query by parsing from a string.
      * 
      * @param updateQuery The update request as a string.

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateQuerierWrapper.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateQuerierWrapper.java?rev=1372700&r1=1372699&r2=1372700&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateQuerierWrapper.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateQuerierWrapper.java Tue Aug 14 01:29:00 2012
@@ -2,6 +2,7 @@ package org.apache.jena.client;
 
 import java.util.Iterator;
 
+import com.hp.hpl.jena.query.ParameterizedSparqlString;
 import com.hp.hpl.jena.update.Update;
 
 class UpdateQuerierWrapper implements UpdateQuerier
@@ -24,6 +25,12 @@ class UpdateQuerierWrapper implements Up
     {
         wrappedObject.update(updateQuery);
     }
+    
+    @Override
+    public void update(ParameterizedSparqlString paramUpdateString)
+    {
+        wrappedObject.update(paramUpdateString);
+    }
 
     @Override
     public void update(String updateQuery, String baseURI)

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdaterBase.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdaterBase.java?rev=1372700&r1=1372699&r2=1372700&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdaterBase.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdaterBase.java Tue Aug 14 01:29:00 2012
@@ -30,6 +30,7 @@ import org.openjena.riot.RiotReader;
 import com.hp.hpl.jena.graph.Graph;
 import com.hp.hpl.jena.graph.Node;
 import com.hp.hpl.jena.graph.Triple;
+import com.hp.hpl.jena.query.ParameterizedSparqlString;
 import com.hp.hpl.jena.sparql.core.DatasetGraph;
 import com.hp.hpl.jena.sparql.core.Quad;
 import com.hp.hpl.jena.update.Update;
@@ -66,6 +67,16 @@ public abstract class UpdaterBase implem
     }
     
     @Override
+    public void update(ParameterizedSparqlString paramUpdateString)
+    {
+        if (null == paramUpdateString)
+        {
+            throw new NullPointerException("paramUpdateString");
+        }
+        update(UpdateFactory.create(paramUpdateString.toString()));
+    }
+    
+    @Override
     public void update(String updateQuery, String baseURI)
     {
         update(UpdateFactory.create(updateQuery, baseURI));

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdaterWrapper.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdaterWrapper.java?rev=1372700&r1=1372699&r2=1372700&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdaterWrapper.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdaterWrapper.java Tue Aug 14 01:29:00 2012
@@ -8,6 +8,7 @@ import org.openjena.riot.Lang;
 import com.hp.hpl.jena.graph.Graph;
 import com.hp.hpl.jena.graph.Node;
 import com.hp.hpl.jena.graph.Triple;
+import com.hp.hpl.jena.query.ParameterizedSparqlString;
 import com.hp.hpl.jena.sparql.core.DatasetGraph;
 import com.hp.hpl.jena.sparql.core.Quad;
 import com.hp.hpl.jena.update.Update;
@@ -188,6 +189,12 @@ class UpdaterWrapper implements Updater
     {
         wrappedObject.update(updateQuery);
     }
+    
+    @Override
+    public void update(ParameterizedSparqlString paramUpdateString)
+    {
+        wrappedObject.update(paramUpdateString);
+    }
 
     @Override
     public void update(String updateQuery, String baseURI)