You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2019/08/15 18:02:10 UTC
[lucene-solr] 04/05: SOLR-13452: Remove more warnings from more
modules.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch jira/SOLR-13452_gradle_5
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit ba6f6bb285e33c4b1ea9b071a7eba97706a59241
Author: markrmiller <ma...@apache.org>
AuthorDate: Thu Aug 15 11:57:31 2019 -0500
SOLR-13452: Remove more warnings from more modules.
---
.../lucene/analysis/ckb/TestSoraniStemFilterFactory.java | 1 +
.../org/apache/lucene/analysis/core/TestBugInSomething.java | 1 +
.../org/apache/lucene/analysis/core/TestRandomChains.java | 5 +++--
.../org/apache/lucene/analysis/custom/TestCustomAnalyzer.java | 1 +
.../analysis/miscellaneous/TestConcatenateGraphFilter.java | 10 ++++++----
.../analysis/miscellaneous/TestFixBrokenOffsetsFilter.java | 1 +
.../analysis/miscellaneous/TestLimitTokenPositionFilter.java | 4 ++--
.../apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java | 1 +
.../org/apache/lucene/analysis/ngram/NGramTokenizerTest.java | 1 +
.../apache/lucene/analysis/synonym/TestSolrSynonymParser.java | 3 +++
.../apache/lucene/analysis/util/TestAnalysisSPILoader.java | 1 +
.../lucene/analysis/util/TestFilesystemResourceLoader.java | 1 +
.../test/org/apache/lucene/spatial/DistanceStrategyTest.java | 1 +
.../src/test/org/apache/lucene/spatial/PortedSolr3Test.java | 1 +
.../org/apache/lucene/spatial/QueryEqualsHashCodeTest.java | 2 ++
.../src/test/org/apache/lucene/spatial/SpatialArgsTest.java | 1 +
.../src/test/org/apache/lucene/spatial/SpatialExample.java | 1 +
.../src/test/org/apache/lucene/spatial/SpatialTestCase.java | 3 +++
.../src/test/org/apache/lucene/spatial/SpatialTestData.java | 1 +
.../src/test/org/apache/lucene/spatial/StrategyTestCase.java | 1 +
.../test/org/apache/lucene/spatial/bbox/TestBBoxStrategy.java | 1 +
.../lucene/spatial/composite/CompositeStrategyTest.java | 1 +
.../org/apache/lucene/spatial/prefix/DateNRStrategyTest.java | 1 +
.../apache/lucene/spatial/prefix/HeatmapFacetCounterTest.java | 1 +
.../test/org/apache/lucene/spatial/prefix/JtsPolygonTest.java | 1 +
.../apache/lucene/spatial/prefix/NumberRangeFacetsTest.java | 1 +
.../spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java | 1 +
.../spatial/prefix/RandomSpatialOpStrategyTestCase.java | 1 +
.../spatial/prefix/TestRecursivePrefixTreeStrategy.java | 1 +
.../spatial/prefix/TestTermQueryPrefixGridStrategy.java | 2 +-
.../lucene/spatial/prefix/tree/SpatialPrefixTreeTest.java | 1 +
.../org/apache/lucene/spatial/spatial4j/Geo3dRptTest.java | 1 +
.../spatial4j/Geo3dShapeSphereModelRectRelationTest.java | 1 +
.../lucene/spatial/spatial4j/RandomizedShapeTestCase.java | 2 +-
.../apache/lucene/spatial/vector/TestPointVectorStrategy.java | 1 +
.../org/apache/lucene/search/TestBaseExplanationTestCase.java | 11 ++++-------
.../apache/lucene/util/TestExceptionInBeforeClassHooks.java | 2 +-
.../test/org/apache/solr/schema/TestICUCollationField.java | 1 +
.../apache/solr/analytics/function/field/DateFieldsTest.java | 2 ++
.../solr/analytics/function/field/DoubleFieldsTest.java | 2 ++
.../apache/solr/analytics/function/field/FloatFieldsTest.java | 2 ++
.../apache/solr/analytics/function/field/IntFieldsTest.java | 2 ++
.../apache/solr/analytics/function/field/LongFieldsTest.java | 2 ++
.../solr/analytics/legacy/facet/LegacyFieldFacetTest.java | 2 +-
.../solr/handler/dataimport/TestMailEntityProcessor.java | 1 +
.../solr/handler/dataimport/TestLineEntityProcessor.java | 7 +++++--
.../feature/TestFeatureExtractionFromMultipleSegments.java | 1 +
.../org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java | 2 ++
.../org/apache/solr/ltr/feature/TestOriginalScoreFeature.java | 1 +
.../org/apache/solr/ltr/model/TestNeuralNetworkModel.java | 1 +
.../solr/ltr/store/rest/TestModelManagerPersistence.java | 1 +
51 files changed, 77 insertions(+), 21 deletions(-)
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilterFactory.java
index 1c4b162..c54a2b6 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilterFactory.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilterFactory.java
@@ -30,6 +30,7 @@ import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase;
*/
public class TestSoraniStemFilterFactory extends BaseTokenStreamFactoryTestCase {
+ @SuppressWarnings("resource")
public void testStemming() throws Exception {
Reader reader = new StringReader("پیاوەکان");
TokenStream stream = new MockTokenizer(MockTokenizer.WHITESPACE, false);
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java
index 6cdff4b..50d2bd8 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java
@@ -257,6 +257,7 @@ public class TestBugInSomething extends BaseTokenStreamTestCase {
-119, 0, 92, 94, -36, 53, -9, -102, -18, 90, 94, -26, 31, 71, -20
};
Analyzer a = new Analyzer() {
+ @SuppressWarnings("deprecation")
@Override
protected TokenStreamComponents createComponents(String fieldName) {
Tokenizer tokenizer = new WikipediaTokenizer();
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
index 10358c7..a0f5fb8 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
@@ -82,7 +82,6 @@ import org.apache.lucene.analysis.miscellaneous.LimitTokenOffsetFilter;
import org.apache.lucene.analysis.miscellaneous.LimitTokenPositionFilter;
import org.apache.lucene.analysis.miscellaneous.StemmerOverrideFilter;
import org.apache.lucene.analysis.miscellaneous.StemmerOverrideFilter.StemmerOverrideMap;
-import org.apache.lucene.analysis.miscellaneous.WordDelimiterFilter;
import org.apache.lucene.analysis.miscellaneous.WordDelimiterGraphFilter;
import org.apache.lucene.analysis.path.PathHierarchyTokenizer;
import org.apache.lucene.analysis.path.ReversePathHierarchyTokenizer;
@@ -112,6 +111,7 @@ import org.tartarus.snowball.SnowballProgram;
import org.xml.sax.InputSource;
/** tests random analysis chains */
+@SuppressWarnings("deprecation")
public class TestRandomChains extends BaseTokenStreamTestCase {
static List<Constructor<? extends Tokenizer>> tokenizers;
@@ -193,7 +193,7 @@ public class TestRandomChains extends BaseTokenStreamTestCase {
// TODO: it seems to mess up offsets!?
WikipediaTokenizer.class,
// TODO: needs to be a tokenizer, doesnt handle graph inputs properly (a shingle or similar following will then cause pain)
- WordDelimiterFilter.class,
+ org.apache.lucene.analysis.miscellaneous.WordDelimiterFilter.class,
// Cannot correct offsets when a char filter had changed them:
WordDelimiterGraphFilter.class,
// requires a special encoded token value, so it may fail with random data:
@@ -321,6 +321,7 @@ public class TestRandomChains extends BaseTokenStreamTestCase {
}
}
+ @SuppressWarnings("serial")
private static final Map<Class<?>,Function<Random,Object>> argProducers = new IdentityHashMap<Class<?>,Function<Random,Object>>() {{
put(int.class, random -> {
// TODO: could cause huge ram usage to use full int range for some filters
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java
index 1afb90e..9313a99 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java
@@ -47,6 +47,7 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.SetOnce.AlreadySetException;
import org.apache.lucene.util.Version;
+@SuppressWarnings("deprecation")
public class TestCustomAnalyzer extends BaseTokenStreamTestCase {
// Test some examples (TODO: we only check behavior, we may need something like TestRandomChains...)
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConcatenateGraphFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConcatenateGraphFilter.java
index 453dcbf..1fe882b 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConcatenateGraphFilter.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestConcatenateGraphFilter.java
@@ -24,7 +24,6 @@ import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.StopFilter;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.Tokenizer;
-import org.apache.lucene.analysis.synonym.SynonymFilter;
import org.apache.lucene.analysis.synonym.SynonymMap;
import org.apache.lucene.util.CharsRef;
import org.apache.lucene.util.CharsRefBuilder;
@@ -67,17 +66,19 @@ public class TestConcatenateGraphFilter extends BaseTokenStreamTestCase {
assertTokenStreamContents(stream, new String[]{builder.toCharsRef().toString()}, null, null, new int[]{1});
}
+ @SuppressWarnings("deprecation")
@Test
public void testWithSynonym() throws Exception {
SynonymMap.Builder builder = new SynonymMap.Builder(true);
builder.add(new CharsRef("mykeyword"), new CharsRef("mysynonym"), true);
Tokenizer tokenizer = new MockTokenizer(MockTokenizer.WHITESPACE, true);
tokenizer.setReader(new StringReader("mykeyword"));
- SynonymFilter filter = new SynonymFilter(tokenizer, builder.build(), true);
+ org.apache.lucene.analysis.synonym.SynonymFilter filter = new org.apache.lucene.analysis.synonym.SynonymFilter(tokenizer, builder.build(), true);
ConcatenateGraphFilter stream = new ConcatenateGraphFilter(filter);
assertTokenStreamContents(stream, new String[] {"mykeyword", "mysynonym"}, null, null, new int[] { 1, 0 });
}
+ @SuppressWarnings("deprecation")
@Test
public void testWithSynonyms() throws Exception {
SynonymMap.Builder builder = new SynonymMap.Builder(true);
@@ -85,7 +86,7 @@ public class TestConcatenateGraphFilter extends BaseTokenStreamTestCase {
Tokenizer tokenStream = new MockTokenizer(MockTokenizer.WHITESPACE, true);
String input = "mykeyword another keyword";
tokenStream.setReader(new StringReader(input));
- SynonymFilter filter = new SynonymFilter(tokenStream, builder.build(), true);
+ org.apache.lucene.analysis.synonym.SynonymFilter filter = new org.apache.lucene.analysis.synonym.SynonymFilter(tokenStream, builder.build(), true);
ConcatenateGraphFilter stream = new ConcatenateGraphFilter(filter, true, false, 100);
String[] expectedOutputs = new String[2];
CharsRefBuilder expectedOutput = new CharsRefBuilder();
@@ -130,6 +131,7 @@ public class TestConcatenateGraphFilter extends BaseTokenStreamTestCase {
}
}
+ @SuppressWarnings("deprecation")
@Test
public void testValidNumberOfExpansions() throws IOException {
SynonymMap.Builder builder = new SynonymMap.Builder(true);
@@ -143,7 +145,7 @@ public class TestConcatenateGraphFilter extends BaseTokenStreamTestCase {
}
MockTokenizer tokenizer = new MockTokenizer(MockTokenizer.WHITESPACE, true);
tokenizer.setReader(new StringReader(valueBuilder.toString()));
- SynonymFilter filter = new SynonymFilter(tokenizer, builder.build(), true);
+ org.apache.lucene.analysis.synonym.SynonymFilter filter = new org.apache.lucene.analysis.synonym.SynonymFilter(tokenizer, builder.build(), true);
int count;
try (ConcatenateGraphFilter stream = new ConcatenateGraphFilter(filter)) {
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFixBrokenOffsetsFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFixBrokenOffsetsFilter.java
index ada5014..6d67060 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFixBrokenOffsetsFilter.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFixBrokenOffsetsFilter.java
@@ -31,6 +31,7 @@ import org.apache.lucene.store.Directory;
public class TestFixBrokenOffsetsFilter extends BaseTokenStreamTestCase {
+ @SuppressWarnings("deprecation")
public void testBogusTermVectors() throws IOException {
Directory dir = newDirectory();
IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(null));
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilter.java
index 46d3025..88aacd5 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilter.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilter.java
@@ -20,7 +20,6 @@ import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.synonym.SynonymFilter;
import org.apache.lucene.analysis.synonym.SynonymMap;
import org.apache.lucene.util.CharsRef;
import org.apache.lucene.util.CharsRefBuilder;
@@ -60,6 +59,7 @@ public class TestLimitTokenPositionFilter extends BaseTokenStreamTestCase {
}
}
+ @SuppressWarnings("deprecation")
public void testMaxPosition3WithSynomyms() throws IOException {
for (final boolean consumeAll : new boolean[]{true, false}) {
MockTokenizer tokenizer = whitespaceMockTokenizer("one two three four five");
@@ -76,7 +76,7 @@ public class TestLimitTokenPositionFilter extends BaseTokenStreamTestCase {
SynonymMap.Builder.join(new String[]{"dopple", "ganger"}, multiWordCharsRef);
builder.add(new CharsRef("two"), multiWordCharsRef.get(), true);
SynonymMap synonymMap = builder.build();
- TokenStream stream = new SynonymFilter(tokenizer, synonymMap, true);
+ TokenStream stream = new org.apache.lucene.analysis.synonym.SynonymFilter(tokenizer, synonymMap, true);
stream = new LimitTokenPositionFilter(stream, 3, consumeAll);
// "only", the 4th word of multi-word synonym "and indubitably single only" is not emitted, since its position is greater than 3.
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java
index 7fbea5f..e96ced8 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java
@@ -119,6 +119,7 @@ public class EdgeNGramTokenizerTest extends BaseTokenStreamTestCase {
false);
}
+ @SuppressWarnings("deprecation")
private static void testNGrams(int minGram, int maxGram, int length, final String nonTokenChars) throws IOException {
final String s = RandomStrings.randomAsciiOfLength(random(), length);
testNGrams(minGram, maxGram, s, nonTokenChars);
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java
index cb54fa2..adcc9ee 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java
@@ -119,6 +119,7 @@ public class NGramTokenizerTest extends BaseTokenStreamTestCase {
}
}
+ @SuppressWarnings("deprecation")
private static void testNGrams(int minGram, int maxGram, int length, final String nonTokenChars) throws IOException {
final String s = RandomStrings.randomAsciiOfLength(random(), length);
testNGrams(minGram, maxGram, s, nonTokenChars);
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSolrSynonymParser.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSolrSynonymParser.java
index 9467137..1180749 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSolrSynonymParser.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSolrSynonymParser.java
@@ -47,6 +47,7 @@ public class TestSolrSynonymParser extends BaseSynonymParserTestCase {
analyzer.close();
analyzer = new Analyzer() {
+ @SuppressWarnings("deprecation")
@Override
protected TokenStreamComponents createComponents(String fieldName) {
Tokenizer tokenizer = new MockTokenizer(MockTokenizer.WHITESPACE, true);
@@ -138,6 +139,7 @@ public class TestSolrSynonymParser extends BaseSynonymParserTestCase {
final SynonymMap map = parser.build();
analyzer.close();
analyzer = new Analyzer() {
+ @SuppressWarnings("deprecation")
@Override
protected TokenStreamComponents createComponents(String fieldName) {
Tokenizer tokenizer = new MockTokenizer(MockTokenizer.KEYWORD, false);
@@ -171,6 +173,7 @@ public class TestSolrSynonymParser extends BaseSynonymParserTestCase {
analyzer.close();
analyzer = new Analyzer() {
+ @SuppressWarnings("deprecation")
@Override
protected TokenStreamComponents createComponents(String fieldName) {
Tokenizer tokenizer = new MockTokenizer(MockTokenizer.WHITESPACE, true);
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestAnalysisSPILoader.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestAnalysisSPILoader.java
index 2398c1e..b2cdd35 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestAnalysisSPILoader.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestAnalysisSPILoader.java
@@ -29,6 +29,7 @@ import org.apache.lucene.util.Version;
public class TestAnalysisSPILoader extends LuceneTestCase {
+ @SuppressWarnings("serial")
private Map<String,String> versionArgOnly() {
return new HashMap<String, String>() {{
put("luceneMatchVersion", Version.LATEST.toString());
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java
index eaa6174..85b8607 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java
@@ -54,6 +54,7 @@ public class TestFilesystemResourceLoader extends LuceneTestCase {
rl.newInstance("org.apache.lucene.analysis.util.RollingCharBuffer", Object.class).getClass().getName());
}
+ @SuppressWarnings("deprecation")
public void testBaseDir() throws Exception {
final Path base = createTempDir("fsResourceLoaderBase");
Writer os = Files.newBufferedWriter(base.resolve("template.txt"), StandardCharsets.UTF_8);
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/DistanceStrategyTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/DistanceStrategyTest.java
index 989252e..a39bafb9 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/DistanceStrategyTest.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/DistanceStrategyTest.java
@@ -36,6 +36,7 @@ import org.locationtech.spatial4j.context.SpatialContext;
import org.locationtech.spatial4j.shape.Point;
import org.locationtech.spatial4j.shape.Shape;
+@SuppressWarnings("deprecation")
public class DistanceStrategyTest extends StrategyTestCase {
@ParametersFactory(argumentFormatting = "strategy=%s")
public static Iterable<Object[]> parameters() {
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/PortedSolr3Test.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/PortedSolr3Test.java
index f55daf6..d9d2124 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/PortedSolr3Test.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/PortedSolr3Test.java
@@ -40,6 +40,7 @@ import org.locationtech.spatial4j.shape.Shape;
/**
* Based off of Solr 3's SpatialFilterTest.
*/
+@SuppressWarnings("deprecation")
public class PortedSolr3Test extends StrategyTestCase {
@ParametersFactory(argumentFormatting = "strategy=%s")
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/QueryEqualsHashCodeTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/QueryEqualsHashCodeTest.java
index f52ef2b..20188e8 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/QueryEqualsHashCodeTest.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/QueryEqualsHashCodeTest.java
@@ -102,11 +102,13 @@ public class QueryEqualsHashCodeTest extends LuceneTestCase {
assertTrue(first.hashCode() != second.hashCode());
}
+ @SuppressWarnings("deprecation")
private SpatialArgs makeArgs1() {
final Shape shape1 = ctx.makeRectangle(0, 0, 10, 10);
return new SpatialArgs(predicate, shape1);
}
+ @SuppressWarnings("deprecation")
private SpatialArgs makeArgs2() {
final Shape shape2 = ctx.makeRectangle(0, 0, 20, 20);
return new SpatialArgs(predicate, shape2);
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialArgsTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialArgsTest.java
index da351fc..7d19d0e 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialArgsTest.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialArgsTest.java
@@ -23,6 +23,7 @@ import org.junit.Test;
import org.locationtech.spatial4j.context.SpatialContext;
import org.locationtech.spatial4j.shape.Shape;
+@SuppressWarnings("deprecation")
public class SpatialArgsTest extends LuceneTestCase {
@Test
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialExample.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialExample.java
index f810ab7..1cad30f 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialExample.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialExample.java
@@ -53,6 +53,7 @@ import org.locationtech.spatial4j.shape.Shape;
* This class serves as example code to show how to use the Lucene spatial
* module.
*/
+@SuppressWarnings("deprecation")
public class SpatialExample extends LuceneTestCase {
//Note: Test invoked via TestTestFramework.spatialExample()
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestCase.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestCase.java
index 55ad1d7..ac80263 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestCase.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestCase.java
@@ -119,6 +119,7 @@ public abstract class SpatialTestCase extends LuceneTestCase {
}
}
+ @SuppressWarnings("deprecation")
protected Point randomPoint() {
final Rectangle WB = ctx.getWorldBounds();
return ctx.makePoint(
@@ -130,6 +131,7 @@ public abstract class SpatialTestCase extends LuceneTestCase {
return randomRectangle(ctx.getWorldBounds());
}
+ @SuppressWarnings("deprecation")
protected Rectangle randomRectangle(Rectangle bounds) {
double[] xNewStartAndWidth = randomSubRange(bounds.getMinX(), bounds.getWidth());
double xMin = xNewStartAndWidth[0];
@@ -147,6 +149,7 @@ public abstract class SpatialTestCase extends LuceneTestCase {
}
/** Returns new minStart and new length that is inside the range specified by the arguments. */
+ @SuppressWarnings("deprecation")
protected double[] randomSubRange(double boundStart, double boundLen) {
if (boundLen >= 3 && usually()) { // typical
// prefer integers for ease of debugability ... and prefer 1/16th of bound
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestData.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestData.java
index 06a68ce..9dc8164 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestData.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/SpatialTestData.java
@@ -41,6 +41,7 @@ public class SpatialTestData {
* an "id", a "name" and the "shape". Empty lines and lines starting with a '#' are skipped.
* The stream is closed.
*/
+ @SuppressWarnings("deprecation")
public static Iterator<SpatialTestData> getTestData(InputStream in, SpatialContext ctx) throws IOException {
List<SpatialTestData> results = new ArrayList<>();
BufferedReader bufInput = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/StrategyTestCase.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/StrategyTestCase.java
index 199ebcf..f44e995 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/StrategyTestCase.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/StrategyTestCase.java
@@ -184,6 +184,7 @@ public abstract class StrategyTestCase extends SpatialTestCase {
return strategy.makeQuery(q.args);
}
+ @SuppressWarnings("deprecation")
protected void adoc(String id, String shapeStr) throws IOException, ParseException {
Shape shape = shapeStr==null ? null : ctx.readShapeFromWkt(shapeStr);
addDocument(newDoc(id, shape));
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/bbox/TestBBoxStrategy.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/bbox/TestBBoxStrategy.java
index 210ab38..b821901 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/bbox/TestBBoxStrategy.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/bbox/TestBBoxStrategy.java
@@ -36,6 +36,7 @@ import org.locationtech.spatial4j.shape.Rectangle;
import org.locationtech.spatial4j.shape.Shape;
import org.locationtech.spatial4j.shape.impl.RectangleImpl;
+@SuppressWarnings("deprecation")
public class TestBBoxStrategy extends RandomSpatialOpStrategyTestCase {
@Override
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/composite/CompositeStrategyTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/composite/CompositeStrategyTest.java
index e74c2b5..f5e19b3 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/composite/CompositeStrategyTest.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/composite/CompositeStrategyTest.java
@@ -116,6 +116,7 @@ public class CompositeStrategyTest extends RandomSpatialOpStrategyTestCase {
}
//TODO move up
+ @SuppressWarnings("deprecation")
private Shape randomCircle() {
final Point point = randomPoint();
//TODO pick using gaussian
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/DateNRStrategyTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/DateNRStrategyTest.java
index 54296da..42821bb 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/DateNRStrategyTest.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/DateNRStrategyTest.java
@@ -38,6 +38,7 @@ public class DateNRStrategyTest extends RandomSpatialOpStrategyTestCase {
long randomCalWindowMs;
+ @SuppressWarnings("deprecation")
@Before
public void setUp() throws Exception {
super.setUp();
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/HeatmapFacetCounterTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/HeatmapFacetCounterTest.java
index a38f5b6..edbfddb 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/HeatmapFacetCounterTest.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/HeatmapFacetCounterTest.java
@@ -43,6 +43,7 @@ import org.locationtech.spatial4j.shape.impl.RectangleImpl;
import static com.carrotsearch.randomizedtesting.RandomizedTest.atMost;
import static com.carrotsearch.randomizedtesting.RandomizedTest.randomIntBetween;
+@SuppressWarnings("deprecation")
public class HeatmapFacetCounterTest extends StrategyTestCase {
SpatialPrefixTree grid;
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/JtsPolygonTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/JtsPolygonTest.java
index 7d029f1..974e14d 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/JtsPolygonTest.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/JtsPolygonTest.java
@@ -37,6 +37,7 @@ import org.junit.Test;
import java.text.ParseException;
import java.util.HashMap;
+@SuppressWarnings("deprecation")
public class JtsPolygonTest extends StrategyTestCase {
private static final double LUCENE_4464_distErrPct = SpatialArgs.DEFAULT_DISTERRPCT;//DEFAULT 2.5%
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/NumberRangeFacetsTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/NumberRangeFacetsTest.java
index 9c12883..680c26c 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/NumberRangeFacetsTest.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/NumberRangeFacetsTest.java
@@ -45,6 +45,7 @@ import org.locationtech.spatial4j.shape.Shape;
import static com.carrotsearch.randomizedtesting.RandomizedTest.randomInt;
import static com.carrotsearch.randomizedtesting.RandomizedTest.randomIntBetween;
+@SuppressWarnings("deprecation")
public class NumberRangeFacetsTest extends StrategyTestCase {
DateRangePrefixTree tree;
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java
index c5b145f..60d9b13 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java
@@ -63,6 +63,7 @@ import static org.locationtech.spatial4j.shape.SpatialRelation.WITHIN;
/** Randomized PrefixTree test that considers the fuzziness of the
* results introduced by grid approximation. */
+@SuppressWarnings("deprecation")
public class RandomSpatialOpFuzzyPrefixTreeTest extends StrategyTestCase {
static final int ITERATIONS = 10;
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpStrategyTestCase.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpStrategyTestCase.java
index 22c5839..517cd7f 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpStrategyTestCase.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpStrategyTestCase.java
@@ -34,6 +34,7 @@ import static com.carrotsearch.randomizedtesting.RandomizedTest.randomIntBetween
/** Base test harness, ideally for SpatialStrategy impls that have exact results
* (not grid approximated), hence "not fuzzy".
*/
+@SuppressWarnings("deprecation")
public abstract class RandomSpatialOpStrategyTestCase extends StrategyTestCase {
//Note: this is partially redundant with StrategyTestCase.runTestQuery & testOperation
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestRecursivePrefixTreeStrategy.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestRecursivePrefixTreeStrategy.java
index f852464..91967f8 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestRecursivePrefixTreeStrategy.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestRecursivePrefixTreeStrategy.java
@@ -31,6 +31,7 @@ import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
+@SuppressWarnings("deprecation")
public class TestRecursivePrefixTreeStrategy extends StrategyTestCase {
private int maxLength;
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java
index fc131c5..def1aa1 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java
@@ -30,9 +30,9 @@ import org.junit.Test;
import java.io.IOException;
import java.util.Arrays;
-
public class TestTermQueryPrefixGridStrategy extends SpatialTestCase {
+ @SuppressWarnings("deprecation")
@Test
public void testNGramPrefixGridLosAngeles() throws IOException {
SpatialContext ctx = SpatialContext.GEO;
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeTest.java
index cc63b5e..e1dfdc4 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeTest.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeTest.java
@@ -79,6 +79,7 @@ public class SpatialPrefixTreeTest extends SpatialTestCase {
* A PrefixTree pruning optimization gone bad, applicable when optimize=true.
* See <a href="https://issues.apache.org/jira/browse/LUCENE-4770">LUCENE-4770</a>.
*/
+ @SuppressWarnings("deprecation")
@Test
public void testBadPrefixTreePrune() throws Exception {
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dRptTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dRptTest.java
index 6ec773b..07f4909 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dRptTest.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dRptTest.java
@@ -46,6 +46,7 @@ import org.locationtech.spatial4j.shape.Shape;
import static org.locationtech.spatial4j.distance.DistanceUtils.DEGREES_TO_RADIANS;
+@SuppressWarnings("deprecation")
public class Geo3dRptTest extends RandomSpatialOpStrategyTestCase {
private PlanetModel planetModel;
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeSphereModelRectRelationTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeSphereModelRectRelationTest.java
index bf152b7..5012803 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeSphereModelRectRelationTest.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeSphereModelRectRelationTest.java
@@ -66,6 +66,7 @@ public class Geo3dShapeSphereModelRectRelationTest extends ShapeRectRelationTest
}
+ @SuppressWarnings({"unchecked", "rawtypes", "deprecation"})
@Test
public void testFailure2_LUCENE6475() {
GeoCircle geo3dCircle = GeoCircleFactory.makeGeoCircle(planetModel, 1.6282053147165243E-4 * RADIANS_PER_DEGREE,
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/RandomizedShapeTestCase.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/RandomizedShapeTestCase.java
index 0c18f5d..0c90b31 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/RandomizedShapeTestCase.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/RandomizedShapeTestCase.java
@@ -36,6 +36,7 @@ import static com.carrotsearch.randomizedtesting.RandomizedTest.*;
* A base test class with utility methods to help test shapes.
* Extends from RandomizedTest.
*/
+@SuppressWarnings("deprecation")
public abstract class RandomizedShapeTestCase extends LuceneTestCase {
protected static final double EPS = 10e-9;
@@ -55,7 +56,6 @@ public abstract class RandomizedShapeTestCase extends LuceneTestCase {
this.ctx = ctx;
}
- @SuppressWarnings("unchecked")
public static void checkShapesImplementEquals( Class<?>[] classes ) {
for( Class<?> clazz : classes ) {
try {
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/vector/TestPointVectorStrategy.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/vector/TestPointVectorStrategy.java
index 901594e..320bb74 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/vector/TestPointVectorStrategy.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/vector/TestPointVectorStrategy.java
@@ -33,6 +33,7 @@ import org.locationtech.spatial4j.context.SpatialContext;
import org.locationtech.spatial4j.shape.Circle;
import org.locationtech.spatial4j.shape.Point;
+@SuppressWarnings("deprecation")
public class TestPointVectorStrategy extends StrategyTestCase {
@Before
diff --git a/lucene/test-framework/src/test/org/apache/lucene/search/TestBaseExplanationTestCase.java b/lucene/test-framework/src/test/org/apache/lucene/search/TestBaseExplanationTestCase.java
index 2f0f067..4e7adf1 100644
--- a/lucene/test-framework/src/test/org/apache/lucene/search/TestBaseExplanationTestCase.java
+++ b/lucene/test-framework/src/test/org/apache/lucene/search/TestBaseExplanationTestCase.java
@@ -20,9 +20,6 @@ import java.io.IOException;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.Term;
-
-import junit.framework.AssertionFailedError;
-
/**
* Tests that the {@link BaseExplanationTestCase} helper code, as well as
* {@link CheckHits#checkNoMatchExplanations} are checking what they are suppose to.
@@ -30,12 +27,12 @@ import junit.framework.AssertionFailedError;
public class TestBaseExplanationTestCase extends BaseExplanationTestCase {
public void testQueryNoMatchWhenExpected() throws Exception {
- expectThrows(AssertionFailedError.class, () -> {
+ expectThrows(AssertionError.class, () -> {
qtest(new TermQuery(new Term(FIELD, "BOGUS")), new int[] { 3 /* none */ });
});
}
public void testQueryMatchWhenNotExpected() throws Exception {
- expectThrows(AssertionFailedError.class, () -> {
+ expectThrows(AssertionError.class, () -> {
qtest(new TermQuery(new Term(FIELD, "w1")), new int[] { 0, 1 /*, 2, 3 */ });
});
}
@@ -45,7 +42,7 @@ public class TestBaseExplanationTestCase extends BaseExplanationTestCase {
qtest(new TermQuery(new Term(FIELD, "zz")), new int[] { 1, 3 });
// ensure when the Explanations are broken, we get an error about those matches
- expectThrows(AssertionFailedError.class, () -> {
+ expectThrows(AssertionError.class, () -> {
qtest(new BrokenExplainTermQuery(new Term(FIELD, "zz"), false, true), new int[] { 1, 3 });
});
@@ -56,7 +53,7 @@ public class TestBaseExplanationTestCase extends BaseExplanationTestCase {
qtest(new TermQuery(new Term(FIELD, "zz")), new int[] { 1, 3 });
// ensure when the Explanations are broken, we get an error about the non matches
- expectThrows(AssertionFailedError.class, () -> {
+ expectThrows(AssertionError.class, () -> {
CheckHits.checkNoMatchExplanations(new BrokenExplainTermQuery(new Term(FIELD, "zz"), true, false),
FIELD, searcher, new int[] { 1, 3 });
});
diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestExceptionInBeforeClassHooks.java b/lucene/test-framework/src/test/org/apache/lucene/util/TestExceptionInBeforeClassHooks.java
index bd99b4b..bc9e89a 100644
--- a/lucene/test-framework/src/test/org/apache/lucene/util/TestExceptionInBeforeClassHooks.java
+++ b/lucene/test-framework/src/test/org/apache/lucene/util/TestExceptionInBeforeClassHooks.java
@@ -20,7 +20,7 @@ import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
diff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
index f164080..0916fe8 100644
--- a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
+++ b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
@@ -62,6 +62,7 @@ public class TestICUCollationField extends SolrTestCaseJ4 {
* look out for jvm differences with collation).
* So it's preferable to create this file on-the-fly.
*/
+ @SuppressWarnings("deprecation")
public static String setupSolrHome() throws Exception {
String tmpFile = createTempDir().toFile().getAbsolutePath();
// make data and conf dirs
diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/DateFieldsTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/DateFieldsTest.java
index fb86738..8947550 100644
--- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/DateFieldsTest.java
+++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/DateFieldsTest.java
@@ -26,6 +26,7 @@ import org.junit.Test;
public class DateFieldsTest extends AbstractAnalyticsFieldTest {
+ @SuppressWarnings("deprecation")
@Test
public void expressionFactoryCreationTest() {
ExpressionFactory fact = getExpressionFactory();
@@ -68,6 +69,7 @@ public class DateFieldsTest extends AbstractAnalyticsFieldTest {
checkSingleFieldValues(singleDates, values, missing);
}
+ @SuppressWarnings("deprecation")
@Test
public void multiValuedTrieDateTest() throws IOException {
DateMultiTrieField valueField = new DateMultiTrieField("date_dtm_t");
diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/DoubleFieldsTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/DoubleFieldsTest.java
index e046f59..b4c0180 100644
--- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/DoubleFieldsTest.java
+++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/DoubleFieldsTest.java
@@ -26,6 +26,7 @@ import org.junit.Test;
public class DoubleFieldsTest extends AbstractAnalyticsFieldTest {
+ @SuppressWarnings("deprecation")
@Test
public void expressionFactoryCreationTest() {
ExpressionFactory fact = getExpressionFactory();
@@ -68,6 +69,7 @@ public class DoubleFieldsTest extends AbstractAnalyticsFieldTest {
checkSingleFieldValues(singleDoubles, values, missing);
}
+ @SuppressWarnings("deprecation")
@Test
public void multiValuedTrieDoubleTest() throws IOException {
DoubleMultiTrieField valueField = new DoubleMultiTrieField("double_dm_t");
diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/FloatFieldsTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/FloatFieldsTest.java
index bba6d46..ac39ab0 100644
--- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/FloatFieldsTest.java
+++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/FloatFieldsTest.java
@@ -26,6 +26,7 @@ import org.junit.Test;
public class FloatFieldsTest extends AbstractAnalyticsFieldTest {
+ @SuppressWarnings("deprecation")
@Test
public void expressionFactoryCreationTest() {
ExpressionFactory fact = getExpressionFactory();
@@ -68,6 +69,7 @@ public class FloatFieldsTest extends AbstractAnalyticsFieldTest {
checkSingleFieldValues(singleFloats, values, missing);
}
+ @SuppressWarnings("deprecation")
@Test
public void multiValuedTrieFloatTest() throws IOException {
FloatMultiTrieField valueField = new FloatMultiTrieField("float_fm_t");
diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/IntFieldsTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/IntFieldsTest.java
index ec52f68..ba60204 100644
--- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/IntFieldsTest.java
+++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/IntFieldsTest.java
@@ -26,6 +26,7 @@ import org.junit.Test;
public class IntFieldsTest extends AbstractAnalyticsFieldTest {
+ @SuppressWarnings("deprecation")
@Test
public void expressionFactoryCreationTest() {
ExpressionFactory fact = getExpressionFactory();
@@ -68,6 +69,7 @@ public class IntFieldsTest extends AbstractAnalyticsFieldTest {
checkSingleFieldValues(singleInts, values, missing);
}
+ @SuppressWarnings("deprecation")
@Test
public void multiValuedTrieIntTest() throws IOException {
IntMultiTrieField valueField = new IntMultiTrieField("int_im_t");
diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/LongFieldsTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/LongFieldsTest.java
index 6c190db..960fcf4 100644
--- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/LongFieldsTest.java
+++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/function/field/LongFieldsTest.java
@@ -26,6 +26,7 @@ import org.junit.Test;
public class LongFieldsTest extends AbstractAnalyticsFieldTest {
+ @SuppressWarnings("deprecation")
@Test
public void expressionFactoryCreationTest() {
ExpressionFactory fact = getExpressionFactory();
@@ -68,6 +69,7 @@ public class LongFieldsTest extends AbstractAnalyticsFieldTest {
checkSingleFieldValues(singleLongs, values, missing);
}
+ @SuppressWarnings("deprecation")
@Test
public void multiValuedTrieLongTest() throws IOException {
LongMultiTrieField valueField = new LongMultiTrieField("long_lm_t");
diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetTest.java
index d394380..f1d468c 100644
--- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetTest.java
+++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/legacy/facet/LegacyFieldFacetTest.java
@@ -938,7 +938,6 @@ public class LegacyFieldFacetTest extends LegacyAbstractAnalyticsFacetTest{
assertEquals(getRawResponse(),stringLong,stringLongTest);
}
- @SuppressWarnings("unchecked")
@Test
public void missingTest() throws Exception {
//Int Date
@@ -1057,6 +1056,7 @@ public class LegacyFieldFacetTest extends LegacyAbstractAnalyticsFacetTest{
}
}
+ @SuppressWarnings({"unchecked", "rawtypes"})
public static void assertEquals(String mes, Object actual, Object expected) {
Collections.sort((List<Comparable>) actual);
Collections.sort((List<Comparable>) expected);
diff --git a/solr/contrib/dataimporthandler-extras/src/test/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java b/solr/contrib/dataimporthandler-extras/src/test/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java
index 0b00be6..fa5bfe0 100644
--- a/solr/contrib/dataimporthandler-extras/src/test/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java
+++ b/solr/contrib/dataimporthandler-extras/src/test/org/apache/solr/handler/dataimport/TestMailEntityProcessor.java
@@ -46,6 +46,7 @@ import java.util.Map;
* @since solr 1.4
*/
@Ignore("Needs a Mock Mail Server to work")
+@SuppressWarnings("unchecked")
public class TestMailEntityProcessor extends AbstractDataImportHandlerTestCase {
// Credentials
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java
index 7aced3b..f8a6508 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java
@@ -31,7 +31,7 @@ import java.util.*;
*/
public class TestLineEntityProcessor extends AbstractDataImportHandlerTestCase {
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({"rawtypes", "unchecked"})
@Test
/************************************************************************/
public void testSimple() throws IOException {
@@ -54,7 +54,7 @@ public class TestLineEntityProcessor extends AbstractDataImportHandlerTestCase {
new VariableResolver(), //resolver
getDataSource(filecontents), //parentDataSource
Context.FULL_DUMP, //currProcess
- Collections.EMPTY_LIST, //entityFields
+ Collections.emptyList(), //entityFields
attrs //entityAttrs
);
LineEntityProcessor ep = new LineEntityProcessor();
@@ -90,6 +90,7 @@ public class TestLineEntityProcessor extends AbstractDataImportHandlerTestCase {
LineEntityProcessor.SKIP_LINE_REGEX, null
);
+ @SuppressWarnings("unchecked")
Context c = getContext(
null, //parentEntity
new VariableResolver(), //resolver
@@ -129,6 +130,7 @@ public class TestLineEntityProcessor extends AbstractDataImportHandlerTestCase {
LineEntityProcessor.SKIP_LINE_REGEX, "\\.xsd"
);
+ @SuppressWarnings("unchecked")
Context c = getContext(
null, //parentEntity
new VariableResolver(), //resolver
@@ -166,6 +168,7 @@ public class TestLineEntityProcessor extends AbstractDataImportHandlerTestCase {
LineEntityProcessor.SKIP_LINE_REGEX, "\\.xsd"
);
+ @SuppressWarnings("unchecked")
Context c = getContext(
null, //parentEntity
new VariableResolver(), //resolver
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java
index a15178b..0ef1d40 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestFeatureExtractionFromMultipleSegments.java
@@ -78,6 +78,7 @@ public class TestFeatureExtractionFromMultipleSegments extends TestRerankBase {
aftertest();
}
+ @SuppressWarnings("unchecked")
@Test
public void testFeatureExtractionFromMultipleSegments() throws Exception {
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java
index a9395bf..0194bdb 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestNoMatchSolrFeature.java
@@ -83,6 +83,7 @@ public class TestNoMatchSolrFeature extends TestRerankBase {
aftertest();
}
+ @SuppressWarnings("unchecked")
@Test
public void test2NoMatch1YesMatchFeatureReturnsFvWith1FeatureAndDocScoreScaledByModel() throws Exception {
// Tests model with all no matching features but 1
@@ -149,6 +150,7 @@ public class TestNoMatchSolrFeature extends TestRerankBase {
assertJQ("/query" + query.toQueryString(), "/response/docs/[3]/fv=='"+docs3fv_default_csv+"'");
}
+ @SuppressWarnings("unchecked")
@Test
public void test1NoMatchFeatureReturnsFvWith1MatchingFeatureFromStoreAndDocWith0Score() throws Exception {
// Tests model with all no matching features, but 1 feature store feature matching for extraction
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.java
index b0af388..b98c26e 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/feature/TestOriginalScoreFeature.java
@@ -75,6 +75,7 @@ public class TestOriginalScoreFeature extends TestRerankBase {
implTestOriginalScoreResponseDocsCheck("origScore", "origScore", "c2", "2.0");
}
+ @SuppressWarnings("unchecked")
public static void implTestOriginalScoreResponseDocsCheck(String modelName,
String origScoreFeatureName,
String nonScoringFeatureName, String nonScoringFeatureValue) throws Exception {
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestNeuralNetworkModel.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestNeuralNetworkModel.java
index 9614733..df57657 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestNeuralNetworkModel.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/model/TestNeuralNetworkModel.java
@@ -314,6 +314,7 @@ public class TestNeuralNetworkModel extends TestRerankBase {
}
}
+ @SuppressWarnings("unchecked")
@Override
protected Layer createLayer(Object o) {
final DefaultLayer layer = new DefaultLayer();
diff --git a/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManagerPersistence.java b/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManagerPersistence.java
index bd93027..f4d4f2e 100644
--- a/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManagerPersistence.java
+++ b/solr/contrib/ltr/src/test/org/apache/solr/ltr/store/rest/TestModelManagerPersistence.java
@@ -46,6 +46,7 @@ public class TestModelManagerPersistence extends TestRerankBase {
}
// executed first
+ @SuppressWarnings("unchecked")
@Test
public void testFeaturePersistence() throws Exception {