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 2014/03/19 11:06:16 UTC
svn commit: r1579183 - in /jena/trunk/jena-arq/src:
main/java/com/hp/hpl/jena/query/ main/java/com/hp/hpl/jena/sparql/engine/
main/java/com/hp/hpl/jena/sparql/engine/http/
test/java/com/hp/hpl/jena/sparql/junit/
Author: andy
Date: Wed Mar 19 10:06:16 2014
New Revision: 1579183
URL: http://svn.apache.org/r1579183
Log:
Deprecate QueryExecution.setFileManager
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecution.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecutionFactory.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/ScriptTestSuiteFactory.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecution.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecution.java?rev=1579183&r1=1579182&r2=1579183&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecution.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecution.java Wed Mar 19 10:06:16 2014
@@ -34,6 +34,7 @@ public interface QueryExecution
/** Set the FileManger that might be used to load files.
* May not be supported by all QueryExecution implementations.
*/
+ @Deprecated
public void setFileManager(FileManager fm) ;
/** Set the initial association of variables and values.
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecutionFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecutionFactory.java?rev=1579183&r1=1579182&r2=1579183&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecutionFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QueryExecutionFactory.java Wed Mar 19 10:06:16 2014
@@ -125,7 +125,7 @@ public class QueryExecutionFactory
* @param fm FileManager
* @return QueryExecution
*/
-
+ @Deprecated
static public QueryExecution create(Query query, FileManager fm)
{
checkArg(query) ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java?rev=1579183&r1=1579182&r2=1579183&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/QueryExecutionBase.java Wed Mar 19 10:06:16 2014
@@ -588,6 +588,7 @@ public class QueryExecutionBase implemen
return dsg ;
}
+ @Deprecated
@Override
public void setFileManager(FileManager fm) { fileManager = fm ; }
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java?rev=1579183&r1=1579182&r2=1579183&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/http/QueryEngineHTTP.java Wed Mar 19 10:06:16 2014
@@ -64,11 +64,11 @@ public class QueryEngineHTTP implements
private final Context context;
// Params
- Params params = null;
+ private Params params = null;
// Protocol
- List<String> defaultGraphURIs = new ArrayList<String>();
- List<String> namedGraphURIs = new ArrayList<String>();
+ private List<String> defaultGraphURIs = new ArrayList<String>();
+ private List<String> namedGraphURIs = new ArrayList<String>();
private HttpAuthenticator authenticator;
private boolean finished = false;
@@ -227,6 +227,7 @@ public class QueryEngineHTTP implements
// { this.params = params ; }
// Meaning-less
+ @Deprecated
@Override
public void setFileManager(FileManager fm) {
throw new UnsupportedOperationException("FileManagers do not apply to remote query execution");
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=1579183&r1=1579182&r2=1579183&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 Wed Mar 19 10:06:16 2014
@@ -43,7 +43,6 @@ import com.hp.hpl.jena.sparql.resultset.
import com.hp.hpl.jena.sparql.resultset.SPARQLResult ;
import com.hp.hpl.jena.sparql.util.DatasetUtils ;
import com.hp.hpl.jena.sparql.vocabulary.ResultSetGraphVocab ;
-import com.hp.hpl.jena.util.FileManager ;
import com.hp.hpl.jena.util.FileUtils ;
import com.hp.hpl.jena.util.junit.TestUtils ;
import com.hp.hpl.jena.vocabulary.RDF ;
@@ -53,7 +52,6 @@ public class QueryTest extends EarlTestC
private static int testCounter = 1 ;
private int testNumber = testCounter++ ;
private TestItem testItem ;
- private FileManager queryFileManager ;
private boolean resetNeeded = false ;
private SPARQLResult results = null ; // Maybe null if no testing of results
@@ -61,10 +59,9 @@ public class QueryTest extends EarlTestC
// If supplied with a model, the test will load that model with data from the source
// If no model is supplied one is created or attached (e.g. a database)
- public QueryTest(String testName, EarlReport earl, FileManager fm, TestItem t)
+ public QueryTest(String testName, EarlReport earl, TestItem t)
{
super(TestUtils.safeName(testName), t.getURI(), earl) ;
- queryFileManager = fm ;
testItem = t ;
}
private boolean oldWarningFlag ;
@@ -166,7 +163,7 @@ public class QueryTest extends EarlTestC
QueryExecution qe = null ;
if ( dataset == null )
- qe = QueryExecutionFactory.create(query, queryFileManager) ;
+ qe = QueryExecutionFactory.create(query) ;
else
qe = QueryExecutionFactory.create(query, dataset) ;
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/ScriptTestSuiteFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/ScriptTestSuiteFactory.java?rev=1579183&r1=1579182&r2=1579183&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/ScriptTestSuiteFactory.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/ScriptTestSuiteFactory.java Wed Mar 19 10:06:16 2014
@@ -53,7 +53,7 @@ public class ScriptTestSuiteFactory exte
static public TestSuite make(String query, String data, String result)
{
TestItem item = TestItem.create(query, query, data, result) ;
- QueryTest t = new QueryTest(item.getName(), null, FileManager.get(), item) ;
+ QueryTest t = new QueryTest(item.getName(), null, item) ;
TestSuite ts = new TestSuite() ;
ts.setName(TestUtils.safeName(query)) ;
ts.addTest(t) ;
@@ -151,11 +151,11 @@ public class ScriptTestSuiteFactory exte
if ( testType.equals(TestManifest.QueryEvaluationTest)
|| testType.equals(TestManifestX.TestQuery)
)
- return new QueryTest(testName, results, fileManager, item) ;
+ return new QueryTest(testName, results, item) ;
// Reduced is funny.
if ( testType.equals(TestManifest.ReducedCardinalityTest) )
- return new QueryTest(testName, results, fileManager, item) ;
+ return new QueryTest(testName, results, item) ;
if ( testType.equals(TestManifestX.TestSurpressed) )
return new SurpressedTest(testName, results, item) ;
@@ -169,7 +169,7 @@ public class ScriptTestSuiteFactory exte
System.err.println("Test type '"+testType+"' not recognized") ;
}
// Default
- test = new QueryTest(testName, results, fileManager, item) ;
+ test = new QueryTest(testName, results, item) ;
return test ;
}
}