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 2011/11/08 22:08:41 UTC
svn commit: r1199455 - in /incubator/jena/Jena2:
Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/
SDB/trunk/src/com/hp/hpl/jena/sdb/store/
TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/store/
Author: andy
Date: Tue Nov 8 21:08:40 2011
New Revision: 1199455
URL: http://svn.apache.org/viewvc?rev=1199455&view=rev
Log:
Remove wrnings due to Dataset/DataSource merge.
Modified:
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_QueryGeneral.java
incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/DatasetStore.java
incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDB.java
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_QueryGeneral.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_QueryGeneral.java?rev=1199455&r1=1199454&r2=1199455&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_QueryGeneral.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/SPARQL_QueryGeneral.java Tue Nov 8 21:08:40 2011
@@ -30,11 +30,7 @@ import static org.openjena.fuseki.HttpNa
import static org.openjena.fuseki.HttpNames.paramQueryRef ;
import static org.openjena.fuseki.HttpNames.paramStyleSheet ;
-import java.util.Arrays ;
-import java.util.Collections ;
-import java.util.HashSet ;
-import java.util.List ;
-import java.util.Set ;
+import java.util.* ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
@@ -45,7 +41,6 @@ import org.openjena.atlas.lib.InternalEr
import org.openjena.fuseki.migrate.GraphLoadUtils ;
import org.openjena.riot.RiotException ;
-import com.hp.hpl.jena.query.DataSource ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
import com.hp.hpl.jena.query.Query ;
@@ -142,7 +137,7 @@ public class SPARQL_QueryGeneral extends
if ( graphURLs.size() == 0 && namedGraphs.size() == 0 )
return null ;
- DataSource dataset = DatasetFactory.create() ;
+ Dataset dataset = DatasetFactory.createMem() ;
// Look in cache for loaded graphs!!
// ---- Default graph
Modified: incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/DatasetStore.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/DatasetStore.java?rev=1199455&r1=1199454&r2=1199455&view=diff
==============================================================================
--- incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/DatasetStore.java (original)
+++ incubator/jena/Jena2/SDB/trunk/src/com/hp/hpl/jena/sdb/store/DatasetStore.java Tue Nov 8 21:08:40 2011
@@ -18,16 +18,13 @@
package com.hp.hpl.jena.sdb.store;
-import com.hp.hpl.jena.sparql.core.DataSourceImpl;
-import com.hp.hpl.jena.sparql.core.DatasetGraph;
-import com.hp.hpl.jena.sparql.core.DatasetImpl;
+import com.hp.hpl.jena.query.Dataset ;
+import com.hp.hpl.jena.sdb.SDB ;
+import com.hp.hpl.jena.sdb.Store ;
+import com.hp.hpl.jena.sparql.core.DatasetGraph ;
+import com.hp.hpl.jena.sparql.core.DatasetImpl ;
-import com.hp.hpl.jena.query.Dataset;
-
-import com.hp.hpl.jena.sdb.SDB;
-import com.hp.hpl.jena.sdb.Store;
-
-public class DatasetStore extends DataSourceImpl
+public class DatasetStore
{
static { SDB.init() ; }
@@ -46,7 +43,4 @@ public class DatasetStore extends DataSo
{
return new DatasetStoreGraph(store, SDB.getContext().copy()) ;
}
-
- // Do not call.
- private DatasetStore() { super((Dataset)null) ; }
}
Modified: incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDB.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDB.java?rev=1199455&r1=1199454&r2=1199455&view=diff
==============================================================================
--- incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDB.java (original)
+++ incubator/jena/Jena2/TDB/trunk/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDB.java Tue Nov 8 21:08:40 2011
@@ -211,7 +211,7 @@ public class TestDatasetTDB extends Base
Model m = ds.getNamedModel("http://example/graph2") ;
// Use graph2 as default model.
- DataSource ds2 = DatasetFactory.create() ;
+ Dataset ds2 = DatasetFactory.createMem() ;
ds2.setDefaultModel(ds.getNamedModel("http://example/graph2")) ;
String qs = "CONSTRUCT {?s ?p ?o } WHERE { ?s ?p ?o}" ;
@@ -230,7 +230,7 @@ public class TestDatasetTDB extends Base
Model m = ds.getNamedModel("http://example/graph2") ;
// Use graph1 as a differently named model.
- DataSource ds2 = DatasetFactory.create() ;
+ Dataset ds2 = DatasetFactory.createMem() ;
ds2.addNamedModel("http://example/graphOther", m) ;
String qs = "CONSTRUCT {?s ?p ?o } WHERE { {?s ?p ?o} UNION { GRAPH <http://example/graphOther> {?s ?p ?o} } }" ;
@@ -249,7 +249,7 @@ public class TestDatasetTDB extends Base
Model m = ds.getDefaultModel() ;
// Use the default model in one dataset as a named model in another.
- DataSource ds2 = DatasetFactory.create() ;
+ Dataset ds2 = DatasetFactory.createMem() ;
ds2.addNamedModel("http://example/graphOther", m) ;
String qs = "CONSTRUCT {?s ?p ?o } WHERE { {?s ?p ?o} UNION { GRAPH <http://example/graphOther> {?s ?p ?o} } }" ;