jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sal...@apache.org
Subject svn commit: r1693630 - in /jena/Experimental/jena-client: ./ src/main/java/org/apache/jena/client/ src/main/java/org/apache/jena/client/graph/ src/main/java/org/apache/jena/client/http/ src/test/java/org/apache/jena/client/graph/
Date Fri, 31 Jul 2015 17:18:41 GMT
Author: sallen
Date: Fri Jul 31 17:18:41 2015
New Revision: 1693630

URL: http://svn.apache.org/r1693630
Log:
jena-client - Update to Jena 3

Modified:
    jena/Experimental/jena-client/pom.xml
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/AbstractConnection.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/AbstractQueryStatement.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/AbstractUpdateStatement.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/AbstractUpdater.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/Connection.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/DatabaseClientFactory.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/QueryStatement.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/QueryStatementWrapper.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateDeleter.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateExecution.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateInserter.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/UpdateStatement.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdaterWrapper.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/AutoCommitQueryExecution.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphConnection.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphDatabaseClient.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphQueryStatement.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphUpdateStatement.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/UpdateEngineUpdater.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpConnection.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpQueryStatement.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpUpdateExecution.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpUpdateStatement.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/SparqlUpdateEntity.java
    jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/UpdateWriterUpdater.java
    jena/Experimental/jena-client/src/test/java/org/apache/jena/client/graph/AutoCommitQueryExecutionTest.java
    jena/Experimental/jena-client/src/test/java/org/apache/jena/client/graph/DatasetGraphTest.java

Modified: jena/Experimental/jena-client/pom.xml
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/pom.xml?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/pom.xml (original)
+++ jena/Experimental/jena-client/pom.xml Fri Jul 31 17:18:41 2015
@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.jena</groupId>
   <artifactId>jena-client</artifactId>
-  <version>0.0.16-SNAPSHOT</version>
+  <version>0.0.17-SNAPSHOT</version>
   <name>Apache Jena - Client (SPARQL 1.1 Client API)</name>
   <description>Client is a library that provides an API for querying and updating local or remote SPARQL 1.1 endpoints.</description>
   
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
-      <version>2.13.0</version>
+      <version>3.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -100,8 +100,8 @@
           <optimize>true</optimize>
           <debug>true</debug>
           <debuglevel>source,lines,vars</debuglevel>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
 
@@ -121,17 +121,6 @@
       </plugin>
 
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.9</version>
-        <configuration>
-          <includes>
-            <include>**/TS_*.java</include>
-          </includes>
-        </configuration>
-      </plugin>
-
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <configuration>

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/AbstractConnection.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/AbstractConnection.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/AbstractConnection.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/AbstractConnection.java Fri Jul 31 17:18:41 2015
@@ -17,12 +17,12 @@
  */
 package org.apache.jena.client;
 
-import org.apache.jena.atlas.iterator.Action ;
+import java.util.function.Consumer ;
 
