You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by aj...@apache.org on 2016/10/30 18:36:20 UTC
[08/14] jena git commit: Minor cleanup, removing dead code
Minor cleanup, removing dead code
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/17d98c98
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/17d98c98
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/17d98c98
Branch: refs/heads/master
Commit: 17d98c98d73f2c4ea9bcf4ac67b4b876ef52e91a
Parents: 93e21f0
Author: ajs6f <aj...@virginia.edu>
Authored: Sat Oct 8 15:55:00 2016 -0400
Committer: ajs6f <aj...@virginia.edu>
Committed: Sun Oct 30 14:12:31 2016 -0400
----------------------------------------------------------------------
.../jena/query/spatial/SpatialDatasetFactory.java | 3 ---
.../query/spatial/pfunction/SpatialOperationPFBase.java | 4 +---
.../spatial/AbstractTestDatasetWithSpatialIndex.java | 12 +++++++-----
.../assembler/TestEntityDefinitionAssembler.java | 2 +-
4 files changed, 9 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/17d98c98/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 1c919f6..056a524 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
@@ -23,7 +23,6 @@ import org.apache.jena.query.DatasetFactory ;
import org.apache.jena.query.spatial.assembler.SpatialVocab;
import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.core.assembler.AssemblerUtils ;
-import org.apache.jena.sparql.util.Context ;
import org.apache.jena.system.JenaSystem ;
import org.apache.lucene.store.Directory;
import org.apache.solr.client.solrj.SolrServer;
@@ -53,8 +52,6 @@ public class SpatialDatasetFactory
SpatialDocProducer producer = new SpatialDocProducerTriples(spatialIndex) ;
DatasetGraph dsgt = new DatasetGraphSpatial(dsg, spatialIndex, producer) ;
// Also set on dsg
- Context c = dsgt.getContext() ;
-
dsgt.getContext().set(SpatialQuery.spatialIndex, spatialIndex) ;
return dsgt ;
http://git-wip-us.apache.org/repos/asf/jena/blob/17d98c98/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/SpatialOperationPFBase.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/SpatialOperationPFBase.java b/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/SpatialOperationPFBase.java
index 82d7b4f..0a1df9c 100644
--- a/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/SpatialOperationPFBase.java
+++ b/jena-spatial/src/main/java/org/apache/jena/query/spatial/pfunction/SpatialOperationPFBase.java
@@ -94,9 +94,7 @@ public abstract class SpatialOperationPFBase extends PropertyFunctionBase {
return IterLib.result(binding, execCxt);
}
- DatasetGraph dsg = execCxt.getDataset();
-
- argSubject = Substitute.substitute(argSubject, binding) ;
+ argSubject = Substitute.substitute(argSubject, binding) ;
argObject = Substitute.substitute(argObject, binding) ;
if (!argSubject.isNode())
http://git-wip-us.apache.org/repos/asf/jena/blob/17d98c98/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestDatasetWithSpatialIndex.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestDatasetWithSpatialIndex.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestDatasetWithSpatialIndex.java
index a4c1bf3..ac2e7fc 100644
--- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestDatasetWithSpatialIndex.java
+++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestDatasetWithSpatialIndex.java
@@ -70,13 +70,15 @@ public abstract class AbstractTestDatasetWithSpatialIndex {
doTestSearch(turtle, queryString, expectedEntityURIs, expectedNumResults, false);
}
- private void doTestSearch(String turtle, String queryString, Set<String> expectedEntityURIs, int expectedNumResults, boolean throwException) {
+ private static void doTestSearch(String turtle, String queryString, Set<String> expectedEntityURIs, int expectedNumResults, boolean throwException) {
Model model = dataset.getDefaultModel();
Reader reader = new StringReader(turtle);
- dataset.begin(ReadWrite.WRITE);
- model.read(reader, "", "TURTLE");
- dataset.commit();
- doTestQuery(dataset, queryString, expectedEntityURIs, expectedNumResults, throwException);
+ try {
+ dataset.begin(ReadWrite.WRITE);
+ model.read(reader, "", "TURTLE");
+ dataset.commit();
+ doTestQuery(dataset, queryString, expectedEntityURIs, expectedNumResults, throwException);
+ } finally { dataset.end(); }
}
public static void doTestQuery(Dataset dataset, String queryString, Set<String> expectedEntityURIs, int expectedNumResults, boolean throwException) {
http://git-wip-us.apache.org/repos/asf/jena/blob/17d98c98/jena-spatial/src/test/java/org/apache/jena/query/spatial/assembler/TestEntityDefinitionAssembler.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/assembler/TestEntityDefinitionAssembler.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/assembler/TestEntityDefinitionAssembler.java
index 3abb491..12376b3 100644
--- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/assembler/TestEntityDefinitionAssembler.java
+++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/assembler/TestEntityDefinitionAssembler.java
@@ -103,7 +103,7 @@ public class TestEntityDefinitionAssembler {
}
EntityDefinitionAssembler emAssembler = new EntityDefinitionAssembler();
- EntityDefinition entityDef = emAssembler.open(null, spec3, null);
+ emAssembler.open(null, spec3, null);
if (jts_lib_ready) {
assertEquals("com.spatial4j.core.context.jts.JtsSpatialContext",
SpatialQuery.ctx.getClass().getName());