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:23 UTC
[11/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/865aab6c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/865aab6c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/865aab6c
Branch: refs/heads/master
Commit: 865aab6c9a4738f158a7d8ebe2f0b0c24918e1bf
Parents: 17d98c9
Author: ajs6f <aj...@virginia.edu>
Authored: Sat Oct 8 16:00:33 2016 -0400
Committer: ajs6f <aj...@virginia.edu>
Committed: Sun Oct 30 14:12:31 2016 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/query/text/TextIndexSolr.java | 5 +----
.../apache/jena/query/text/assembler/TextDatasetAssembler.java | 5 +----
.../java/org/apache/jena/query/text/TestBuildTextDataset.java | 2 +-
.../jena/query/text/assembler/TestEntityMapAssembler.java | 2 +-
4 files changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/865aab6c/jena-text/src/main/java/org/apache/jena/query/text/TextIndexSolr.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexSolr.java b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexSolr.java
index 5d645c6..2f31955 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexSolr.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexSolr.java
@@ -166,11 +166,8 @@ public class TextIndexSolr implements TextIndex
continue ;
// Multivalued -> array.
// Null means "not stored" or "not present"
- if ( obj instanceof List<? > ) {
- @SuppressWarnings("unchecked")
- List<String> vals = (List<String>)obj ;
+ if ( obj instanceof List<? > )
continue ;
- }
String v = (String)obj ;
Node n = entryToNode(v) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/865aab6c/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextDatasetAssembler.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextDatasetAssembler.java b/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextDatasetAssembler.java
index 0125a6a..ec0540b 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextDatasetAssembler.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextDatasetAssembler.java
@@ -36,14 +36,11 @@ import org.apache.jena.query.text.TextIndex ;
import org.apache.jena.rdf.model.Resource ;
import org.apache.jena.sparql.ARQConstants ;
import org.apache.jena.sparql.core.DatasetGraph ;
-import org.apache.jena.sparql.core.assembler.DatasetAssembler ;
import org.apache.jena.sparql.util.Loader ;
import org.apache.jena.sparql.util.graph.GraphUtils ;
public class TextDatasetAssembler extends AssemblerBase implements Assembler
{
- private DatasetAssembler datasetAssembler = new DatasetAssembler() ;
-
public static Resource getType() { return textDataset ; }
/*
@@ -90,7 +87,7 @@ public class TextDatasetAssembler extends AssemblerBase implements Assembler
return dst ;
}
- private Constructor<?> getConstructor(Class<?> c, Class<?> ...types) {
+ private static Constructor<?> getConstructor(Class<?> c, Class<?> ...types) {
try {
return c.getConstructor(types);
} catch (NoSuchMethodException e) {
http://git-wip-us.apache.org/repos/asf/jena/blob/865aab6c/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 ed67fb6..f8c9eae 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
@@ -65,7 +65,7 @@ public class TestBuildTextDataset extends BaseTest
queryData(ds) ;
}
- private void loadData(Dataset dataset) {
+ private static void loadData(Dataset dataset) {
dataset.begin(ReadWrite.WRITE) ;
try {
Model m = dataset.getDefaultModel() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/865aab6c/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestEntityMapAssembler.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestEntityMapAssembler.java b/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestEntityMapAssembler.java
index e4c823d..cdf5dcc 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestEntityMapAssembler.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestEntityMapAssembler.java
@@ -81,7 +81,7 @@ public class TestEntityMapAssembler {
assertEquals(SPEC1_PREDICATE.asNode(), getOne(entityDef,SPEC1_DEFAULT_FIELD));
}
- private Object getOne(EntityDefinition entityDef, String field) {
+ private static Object getOne(EntityDefinition entityDef, String field) {
Collection<Node> x = entityDef.getPredicates(field) ;
if ( x == null || x.size() == 0 )
return null ;