jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject jena git commit: JENA-624: Specific to general Dataset
Date Wed, 25 Nov 2015 18:09:28 GMT
Repository: jena
Updated Branches:
  refs/heads/master 35b1e7a6e -> 1fa20a279


JENA-624: Specific to general Dataset


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/1fa20a27
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/1fa20a27
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/1fa20a27

Branch: refs/heads/master
Commit: 1fa20a279f5251854bc9b3f70c5325b9100acb7b
Parents: 35b1e7a
Author: Andy Seaborne <andy@apache.org>
Authored: Wed Nov 25 18:09:19 2015 +0000
Committer: Andy Seaborne <andy@apache.org>
Committed: Wed Nov 25 18:09:19 2015 +0000

----------------------------------------------------------------------
 .../java/org/apache/jena/riot/RDFDataMgr.java   |  8 +++---
 .../jena/sparql/engine/QueryExecutionBase.java  |  2 +-
 .../sparql/engine/http/QueryEngineHTTP.java     |  2 +-
 .../org/apache/jena/sparql/api/TestAPI.java     |  2 +-
 .../org/apache/jena/sparql/core/TS_Core.java    |  2 +-
 .../jena/sparql/core/TestDatasetGeneral.java    | 28 ++++++++++++++++++++
 .../apache/jena/sparql/core/TestDatasetMem.java | 28 --------------------
 7 files changed, 36 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/1fa20a27/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
index 38444a7..ba8e398 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
@@ -311,10 +311,10 @@ public class RDFDataMgr
         process(dest, in, base, lang, (Context)null) ;
     }
     
-    private static Model createModel() { return ModelFactory.createDefaultModel() ; } 
-    private static Graph createGraph() { return GraphFactory.createDefaultGraph() ; } 
-    private static Dataset createDataset() { return DatasetFactory.createMem() ; } 
-    private static DatasetGraph createDatasetGraph() { return DatasetGraphFactory.createMem()
; }
+    private static Model createModel()                  { return ModelFactory.createDefaultModel()
; } 
+    private static Graph createGraph()                  { return GraphFactory.createDefaultGraph()
; } 
+    private static Dataset createDataset()              { return DatasetFactory.createTxnMem()
; } 
+    private static DatasetGraph createDatasetGraph()    { return DatasetGraphFactory.createTxnMem()
; }
     
     // Load:
     /** Create a memory Model and read in some data

http://git-wip-us.apache.org/repos/asf/jena/blob/1fa20a27/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryExecutionBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryExecutionBase.java
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryExecutionBase.java
index c679bdf..957c7e2 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryExecutionBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/QueryExecutionBase.java
@@ -263,7 +263,7 @@ public class QueryExecutionBase implements QueryExecution
     
     @Override
     public Dataset execConstructDataset(){
-        return execConstructDataset(DatasetFactory.createMem()) ;
+        return execConstructDataset(DatasetFactory.createTxnMem()) ;
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/jena/blob/1fa20a27/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
index 427d5e3..f6c807d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/QueryEngineHTTP.java
@@ -413,7 +413,7 @@ public class QueryEngineHTTP implements QueryExecution {
     
     @Override
     public Dataset execConstructDataset(){
-        return execConstructDataset(DatasetFactory.createMem());
+        return execConstructDataset(DatasetFactory.createTxnMem());
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/jena/blob/1fa20a27/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java b/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java
index 2990d18..18f2580 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/api/TestAPI.java
@@ -516,7 +516,7 @@ public class TestAPI extends BaseTest
         QueryExecution qExec = QueryExecutionFactory.create(q, d);
         Dataset result = qExec.execConstructDataset();
         
-        Dataset expected = DatasetFactory.createMem();
+        Dataset expected = DatasetFactory.createTxnMem();
         expected.addNamedModel(g1.getURI(), m);
         
         assertTrue(IsoMatcher.isomorphic( expected.asDatasetGraph(), result.asDatasetGraph())
);

http://git-wip-us.apache.org/repos/asf/jena/blob/1fa20a27/jena-arq/src/test/java/org/apache/jena/sparql/core/TS_Core.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/TS_Core.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/TS_Core.java
index 26f1ee2..62bd1a9 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/core/TS_Core.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/TS_Core.java
@@ -26,7 +26,7 @@ import org.junit.runners.Suite ;
     TestContext.class
     , TestDatasetGraphMem.class
     , TestDatasetGraphMemTriplesQuads.class
-    , TestDatasetMem.class
+    , TestDatasetGeneral.class
     // Not ready , TestDynamicDatasetMem.class
     , TestDatasetGraphsRegular.class
     , TestGraphOverDatasetMem.class

http://git-wip-us.apache.org/repos/asf/jena/blob/1fa20a27/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGeneral.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGeneral.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGeneral.java
new file mode 100644
index 0000000..2a3aa82
--- /dev/null
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGeneral.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.sparql.core;
+
+import org.apache.jena.query.Dataset ;
+import org.apache.jena.query.DatasetFactory ;
+
+public class TestDatasetGeneral extends AbstractTestDataset 
+{
+    @Override
+    protected Dataset createFixed() { return DatasetFactory.createGeneral() ; }
+}

http://git-wip-us.apache.org/repos/asf/jena/blob/1fa20a27/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetMem.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetMem.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetMem.java
deleted file mode 100644
index cd73d0f..0000000
--- a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetMem.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.sparql.core;
-
-import org.apache.jena.query.Dataset ;
-import org.apache.jena.query.DatasetFactory ;
-
-public class TestDatasetMem extends AbstractTestDataset 
-{
-    @Override
-    protected Dataset createFixed() { return DatasetFactory.createMem() ; }
-}


Mime
View raw message