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 2015/12/05 23:35:33 UTC
[2/2] jena git commit: Clean some deprecations.
Clean some deprecations.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/74e4ab12
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/74e4ab12
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/74e4ab12
Branch: refs/heads/master
Commit: 74e4ab123536b91ed5a7efaba90668fe2bba0da8
Parents: 9613dba
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Dec 5 22:34:21 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Dec 5 22:35:09 2015 +0000
----------------------------------------------------------------------
jena-spatial/src/main/java/examples/JenaSpatialExample1.java | 2 +-
.../org/apache/jena/query/spatial/SpatialDatasetFactory.java | 2 +-
.../org/apache/jena/query/spatial/SpatialSearchUtil.java | 2 +-
jena-text/src/main/java/examples/JenaTextExample1.java | 2 +-
.../java/org/apache/jena/query/text/TextDatasetFactory.java | 4 ++--
.../org/apache/jena/query/text/TestBuildTextDataset.java | 2 +-
.../jena/query/text/TestLuceneWithMultipleThreads.java | 8 ++++----
7 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/74e4ab12/jena-spatial/src/main/java/examples/JenaSpatialExample1.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/main/java/examples/JenaSpatialExample1.java b/jena-spatial/src/main/java/examples/JenaSpatialExample1.java
index 5adc33d..57f9fed 100644
--- a/jena-spatial/src/main/java/examples/JenaSpatialExample1.java
+++ b/jena-spatial/src/main/java/examples/JenaSpatialExample1.java
@@ -115,7 +115,7 @@ public class JenaSpatialExample1 {
private static Dataset createDatasetByCode(File indexDir) throws IOException {
// Base data
- Dataset ds1 = DatasetFactory.createMem();
+ Dataset ds1 = DatasetFactory.create();
return joinDataset(ds1, indexDir);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/74e4ab12/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialDatasetFactory.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialDatasetFactory.java b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialDatasetFactory.java
index 890a4f4..9d0c8d5 100644
--- a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialDatasetFactory.java
+++ b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialDatasetFactory.java
@@ -43,7 +43,7 @@ public class SpatialDatasetFactory
{
DatasetGraph dsg = base.asDatasetGraph() ;
dsg = create(dsg, textIndex) ;
- return DatasetFactory.create(dsg) ;
+ return DatasetFactory.wrap(dsg) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/74e4ab12/jena-spatial/src/test/java/org/apache/jena/query/spatial/SpatialSearchUtil.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/SpatialSearchUtil.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/SpatialSearchUtil.java
index 493ad11..a1b5f08 100644
--- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/SpatialSearchUtil.java
+++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/SpatialSearchUtil.java
@@ -112,7 +112,7 @@ public class SpatialSearchUtil {
private static Dataset createDatasetByCode(File indexDir) throws IOException {
// Base data
- Dataset ds1 = DatasetFactory.createMem();
+ Dataset ds1 = DatasetFactory.create();
return joinDataset(ds1, indexDir);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/74e4ab12/jena-text/src/main/java/examples/JenaTextExample1.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/examples/JenaTextExample1.java b/jena-text/src/main/java/examples/JenaTextExample1.java
index a4a75f5..6542cda 100644
--- a/jena-text/src/main/java/examples/JenaTextExample1.java
+++ b/jena-text/src/main/java/examples/JenaTextExample1.java
@@ -54,7 +54,7 @@ public class JenaTextExample1
// Here , in-memory base data and in-memeory Lucene index
// Base data
- Dataset ds1 = DatasetFactory.createMem() ;
+ Dataset ds1 = DatasetFactory.create() ;
// Define the index mapping
EntityDefinition entDef = new EntityDefinition("uri", "text");
http://git-wip-us.apache.org/repos/asf/jena/blob/74e4ab12/jena-text/src/main/java/org/apache/jena/query/text/TextDatasetFactory.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextDatasetFactory.java b/jena-text/src/main/java/org/apache/jena/query/text/TextDatasetFactory.java
index 71bc1fa..544082b 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextDatasetFactory.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextDatasetFactory.java
@@ -50,7 +50,7 @@ public class TextDatasetFactory
{
DatasetGraph dsg = base.asDatasetGraph() ;
dsg = create(dsg, textIndex, closeIndexOnDSGClose) ;
- return DatasetFactory.create(dsg) ;
+ return DatasetFactory.wrap(dsg) ;
}
/** Create a text-indexed dataset, optionally allowing the text index to be closed if the Dataset is */
@@ -58,7 +58,7 @@ public class TextDatasetFactory
{
DatasetGraph dsg = base.asDatasetGraph() ;
dsg = create(dsg, textIndex, closeIndexOnDSGClose, producer) ;
- return DatasetFactory.create(dsg) ;
+ return DatasetFactory.wrap(dsg) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/74e4ab12/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java b/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java
index ce50907..ed67fb6 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java
@@ -100,7 +100,7 @@ public class TestBuildTextDataset extends BaseTest
public static Dataset createCode() {
// Base data
- Dataset ds1 = DatasetFactory.createMem() ;
+ Dataset ds1 = DatasetFactory.create() ;
// Define the index mapping
EntityDefinition entDef = new EntityDefinition("uri", "text");
http://git-wip-us.apache.org/repos/asf/jena/blob/74e4ab12/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java b/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java
index 207e746..5902c99 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java
@@ -59,7 +59,7 @@ public class TestLuceneWithMultipleThreads
public void testReadInMiddleOfWrite() throws InterruptedException, ExecutionException
{
final DatasetGraphText dsg = (DatasetGraphText)TextDatasetFactory.createLucene(new GraphStoreNullTransactional(), new RAMDirectory(), new TextIndexConfig(entDef));
- final Dataset ds = DatasetFactory.create(dsg);
+ final Dataset ds = DatasetFactory.wrap(dsg);
final ExecutorService execService = Executors.newSingleThreadExecutor();
final Future<?> f = execService.submit(new Runnable()
{
@@ -116,7 +116,7 @@ public class TestLuceneWithMultipleThreads
{
final DatasetGraphText dsg = (DatasetGraphText)TextDatasetFactory.createLucene(new GraphStoreNullTransactional(), new RAMDirectory(), new TextIndexConfig(entDef));
final int numReads = 10;
- final Dataset ds = DatasetFactory.create(dsg);
+ final Dataset ds = DatasetFactory.wrap(dsg);
final ExecutorService execService = Executors.newFixedThreadPool(10);
final Future<?> f = execService.submit(new Runnable()
{
@@ -182,12 +182,12 @@ public class TestLuceneWithMultipleThreads
@Test
public void testIsolation() throws InterruptedException, ExecutionException {
- final DatasetGraphText dsg = (DatasetGraphText)TextDatasetFactory.createLucene(DatasetGraphFactory.createMem(), new RAMDirectory(), new TextIndexConfig(entDef));
+ final DatasetGraphText dsg = (DatasetGraphText)TextDatasetFactory.createLucene(DatasetGraphFactory.create(), new RAMDirectory(), new TextIndexConfig(entDef));
final int numReaders = 2;
final List<Future<?>> futures = new ArrayList<Future<?>>(numReaders);
final ExecutorService execService = Executors.newFixedThreadPool(numReaders);
- final Dataset ds = DatasetFactory.create(dsg);
+ final Dataset ds = DatasetFactory.wrap(dsg);
for (int i=0; i<numReaders; i++) {