Skip to content

Commit

Permalink
Minor cleanup, removing dead code
Browse files Browse the repository at this point in the history
ajs6f committed Oct 30, 2016
1 parent 93e21f0 commit 17d98c9
Showing 4 changed files with 9 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -23,7 +23,6 @@
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 static DatasetGraph create(DatasetGraph dsg, SpatialIndex spatialIndex)
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 ;

Original file line number Diff line number Diff line change
@@ -94,9 +94,7 @@ public QueryIterator exec(Binding binding, PropFuncArg argSubject,
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())
Original file line number Diff line number Diff line change
@@ -70,13 +70,15 @@ protected void doTestSearch(String turtle, String queryString, Set<String> expec
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) {
Original file line number Diff line number Diff line change
@@ -103,7 +103,7 @@ public void EntityHasSpatialContextFactory() {
}

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());

0 comments on commit 17d98c9

Please sign in to comment.