-import com.hp.hpl.jena.query.ParameterizedSparqlString ;
-import com.hp.hpl.jena.query.Query ;
-import com.hp.hpl.jena.rdf.model.Model ;
-import com.hp.hpl.jena.update.Update ;
+import org.apache.jena.query.ParameterizedSparqlString ;
+import org.apache.jena.query.Query ;
+import org.apache.jena.rdf.model.Model ;
+import org.apache.jena.update.Update ;
 
 /**
  * Abstract class for Connection implementations, provides tracking of Query/Update statement creation
@@ -47,7 +47,7 @@ public abstract class AbstractConnection
     protected abstract UpdateStatement doCreateUpdateStatement(Update update);
     protected abstract UpdateStatement doCreateUpdateStatement(Iterable<? extends Update> update);
     protected abstract UpdateStatement doCreateUpdateStatement(String updateString);
-    protected abstract UpdateStatement doCreateUpdateStatement(Action<Updater> action);
+    protected abstract UpdateStatement doCreateUpdateStatement(Consumer<Updater> action);
     
     @Override
     public DatabaseClient getDatabaseClient()
@@ -113,7 +113,7 @@ public abstract class AbstractConnection
     }
     
     @Override
-    public final UpdateStatement createUpdateStatement(Action<Updater> action)
+    public final UpdateStatement createUpdateStatement(Consumer<Updater> action)
     {
         checkOperationOngoing();
         return registerUpdateStatement(doCreateUpdateStatement(action));

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/AbstractQueryStatement.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/AbstractQueryStatement.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/AbstractQueryStatement.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/AbstractQueryStatement.java Fri Jul 31 17:18:41 2015
@@ -19,16 +19,16 @@ package org.apache.jena.client;
 
 import java.util.Iterator;
 
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryCancelledException;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.impl.StmtIteratorImpl;
-import com.hp.hpl.jena.sparql.util.ModelUtils;
+import org.apache.jena.graph.Triple;
+import org.apache.jena.query.Query;
+import org.apache.jena.query.QueryCancelledException;
+import org.apache.jena.query.QueryExecution;
+import org.apache.jena.query.ResultSet;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.impl.StmtIteratorImpl;
+import org.apache.jena.sparql.util.ModelUtils;
 
 public abstract class AbstractQueryStatement<T extends QueryExecution> extends AbstractSparqlStatement implements QueryStatement
 {

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/AbstractUpdateStatement.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/AbstractUpdateStatement.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/AbstractUpdateStatement.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/AbstractUpdateStatement.java Fri Jul 31 17:18:41 2015
@@ -18,25 +18,18 @@
 package org.apache.jena.client;
 
 import java.util.Arrays ;
+import java.util.function.Consumer ;
 
-import org.apache.jena.atlas.iterator.Action ;
-
-import com.hp.hpl.jena.update.Update ;
+import org.apache.jena.update.Update ;
 
 
 public abstract class AbstractUpdateStatement extends AbstractSparqlStatement implements UpdateStatement
 {
-    protected final Action<Updater> action;
+    protected final Consumer<Updater> action;
     
     public AbstractUpdateStatement(final String updateString, final Connection connection)
     {
-        this(new Action<Updater>() {
-            @Override
-            public void apply(Updater updater)
-            {
-                updater.update(updateString);
-            }
-        }, connection);
+        this(up -> up.update(updateString), connection);
     }
     
     public AbstractUpdateStatement(Update update, Connection connection)
@@ -46,16 +39,10 @@ public abstract class AbstractUpdateStat
     
     public AbstractUpdateStatement(final Iterable<? extends Update> updates, final Connection connection)
     {
-        this(new Action<Updater>() {
-            @Override
-            public void apply(Updater updater)
-            {
-                updater.update(updates);
-            }
-        }, connection);
+        this (up -> up.update(updates), connection);
     }
     
-    public AbstractUpdateStatement(final Action<Updater> action, final Connection connection)
+    public AbstractUpdateStatement(final Consumer<Updater> action, final Connection connection)
     {
         super(connection);
         this.action = action;

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=1693630&r1=1693629&r2=1693630&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 Fri Jul 31 17:18:41 2015
@@ -23,19 +23,17 @@ import java.util.Arrays;
 import java.util.Iterator;
 
 import org.apache.jena.atlas.iterator.Iter;
-import org.apache.jena.atlas.iterator.Transform;
+import org.apache.jena.graph.Graph;
+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.RDFLanguages ;
 import org.apache.jena.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;
-import com.hp.hpl.jena.update.UpdateFactory;
+import org.apache.jena.sparql.core.DatasetGraph;
+import org.apache.jena.sparql.core.Quad;
+import org.apache.jena.update.Update;
+import org.apache.jena.update.UpdateFactory;
 
 /**
  * An abstract implementation of Updater that handles all of the convenience methods,
@@ -141,14 +139,7 @@ public abstract class AbstractUpdater im
     @Override
     public void insert(final Node graphName, Iterator<? extends Triple> tripleIter)
     {
-        insert(Iter.map(tripleIter, new Transform<Triple, Quad>()
-        {
-            @Override
-            public Quad convert(Triple item)
-            {
-                return Quad.create(graphName, item);
-            }
-        }));
+        insert(Iter.map(tripleIter, t -> Quad.create(graphName, t)));
     }
     
     @Override
@@ -189,30 +180,13 @@ public abstract class AbstractUpdater im
         if (RDFLanguages.isTriples(lang))
         {
             Iterator<Triple> parser = RiotReader.createIteratorTriples(in, lang, base);
-            
-            it = Iter.map(parser, new Transform<Triple, Quad>()
-            {
-                @Override
-                public Quad convert(Triple item)
-                {
-                    return Quad.create(graphName, item);
-                }
-            });
+            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);
-            
-            it = Iter.map(parser, new Transform<Quad, Quad>()
-            {
-                @Override
-                public Quad convert(Quad item)
-                {
-                    return Quad.create(graphName, item.getSubject(), item.getPredicate(), item.getObject());
-                }
-            });
+            it = Iter.map(parser, t -> Quad.create(graphName, t.getSubject(), t.getPredicate(), t.getObject()));
         }
         
         try
@@ -280,14 +254,7 @@ public abstract class AbstractUpdater im
     @Override
     public void delete(final Node graphName, Iterator<? extends Triple> tripleIter)
     {
-        delete(Iter.map(tripleIter, new Transform<Triple, Quad>()
-        {
-            @Override
-            public Quad convert(Triple item)
-            {
-                return Quad.create(graphName, item);
-            }
-        }));
+        delete(Iter.map(tripleIter, t -> Quad.create(graphName, t)));
     }
     
     @Override
@@ -328,30 +295,13 @@ public abstract class AbstractUpdater im
         if (RDFLanguages.isTriples(lang))
         {
             Iterator<Triple> parser = RiotReader.createIteratorTriples(in, lang, base);
-            
-            it = Iter.map(parser, new Transform<Triple, Quad>()
-            {
-                @Override
-                public Quad convert(Triple item)
-                {
-                    return Quad.create(graphName, item);
-                }
-            });
+            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);
-            
-            it = Iter.map(parser, new Transform<Quad, Quad>()
-            {
-                @Override
-                public Quad convert(Quad item)
-                {
-                    return Quad.create(graphName, item.getSubject(), item.getPredicate(), item.getObject());
-                }
-            });
+            it = Iter.map(parser, t -> Quad.create(graphName, t.getSubject(), t.getPredicate(), t.getObject()));
         }
         
         try

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=1693630&r1=1693629&r2=1693630&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 Fri Jul 31 17:18:41 2015
@@ -18,12 +18,12 @@
 
 package org.apache.jena.client;
 
-import org.apache.jena.atlas.iterator.Action ;
+import java.util.function.Consumer ;
 
-import com.hp.hpl.jena.query.ParameterizedSparqlString ;
-import com.hp.hpl.jena.query.Query ;
-import com.hp.hpl.jena.sparql.core.Transactional ;
-import com.hp.hpl.jena.update.Update ;
+import org.apache.jena.query.ParameterizedSparqlString ;
+import org.apache.jena.query.Query ;
+import org.apache.jena.sparql.core.Transactional ;
+import org.apache.jena.update.Update ;
 
 /**
  * A connection (session) with a specific database.  SPARQL statements are executed and results returned within the context of a connection.
@@ -133,7 +133,7 @@ public interface Connection extends Tran
      *               these updates are streamed into the database
      * @return an UpdateStatement based on the supplied <code>{@literal Action<Updater>}</code>
      */
