You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2019/11/22 01:33:13 UTC
[lucene-solr] 19/21: SOLR-13952: Separate out Gradle-specific code
from other (mostly test) changes and commit separately
This is an automated email from the ASF dual-hosted git repository.
erick pushed a commit to branch jira/SOLR-13952
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 93f7055cfc21e7b08184159ded87e87ba5818fb6
Author: Erick Erickson <Er...@gmail.com>
AuthorDate: Thu Nov 21 20:15:55 2019 -0500
SOLR-13952: Separate out Gradle-specific code from other (mostly test) changes and commit separately
---
.../org/apache/lucene/analysis/synonym/SynonymMap.java | 1 +
.../apache/lucene/analysis/core/TestBugInSomething.java | 1 +
.../org/apache/lucene/analysis/core/TestRandomChains.java | 5 +++--
.../apache/lucene/analysis/custom/TestCustomAnalyzer.java | 1 +
.../miscellaneous/TestConcatenateGraphFilter.java | 9 ++++++---
.../miscellaneous/TestFixBrokenOffsetsFilter.java | 1 +
.../miscellaneous/TestLimitTokenPositionFilter.java | 4 ++--
.../miscellaneous/TestRemoveDuplicatesTokenFilter.java | 1 +
.../lucene/analysis/util/TestAnalysisSPILoader.java | 1 +
.../analysis/util/TestFilesystemResourceLoader.java | 1 +
.../lucene/benchmark/byTask/feeds/SpatialDocMaker.java | 2 ++
.../test/org/apache/lucene/analysis/TestCharArraySet.java | 2 +-
.../src/test/org/apache/lucene/document/TestDocument.java | 1 +
.../org/apache/lucene/index/TestFieldUpdatesBuffer.java | 1 +
.../apache/lucene/search/TestMultiTermConstantScore.java | 5 ++---
.../src/test/org/apache/lucene/util/TestCharsRef.java | 1 +
.../src/test/org/apache/lucene/util/fst/Test2BFST.java | 1 +
.../src/test/org/apache/lucene/util/fst/TestFSTs.java | 3 ++-
.../org/apache/lucene/search/grouping/TestGrouping.java | 9 +++++----
.../apache/lucene/search/join/TestBlockJoinSelector.java | 2 ++
.../index/memory/TestMemoryIndexAgainstDirectory.java | 3 +++
.../search/similarity/TestLegacyBM25Similarity.java | 1 +
.../function/valuesource/SumTotalTermFreqValueSource.java | 2 ++
.../lucene/queries/payloads/TestPayloadCheckQuery.java | 1 +
.../flexible/core/builders/TestQueryTreeBuilder.java | 3 ++-
.../java/org/apache/lucene/spatial/SpatialStrategy.java | 1 +
.../apache/lucene/spatial/query/SpatialArgsParser.java | 1 +
.../test/org/apache/lucene/spatial/SpatialArgsTest.java | 1 +
.../test/org/apache/lucene/spatial/SpatialExample.java | 1 +
.../test/org/apache/lucene/spatial/SpatialTestCase.java | 3 +++
.../test/org/apache/lucene/spatial/SpatialTestData.java | 1 +
.../test/org/apache/lucene/spatial/StrategyTestCase.java | 1 +
.../org/apache/lucene/spatial/bbox/TestBBoxStrategy.java | 1 +
.../spatial/prefix/TestRecursivePrefixTreeStrategy.java | 1 +
.../lucene/spatial/prefix/tree/SpatialPrefixTreeTest.java | 1 +
.../lucene/spatial/vector/TestPointVectorStrategy.java | 1 +
.../apache/lucene/search/TestBaseExplanationTestCase.java | 11 ++++-------
.../lucene/util/TestExceptionInBeforeClassHooks.java | 2 +-
lucene/tools/junit4/tests.policy | 4 ++++
.../org/apache/solr/schema/TestICUCollationField.java | 1 +
.../solr/handler/dataimport/TestMailEntityProcessor.java | 1 +
.../solr/handler/dataimport/TemplateTransformer.java | 2 +-
.../solr/handler/dataimport/TestClobTransformer.java | 2 +-
.../handler/dataimport/TestContentStreamDataSource.java | 1 +
.../apache/solr/handler/dataimport/TestDataConfig.java | 2 +-
.../apache/solr/handler/dataimport/TestDocBuilder.java | 6 ++++++
.../apache/solr/handler/dataimport/TestDocBuilder2.java | 12 +-----------
.../solr/handler/dataimport/TestEphemeralCache.java | 2 +-
.../apache/solr/handler/dataimport/TestErrorHandling.java | 1 +
.../apache/solr/handler/dataimport/TestFieldReader.java | 1 +
.../handler/dataimport/TestFileListEntityProcessor.java | 3 +--
.../handler/dataimport/TestJdbcDataSourceConvertType.java | 2 ++
.../solr/handler/dataimport/TestLineEntityProcessor.java | 15 +++++++++++----
.../handler/dataimport/TestPlainTextEntityProcessor.java | 3 +++
.../solr/handler/dataimport/TestRegexTransformer.java | 4 ++++
.../TestFeatureExtractionFromMultipleSegments.java | 1 +
.../apache/solr/ltr/feature/TestNoMatchSolrFeature.java | 2 ++
.../apache/solr/ltr/feature/TestOriginalScoreFeature.java | 1 +
.../org/apache/solr/ltr/model/TestNeuralNetworkModel.java | 1 +
.../solr/ltr/store/rest/TestModelManagerPersistence.java | 1 +
.../solr/prometheus/exporter/SolrExporterTestBase.java | 1 +
.../cloud/api/collections/TestHdfsCloudBackupRestore.java | 12 ++++++++++++
.../test/org/apache/solr/cloud/hdfs/StressHdfsTest.java | 11 +++++++++++
.../apache/solr/handler/TestHdfsBackupRestoreCore.java | 11 +++++++++++
.../src/test/org/apache/solr/search/TestRecoveryHdfs.java | 10 ++++++++++
.../test/org/apache/solr/update/TestHdfsUpdateLog.java | 11 +++++++++++
.../src/java/org/apache/solr/common/SolrDocument.java | 2 ++
.../src/java/org/apache/solr/common/SolrException.java | 1 +
.../java/org/apache/solr/common/SolrInputDocument.java | 1 +
.../src/java/org/apache/solr/common/SolrInputField.java | 6 ++----
.../java/org/apache/solr/SolrIgnoredThreadsFilter.java | 5 +++++
.../src/java/org/apache/solr/SolrTestCase.java | 8 ++++++++
72 files changed, 185 insertions(+), 50 deletions(-)
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java
index 97db1de..c7df323 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java
@@ -210,6 +210,7 @@ public class SynonymMap {
/**
* Builds an {@link SynonymMap} and returns it.
*/
+ @SuppressWarnings("deprecation")
public SynonymMap build() throws IOException {
ByteSequenceOutputs outputs = ByteSequenceOutputs.getSingleton();
// TODO: are we using the best sharing options?
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 6121935..2a0f147 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
@@ -69,17 +69,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);
@@ -87,7 +89,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, SEP_LABEL, false, 100);
String[] expectedOutputs = new String[2];
CharsRefBuilder expectedOutput = new CharsRefBuilder();
@@ -132,6 +134,7 @@ public class TestConcatenateGraphFilter extends BaseTokenStreamTestCase {
}
}
+ @SuppressWarnings("deprecation")
@Test
public void testValidNumberOfExpansions() throws IOException {
SynonymMap.Builder builder = new SynonymMap.Builder(true);
@@ -145,7 +148,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/miscellaneous/TestRemoveDuplicatesTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilter.java
index d1e2e2e..84b7d10 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilter.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilter.java
@@ -156,6 +156,7 @@ public class TestRemoveDuplicatesTokenFilter extends BaseTokenStreamTestCase {
@Override
protected TokenStreamComponents createComponents(String fieldName) {
Tokenizer tokenizer = new MockTokenizer(MockTokenizer.SIMPLE, true);
+ @SuppressWarnings("deprecation")
TokenStream stream = new SynonymFilter(tokenizer, map, ignoreCase);
return new TokenStreamComponents(tokenizer, new RemoveDuplicatesTokenFilter(stream));
}
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/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java
index b466e96..274bd42 100644
--- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java
+++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java
@@ -169,6 +169,7 @@ public class SpatialDocMaker extends DocMaker {
final boolean bbox = config.get(configKeyPrefix + "bbox", false);
return new ShapeConverter() {
+ @SuppressWarnings("deprecation")
@Override
public Shape convert(Shape shape) {
if (shape instanceof Point && (radiusDegrees != 0.0 || plusMinus != 0.0)) {
@@ -217,6 +218,7 @@ public class SpatialDocMaker extends DocMaker {
return doc;
}
+ @SuppressWarnings("deprecation")
public static Shape makeShapeFromString(SpatialStrategy strategy, String name, String shapeStr) {
if (shapeStr != null && shapeStr.length() > 0) {
try {
diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestCharArraySet.java b/lucene/core/src/test/org/apache/lucene/analysis/TestCharArraySet.java
index e51f207..a28de92 100644
--- a/lucene/core/src/test/org/apache/lucene/analysis/TestCharArraySet.java
+++ b/lucene/core/src/test/org/apache/lucene/analysis/TestCharArraySet.java
@@ -57,6 +57,7 @@ public class TestCharArraySet extends LuceneTestCase {
assertTrue(set.contains(new String(findme,1,4)));
}
+ @SuppressWarnings("deprecation")
@SuppressForbidden(reason = "Explicitly checking new Integers")
public void testObjectContains() {
CharArraySet set = new CharArraySet(10, true);
@@ -211,7 +212,6 @@ public class TestCharArraySet extends LuceneTestCase {
}
}
- @SuppressWarnings("deprecated")
public void testCopyCharArraySetBWCompat() {
CharArraySet setIngoreCase = new CharArraySet(10, true);
CharArraySet setCaseSensitive = new CharArraySet(10, false);
diff --git a/lucene/core/src/test/org/apache/lucene/document/TestDocument.java b/lucene/core/src/test/org/apache/lucene/document/TestDocument.java
index 50c1ed0..1d02685 100644
--- a/lucene/core/src/test/org/apache/lucene/document/TestDocument.java
+++ b/lucene/core/src/test/org/apache/lucene/document/TestDocument.java
@@ -212,6 +212,7 @@ public class TestDocument extends LuceneTestCase {
dir.close();
}
+ @SuppressWarnings("deprecation")
public void testGetValues() {
Document doc = makeDocumentWithFields();
assertEquals(new String[] {"test1", "test2"},
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFieldUpdatesBuffer.java b/lucene/core/src/test/org/apache/lucene/index/TestFieldUpdatesBuffer.java
index 0ca3af8..cb387fd 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestFieldUpdatesBuffer.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestFieldUpdatesBuffer.java
@@ -149,6 +149,7 @@ public class TestFieldUpdatesBuffer extends LuceneTestCase {
assertFalse(buffer.isNumeric());
}
+ @SuppressWarnings("unchecked")
public <T extends DocValuesUpdate> T getRandomUpdate(boolean binary) {
String termField = RandomPicks.randomFrom(random(), Arrays.asList("id", "_id", "some_other_field"));
String docId = "" + random().nextInt(10);
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java
index 69e1e10..9453721 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java
@@ -33,8 +33,6 @@ import org.junit.Test;
import java.io.IOException;
-import junit.framework.Assert;
-
public class TestMultiTermConstantScore extends BaseTestRangeFilter {
/** threshold for comparing floats */
@@ -43,8 +41,9 @@ public class TestMultiTermConstantScore extends BaseTestRangeFilter {
static Directory small;
static IndexReader reader;
+ @SuppressWarnings("deprecation")
static public void assertEquals(String m, int e, int a) {
- Assert.assertEquals(m, e, a);
+ junit.framework.Assert.assertEquals(m, e, a);
}
@BeforeClass
diff --git a/lucene/core/src/test/org/apache/lucene/util/TestCharsRef.java b/lucene/core/src/test/org/apache/lucene/util/TestCharsRef.java
index 079b3b7..8ed9352 100644
--- a/lucene/core/src/test/org/apache/lucene/util/TestCharsRef.java
+++ b/lucene/core/src/test/org/apache/lucene/util/TestCharsRef.java
@@ -20,6 +20,7 @@ import java.util.Arrays;
public class TestCharsRef extends LuceneTestCase {
+ @SuppressWarnings("deprecation")
public void testUTF16InUTF8Order() {
final int numStrings = atLeast(1000);
BytesRef utf8[] = new BytesRef[numStrings];
diff --git a/lucene/core/src/test/org/apache/lucene/util/fst/Test2BFST.java b/lucene/core/src/test/org/apache/lucene/util/fst/Test2BFST.java
index cc093b3..7948ef1 100644
--- a/lucene/core/src/test/org/apache/lucene/util/fst/Test2BFST.java
+++ b/lucene/core/src/test/org/apache/lucene/util/fst/Test2BFST.java
@@ -39,6 +39,7 @@ public class Test2BFST extends LuceneTestCase {
private static long LIMIT = 3L*1024*1024*1024;
+ @SuppressWarnings("deprecation")
public void test() throws Exception {
assumeWorkingMMapOnWindows();
diff --git a/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java b/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
index 316cbdf..319079d 100644
--- a/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
+++ b/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
@@ -567,7 +567,7 @@ public class TestFSTs extends LuceneTestCase {
} else {
// Get by output
final Long output = (Long) getOutput(intsRef.get(), ord);
- @SuppressWarnings("unchecked") final IntsRef actual = Util.getByOutput((FST<Long>) fst, output.longValue());
+ @SuppressWarnings({"unchecked", "deprecation"}) final IntsRef actual = Util.getByOutput((FST<Long>) fst, output.longValue());
if (actual == null) {
throw new RuntimeException("unexpected null input from output=" + output);
}
@@ -787,6 +787,7 @@ public class TestFSTs extends LuceneTestCase {
}
*/
+ @SuppressWarnings("deprecation")
public void testSimple() throws Exception {
// Get outputs -- passing true means FST will share
diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
index 87a1d97..dc19f6d 100644
--- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
+++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
@@ -287,9 +287,11 @@ public class TestGrouping extends LuceneTestCase {
private Collection<SearchGroup<BytesRef>> getSearchGroups(FirstPassGroupingCollector<?> c, int groupOffset) throws IOException {
if (TermGroupSelector.class.isAssignableFrom(c.getGroupSelector().getClass())) {
+ @SuppressWarnings("unchecked")
FirstPassGroupingCollector<BytesRef> collector = (FirstPassGroupingCollector<BytesRef>) c;
return collector.getTopGroups(groupOffset);
} else if (ValueSourceGroupSelector.class.isAssignableFrom(c.getGroupSelector().getClass())) {
+ @SuppressWarnings("unchecked")
FirstPassGroupingCollector<MutableValue> collector = (FirstPassGroupingCollector<MutableValue>) c;
Collection<SearchGroup<MutableValue>> mutableValueGroups = collector.getTopGroups(groupOffset);
if (mutableValueGroups == null) {
@@ -404,7 +406,6 @@ public class TestGrouping extends LuceneTestCase {
};
}
- @SuppressWarnings({"unchecked","rawtypes"})
private Comparable<?>[] fillFields(GroupDoc d, Sort sort) {
final SortField[] sortFields = sort.getSort();
final Comparable<?>[] fields = new Comparable[sortFields.length];
@@ -490,7 +491,7 @@ public class TestGrouping extends LuceneTestCase {
final int limit = Math.min(groupOffset + topNGroups, groups.size());
final Comparator<GroupDoc> docSortComp = getComparator(docSort);
- @SuppressWarnings({"unchecked","rawtypes"})
+ @SuppressWarnings({"unchecked"})
final GroupDocs<BytesRef>[] result = new GroupDocs[limit-groupOffset];
int totalGroupedHitCount = 0;
for(int idx=groupOffset;idx < limit;idx++) {
@@ -1042,7 +1043,7 @@ public class TestGrouping extends LuceneTestCase {
}
// Get block grouping result:
sBlocks.search(query, c4);
- @SuppressWarnings({"unchecked","rawtypes"})
+ @SuppressWarnings({"unchecked"})
final TopGroups<BytesRef> tempTopGroupsBlocks = (TopGroups<BytesRef>) c3.getTopGroups(docSort, groupOffset, docOffset, docOffset+docsPerGroup);
final TopGroups<BytesRef> groupsResultBlocks;
if (doAllGroups && tempTopGroupsBlocks != null) {
@@ -1198,7 +1199,7 @@ public class TestGrouping extends LuceneTestCase {
if (mergedTopGroups != null) {
// Now 2nd pass:
- @SuppressWarnings({"unchecked","rawtypes"})
+ @SuppressWarnings({"unchecked"})
final TopGroups<BytesRef>[] shardTopGroups = new TopGroups[subSearchers.length];
for(int shardIDX=0;shardIDX<subSearchers.length;shardIDX++) {
final TopGroupsCollector<?> secondPassCollector = createSecondPassCollector(firstPassGroupingCollectors.get(shardIDX),
diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSelector.java b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSelector.java
index 838826f..d88a87d 100644
--- a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSelector.java
+++ b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSelector.java
@@ -108,6 +108,7 @@ public class TestBlockJoinSelector extends LuceneTestCase {
: ((NumericDocValues) sdv).advanceExact(target);
}
+ @SuppressWarnings("deprecation")
public void testSortedSelector() throws IOException {
final BitSet parents = new FixedBitSet(20);
parents.set(0);
@@ -217,6 +218,7 @@ public class TestBlockJoinSelector extends LuceneTestCase {
}
}
+ @SuppressWarnings("deprecation")
public void testNumericSelector() throws Exception {
final BitSet parents = new FixedBitSet(20);
parents.set(0);
diff --git a/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstDirectory.java b/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstDirectory.java
index a9d83b0..6262862 100644
--- a/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstDirectory.java
+++ b/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstDirectory.java
@@ -335,6 +335,7 @@ public class TestMemoryIndexAgainstDirectory extends BaseTokenStreamTestCase {
reader.close();
}
+ @SuppressWarnings("unused")
private Allocator randomByteBlockAllocator() {
if (random().nextBoolean()) {
return new RecyclingByteBlockAllocator();
@@ -377,6 +378,7 @@ public class TestMemoryIndexAgainstDirectory extends BaseTokenStreamTestCase {
}
// LUCENE-3831
+ @SuppressWarnings("resource")
public void testNullPointerException() throws IOException {
RegexpQuery regex = new RegexpQuery(new Term("field", "worl."));
SpanQuery wrappedquery = new SpanMultiTermQueryWrapper<>(regex);
@@ -390,6 +392,7 @@ public class TestMemoryIndexAgainstDirectory extends BaseTokenStreamTestCase {
}
// LUCENE-3831
+ @SuppressWarnings("resource")
public void testPassesIfWrapped() throws IOException {
RegexpQuery regex = new RegexpQuery(new Term("field", "worl."));
SpanQuery wrappedquery = new SpanOrQuery(new SpanMultiTermQueryWrapper<>(regex));
diff --git a/lucene/misc/src/test/org/apache/lucene/search/similarity/TestLegacyBM25Similarity.java b/lucene/misc/src/test/org/apache/lucene/search/similarity/TestLegacyBM25Similarity.java
index b3a0cd2..f3ab546 100644
--- a/lucene/misc/src/test/org/apache/lucene/search/similarity/TestLegacyBM25Similarity.java
+++ b/lucene/misc/src/test/org/apache/lucene/search/similarity/TestLegacyBM25Similarity.java
@@ -23,6 +23,7 @@ import org.apache.lucene.search.similarities.BM25Similarity;
import org.apache.lucene.search.similarities.BaseSimilarityTestCase;
import org.apache.lucene.search.similarities.Similarity;
+@SuppressWarnings("deprecation")
public class TestLegacyBM25Similarity extends BaseSimilarityTestCase {
public void testIllegalK1() {
diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java
index 716d304..3f25d34 100644
--- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java
+++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java
@@ -47,11 +47,13 @@ public class SumTotalTermFreqValueSource extends ValueSource {
return name() + '(' + indexedField + ')';
}
+ @SuppressWarnings("rawtypes")
@Override
public FunctionValues getValues(Map context, LeafReaderContext readerContext) throws IOException {
return (FunctionValues)context.get(this);
}
+ @SuppressWarnings({"rawtypes", "unchecked"})
@Override
public void createWeight(Map context, IndexSearcher searcher) throws IOException {
long sumTotalTermFreq = 0;
diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java
index 6869177..5b99e70 100644
--- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java
+++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java
@@ -210,6 +210,7 @@ public class TestPayloadCheckQuery extends LuceneTestCase {
assertFalse(query3.equals(query4));
}
+ @SuppressWarnings({"unchecked", "rawtypes"})
public void testRewrite() throws IOException {
SpanMultiTermQueryWrapper fiv = new SpanMultiTermQueryWrapper(new WildcardQuery(new Term("field", "fiv*")));
SpanMultiTermQueryWrapper hund = new SpanMultiTermQueryWrapper(new WildcardQuery(new Term("field", "hund*")));
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/builders/TestQueryTreeBuilder.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/builders/TestQueryTreeBuilder.java
index be1eb24..2e13244 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/builders/TestQueryTreeBuilder.java
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/builders/TestQueryTreeBuilder.java
@@ -27,8 +27,9 @@ import org.apache.lucene.queryparser.flexible.core.util.UnescapedCharSequence;
import org.apache.lucene.util.LuceneTestCase;
import org.junit.Test;
+@SuppressWarnings("deprecation")
public class TestQueryTreeBuilder extends LuceneTestCase {
-
+
@Test
public void testSetFieldBuilder() throws QueryNodeException {
QueryTreeBuilder qtb = new QueryTreeBuilder();
diff --git a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/SpatialStrategy.java b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/SpatialStrategy.java
index 215fa1d..79eb98a 100644
--- a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/SpatialStrategy.java
+++ b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/SpatialStrategy.java
@@ -133,6 +133,7 @@ public abstract class SpatialStrategy {
* scores will be 1 for indexed points at the center of the query shape and as
* low as ~0.1 at its furthest edges.
*/
+ @SuppressWarnings("deprecation")
public final DoubleValuesSource makeRecipDistanceValueSource(Shape queryShape) {
Rectangle bbox = queryShape.getBoundingBox();
double diagonalDist = ctx.getDistCalc().distance(
diff --git a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java
index 79ad7a9..c3bd350 100644
--- a/lucene/spatial-extras/src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java
+++ b/lucene/spatial-extras/src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java
@@ -112,6 +112,7 @@ public class SpatialArgsParser {
args.setDistErr(readDouble(nameValPairs.remove(DIST_ERR)));
}
+ @SuppressWarnings("deprecation")
protected Shape parseShape(String str, SpatialContext ctx) throws ParseException {
//return ctx.readShape(str);//still in Spatial4j 0.4 but will be deleted
return ctx.readShapeFromWkt(str);
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/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/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/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/lucene/tools/junit4/tests.policy b/lucene/tools/junit4/tests.policy
index 7494981..5afe0ca 100644
--- a/lucene/tools/junit4/tests.policy
+++ b/lucene/tools/junit4/tests.policy
@@ -101,6 +101,10 @@ grant {
permission java.security.SecurityPermission "getProperty.ssl.KeyManagerFactory.algorithm";
permission java.security.SecurityPermission "getProperty.ssl.TrustManagerFactory.algorithm";
+ // Another one for jetty
+ permission java.util.PropertyPermission "jetty.git.hash", "write";
+
+
// allows LuceneTestCase#runWithRestrictedPermissions to execute with lower (or no) permission
permission java.security.SecurityPermission "createAccessControlContext";
};
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/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/java/org/apache/solr/handler/dataimport/TemplateTransformer.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/TemplateTransformer.java
index f655edd..2995509 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/TemplateTransformer.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/TemplateTransformer.java
@@ -52,7 +52,6 @@ public class TemplateTransformer extends Transformer {
private Map<String ,List<String>> templateVsVars = new HashMap<>();
@Override
- @SuppressWarnings("unchecked")
public Object transformRow(Map<String, Object> row, Context context) {
@@ -94,6 +93,7 @@ public class TemplateTransformer extends Transformer {
return row;
}
+ @SuppressWarnings({"unchecked", "rawtypes"})
private void addToRow(String key, Map<String, Object> row, Object value) {
Object prevVal = row.get(key);
if (prevVal != null) {
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestClobTransformer.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestClobTransformer.java
index fe00d49..215234b 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestClobTransformer.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestClobTransformer.java
@@ -42,7 +42,7 @@ public class TestClobTransformer extends AbstractDataImportHandlerTestCase {
f.put(ClobTransformer.CLOB, "true");
f.put(DataImporter.NAME, "description");
flds.add(f);
- Context ctx = getContext(null, new VariableResolver(), null, Context.FULL_DUMP, flds, Collections.EMPTY_MAP);
+ Context ctx = getContext(null, new VariableResolver(), null, Context.FULL_DUMP, flds, Collections.emptyMap());
Transformer t = new ClobTransformer();
Map<String, Object> row = new HashMap<>();
Clob clob = (Clob) Proxy.newProxyInstance(this.getClass().getClassLoader(), new Class[]{Clob.class}, new InvocationHandler() {
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
index 34e50e0..b006665 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
@@ -65,6 +65,7 @@ public class TestContentStreamDataSource extends AbstractDataImportHandlerTestCa
super.tearDown();
}
+ @SuppressWarnings("rawtypes")
@Test
public void testSimple() throws Exception {
DirectXmlRequest req = new DirectXmlRequest("/dataimport", xml);
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDataConfig.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDataConfig.java
index 7a56fd2..1ea4a5e 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDataConfig.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDataConfig.java
@@ -42,7 +42,7 @@ public class TestDataConfig extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
public void testDataConfigWithDataSource() throws Exception {
List rows = new ArrayList();
rows.add(createMap("id", "1", "desc", "one"));
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder.java
index 7f7278e..0cbee68 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder.java
@@ -51,6 +51,7 @@ public class TestDocBuilder extends AbstractDataImportHandlerTestCase {
assertNotNull(clz);
}
+ @SuppressWarnings("unchecked")
@Test
public void singleEntityNoRows() {
DataImporter di = new DataImporter();
@@ -70,6 +71,7 @@ public class TestDocBuilder extends AbstractDataImportHandlerTestCase {
assertEquals(0, di.getDocBuilder().importStatistics.rowsCount.get());
}
+ @SuppressWarnings("unchecked")
@Test
public void testDeltaImportNoRows_MustNotCommit() {
DataImporter di = new DataImporter();
@@ -92,6 +94,7 @@ public class TestDocBuilder extends AbstractDataImportHandlerTestCase {
assertEquals(0, di.getDocBuilder().importStatistics.rowsCount.get());
}
+ @SuppressWarnings("unchecked")
@Test
public void singleEntityOneRow() {
DataImporter di = new DataImporter();
@@ -121,6 +124,7 @@ public class TestDocBuilder extends AbstractDataImportHandlerTestCase {
}
}
+ @SuppressWarnings("unchecked")
@Test
public void testImportCommand() {
DataImporter di = new DataImporter();
@@ -150,6 +154,7 @@ public class TestDocBuilder extends AbstractDataImportHandlerTestCase {
}
}
+ @SuppressWarnings("unchecked")
@Test
public void singleEntityMultipleRows() {
DataImporter di = new DataImporter();
@@ -182,6 +187,7 @@ public class TestDocBuilder extends AbstractDataImportHandlerTestCase {
assertEquals(3, di.getDocBuilder().importStatistics.rowsCount.get());
}
+ @SuppressWarnings("unchecked")
@Test
public void templateXPath() {
DataImporter di = new DataImporter();
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java
index 27865cd..6279a23 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDocBuilder2.java
@@ -36,6 +36,7 @@ import java.nio.charset.StandardCharsets;
*
* @since solr 1.3
*/
+@SuppressWarnings({"unchecked", "rawtypes"})
public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
@BeforeClass
@@ -44,7 +45,6 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testSingleEntity() throws Exception {
List rows = new ArrayList();
rows.add(createMap("id", "1", "desc", "one"));
@@ -60,7 +60,6 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testSingleEntity_CaseInsensitive() throws Exception {
List rows = new ArrayList();
rows.add(createMap("id", "1", "desC", "one"));
@@ -88,7 +87,6 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testDynamicFields() throws Exception {
List rows = new ArrayList();
rows.add(createMap("id", "1", "desc", "one"));
@@ -101,7 +99,6 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testRequestParamsAsVariable() throws Exception {
List rows = new ArrayList();
rows.add(createMap("id", "101", "desc", "ApacheSolr"));
@@ -116,7 +113,6 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testDynamicFieldNames() throws Exception {
List rows = new ArrayList();
rows.add(createMap("mypk", "101", "text", "ApacheSolr"));
@@ -130,7 +126,6 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testRequestParamsAsFieldName() throws Exception {
List rows = new ArrayList();
rows.add(createMap("mypk", "101", "text", "ApacheSolr"));
@@ -145,7 +140,6 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testContext() throws Exception {
List rows = new ArrayList();
rows.add(createMap("id", "1", "desc", "one"));
@@ -155,7 +149,6 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testSkipDoc() throws Exception {
List rows = new ArrayList();
rows.add(createMap("id", "1", "desc", "one"));
@@ -169,7 +162,6 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testSkipRow() throws Exception {
List rows = new ArrayList();
rows.add(createMap("id", "1", "desc", "one"));
@@ -204,7 +196,6 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testStopTransform() throws Exception {
List rows = new ArrayList();
rows.add(createMap("id", "1", "desc", "one"));
@@ -219,7 +210,6 @@ public class TestDocBuilder2 extends AbstractDataImportHandlerTestCase {
}
@Test
- @SuppressWarnings("unchecked")
public void testDeleteDocs() throws Exception {
List rows = new ArrayList();
rows.add(createMap("id", "1", "desc", "one"));
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEphemeralCache.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEphemeralCache.java
index ddccafe..351ec46 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEphemeralCache.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEphemeralCache.java
@@ -44,7 +44,7 @@ public class TestEphemeralCache extends AbstractDataImportHandlerTestCase {
assertFullImport(getDataConfigDotXml());
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
private void setupMockData() {
List parentRows = new ArrayList();
parentRows.add(createMap("id", new BigDecimal("1"), "parent_s", "one"));
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestErrorHandling.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestErrorHandling.java
index 1ea1ad4..4411251 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestErrorHandling.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestErrorHandling.java
@@ -80,6 +80,7 @@ public class TestErrorHandling extends AbstractDataImportHandlerTestCase {
assertQ(req("*:*"), "//*[@numFound='0']");
}
+ @SuppressWarnings("unchecked")
public void testTransformerErrorContinue() throws Exception {
StringDataSource.xml = wellformedXml;
List<Map<String, Object>> rows = new ArrayList<>();
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFieldReader.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFieldReader.java
index 347a40b..fc57c14 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFieldReader.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFieldReader.java
@@ -31,6 +31,7 @@ import java.util.Map;
*/
public class TestFieldReader extends AbstractDataImportHandlerTestCase {
+ @SuppressWarnings("unchecked")
@Test
public void simple() {
DataImporter di = new DataImporter();
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java
index dd2cf72..6cbac9a 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java
@@ -40,10 +40,10 @@ import org.junit.Test;
*
* @since solr 1.3
*/
+@SuppressWarnings({"unchecked", "rawtypes"})
public class TestFileListEntityProcessor extends AbstractDataImportHandlerTestCase {
@Test
- @SuppressWarnings("unchecked")
public void testSimple() throws IOException {
File tmpdir = createTempDir().toFile();
@@ -119,7 +119,6 @@ public class TestFileListEntityProcessor extends AbstractDataImportHandlerTestCa
assertEquals(l, new HashSet<>(fList));
}
- @SuppressWarnings("unchecked")
static List<String> getFiles(VariableResolver resolver, Map attrs) {
Context c = getContext(null,
resolver, null, Context.FULL_DUMP, Collections.EMPTY_LIST, attrs);
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSourceConvertType.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSourceConvertType.java
index 94f437c..80436a8 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSourceConvertType.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSourceConvertType.java
@@ -30,6 +30,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Properties;
+@SuppressWarnings("deprecation")
@ThreadLeakAction({ThreadLeakAction.Action.WARN})
@ThreadLeakLingering(linger = 0)
@ThreadLeakZombies(ThreadLeakZombies.Consequence.CONTINUE)
@@ -48,6 +49,7 @@ public class TestJdbcDataSourceConvertType extends AbstractDataImportHandlerTest
convertTypeTest("true", Long.class);
}
+ @SuppressWarnings("rawtypes")
private void convertTypeTest(String convertType, Class resultClass) throws Throwable {
JdbcDataSource dataSource = new JdbcDataSource();
Properties p = new Properties();
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 eb9989c..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,6 +31,7 @@ import java.util.*;
*/
public class TestLineEntityProcessor extends AbstractDataImportHandlerTestCase {
+ @SuppressWarnings({"rawtypes", "unchecked"})
@Test
/************************************************************************/
public void testSimple() throws IOException {
@@ -53,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();
@@ -71,6 +72,7 @@ public class TestLineEntityProcessor extends AbstractDataImportHandlerTestCase {
assertEquals(24, fList.size());
}
+ @SuppressWarnings("rawtypes")
@Test
/************************************************************************/
public void testOnly_xml_files() throws IOException {
@@ -88,12 +90,13 @@ public class TestLineEntityProcessor extends AbstractDataImportHandlerTestCase {
LineEntityProcessor.SKIP_LINE_REGEX, null
);
+ @SuppressWarnings("unchecked")
Context c = getContext(
null, //parentEntity
new VariableResolver(), //resolver
getDataSource(filecontents), //parentDataSource
Context.FULL_DUMP, //currProcess
- Collections.EMPTY_LIST, //entityFields
+ Collections.emptyList(), //entityFields
attrs //entityAttrs
);
LineEntityProcessor ep = new LineEntityProcessor();
@@ -109,6 +112,7 @@ public class TestLineEntityProcessor extends AbstractDataImportHandlerTestCase {
assertEquals(5, fList.size());
}
+ @SuppressWarnings("rawtypes")
@Test
/************************************************************************/
public void testOnly_xml_files_no_xsd() throws IOException {
@@ -126,12 +130,13 @@ public class TestLineEntityProcessor extends AbstractDataImportHandlerTestCase {
LineEntityProcessor.SKIP_LINE_REGEX, "\\.xsd"
);
+ @SuppressWarnings("unchecked")
Context c = getContext(
null, //parentEntity
new VariableResolver(), //resolver
getDataSource(filecontents), //parentDataSource
Context.FULL_DUMP, //currProcess
- Collections.EMPTY_LIST, //entityFields
+ Collections.emptyList(), //entityFields
attrs //entityAttrs
);
LineEntityProcessor ep = new LineEntityProcessor();
@@ -147,6 +152,7 @@ public class TestLineEntityProcessor extends AbstractDataImportHandlerTestCase {
assertEquals(4, fList.size());
}
+ @SuppressWarnings("rawtypes")
@Test
/************************************************************************/
public void testNo_xsd_files() throws IOException {
@@ -162,12 +168,13 @@ public class TestLineEntityProcessor extends AbstractDataImportHandlerTestCase {
LineEntityProcessor.SKIP_LINE_REGEX, "\\.xsd"
);
+ @SuppressWarnings("unchecked")
Context c = getContext(
null, //parentEntity
new VariableResolver(), //resolver
getDataSource(filecontents), //parentDataSource
Context.FULL_DUMP, //currProcess
- Collections.EMPTY_LIST, //entityFields
+ Collections.emptyList(), //entityFields
attrs //entityAttrs
);
LineEntityProcessor ep = new LineEntityProcessor();
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java
index 2385438..be9eb4b 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestPlainTextEntityProcessor.java
@@ -39,6 +39,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
* @since solr 1.4
*/
public class TestPlainTextEntityProcessor extends AbstractDataImportHandlerTestCase {
+ @SuppressWarnings("unchecked")
@Test
public void testSimple() throws IOException {
DataImporter di = new DataImporter();
@@ -114,6 +115,7 @@ public class TestPlainTextEntityProcessor extends AbstractDataImportHandlerTestC
}
}
+ @SuppressWarnings("unchecked")
@Test
public void testSimple2() throws IOException {
DataImporter di = new DataImporter();
@@ -148,6 +150,7 @@ public class TestPlainTextEntityProcessor extends AbstractDataImportHandlerTestC
}
+ @SuppressWarnings("rawtypes")
public static class DS extends DataSource {
static String s = "hello world";
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestRegexTransformer.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestRegexTransformer.java
index e792804..0d4971d 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestRegexTransformer.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestRegexTransformer.java
@@ -36,6 +36,7 @@ import java.util.Map;
*/
public class TestRegexTransformer extends AbstractDataImportHandlerTestCase {
+ @SuppressWarnings("rawtypes")
@Test
public void testCommaSeparated() {
List<Map<String, String>> fields = new ArrayList<>();
@@ -52,6 +53,7 @@ public class TestRegexTransformer extends AbstractDataImportHandlerTestCase {
}
+ @SuppressWarnings({"unchecked", "rawtypes"})
@Test
public void testGroupNames() {
List<Map<String, String>> fields = new ArrayList<>();
@@ -114,6 +116,7 @@ public class TestRegexTransformer extends AbstractDataImportHandlerTestCase {
assertEquals("valueWithoutSpaces", result.get("title_underscore")); // value should be returned as-is
}
+ @SuppressWarnings("unchecked")
@Test
public void testMileage() {
// init a whole pile of fields
@@ -163,6 +166,7 @@ public class TestRegexTransformer extends AbstractDataImportHandlerTestCase {
assertEquals("Fuel Economy range: 26 mpg Hwy, 19 mpg City", result.get("t3"));
}
+ @SuppressWarnings("unchecked")
@Test
public void testMultiValuedRegex(){
List<Map<String, String>> fields = new ArrayList<>();
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 48c1262..0c78d25 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 8ff5684..b3e005a 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 045c625..9b0bbe8 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 0e829e6..ad33b0a 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
@@ -51,6 +51,7 @@ public class TestModelManagerPersistence extends TestRerankBase {
}
// executed first
+ @SuppressWarnings("unchecked")
@Test
public void testFeaturePersistence() throws Exception {
diff --git a/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTestBase.java b/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTestBase.java
index a390be1..6d6954f 100644
--- a/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTestBase.java
+++ b/solr/contrib/prometheus-exporter/src/test/org/apache/solr/prometheus/exporter/SolrExporterTestBase.java
@@ -47,6 +47,7 @@ public class SolrExporterTestBase extends PrometheusExporterTestBase {
private CloseableHttpClient httpClient;
private int promtheusExporterPort;
+ @SuppressWarnings("deprecation")
@Override
@After
public void tearDown() throws Exception {
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestHdfsCloudBackupRestore.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestHdfsCloudBackupRestore.java
index 27a187e..55ce4fb 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/TestHdfsCloudBackupRestore.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/TestHdfsCloudBackupRestore.java
@@ -26,6 +26,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+import org.apache.lucene.util.QuickPatchThreadsFilter;
+
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
import org.apache.commons.io.IOUtils;
import org.apache.hadoop.conf.Configuration;
@@ -34,6 +36,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hdfs.DistributedFileSystem;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.hdfs.protocol.HdfsConstants.SafeModeAction;
+import org.apache.solr.SolrIgnoredThreadsFilter;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.cloud.hdfs.HdfsTestUtil;
@@ -60,7 +63,16 @@ import static org.apache.solr.core.backup.BackupManager.ZK_STATE_DIR;
/**
* This class implements the tests for HDFS integration for Solr backup/restore capability.
*/
+
+//nocommit. Here.s the addition to SolrIgnoredThreadsFilter
+// if (threadName.startsWith("Log4j2-TF-2-AsyncLoggerConfig")) {
+// return true;
+// }
+
+
@ThreadLeakFilters(defaultFilters = true, filters = {
+ SolrIgnoredThreadsFilter.class,
+ QuickPatchThreadsFilter.class,
BadHdfsThreadsFilter.class // hdfs currently leaks thread(s)
})
public class TestHdfsCloudBackupRestore extends AbstractCloudBackupRestoreTestCase {
diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java
index 04f9387..df75a28 100644
--- a/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java
@@ -24,7 +24,9 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.hdfs.server.namenode.NameNodeAdapter;
+import org.apache.lucene.util.QuickPatchThreadsFilter;
import org.apache.lucene.util.LuceneTestCase.Slow;
+import org.apache.solr.SolrIgnoredThreadsFilter;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
@@ -55,7 +57,16 @@ import java.util.concurrent.TimeUnit;
@Slow
@Nightly
+
+//nocommit. Here.s the addition to SolrIgnoredThreadsFilter
+// if (threadName.startsWith("Log4j2-TF-2-AsyncLoggerConfig")) {
+// return true;
+// }
+
+
@ThreadLeakFilters(defaultFilters = true, filters = {
+ SolrIgnoredThreadsFilter.class,
+ QuickPatchThreadsFilter.class,
BadHdfsThreadsFilter.class // hdfs currently leaks thread(s)
})
public class StressHdfsTest extends BasicDistributedZkTest {
diff --git a/solr/core/src/test/org/apache/solr/handler/TestHdfsBackupRestoreCore.java b/solr/core/src/test/org/apache/solr/handler/TestHdfsBackupRestoreCore.java
index fc7a58e..2865b42 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestHdfsBackupRestoreCore.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestHdfsBackupRestoreCore.java
@@ -33,7 +33,9 @@ import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.hdfs.DistributedFileSystem;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.hdfs.protocol.HdfsConstants.SafeModeAction;
+import org.apache.lucene.util.QuickPatchThreadsFilter;
import org.apache.lucene.util.TestUtil;
+import org.apache.solr.SolrIgnoredThreadsFilter;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
@@ -56,7 +58,16 @@ import org.slf4j.LoggerFactory;
import static org.apache.solr.common.cloud.ZkStateReader.BASE_URL_PROP;
+
+//nocommit. Here.s the addition to SolrIgnoredThreadsFilter
+// if (threadName.startsWith("Log4j2-TF-2-AsyncLoggerConfig")) {
+// return true;
+// }
+
+
@ThreadLeakFilters(defaultFilters = true, filters = {
+ SolrIgnoredThreadsFilter.class,
+ QuickPatchThreadsFilter.class,
BadHdfsThreadsFilter.class // hdfs currently leaks thread(s)
})
@SolrTestCaseJ4.SuppressSSL // Currently unknown why SSL does not work with this test
diff --git a/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java b/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java
index e19895e..19f31e0 100644
--- a/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java
+++ b/solr/core/src/test/org/apache/solr/search/TestRecoveryHdfs.java
@@ -39,6 +39,8 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.lucene.util.QuickPatchThreadsFilter;
+import org.apache.solr.SolrIgnoredThreadsFilter;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.cloud.hdfs.HdfsTestUtil;
import org.apache.solr.common.util.IOUtils;
@@ -59,7 +61,15 @@ import org.junit.Test;
import static org.apache.solr.update.processor.DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM;
+//nocommit. Here.s the addition to SolrIgnoredThreadsFilter
+// if (threadName.startsWith("Log4j2-TF-2-AsyncLoggerConfig")) {
+// return true;
+// }
+
+
@ThreadLeakFilters(defaultFilters = true, filters = {
+ SolrIgnoredThreadsFilter.class,
+ QuickPatchThreadsFilter.class,
BadHdfsThreadsFilter.class // hdfs currently leaks thread(s)
})
// TODO: longer term this should be combined with TestRecovery somehow ??
diff --git a/solr/core/src/test/org/apache/solr/update/TestHdfsUpdateLog.java b/solr/core/src/test/org/apache/solr/update/TestHdfsUpdateLog.java
index 5ba7f58..0aefb3e 100644
--- a/solr/core/src/test/org/apache/solr/update/TestHdfsUpdateLog.java
+++ b/solr/core/src/test/org/apache/solr/update/TestHdfsUpdateLog.java
@@ -23,6 +23,8 @@ import java.net.URISyntaxException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.lucene.util.QuickPatchThreadsFilter;
+import org.apache.solr.SolrIgnoredThreadsFilter;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.cloud.hdfs.HdfsTestUtil;
import org.apache.solr.common.util.IOUtils;
@@ -34,7 +36,16 @@ import org.junit.Test;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
+
+//nocommit. Here.s the addition to SolrIgnoredThreadsFilter
+// if (threadName.startsWith("Log4j2-TF-2-AsyncLoggerConfig")) {
+// return true;
+// }
+
+
@ThreadLeakFilters(defaultFilters = true, filters = {
+ SolrIgnoredThreadsFilter.class,
+ QuickPatchThreadsFilter.class,
BadHdfsThreadsFilter.class // hdfs currently leaks thread(s)
})
public class TestHdfsUpdateLog extends SolrTestCaseJ4 {
diff --git a/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java b/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java
index fd56d9d..4720f79 100644
--- a/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java
+++ b/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java
@@ -408,6 +408,8 @@ public class SolrDocument extends SolrDocumentBase<Object, SolrDocument> impleme
}
@Override
+
+ @Deprecated
public int getChildDocumentCount() {
if (_childDocuments == null) return 0;
return _childDocuments.size();
diff --git a/solr/solrj/src/java/org/apache/solr/common/SolrException.java b/solr/solrj/src/java/org/apache/solr/common/SolrException.java
index 673bae7..f5c8423 100644
--- a/solr/solrj/src/java/org/apache/solr/common/SolrException.java
+++ b/solr/solrj/src/java/org/apache/solr/common/SolrException.java
@@ -29,6 +29,7 @@ import org.slf4j.MDC;
/**
*
*/
+@SuppressWarnings("unchecked")
public class SolrException extends RuntimeException {
public static final String ROOT_ERROR_CLASS = "root-error-class";
diff --git a/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java b/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java
index 860f3d5..fa88584 100644
--- a/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java
+++ b/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java
@@ -289,6 +289,7 @@ public class SolrInputDocument extends SolrDocumentBase<SolrInputField, SolrInpu
}
@Override
+ @Deprecated
public int getChildDocumentCount() {
return hasChildDocuments() ? _childDocuments.size(): 0;
}
diff --git a/solr/solrj/src/java/org/apache/solr/common/SolrInputField.java b/solr/solrj/src/java/org/apache/solr/common/SolrInputField.java
index 8b4add6..4eb30f1 100644
--- a/solr/solrj/src/java/org/apache/solr/common/SolrInputField.java
+++ b/solr/solrj/src/java/org/apache/solr/common/SolrInputField.java
@@ -27,6 +27,7 @@ import static org.apache.solr.common.util.ByteArrayUtf8CharSequence.convertCharS
*
* @since solr 1.3
*/
+@SuppressWarnings({"unchecked", "rawtypes"})
public class SolrInputField implements Iterable<Object>, Serializable
{
String name;
@@ -63,7 +64,6 @@ public class SolrInputField implements Iterable<Object>, Serializable
* Add values to a field. If the added value is a collection, each value
* will be added individually.
*/
- @SuppressWarnings("unchecked")
public void addValue(Object v) {
if( value == null ) {
if ( v instanceof Collection ) {
@@ -108,7 +108,6 @@ public class SolrInputField implements Iterable<Object>, Serializable
//---------------------------------------------------------------
//---------------------------------------------------------------
- @SuppressWarnings("unchecked")
public Object getFirstValue() {
if( value instanceof Collection ) {
Collection c = (Collection<Object>)value;
@@ -154,7 +153,6 @@ public class SolrInputField implements Iterable<Object>, Serializable
* @return the values for this field. This will return a collection even
* if the field is not multi-valued
*/
- @SuppressWarnings("unchecked")
public Collection<Object> getValues() {
if (value instanceof Collection) {
return convertCharSeq((Collection<Object>) value);
@@ -214,7 +212,7 @@ public class SolrInputField implements Iterable<Object>, Serializable
};
}
- @SuppressWarnings("unchecked")
+
public Iterator<Object> getRawIterator() {
if( value instanceof Collection ) {
return ((Collection)value).iterator();
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java b/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
index 48c1482..e4ff09c 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java
@@ -59,6 +59,11 @@ public class SolrIgnoredThreadsFilter implements ThreadFilter {
if (threadName.startsWith("Image Fetcher")) {
return true;
}
+ //nocommit. SolrIgnoredTHreadsFilter has been added to a lot of tests, is this OK?
+ if (threadName.startsWith("Log4j2-TF-2-AsyncLoggerConfig")) {
+ return true;
+ }
+
return false;
}
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
index c4c40e7..7e654db8 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -28,6 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static com.carrotsearch.randomizedtesting.RandomizedTest.systemPropertyAsBoolean;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
/**
* All Solr test cases should derive from this class eventually. This is originally a result of async logging, see:
@@ -41,6 +42,13 @@ import static com.carrotsearch.randomizedtesting.RandomizedTest.systemPropertyAs
* SolrTestCaseJ4.
*/
+//nocommit. Here.s the addition to SolrIgnoredThreadsFilter
+// if (threadName.startsWith("Log4j2-TF-2-AsyncLoggerConfig")) {
+// return true;
+// }
+
+
+@ThreadLeakFilters(defaultFilters = true, filters = { SolrIgnoredThreadsFilter.class })
public class SolrTestCase extends LuceneTestCase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());