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 2013/02/06 17:32:01 UTC

svn commit: r1443049 - in /jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify: UpdateEngine.java UpdateEngineBase.java UpdateEngineMain.java UpdateProcessorBase.java

Author: andy
Date: Wed Feb  6 16:32:00 2013
New Revision: 1443049

URL: http://svn.apache.org/viewvc?rev=1443049&view=rev
Log:
Reverse earlier changes to UpdateEngine

Modified:
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngine.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineBase.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineMain.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessorBase.java

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngine.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngine.java?rev=1443049&r1=1443048&r2=1443049&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngine.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngine.java Wed Feb  6 16:32:00 2013
@@ -18,19 +18,11 @@
 
 package com.hp.hpl.jena.sparql.modify;
 
-import com.hp.hpl.jena.update.UpdateRequest ;
 
 /**
  * An UpdateEngine provides an interface to execute a SPARQL update request.
  * An update engine is use-once; that is, it executes a single SPARQL Update request
  * (there may be multiple operations in one request).
- * 
- * An UpdateEngine is called in the sequence:
- * <ul>
- * <li>startRequest()</li> 
- * <li>execute()</li> 
- * <li>finishRequest()</li> 
- * </ul>  
  */
 public interface UpdateEngine
 {
@@ -40,11 +32,6 @@ public interface UpdateEngine
     public void startRequest();
     
     /**
-     *  Signal start of a request being executed
-     */
-    public void execute(UpdateRequest request);
-
-    /**
      * Signal end of a request being executed 
      */
     public void finishRequest();

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineBase.java?rev=1443049&r1=1443048&r2=1443049&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineBase.java Wed Feb  6 16:32:00 2013
@@ -18,15 +18,12 @@
 
 package com.hp.hpl.jena.sparql.modify;
 
-import org.apache.jena.atlas.iterator.Iter ;
-
 import com.hp.hpl.jena.query.ARQ ;
 import com.hp.hpl.jena.sparql.ARQConstants ;
 import com.hp.hpl.jena.sparql.core.DatasetGraph ;
 import com.hp.hpl.jena.sparql.util.Context ;
 import com.hp.hpl.jena.sparql.util.NodeFactory ;
 import com.hp.hpl.jena.update.GraphStore ;
-import com.hp.hpl.jena.update.UpdateRequest ;
 
 public abstract class UpdateEngineBase implements UpdateEngine
 {
@@ -40,14 +37,6 @@ public abstract class UpdateEngineBase i
         this.context = setupContext(context, graphStore) ;
     }
     
-    @Override
-    public void execute(UpdateRequest request)
-    {
-        UpdateSink sink = getUpdateSink();
-        Iter.sendToSink(request, sink);  // Will call close on sink if there are no exceptions
-    }
-    
-    // Put any 
     private static Context setupContext(Context context, DatasetGraph dataset)
     {
         // To many copies?

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineMain.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineMain.java?rev=1443049&r1=1443048&r2=1443049&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineMain.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateEngineMain.java Wed Feb  6 16:32:00 2013
@@ -18,12 +18,9 @@
 
 package com.hp.hpl.jena.sparql.modify;
 
-import org.apache.jena.atlas.iterator.Iter ;
-
 import com.hp.hpl.jena.sparql.modify.request.UpdateVisitor ;
 import com.hp.hpl.jena.sparql.util.Context ;
 import com.hp.hpl.jena.update.GraphStore ;
-import com.hp.hpl.jena.update.UpdateRequest ;
 
 /**
  * Default implementation of an update engine
@@ -55,13 +52,6 @@ public class UpdateEngineMain extends Up
         graphStore.finishRequest();
     }
     
-    @Override
-    public void execute(UpdateRequest request)
-    {
-        UpdateSink sink = getUpdateSink();
-        Iter.sendToSink(request, sink);  // Will call close on sink if there are no exceptions
-    }
-    
     private UpdateSink updateSink = null ;
     
     /**

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessorBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessorBase.java?rev=1443049&r1=1443048&r2=1443049&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessorBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/modify/UpdateProcessorBase.java Wed Feb  6 16:32:00 2013
@@ -18,6 +18,8 @@
 
 package com.hp.hpl.jena.sparql.modify;
 
+import org.apache.jena.atlas.iterator.Iter ;
+
 import com.hp.hpl.jena.sparql.util.Context ;
 import com.hp.hpl.jena.update.GraphStore ;
 import com.hp.hpl.jena.update.UpdateProcessor ;
@@ -51,7 +53,8 @@ public class UpdateProcessorBase impleme
         uProc.startRequest();
         
         try {
-            uProc.execute(request) ; 
+            UpdateSink sink = uProc.getUpdateSink();
+            Iter.sendToSink(request, sink);     // Will call close on sink if there are no exceptions
         } finally {
             uProc.finishRequest() ;
         }