Github user ajs6f commented on a diff in the pull request:
https://github.com/apache/jena/pull/94#discussion_r44409220
--- Diff: jena-arq/src/main/java/org/apache/jena/query/DatasetFactory.java
---
@@ -16,253 +16,226 @@
* limitations under the License.
*/
-package org.apache.jena.query ;
-
-import java.util.List ;
-
-import org.apache.jena.assembler.Assembler ;
-import org.apache.jena.rdf.model.Model ;
-import org.apache.jena.rdf.model.Resource ;
-import org.apache.jena.sparql.ARQException ;
-import org.apache.jena.sparql.core.DatasetGraph ;
-import org.apache.jena.sparql.core.DatasetGraphFactory ;
-import org.apache.jena.sparql.core.DatasetImpl ;
-import org.apache.jena.sparql.core.assembler.DatasetAssembler ;
-import org.apache.jena.sparql.util.DatasetUtils ;
-import org.apache.jena.sparql.util.graph.GraphUtils ;
-import org.apache.jena.util.FileManager ;
-
-/** Make Datasets and DataSources in various ways */
-
+package org.apache.jena.query;
+
+import java.util.List;
+
+import org.apache.jena.assembler.Assembler;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.sparql.ARQException;
+import org.apache.jena.sparql.core.DatasetGraph;
+import org.apache.jena.sparql.core.DatasetGraphFactory;
+import org.apache.jena.sparql.core.DatasetImpl;
+import org.apache.jena.sparql.core.assembler.DatasetAssembler;
+import org.apache.jena.sparql.util.DatasetUtils;
+import org.apache.jena.sparql.util.graph.GraphUtils;
+import org.apache.jena.util.FileManager;
+
+/**
+ * Makes {@link Dataset}s in various ways.
+ *
+ */
public class DatasetFactory {
- /** Create an in-memory, modifiable Dataset */
- public static Dataset createMem() {
- return create(DatasetGraphFactory.createMem()) ;
- }
-
- /**
- * Create an in-memory, modifiable Dataset. New graphs must be
explicitly
- * added using .addGraph.
- */
- public static Dataset createMemFixed() {
- return create(DatasetGraphFactory.createMemFixed()) ;
- }
-
- /**
- * Create a dataset with the given model as the default graph
- *
- * @param model
- * The model for the default graph
- * @return Dataset
- */
- public static Dataset create(Model model) {
- return new DatasetImpl(model) ;
- }
-
- /**
- * Create a dataset: clone the dataset structure of named graohs, and
share
- * the graphs themselves.
- *
- * @param dataset
- * Dataset to clone structure from.
- * @return Dataset
- */
- public static Dataset create(Dataset dataset) {
- return new DatasetImpl(dataset) ;
- }
-
- /**
- * Wrap a datasetgraph to make a mutable dataset
- *
- * @param dataset
- * DatasetGraph
- * @return Dataset
- */
- public static Dataset create(DatasetGraph dataset) {
- return DatasetImpl.wrap(dataset) ;
- }
-
- /**
- * Create a dataset based on a list of URIs : these are merged into the
- * default graph of the dataset.
- *
- * @param uriList
- * URIs merged to form the default dataset
- * @return Dataset
- */
-
- public static Dataset create(List<String> uriList) {
- return create(uriList, null, null) ;
- }
-
- /**
- * Create a dataset with a default graph and no named graphs
- *
- * @param uri
- * URIs merged to form the default dataset
- * @return Dataset
- */
-
- public static Dataset create(String uri) {
- return create(uri, null, null) ;
- }
-
- /**
- * Create a dataset based on a list of URIs : these are merged into the
- * default graph of the dataset.
- *
- * @param uriList
- * URIs merged to form the default dataset
- * @param fileManager
- * @return Dataset
- */
-
- /**
- * Create a named graph container of graphs based on a list of URIs.
- *
- * @param namedSourceList
- * @return Dataset
- */
-
- public static Dataset createNamed(List<String> namedSourceList) {
- return create((List<String>)null, namedSourceList, null) ;
- }
-
- /**
- * Create a dataset based on two list of URIs. The first lists is used
to
- * create the background (unnamed graph) by merging, the second is
used to
- * create the collection of named graphs.
- *
- * (Jena calls graphs "Models" and triples "Statements")
- *
- * @param uriList
- * graphs to be loaded into the unnamed, default graph
- * @param namedSourceList
- * graphs to be atatched as named graphs
- * @return Dataset
- */
-
- public static Dataset create(List<String> uriList, List<String>
namedSourceList) {
- return create(uriList, namedSourceList, null) ;
- }
-
- /**
- * Create a dataset container based on two list of URIs. The first is
used
- * to create the background (unnamed graph), the second is used to
create
- * the collection of named graphs.
- *
- * (Jena calls graphs "Models" and triples "Statements")
- *
- * @param uri
- * graph to be loaded into the unnamed, default graph
- * @param namedSourceList
- * graphs to be attached as named graphs
- * @return Dataset
- */
-
- public static Dataset create(String uri, List<String> namedSourceList)
{
- return create(uri, namedSourceList, null) ;
- }
-
- /**
- * Create a named graph container based on two list of URIs. The first
is
- * used to create the background (unnamed graph), the second is used to
- * create the collection of named graphs.
- *
- * (Jena calls graphs "Models" and triples "Statements")
- *
- * @param uri
- * graph to be loaded into the unnamed, default graph
- * @param namedSourceList
- * graphs to be atatched as named graphs
- * @param baseURI
- * baseURI for relative URI expansion
- * @return Dataset
- */
-
- public static Dataset create(String uri, List<String> namedSourceList,
String baseURI) {
- return DatasetUtils.createDataset(uri, namedSourceList, baseURI) ;
- }
-
- /**
- * Create a named graph container based on two list of URIs. The first
is
- * used to create the background (unnamed graph), the second is used to
- * create the collection of named graphs.
- *
- * (Jena calls graphs "Models" and triples "Statements")
- *
- * @param uriList
- * graphs to be loaded into the unnamed, default graph
- * @param namedSourceList
- * graphs to be atatched as named graphs
- * @param baseURI
- * baseURI for relative URI expansion
- * @return Dataset
- */
-
- public static Dataset create(List<String> uriList, List<String>
namedSourceList, String baseURI) {
- return DatasetUtils.createDataset(uriList, namedSourceList,
baseURI) ;
- }
-
- public static Dataset make(Dataset ds, Model defaultModel) {
- Dataset ds2 = new DatasetImpl(ds) ;
- ds2.setDefaultModel(defaultModel) ;
- return ds2 ;
- }
-
- // Assembler.
- /**
- * Assembler a dataset from the model in a file
- *
- * @param filename
- * The filename
- * @return Dataset
- */
- public static Dataset assemble(String filename) {
- Model model = FileManager.get().loadModel(filename) ;
- return assemble(model) ;
- }
-
- /**
- * Assembler a dataset from the model in a file
- *
- * @param filename
- * The filename
- * @param resourceURI
- * URI for the dataset to assembler
- * @return Dataset
- */
- public static Dataset assemble(String filename, String resourceURI) {
- Model model = FileManager.get().loadModel(filename) ;
- Resource r = model.createResource(resourceURI) ;
- return assemble(r) ;
- }
-
- /**
- * Assembler a dataset from the model
- *
- * @param model
- * @return Dataset
- */
- public static Dataset assemble(Model model) {
- Resource r = GraphUtils.findRootByType(model,
DatasetAssembler.getType()) ;
- if ( r == null )
- throw new ARQException("No root found for type <" +
DatasetAssembler.getType() + ">") ;
-
- return assemble(r) ;
- }
-
- /**
- * Assembler a dataset from a resource
- *
- * @param resource
- * The resource for the dataset
- * @return Dataset
- */
-
- public static Dataset assemble(Resource resource) {
- Dataset ds = (Dataset)Assembler.general.open(resource) ;
- return ds ;
- }
+ /**
+ * @return an in-memory, modifiable Dataset
+ * @deprecated Prefer {@link #createGeneral()} or {@link
#createTxnMem()}
+ */
+ @Deprecated
+ public static Dataset createMem() {
+ return create(DatasetGraphFactory.createMem());
+ }
+
+ /**
+ * @return a transactional, in-memory, modifiable Dataset with MR+SW
locking
+ */
+ public static Dataset createTxnMem() {
+ return create(DatasetGraphFactory.createTxMem());
+ }
+
+ /**
+ * @return a general-purpose, in-memory, modifiable Dataset
+ */
+ public static Dataset createGeneral() {
+ return createTxnMem();
+ }
+
--- End diff --
Ah, right. Will fix.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
