Author: andy
Date: Sun Jun 22 18:10:05 2014
New Revision: 1604629
URL: http://svn.apache.org/r1604629
Log:
JENA-726 : Remove deprecated QueryExecution.setFileManager.
Work through the codebase removing operations that supported that.
Modified:
jena/trunk/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneral.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java
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/main/java/com/hp/hpl/jena/sparql/util/DatasetUtils.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java
Modified: jena/trunk/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneral.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneral.java?rev=1604629&r1=1604628&r2=1604629&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneral.java
(original)
+++ jena/trunk/jena-arq/src/main/java/arq/cmdline/ModDatasetGeneral.java Sun
Jun 22 18:10:05 2014
@@ -31,8 +31,6 @@ import com.hp.hpl.jena.sparql.core.DataF
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
import com.hp.hpl.jena.sparql.util.DatasetUtils ;
-import com.hp.hpl.jena.util.FileManager ;
-import com.hp.hpl.jena.util.LocationMapper ;
/** ModDataset: arguments to build a dataset -
* see also ModDatasetAssembler which extends ModDataset
@@ -46,13 +44,11 @@ public class ModDatasetGeneral extends M
protected final ArgDecl namedGraphDecl = new ArgDecl(ArgDecl.HasValue,
"named", "namedgraph", "namedGraph", "namedData", "nameddata") ;
//protected final ArgDecl dataFmtDecl = new ArgDecl(ArgDecl.HasValue,
"fmt", "format") ;
//protected final ArgDecl dirDecl = new ArgDecl(ArgDecl.HasValue,
"dir") ;
- protected final ArgDecl lmapDecl = new ArgDecl(ArgDecl.HasValue,
"lmap") ;
private List<String> dataURLs = null ;
private List<String> graphURLs = null ;
private List<String> namedGraphURLs = null ;
private DataFormat dataSyntax = null ;
- private FileManager fileManager = FileManager.get() ;
protected ModDatasetGeneral() {}
@@ -69,11 +65,6 @@ public class ModDatasetGeneral extends M
cl.add(namedGraphDecl,
"--namedGraph=FILE",
"Add a graph into the dataset as a named graph") ;
- //cl.add(dirDecl) ;
- //cl.add(dataFmtDecl) ;
- cl.add(lmapDecl,
- "--lmap",
- "Specify a location mapping file") ;
}
@Override
@@ -82,13 +73,6 @@ public class ModDatasetGeneral extends M
dataURLs = cmdLine.getValues(dataDecl) ;
graphURLs = cmdLine.getValues(graphDecl) ;
namedGraphURLs = cmdLine.getValues(namedGraphDecl) ;
-
- if ( cmdLine.contains(lmapDecl) )
- {
- String lmapFile = cmdLine.getValue(lmapDecl) ;
- LocationMapper locMap = new LocationMapper(lmapFile) ;
- fileManager = new FileManager(locMap) ;
- }
}
@Override
@@ -118,7 +102,7 @@ public class ModDatasetGeneral extends M
}
if ( (graphURLs != null) || (namedGraphURLs != null) )
- ds = DatasetUtils.addInGraphs(ds, graphURLs, namedGraphURLs,
fileManager, null) ;
+ ds = DatasetUtils.addInGraphs(ds, graphURLs, namedGraphURLs,
null) ;
}
catch (LabelExistsException ex)
{ throw new CmdException(ex.getMessage()) ; }
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java?rev=1604629&r1=1604628&r2=1604629&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java
(original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java
Sun Jun 22 18:10:05 2014
@@ -167,7 +167,7 @@ public class DatasetFactory
public static Dataset create(String uri, List<String> namedSourceList,
FileManager fileManager, String baseURI)
{
- return DatasetUtils.createDataset(uri, namedSourceList, fileManager,
baseURI) ;
+ return DatasetUtils.createDataset(uri, namedSourceList, baseURI) ;
}
@@ -182,12 +182,14 @@ public class DatasetFactory
* @param fileManager
* @param baseURI baseURI for relative URI expansion
* @return Dataset
+ * @deprecated FileManager argument has no effect
*/
+ @Deprecated
public static Dataset create(List<String> uriList, List<String>
namedSourceList,
FileManager fileManager, String baseURI)
{
- return DatasetUtils.createDataset(uriList, namedSourceList,
fileManager, baseURI) ;
+ return DatasetUtils.createDataset(uriList, namedSourceList, baseURI) ;
}
// public static Dataset make(Dataset ds)
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=1604629&r1=1604628&r2=1604629&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
Sun Jun 22 18:10:05 2014
@@ -24,19 +24,12 @@ import java.util.concurrent.TimeUnit ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.sparql.util.Context ;
-import com.hp.hpl.jena.util.FileManager ;
/** A interface for a single execution of a query. */
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.
* May not be supported by all QueryExecution implementations.
* @param binding
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=1604629&r1=1604628&r2=1604629&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
Sun Jun 22 18:10:05 2014
@@ -121,32 +121,15 @@ public class QueryExecutionFactory
/** Create a QueryExecution : the file manager will be used to load
* URIs in the query decription.
*
- * @param query Query
- * @param fm FileManager
- * @return QueryExecution
- */
- @Deprecated
- static public QueryExecution create(Query query, FileManager fm)
- {
- checkArg(query) ;
- QueryExecution qe = make(query) ;
- if ( fm != null )
- qe.setFileManager(fm) ;
- return qe ;
- }
-
- /** Create a QueryExecution : the file manager will be used to load
- * URIs in the query decription.
- *
* @param queryStr Query string
* @param fm FileManager
* @return QueryExecution
+ * @deprecated Setting the FileManger has no effect. Use {@linkplain
#create(String)}
*/
-
+ @Deprecated
static public QueryExecution create(String queryStr, FileManager fm)
{
- checkArg(queryStr) ;
- return create(makeQuery(queryStr), fm) ;
+ return create(queryStr) ;
}
/** Create a QueryExecution : the file manager will be used to load
@@ -156,12 +139,13 @@ public class QueryExecutionFactory
* @param syntax Syntax
* @param fm FileManager
* @return QueryExecution
+ * @deprecated Setting the FileManger has no effect. Use {@linkplain
#create(String, Syntax)}
*/
-
- static public QueryExecution create(String queryStr, Syntax syntax,
FileManager fm)
+ @Deprecated
+ static public QueryExecution create(String queryStr, Syntax syntax,
FileManager fm)
{
checkArg(queryStr) ;
- return create(makeQuery(queryStr, syntax), fm) ;
+ return create(makeQuery(queryStr, syntax)) ;
}
// ---------------- Query + Model
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=1604629&r1=1604628&r2=1604629&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
Sun Jun 22 18:10:05 2014
@@ -48,7 +48,6 @@ import com.hp.hpl.jena.sparql.syntax.Tem
import com.hp.hpl.jena.sparql.util.Context ;
import com.hp.hpl.jena.sparql.util.DatasetUtils ;
import com.hp.hpl.jena.sparql.util.ModelUtils ;
-import com.hp.hpl.jena.util.FileManager ;
/** All the SPARQL query result forms made from a graph-level execution object
*/
@@ -64,7 +63,6 @@ public class QueryExecutionBase implemen
private QueryIterator queryIterator = null ;
private Plan plan = null ;
private Context context ;
- private FileManager fileManager = FileManager.get() ;
private QuerySolution initialBinding = null ;
// Set if QueryIterator.cancel has been called
@@ -520,7 +518,7 @@ public class QueryExecutionBase implemen
{
if ( plan == null )
{
- DatasetGraph dsg = prepareDataset(dataset, query, fileManager) ;
+ DatasetGraph dsg = prepareDataset(dataset, query) ;
Binding inputBinding = null ;
if ( initialBinding != null )
inputBinding = BindingUtils.asBinding(initialBinding) ;
@@ -569,8 +567,7 @@ public class QueryExecutionBase implemen
@Override
public Query getQuery() { return query ; }
- // Call after setFM called.
- private static DatasetGraph prepareDataset(Dataset dataset, Query query,
FileManager fileManager)
+ private static DatasetGraph prepareDataset(Dataset dataset, Query query)
{
if ( dataset != null )
return dataset.asDatasetGraph() ;
@@ -583,15 +580,10 @@ public class QueryExecutionBase implemen
if ( baseURI == null )
baseURI = IRIResolver.chooseBaseURI() ;
- DatasetGraph dsg =
DatasetUtils.createDatasetGraph(query.getDatasetDescription(),
- fileManager,
baseURI ) ;
+ DatasetGraph dsg =
DatasetUtils.createDatasetGraph(query.getDatasetDescription(), baseURI ) ;
return dsg ;
}
- @Deprecated
- @Override
- public void setFileManager(FileManager fm) { fileManager = fm ; }
-
@Override
public void setInitialBinding(QuerySolution startSolution)
{
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=1604629&r1=1604628&r2=1604629&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
Sun Jun 22 18:10:05 2014
@@ -45,7 +45,6 @@ import com.hp.hpl.jena.sparql.resultset.
import com.hp.hpl.jena.sparql.resultset.TSVInput ;
import com.hp.hpl.jena.sparql.resultset.XMLInput ;
import com.hp.hpl.jena.sparql.util.Context ;
-import com.hp.hpl.jena.util.FileManager ;
/**
* A query execution implementation where queries are executed against a remote
@@ -224,13 +223,6 @@ public class QueryEngineHTTP implements
// public void setParams(Params params)
// { this.params = params ; }
- // Meaning-less
- @Deprecated
- @Override
- public void setFileManager(FileManager fm) {
- throw new UnsupportedOperationException("FileManagers do not apply to
remote query execution");
- }
-
@Override
public void setInitialBinding(QuerySolution binding) {
throw new UnsupportedOperationException(
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/DatasetUtils.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/DatasetUtils.java?rev=1604629&r1=1604628&r2=1604629&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/DatasetUtils.java
(original)
+++
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/DatasetUtils.java
Sun Jun 22 18:10:05 2014
@@ -19,9 +19,11 @@
package com.hp.hpl.jena.sparql.util;
import java.util.ArrayList ;
+import java.util.Arrays ;
import java.util.Iterator ;
import java.util.List ;
+import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.riot.system.IRIResolver ;
import com.hp.hpl.jena.graph.Node ;
@@ -33,7 +35,6 @@ import com.hp.hpl.jena.sparql.core.Datas
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
import com.hp.hpl.jena.sparql.graph.GraphFactory ;
-import com.hp.hpl.jena.util.FileManager ;
/** Internal Dataset/DataSource factory + graph equivalents. */
@@ -42,56 +43,45 @@ public class DatasetUtils
public static Dataset createDataset(String uri, List<String>
namedSourceList)
{
- return createDataset(uri, namedSourceList, null, null) ;
- }
-
- public static Dataset createDataset(String uri, List<String>
namedSourceList,
- FileManager fileManager, String
baseURI)
- {
- List<String> uriList = new ArrayList<String>() ;
- uriList.add(uri) ;
- return createDataset(uriList, namedSourceList, fileManager, baseURI) ;
+ return createDataset(uri, namedSourceList, null) ;
}
- public static Dataset createDataset(List<String> uriList, List<String>
namedSourceList)
+ public static Dataset createDataset(String uri, List<String>
namedSourceList, String baseURI)
{
- return createDataset(uriList, namedSourceList, null, null) ;
+ List<String> uriList = Arrays.asList(uri) ;
+ return createDataset(uriList, namedSourceList, baseURI) ;
}
- public static Dataset createDataset(List<String> uriList, List<String>
namedSourceList,
- FileManager fileManager, String
baseURI)
+ public static Dataset createDataset(List<String> uriList, List<String>
namedSourceList)
{
- // Fixed dataset - any GRAPH <notThere> in a query must return no
match.
- Dataset ds = DatasetFactory.createMemFixed() ;
- addInGraphs(ds, uriList, namedSourceList, fileManager, baseURI) ;
- return ds ;
+ return createDataset(uriList, namedSourceList, null) ;
}
public static Dataset createDataset(DatasetDescription datasetDesc)
{
- return createDataset(datasetDesc.getDefaultGraphURIs(),
datasetDesc.getNamedGraphURIs(), null, null) ;
+ return createDataset(datasetDesc, null) ;
}
- public static Dataset createDataset(DatasetDescription datasetDesc,
- FileManager fileManager, String
baseURI)
+ public static Dataset createDataset(DatasetDescription datasetDesc, String
baseURI)
{
- return createDataset(datasetDesc.getDefaultGraphURIs(),
datasetDesc.getNamedGraphURIs(), fileManager, baseURI) ;
+ return createDataset(datasetDesc.getDefaultGraphURIs(),
datasetDesc.getNamedGraphURIs(), baseURI) ;
}
+ public static Dataset createDataset(List<String> uriList, List<String>
namedSourceList, String baseURI)
+ {
+ Dataset ds = DatasetFactory.createMem() ;
+ return addInGraphs(ds, uriList, namedSourceList, baseURI) ;
+ }
- /** add graphs into an exiting DataSource */
+ /** add graphs into an existing DataSource */
public static Dataset addInGraphs(Dataset ds, List<String> uriList,
List<String> namedSourceList)
{
- return addInGraphs(ds, uriList, namedSourceList, null, null) ;
+ return addInGraphs(ds, uriList, namedSourceList, null) ;
}
/** add graphs into an existing DataSource */
- public static Dataset addInGraphs(Dataset ds, List<String> uriList,
List<String> namedSourceList,
- FileManager fileManager, String baseURI)
+ public static Dataset addInGraphs(Dataset ds, List<String> uriList,
List<String> namedSourceList, String baseURI)
{
- if ( fileManager == null )
- fileManager = FileManager.get() ;
-
if ( ds.getDefaultModel() == null )
// Merge into background graph
ds.setDefaultModel(GraphFactory.makeDefaultModel()) ;
@@ -106,7 +96,7 @@ public class DatasetUtils
absURI = IRIResolver.resolveString(sourceURI, baseURI) ;
else
absURI = IRIResolver.resolveString(sourceURI) ;
- fileManager.readModel(ds.getDefaultModel(), sourceURI, absURI,
null) ;
+ RDFDataMgr.read(ds.getDefaultModel(), sourceURI, absURI, null)
;
}
}
@@ -121,7 +111,7 @@ public class DatasetUtils
else
absURI = IRIResolver.resolveString(sourceURI) ;
Model m = GraphFactory.makeDefaultModel() ;
- fileManager.readModel(m, sourceURI, absURI, null) ;
+ RDFDataMgr.read(m, sourceURI, absURI, null) ;
ds.addNamedModel(absURI, m) ;
}
}
@@ -132,33 +122,25 @@ public class DatasetUtils
public static DatasetGraph createDatasetGraph(DatasetDescription
datasetDesc)
{
- return createDatasetGraph(datasetDesc.getDefaultGraphURIs(),
datasetDesc.getNamedGraphURIs(), null, null) ;
+ return createDatasetGraph(datasetDesc.getDefaultGraphURIs(),
datasetDesc.getNamedGraphURIs(), null) ;
}
- public static DatasetGraph createDatasetGraph(DatasetDescription
datasetDesc,
- FileManager fileManager,
String baseURI)
+ public static DatasetGraph createDatasetGraph(DatasetDescription
datasetDesc, String baseURI)
{
- return createDatasetGraph(datasetDesc.getDefaultGraphURIs(),
datasetDesc.getNamedGraphURIs(), fileManager, baseURI) ;
+ return createDatasetGraph(datasetDesc.getDefaultGraphURIs(),
datasetDesc.getNamedGraphURIs(), baseURI) ;
}
-
-
- public static DatasetGraph createDatasetGraph(String uri, List<String>
namedSourceList,
- FileManager fileManager,
String baseURI)
- {
- List<String> uriList = new ArrayList<String>() ;
- uriList.add(uri) ;
- return createDatasetGraph(uriList, namedSourceList, fileManager,
baseURI) ;
- }
+ public static DatasetGraph createDatasetGraph(String uri, List<String>
namedSourceList, String baseURI)
+ {
+ List<String> uriList = new ArrayList<String>() ;
+ uriList.add(uri) ;
+ return createDatasetGraph(uriList, namedSourceList, baseURI) ;
+ }
- public static DatasetGraph createDatasetGraph(List<String> uriList,
List<String> namedSourceList,
- FileManager fileManager,
String baseURI)
+ public static DatasetGraph createDatasetGraph(List<String> uriList,
List<String> namedSourceList, String baseURI)
{
DatasetGraph ds = DatasetGraphFactory.createMem() ;
- if ( fileManager == null )
- fileManager = FileManager.get() ;
-
// Merge into background graph
if ( uriList != null )
{
@@ -172,7 +154,7 @@ public class DatasetUtils
else
absURI = IRIResolver.resolveString(sourceURI) ;
// FileManager.readGraph?
- fileManager.readModel(m, sourceURI, absURI, null) ;
+ RDFDataMgr.read(m, sourceURI, absURI, null) ;
}
ds.setDefaultGraph(m.getGraph()) ;
}
@@ -191,7 +173,8 @@ public class DatasetUtils
absURI = IRIResolver.resolveString(baseURI, sourceURI) ;
else
absURI = IRIResolver.resolveString(sourceURI) ;
- Model m = fileManager.loadModel(sourceURI, absURI, null) ;
+ Model m = GraphFactory.makeDefaultModel() ;
+ RDFDataMgr.read(m, sourceURI, absURI, null) ;
Node gn = NodeFactory.createURI(sourceURI) ;
ds.addGraph(gn, m.getGraph()) ;
}
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=1604629&r1=1604628&r2=1604629&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
Sun Jun 22 18:10:05 2014
@@ -137,7 +137,7 @@ public class QueryTest extends EarlTestC
private static Dataset createDataset(List<String> defaultGraphURIs,
List<String> namedGraphURIs)
{
- return DatasetUtils.createDataset(defaultGraphURIs, namedGraphURIs,
null, null) ;
+ return DatasetUtils.createDataset(defaultGraphURIs, namedGraphURIs,
null) ;
}
@Override
