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/04/05 11:40:42 UTC
svn commit: r1464901 - in /jena/trunk:
jena-arq/src/main/java/com/hp/hpl/jena/query/
jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/
jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/
jena-sdb/src/test/java/com/hp/hpl/jena/sdb/test/junit/ je...
Author: andy
Date: Fri Apr 5 09:40:41 2013
New Revision: 1464901
URL: http://svn.apache.org/r1464901
Log:
Start deprecation cycle for c.h.h.j.sparql.resultset.ResultSetRewindable.
Version in public API is the correct one (and has been for a while).
Clean all code appropriately.
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetRewindable.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetCompare.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetMem.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TextOutput.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java
jena/trunk/jena-sdb/src/test/java/com/hp/hpl/jena/sdb/test/junit/QueryTestSDB.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/QueryTestTDB.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/solver/TestSolverTDB.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetRewindable.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetRewindable.java?rev=1464901&r1=1464900&r2=1464901&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetRewindable.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetRewindable.java Fri Apr 5 09:40:41 2013
@@ -18,14 +18,11 @@
package com.hp.hpl.jena.query;
-
-public interface ResultSetRewindable extends com.hp.hpl.jena.sparql.resultset.ResultSetRewindable
+public interface ResultSetRewindable extends ResultSet
{
/** Move back to the start of the iterator for this instance of results of a query. */
- @Override
public void reset() ;
/** return the number of solutions */
- @Override
public int size() ;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetCompare.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetCompare.java?rev=1464901&r1=1464900&r2=1464901&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetCompare.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetCompare.java Fri Apr 5 09:40:41 2013
@@ -35,6 +35,7 @@ import com.hp.hpl.jena.sparql.engine.bin
import com.hp.hpl.jena.sparql.util.NodeIsomorphismMap ;
import com.hp.hpl.jena.sparql.util.NodeUtils ;
import com.hp.hpl.jena.sparql.util.NodeUtils.EqualityTest ;
+import com.hp.hpl.jena.query.ResultSetRewindable ;
public class ResultSetCompare
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetMem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetMem.java?rev=1464901&r1=1464900&r2=1464901&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetMem.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/ResultSetMem.java Fri Apr 5 09:40:41 2013
@@ -19,10 +19,9 @@
package com.hp.hpl.jena.sparql.resultset;
import java.util.ArrayList ;
-import java.util.Iterator ;
import java.util.List ;
-import org.apache.jena.atlas.iterator.PeekIterator;
+import org.apache.jena.atlas.iterator.PeekIterator ;
import com.hp.hpl.jena.query.QuerySolution ;
import com.hp.hpl.jena.query.ResultSet ;
@@ -33,7 +32,8 @@ import com.hp.hpl.jena.sparql.util.Utils
/** An in-memory result set.
* Also useful for writing input processors which
- * keep the result set in memory. */
+ * keep the result set in memory.
+ */
public class ResultSetMem implements com.hp.hpl.jena.query.ResultSetRewindable, ResultSetPeekable
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TextOutput.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TextOutput.java?rev=1464901&r1=1464900&r2=1464901&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TextOutput.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/TextOutput.java Fri Apr 5 09:40:41 2013
@@ -31,6 +31,7 @@ import com.hp.hpl.jena.sparql.core.Prolo
import com.hp.hpl.jena.sparql.serializer.SerializationContext ;
import com.hp.hpl.jena.sparql.util.FmtUtils ;
import com.hp.hpl.jena.util.FileUtils ;
+import com.hp.hpl.jena.query.ResultSetRewindable ;
/** <p>Takes a ResultSet object and creates displayable formatted output in plain text.</p>
*
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java?rev=1464901&r1=1464900&r2=1464901&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java Fri Apr 5 09:40:41 2013
@@ -40,7 +40,6 @@ import com.hp.hpl.jena.sparql.engine.bin
import com.hp.hpl.jena.sparql.engine.iterator.QueryIterPlainWrapper ;
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeFunctions ;
import com.hp.hpl.jena.sparql.resultset.ResultSetCompare ;
-import com.hp.hpl.jena.sparql.resultset.ResultSetRewindable ;
import com.hp.hpl.jena.sparql.resultset.SPARQLResult ;
import com.hp.hpl.jena.sparql.util.DatasetUtils ;
import com.hp.hpl.jena.sparql.vocabulary.ResultSetGraphVocab ;
Modified: jena/trunk/jena-sdb/src/test/java/com/hp/hpl/jena/sdb/test/junit/QueryTestSDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/test/java/com/hp/hpl/jena/sdb/test/junit/QueryTestSDB.java?rev=1464901&r1=1464900&r2=1464901&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/test/java/com/hp/hpl/jena/sdb/test/junit/QueryTestSDB.java (original)
+++ jena/trunk/jena-sdb/src/test/java/com/hp/hpl/jena/sdb/test/junit/QueryTestSDB.java Fri Apr 5 09:40:41 2013
@@ -47,7 +47,7 @@ import com.hp.hpl.jena.sparql.junit.Earl
import com.hp.hpl.jena.sparql.junit.EarlTestCase ;
import com.hp.hpl.jena.sparql.junit.TestItem ;
import com.hp.hpl.jena.sparql.resultset.ResultSetCompare ;
-import com.hp.hpl.jena.sparql.resultset.ResultSetRewindable ;
+import com.hp.hpl.jena.query.ResultSetRewindable ;
public class QueryTestSDB extends EarlTestCase
{
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/QueryTestTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/QueryTestTDB.java?rev=1464901&r1=1464900&r2=1464901&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/QueryTestTDB.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/QueryTestTDB.java Fri Apr 5 09:40:41 2013
@@ -32,7 +32,7 @@ import com.hp.hpl.jena.sparql.junit.Earl
import com.hp.hpl.jena.sparql.junit.EarlTestCase ;
import com.hp.hpl.jena.sparql.junit.TestItem ;
import com.hp.hpl.jena.sparql.resultset.ResultSetCompare ;
-import com.hp.hpl.jena.sparql.resultset.ResultSetRewindable ;
+import com.hp.hpl.jena.query.ResultSetRewindable ;
import com.hp.hpl.jena.sparql.resultset.SPARQLResult ;
import com.hp.hpl.jena.tdb.TDBFactory ;
import com.hp.hpl.jena.util.FileManager ;
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/solver/TestSolverTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/solver/TestSolverTDB.java?rev=1464901&r1=1464900&r2=1464901&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/solver/TestSolverTDB.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/solver/TestSolverTDB.java Fri Apr 5 09:40:41 2013
@@ -35,6 +35,7 @@ import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.query.ResultSet ;
import com.hp.hpl.jena.query.ResultSetFactory ;
import com.hp.hpl.jena.query.ResultSetFormatter ;
+import com.hp.hpl.jena.query.ResultSetRewindable ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
import com.hp.hpl.jena.shared.PrefixMapping ;
@@ -46,7 +47,6 @@ import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.engine.QueryIterator ;
import com.hp.hpl.jena.sparql.engine.binding.Binding ;
import com.hp.hpl.jena.sparql.resultset.ResultSetCompare ;
-import com.hp.hpl.jena.sparql.resultset.ResultSetRewindable ;
import com.hp.hpl.jena.sparql.sse.SSE ;
import com.hp.hpl.jena.tdb.TDBFactory ;
import com.hp.hpl.jena.util.FileManager ;