-    UpdateStatement createUpdateStatement(Action<Updater> action);
+    UpdateStatement createUpdateStatement(Consumer<Updater> action);
     
 
     // I think we'll not expose these...  The original idea was to better support the

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/DatabaseClientFactory.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/DatabaseClientFactory.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/DatabaseClientFactory.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/DatabaseClientFactory.java Fri Jul 31 17:18:41 2015
@@ -21,8 +21,8 @@ import org.apache.jena.atlas.web.auth.Ht
 import org.apache.jena.client.graph.DatasetGraphDatabaseClient ;
 import org.apache.jena.client.http.HttpDatabaseClient ;
 
-import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.core.Transactional ;
+import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.sparql.core.Transactional ;
 
 /**
  * A factory for local and remote (SPARQL 1.1 Protocol) DatabaseClients.

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/QueryStatement.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/QueryStatement.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/QueryStatement.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/QueryStatement.java Fri Jul 31 17:18:41 2015
@@ -19,10 +19,10 @@ package org.apache.jena.client;
 
 import java.util.Iterator;
 
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.Statement;
+import org.apache.jena.graph.Triple;
+import org.apache.jena.query.ResultSet;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.Statement;
 
 
 /**

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/QueryStatementWrapper.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/QueryStatementWrapper.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/QueryStatementWrapper.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/QueryStatementWrapper.java Fri Jul 31 17:18:41 2015
@@ -20,10 +20,10 @@ package org.apache.jena.client;
 import java.util.Iterator;
 import java.util.concurrent.TimeUnit;
 
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.Statement;
+import org.apache.jena.graph.Triple;
+import org.apache.jena.query.ResultSet;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.Statement;
 
 class QueryStatementWrapper implements QueryStatement
 {

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateDeleter.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateDeleter.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateDeleter.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateDeleter.java Fri Jul 31 17:18:41 2015
@@ -23,11 +23,11 @@ import java.util.Iterator ;
 
 import org.apache.jena.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.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.core.Quad ;
+import org.apache.jena.graph.Graph ;
+import org.apache.jena.graph.Node ;
+import org.apache.jena.graph.Triple ;
+import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.sparql.core.Quad ;
 
 /**
  * Represents a streamable SPARQL Update DELETE DATA operation. 

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateExecution.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateExecution.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateExecution.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateExecution.java Fri Jul 31 17:18:41 2015
@@ -18,12 +18,12 @@
 
 package org.apache.jena.client;
 
-import org.apache.jena.atlas.iterator.Action ;
+import java.util.function.Consumer ;
 
 /**
  * 
  */
 public interface UpdateExecution
 {
-    void execUpdate(Action<Updater> action);
+    void execUpdate(Consumer<Updater> action);
 }

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateInserter.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateInserter.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateInserter.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateInserter.java Fri Jul 31 17:18:41 2015
@@ -23,11 +23,11 @@ import java.util.Iterator ;
 
 import org.apache.jena.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.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.core.Quad ;
+import org.apache.jena.graph.Graph ;
+import org.apache.jena.graph.Node ;
+import org.apache.jena.graph.Triple ;
+import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.sparql.core.Quad ;
 
 /**
  * Represents a streamable SPARQL Update INSERT DATA operation. 

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=1693630&r1=1693629&r2=1693630&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 Fri Jul 31 17:18:41 2015
@@ -19,8 +19,8 @@ package org.apache.jena.client;
 
 import java.util.Iterator ;
 
-import com.hp.hpl.jena.query.ParameterizedSparqlString ;
-import com.hp.hpl.jena.update.Update ;
+import org.apache.jena.query.ParameterizedSparqlString ;
+import org.apache.jena.update.Update ;
 
 /**
  * Represents non-INSERT/DELETE DATA update query operations

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateStatement.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateStatement.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateStatement.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/UpdateStatement.java Fri Jul 31 17:18:41 2015
@@ -18,15 +18,14 @@
 package org.apache.jena.client;
 
 
-
 /**
- * 
+ * Statement to perform a SPARQL Update operation.  Execution of
+ * the update is not performed until {@link #execUpdate()} is called.
  * 
  * @see Connection#createUpdateStatement
  */
 public interface UpdateStatement extends SparqlStatement
 {
-
     /**
      * Execute an UPDATE query.
      */

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=1693630&r1=1693629&r2=1693630&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 Fri Jul 31 17:18:41 2015
@@ -22,13 +22,13 @@ import java.util.Iterator ;
 
 import org.apache.jena.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 ;
+import org.apache.jena.graph.Graph ;
+import org.apache.jena.graph.Node ;
+import org.apache.jena.graph.Triple ;
+import org.apache.jena.query.ParameterizedSparqlString ;
+import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.sparql.core.Quad ;
+import org.apache.jena.update.Update ;
 
 class UpdaterWrapper implements Updater
 {

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=1693630&r1=1693629&r2=1693630&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 Fri Jul 31 17:18:41 2015
@@ -21,16 +21,16 @@ package org.apache.jena.client.graph;
 import java.util.Iterator ;
 import java.util.concurrent.TimeUnit ;
 
-import com.hp.hpl.jena.graph.Triple ;
-import com.hp.hpl.jena.query.Dataset ;
-import com.hp.hpl.jena.query.Query ;
-import com.hp.hpl.jena.query.QueryExecution ;
-import com.hp.hpl.jena.query.QuerySolution ;
-import com.hp.hpl.jena.query.ReadWrite ;
-import com.hp.hpl.jena.query.ResultSet ;
-import com.hp.hpl.jena.rdf.model.Model ;
-import com.hp.hpl.jena.sparql.core.Transactional ;
-import com.hp.hpl.jena.sparql.util.Context ;
+import org.apache.jena.graph.Triple ;
+import org.apache.jena.query.Dataset ;
+import org.apache.jena.query.Query ;
+import org.apache.jena.query.QueryExecution ;
+import org.apache.jena.query.QuerySolution ;
+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.Transactional ;
+import org.apache.jena.sparql.util.Context ;
 
 /**
  * Wraps a QueryExecution and provides auto commit transaction support.

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphConnection.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphConnection.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphConnection.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphConnection.java Fri Jul 31 17:18:41 2015
@@ -18,18 +18,17 @@
  
 package org.apache.jena.client.graph;
 
-import org.apache.jena.atlas.iterator.Action ;
+import java.util.function.Consumer ;
+
 import org.apache.jena.client.AbstractConnection ;
 import org.apache.jena.client.QueryStatement ;
 import org.apache.jena.client.UpdateStatement ;
 import org.apache.jena.client.Updater ;
-
-import com.hp.hpl.jena.query.Query ;
-import com.hp.hpl.jena.query.ReadWrite ;
-import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.core.Transactional ;
-import com.hp.hpl.jena.update.GraphStoreFactory ;
-import com.hp.hpl.jena.update.Update ;
+import org.apache.jena.query.Query ;
+import org.apache.jena.query.ReadWrite ;
+import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.sparql.core.Transactional ;
+import org.apache.jena.update.Update ;
 
 public class DatasetGraphConnection extends AbstractConnection
 {
@@ -60,25 +59,25 @@ public class DatasetGraphConnection exte
     @Override
     public UpdateStatement doCreateUpdateStatement(String updateString)
     {
-        return new DatasetGraphUpdateStatement(updateString, GraphStoreFactory.create(dsg), autoCommitMode, this);
+        return new DatasetGraphUpdateStatement(updateString, dsg, autoCommitMode, this);
     }
 
     @Override
     public UpdateStatement doCreateUpdateStatement(Update update)
     {
-        return new DatasetGraphUpdateStatement(update, GraphStoreFactory.create(dsg), autoCommitMode, this);
+        return new DatasetGraphUpdateStatement(update, dsg, autoCommitMode, this);
     }
     
     @Override
     public UpdateStatement doCreateUpdateStatement(Iterable<? extends Update> updates)
     {
-        return new DatasetGraphUpdateStatement(updates, GraphStoreFactory.create(dsg), autoCommitMode, this);
+        return new DatasetGraphUpdateStatement(updates, dsg, autoCommitMode, this);
     }
     
     @Override
-    protected UpdateStatement doCreateUpdateStatement(Action<Updater> action)
+    protected UpdateStatement doCreateUpdateStatement(Consumer<Updater> action)
     {
-        return new DatasetGraphUpdateStatement(action, GraphStoreFactory.create(dsg), autoCommitMode, this);
+        return new DatasetGraphUpdateStatement(action, dsg, autoCommitMode, this);
     }
     
     @Override

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphDatabaseClient.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphDatabaseClient.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphDatabaseClient.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphDatabaseClient.java Fri Jul 31 17:18:41 2015
@@ -20,8 +20,8 @@ package org.apache.jena.client.graph;
 import org.apache.jena.client.Connection ;
 import org.apache.jena.client.DatabaseClient ;
 
-import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.core.Transactional ;
+import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.sparql.core.Transactional ;
 
 /**
  * A DatabaseClient wrapped around a local DatasetGraph.

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphQueryStatement.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphQueryStatement.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphQueryStatement.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphQueryStatement.java Fri Jul 31 17:18:41 2015
@@ -20,12 +20,12 @@ package org.apache.jena.client.graph;
 import org.apache.jena.client.QueryStatement ;
 import org.apache.jena.client.AbstractQueryStatement ;
 
-import com.hp.hpl.jena.query.Query ;
-import com.hp.hpl.jena.query.QueryExecution ;
-import com.hp.hpl.jena.query.QueryExecutionFactory ;
-import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.core.DatasetImpl ;
-import com.hp.hpl.jena.sparql.core.Transactional ;
+import org.apache.jena.query.Query ;
+import org.apache.jena.query.QueryExecution ;
+import org.apache.jena.query.QueryExecutionFactory ;
+import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.sparql.core.DatasetImpl ;
+import org.apache.jena.sparql.core.Transactional ;
 
 class DatasetGraphQueryStatement extends AbstractQueryStatement<QueryExecution> implements QueryStatement
 {
@@ -50,7 +50,6 @@ class DatasetGraphQueryStatement extends
     }
     
     @Override
-    @SuppressWarnings("resource")  // Suppress the warning that AutoCommitQueryExection is not used within a try-with-resources block
     protected QueryExecution createQueryExecution()
     {
         final QueryExecution qe = (null != queryString) ?

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphUpdateStatement.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphUpdateStatement.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphUpdateStatement.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/DatasetGraphUpdateStatement.java Fri Jul 31 17:18:41 2015
@@ -17,51 +17,51 @@
  */
 package org.apache.jena.client.graph;
 
-import org.apache.jena.atlas.iterator.Action ;
+import java.util.function.Consumer ;
+
 import org.apache.jena.client.AbstractUpdateStatement ;
 import org.apache.jena.client.UpdateExecution ;
 import org.apache.jena.client.Updater ;
-
-import com.hp.hpl.jena.query.ARQ ;
-import com.hp.hpl.jena.query.ReadWrite ;
-import com.hp.hpl.jena.sparql.core.Transactional ;
-import com.hp.hpl.jena.sparql.modify.UpdateEngine ;
-import com.hp.hpl.jena.sparql.modify.UpdateEngineFactory ;
-import com.hp.hpl.jena.sparql.modify.UpdateEngineRegistry ;
-import com.hp.hpl.jena.sparql.util.Context ;
-import com.hp.hpl.jena.update.GraphStore ;
-import com.hp.hpl.jena.update.Update ;
+import org.apache.jena.query.ARQ ;
+import org.apache.jena.query.ReadWrite ;
+import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.sparql.core.Transactional ;
+import org.apache.jena.sparql.modify.UpdateEngine ;
+import org.apache.jena.sparql.modify.UpdateEngineFactory ;
+import org.apache.jena.sparql.modify.UpdateEngineRegistry ;
+import org.apache.jena.sparql.util.Context ;
+import org.apache.jena.update.Update ;
 
 class DatasetGraphUpdateStatement extends AbstractUpdateStatement
 {
-    private final GraphStore graphStore;
+    private final DatasetGraph dsg;
     private final boolean autoCommitMode;
     
-    DatasetGraphUpdateStatement(String updateString, GraphStore graphStore, boolean autoCommitMode, DatasetGraphConnection connection)
+    DatasetGraphUpdateStatement(String updateString, DatasetGraph dsg, boolean autoCommitMode, DatasetGraphConnection connection)
     {
         super(updateString, connection);
-        this.graphStore = graphStore;
+        this.dsg = dsg;
         this.autoCommitMode = autoCommitMode;
     }
     
-    DatasetGraphUpdateStatement(Update update, GraphStore graphStore, boolean autoCommitMode, DatasetGraphConnection connection)
+    DatasetGraphUpdateStatement(Update update, DatasetGraph dsg, boolean autoCommitMode, DatasetGraphConnection connection)
     {
         super(update, connection);
-        this.graphStore = graphStore;
+        this.dsg = dsg;
         this.autoCommitMode = autoCommitMode;
     }
     
-    DatasetGraphUpdateStatement(Iterable<? extends Update> updates, GraphStore graphStore, boolean autoCommitMode, DatasetGraphConnection connection)
+    DatasetGraphUpdateStatement(Iterable<? extends Update> updates, DatasetGraph dsg, boolean autoCommitMode, DatasetGraphConnection connection)
     {
         super(updates, connection);
-        this.graphStore = graphStore;
+        this.dsg = dsg;
         this.autoCommitMode = autoCommitMode;
     }
     
-    DatasetGraphUpdateStatement(Action<Updater> action, GraphStore graphStore, boolean autoCommitMode, DatasetGraphConnection connection)
+    DatasetGraphUpdateStatement(Consumer<Updater> action, DatasetGraph dsg, boolean autoCommitMode, DatasetGraphConnection connection)
     {
         super(action, connection);
-        this.graphStore = graphStore;
+        this.dsg = dsg;
         this.autoCommitMode = autoCommitMode;
     }
     
@@ -74,20 +74,20 @@ class DatasetGraphUpdateStatement extend
         return new UpdateExecution()
         {
             @Override
-            public void execUpdate(Action<Updater> action)
+            public void execUpdate(Consumer<Updater> action)
             {
-                final UpdateEngineFactory factory = UpdateEngineRegistry.findFactory(graphStore, context);
-                final UpdateEngine updateEngine = factory.create(graphStore, null, context);
+                final UpdateEngineFactory factory = UpdateEngineRegistry.findFactory(dsg, context);
+                final UpdateEngine updateEngine = factory.create(dsg, null, context);
                 
-                final boolean performTransaction = autoCommitMode && graphStore instanceof Transactional;
-                final Transactional tx = performTransaction ? (Transactional)graphStore : null;
+                final boolean performTransaction = autoCommitMode && dsg instanceof Transactional;
+                final Transactional tx = performTransaction ? (Transactional)dsg : null;
                 if (performTransaction) tx.begin(ReadWrite.WRITE);
                 try
                 {
                     try (UpdateEngineUpdater updater = new UpdateEngineUpdater(updateEngine))
                     {
                         updater.open();
-                        action.apply(updater);
+                        action.accept(updater);
                     }
                     if (performTransaction) tx.commit();
                 }

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/UpdateEngineUpdater.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/UpdateEngineUpdater.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/UpdateEngineUpdater.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/graph/UpdateEngineUpdater.java Fri Jul 31 17:18:41 2015
@@ -22,11 +22,11 @@ import java.util.Iterator ;
 
 import org.apache.jena.client.AbstractUpdater ;
 
-import com.hp.hpl.jena.sparql.core.Quad ;
-import com.hp.hpl.jena.sparql.modify.UpdateEngine ;
-import com.hp.hpl.jena.sparql.modify.UpdateSink ;
-import com.hp.hpl.jena.sparql.modify.request.QuadDataAccSink ;
-import com.hp.hpl.jena.update.Update ;
+import org.apache.jena.sparql.core.Quad ;
+import org.apache.jena.sparql.modify.UpdateEngine ;
+import org.apache.jena.sparql.modify.UpdateSink ;
+import org.apache.jena.sparql.modify.request.QuadDataAccSink ;
+import org.apache.jena.update.Update ;
 
 class UpdateEngineUpdater extends AbstractUpdater implements AutoCloseable
 {

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpConnection.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpConnection.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpConnection.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpConnection.java Fri Jul 31 17:18:41 2015
@@ -17,16 +17,17 @@
  */
 package org.apache.jena.client.http;
 
-import org.apache.jena.atlas.iterator.Action ;
+import java.util.function.Consumer ;
+
 import org.apache.jena.atlas.web.auth.HttpAuthenticator ;
 import org.apache.jena.client.AbstractConnection ;
 import org.apache.jena.client.QueryStatement ;
 import org.apache.jena.client.UpdateStatement ;
 import org.apache.jena.client.Updater ;
 
-import com.hp.hpl.jena.query.Query ;
-import com.hp.hpl.jena.query.ReadWrite ;
-import com.hp.hpl.jena.update.Update ;
+import org.apache.jena.query.Query ;
+import org.apache.jena.query.ReadWrite ;
+import org.apache.jena.update.Update ;
 
 public class HttpConnection extends AbstractConnection
 {
@@ -127,7 +128,7 @@ public class HttpConnection extends Abst
     }
     
     @Override
-    protected UpdateStatement doCreateUpdateStatement(Action<Updater> action)
+    protected UpdateStatement doCreateUpdateStatement(Consumer<Updater> action)
     {
         if (null == updateEndpoint) throw new IllegalStateException("Cannot create an UpdateStatement because the update endpoint URL has not been set");
         return new HttpUpdateStatement(action, updateEndpoint, authenticator, this, updateContentType);

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpQueryStatement.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpQueryStatement.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpQueryStatement.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpQueryStatement.java Fri Jul 31 17:18:41 2015
@@ -21,8 +21,8 @@ import org.apache.jena.atlas.web.auth.Ht
 import org.apache.jena.client.QueryStatement ;
 import org.apache.jena.client.AbstractQueryStatement ;
 
-import com.hp.hpl.jena.query.Query ;
-import com.hp.hpl.jena.sparql.engine.http.QueryEngineHTTP ;
+import org.apache.jena.query.Query ;
+import org.apache.jena.sparql.engine.http.QueryEngineHTTP ;
 
 class HttpQueryStatement extends AbstractQueryStatement<QueryEngineHTTP> implements QueryStatement
 {

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpUpdateExecution.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpUpdateExecution.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpUpdateExecution.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpUpdateExecution.java Fri Jul 31 17:18:41 2015
@@ -23,6 +23,7 @@ import java.nio.charset.UnsupportedChars
 import java.util.ArrayList ;
 import java.util.List ;
 import java.util.Map ;
+import java.util.function.Consumer ;
 
 import org.apache.http.Consts ;
 import org.apache.http.HttpEntity ;
@@ -31,25 +32,23 @@ import org.apache.http.client.entity.Url
 import org.apache.http.message.BasicNameValuePair ;
 import org.apache.http.protocol.HttpContext ;
 import org.apache.jena.atlas.io.IndentedWriter ;
-import org.apache.jena.atlas.iterator.Action ;
 import org.apache.jena.atlas.web.auth.HttpAuthenticator ;
 import org.apache.jena.atlas.web.auth.SimpleAuthenticator ;
 import org.apache.jena.client.UpdateExecution ;
 import org.apache.jena.client.Updater ;
+import org.apache.jena.query.ARQ ;
 import org.apache.jena.riot.WebContent ;
 import org.apache.jena.riot.web.HttpOp ;
 import org.apache.jena.riot.web.HttpResponseLib ;
+import org.apache.jena.sparql.engine.http.QueryEngineHTTP ;
+import org.apache.jena.sparql.engine.http.Service ;
+import org.apache.jena.sparql.modify.request.UpdateWriter ;
+import org.apache.jena.sparql.serializer.SerializationContext ;
+import org.apache.jena.sparql.util.Context ;
+import org.apache.jena.sparql.util.Symbol ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
 
-import com.hp.hpl.jena.query.ARQ ;
-import com.hp.hpl.jena.sparql.engine.http.QueryEngineHTTP ;
-import com.hp.hpl.jena.sparql.engine.http.Service ;
-import com.hp.hpl.jena.sparql.modify.request.UpdateWriter ;
-import com.hp.hpl.jena.sparql.serializer.SerializationContext ;
-import com.hp.hpl.jena.sparql.util.Context ;
-import com.hp.hpl.jena.sparql.util.Symbol ;
-
 class HttpUpdateExecution implements UpdateExecution
 {
     private static Logger log = LoggerFactory.getLogger(HttpUpdateExecution.class);
@@ -146,7 +145,7 @@ class HttpUpdateExecution implements Upd
     }
     
     @Override
-    public void execUpdate(Action<Updater> action)
+    public void execUpdate(Consumer<Updater> action)
     {
         HttpEntity entity;
         if (WebContent.contentTypeSPARQLUpdate.equals(contentType))
@@ -164,7 +163,7 @@ class HttpUpdateExecution implements Upd
                 writer.open();
                 try
                 {
-                    action.apply(new UpdateWriterUpdater(writer));
+                    action.accept(new UpdateWriterUpdater(writer));
                 }
                 finally
                 {

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpUpdateStatement.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpUpdateStatement.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpUpdateStatement.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/HttpUpdateStatement.java Fri Jul 31 17:18:41 2015
@@ -17,13 +17,14 @@
  */
 package org.apache.jena.client.http;
 
-import org.apache.jena.atlas.iterator.Action ;
+import java.util.function.Consumer ;
+
 import org.apache.jena.atlas.web.auth.HttpAuthenticator ;
 import org.apache.jena.client.UpdateExecution ;
 import org.apache.jena.client.AbstractUpdateStatement ;
 import org.apache.jena.client.Updater ;
 
-import com.hp.hpl.jena.update.Update ;
+import org.apache.jena.update.Update ;
 
 class HttpUpdateStatement extends AbstractUpdateStatement
 {
@@ -55,7 +56,7 @@ class HttpUpdateStatement extends Abstra
         this.updateContentType = updateContentType;
     }
     
-    HttpUpdateStatement(Action<Updater> action, String updateEndpoint, HttpAuthenticator authenticator, HttpConnection connection, String updateContentType)
+    HttpUpdateStatement(Consumer<Updater> action, String updateEndpoint, HttpAuthenticator authenticator, HttpConnection connection, String updateContentType)
     {
         super(action, connection);
         this.updateEndpoint = updateEndpoint;

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/SparqlUpdateEntity.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/SparqlUpdateEntity.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/SparqlUpdateEntity.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/SparqlUpdateEntity.java Fri Jul 31 17:18:41 2015
@@ -21,22 +21,21 @@ package org.apache.jena.client.http;
 import java.io.IOException ;
 import java.io.InputStream ;
 import java.io.OutputStream ;
+import java.util.function.Consumer ;
 
 import org.apache.http.entity.AbstractHttpEntity ;
 import org.apache.jena.atlas.io.IndentedWriter ;
-import org.apache.jena.atlas.iterator.Action ;
 import org.apache.jena.client.Updater ;
 import org.apache.jena.riot.WebContent ;
-
-import com.hp.hpl.jena.sparql.modify.request.UpdateWriter ;
-import com.hp.hpl.jena.sparql.serializer.SerializationContext ;
+import org.apache.jena.sparql.modify.request.UpdateWriter ;
+import org.apache.jena.sparql.serializer.SerializationContext ;
 
 class SparqlUpdateEntity extends AbstractHttpEntity
 {
-    private final Action<Updater> action;
+    private final Consumer<Updater> action;
     private final SerializationContext sCxt;
     
-    SparqlUpdateEntity(Action<Updater> action, SerializationContext sCxt) {
+    SparqlUpdateEntity(Consumer<Updater> action, SerializationContext sCxt) {
         this.action = action;
         this.sCxt = sCxt;
         this.setContentType(WebContent.contentTypeSPARQLUpdate);
@@ -75,7 +74,7 @@ class SparqlUpdateEntity extends Abstrac
         writer.open();
         try
         {
-            action.apply(new UpdateWriterUpdater(writer));
+            action.accept(new UpdateWriterUpdater(writer));
         }
         finally
         {

Modified: jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/UpdateWriterUpdater.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/UpdateWriterUpdater.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/UpdateWriterUpdater.java (original)
+++ jena/Experimental/jena-client/src/main/java/org/apache/jena/client/http/UpdateWriterUpdater.java Fri Jul 31 17:18:41 2015
@@ -22,9 +22,9 @@ import java.util.Iterator ;
 
 import org.apache.jena.client.AbstractUpdater ;
 
-import com.hp.hpl.jena.sparql.core.Quad ;
-import com.hp.hpl.jena.sparql.modify.request.UpdateWriter ;
-import com.hp.hpl.jena.update.Update ;
+import org.apache.jena.sparql.core.Quad ;
+import org.apache.jena.sparql.modify.request.UpdateWriter ;
+import org.apache.jena.update.Update ;
 
 class UpdateWriterUpdater extends AbstractUpdater implements AutoCloseable
 {

Modified: jena/Experimental/jena-client/src/test/java/org/apache/jena/client/graph/AutoCommitQueryExecutionTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/test/java/org/apache/jena/client/graph/AutoCommitQueryExecutionTest.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/test/java/org/apache/jena/client/graph/AutoCommitQueryExecutionTest.java (original)
+++ jena/Experimental/jena-client/src/test/java/org/apache/jena/client/graph/AutoCommitQueryExecutionTest.java Fri Jul 31 17:18:41 2015
@@ -21,10 +21,10 @@ package org.apache.jena.client.graph;
 import org.junit.Before ;
 import org.junit.Test ;
 
-import com.hp.hpl.jena.query.QueryExecution ;
-import com.hp.hpl.jena.query.ReadWrite ;
-import com.hp.hpl.jena.sparql.core.Transactional ;
-import com.hp.hpl.jena.sparql.core.TransactionalNull ;
+import org.apache.jena.query.QueryExecution ;
+import org.apache.jena.query.ReadWrite ;
+import org.apache.jena.sparql.core.Transactional ;
+import org.apache.jena.sparql.core.TransactionalNull ;
 
 import static org.fest.assertions.Assertions.* ;
 import static org.mockito.Mockito.* ;

Modified: jena/Experimental/jena-client/src/test/java/org/apache/jena/client/graph/DatasetGraphTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-client/src/test/java/org/apache/jena/client/graph/DatasetGraphTest.java?rev=1693630&r1=1693629&r2=1693630&view=diff
==============================================================================
--- jena/Experimental/jena-client/src/test/java/org/apache/jena/client/graph/DatasetGraphTest.java (original)
+++ jena/Experimental/jena-client/src/test/java/org/apache/jena/client/graph/DatasetGraphTest.java Fri Jul 31 17:18:41 2015
@@ -21,13 +21,24 @@ package org.apache.jena.client.graph;
 import java.io.ByteArrayInputStream ;
 import java.util.Iterator ;
 
-import org.apache.jena.atlas.iterator.Action ;
 import org.apache.jena.client.Connection ;
 import org.apache.jena.client.DatabaseClient ;
 import org.apache.jena.client.DatabaseClientFactory ;
 import org.apache.jena.client.QueryStatement ;
-import org.apache.jena.client.Updater ;
+import org.apache.jena.query.QueryExecException ;
+import org.apache.jena.query.QueryParseException ;
+import org.apache.jena.query.QuerySolution ;
+import org.apache.jena.query.ReadWrite ;
+import org.apache.jena.query.ResultSet ;
+import org.apache.jena.rdf.model.Model ;
 import org.apache.jena.riot.Lang ;
+import org.apache.jena.sparql.ARQException ;
+import org.apache.jena.sparql.JenaTransactionException ;
+import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.sparql.core.DatasetGraphFactory ;
+import org.apache.jena.sparql.core.DatasetGraphTrackActive ;
+import org.apache.jena.sparql.core.Quad ;
+import org.apache.jena.sparql.util.Context ;
 import org.apache.log4j.ConsoleAppender ;
 import org.apache.log4j.Level ;
 import org.apache.log4j.Logger ;
@@ -35,23 +46,6 @@ import org.apache.log4j.PatternLayout ;
 import org.junit.Before ;
 import org.junit.Test ;
 
-import com.hp.hpl.jena.query.Dataset ;
-import com.hp.hpl.jena.query.DatasetFactory ;
-import com.hp.hpl.jena.query.QueryExecException ;
-import com.hp.hpl.jena.query.QueryParseException ;
-import com.hp.hpl.jena.query.QuerySolution ;
-import com.hp.hpl.jena.query.ReadWrite ;
-import com.hp.hpl.jena.query.ResultSet ;
-import com.hp.hpl.jena.rdf.model.Model ;
-import com.hp.hpl.jena.sparql.ARQException ;
-import com.hp.hpl.jena.sparql.JenaTransactionException ;
-import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
-import com.hp.hpl.jena.sparql.core.DatasetGraphTrackActive ;
-import com.hp.hpl.jena.sparql.core.Quad ;
-import com.hp.hpl.jena.sparql.util.Context ;
-import com.hp.hpl.jena.update.GraphStore ;
-
 import static org.fest.assertions.Assertions.* ;
 import static org.mockito.Mockito.* ;
 
@@ -79,13 +73,7 @@ public class DatasetGraphTest
     {
         try(Connection conn = client.getConnection())
         {
-            conn.createUpdateStatement(new Action<Updater>() {
-                @Override
-                public void apply(Updater up)
-                {
-                    up.insert(null, new ByteArrayInputStream(data.getBytes()), Lang.TURTLE);
-                }
-            }).execUpdate();
+            conn.createUpdateStatement(up -> up.insert(null, new ByteArrayInputStream(data.getBytes()), Lang.TURTLE)).execUpdate();
         }
     }
     
@@ -387,7 +375,7 @@ public class DatasetGraphTest
     /**
      * Doesn't provide thread-safe transactions, but otherwise does honor transaction semantics and ensures that all operations occur inside of a transaction boundary
      */
-    private static class CopyOnTxGraphStore extends DatasetGraphTrackActive implements GraphStore
+    private static class CopyOnTxGraphStore extends DatasetGraphTrackActive implements DatasetGraph
     {
         private final DatasetGraph dsg;
         private DatasetGraph dsgWork;
@@ -486,22 +474,5 @@ public class DatasetGraphTest
         {
             _end();
         }
-
-        @Override
-        public Dataset toDataset()
-        {
-            checkActive();
-            return DatasetFactory.create(dsgWork);
-        }
-
-        @Override
-        public void startRequest()
-        {
-        }
-
-        @Override
-        public void finishRequest()
-        {
-        }
     }
 }



Mime
View raw message