diff --git a/test/framework/build.gradle b/test/framework/build.gradle index af9e5363fa98e..f8b3f54e60a0a 100644 --- a/test/framework/build.gradle +++ b/test/framework/build.gradle @@ -37,8 +37,6 @@ dependencies { api "org.apache.commons:commons-lang3:${versions.commons_lang3}" } -tasks.named("compileJava").configure { options.compilerArgs << '-Xlint:-cast,-unchecked' } - // the main files are actually test files, so use the appropriate forbidden api sigs tasks.named('forbiddenApisMain').configure { replaceSignatureFiles 'jdk-signatures', 'es-all-signatures', 'es-test-signatures' @@ -113,6 +111,6 @@ tasks.register("verifyVersions") { } tasks.named('splitPackagesAudit').configure { - // for now we always run tests with the classpath, so we are ok with split packages for tests + // for now we always run tests with the classpath, so we are ok with split packages for tests onlyIf { false } } diff --git a/test/framework/src/main/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java index 6cec26d9e5b14..91922081919d9 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java @@ -483,6 +483,7 @@ public synchronized void close() throws Exception { } @Override + @SuppressWarnings("unchecked") public Iterator iterator() { return Iterators.concat(replicas.iterator(), Collections.singleton(primary).iterator()); } diff --git a/test/framework/src/main/java/org/elasticsearch/ingest/TestTemplateService.java b/test/framework/src/main/java/org/elasticsearch/ingest/TestTemplateService.java index 5a07ad57e82c6..5093828384a54 100644 --- a/test/framework/src/main/java/org/elasticsearch/ingest/TestTemplateService.java +++ b/test/framework/src/main/java/org/elasticsearch/ingest/TestTemplateService.java @@ -37,6 +37,7 @@ private TestTemplateService(boolean compilationException) { } @Override + @SuppressWarnings("unchecked") public FactoryType compile(Script script, ScriptContext context) { if (this.compilationException) { throw new RuntimeException("could not compile script"); diff --git a/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java b/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java index b720953ae2476..d9d4543ca8d3c 100644 --- a/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java @@ -441,6 +441,7 @@ protected A searchAndReduc * for each leaf as though it were a separate index. If false this aggregates * all leaves together, like we do in production. */ + @SuppressWarnings("unchecked") protected A searchAndReduce(IndexSettings indexSettings, IndexSearcher searcher, Query query, diff --git a/test/framework/src/main/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java index 6faf54e64f940..6a5c3f1da2dc1 100644 --- a/test/framework/src/main/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java @@ -164,6 +164,7 @@ protected RepositoryData getRepositoryData(String repoName, Version version) { } } + @SuppressWarnings("cast") protected RepositoryData getRepositoryData(String repository) { return getRepositoryData((Repository) getRepositoryOnMaster(repository)); } diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java index 227e0daf14110..32695f9184578 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java @@ -1163,6 +1163,8 @@ public static Settings.Builder settings(Version version) { /** * Returns size random values */ + @SafeVarargs + @SuppressWarnings("varargs") public static List randomSubsetOf(int size, T... values) { List list = arrayAsArrayList(values); return randomSubsetOf(size, list); diff --git a/test/framework/src/main/java/org/elasticsearch/test/InternalAggregationTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/InternalAggregationTestCase.java index c0a6643aa7443..078131bc8504a 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/InternalAggregationTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/InternalAggregationTestCase.java @@ -327,6 +327,7 @@ protected T createUnmappedInstance(String name, Map metadata) { } @Override + @SuppressWarnings("unchecked") protected final Class categoryClass() { return (Class) InternalAggregation.class; } diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/NetworkDisruption.java b/test/framework/src/main/java/org/elasticsearch/test/disruption/NetworkDisruption.java index a13470115516f..570c1a51ecd8d 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/NetworkDisruption.java +++ b/test/framework/src/main/java/org/elasticsearch/test/disruption/NetworkDisruption.java @@ -181,6 +181,7 @@ public String toString() { public abstract static class DisruptedLinks { private final Set nodes; + @SafeVarargs protected DisruptedLinks(Set... nodeSets) { Set allNodes = new HashSet<>(); for (Set nodeSet : nodeSets) { diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java index 9b7bd00a228dc..f4c53bd378c0b 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java @@ -33,15 +33,10 @@ import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestClientBuilder; import org.elasticsearch.client.WarningsHandler; -import org.elasticsearch.core.CharArrays; -import org.elasticsearch.core.CheckedRunnable; -import org.elasticsearch.core.Nullable; import org.elasticsearch.common.Strings; -import org.elasticsearch.core.PathUtils; import org.elasticsearch.common.settings.SecureString; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.ssl.PemUtils; -import org.elasticsearch.core.TimeValue; import org.elasticsearch.common.util.concurrent.ThreadContext; import org.elasticsearch.common.util.set.Sets; import org.elasticsearch.common.xcontent.DeprecationHandler; @@ -52,6 +47,11 @@ import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.common.xcontent.support.XContentMapValues; +import org.elasticsearch.core.CharArrays; +import org.elasticsearch.core.CheckedRunnable; +import org.elasticsearch.core.Nullable; +import org.elasticsearch.core.PathUtils; +import org.elasticsearch.core.TimeValue; import org.elasticsearch.core.internal.io.IOUtils; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.seqno.ReplicationTracker; @@ -65,7 +65,6 @@ import org.junit.AfterClass; import org.junit.Before; -import javax.net.ssl.SSLContext; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -99,6 +98,7 @@ import java.util.function.Predicate; import java.util.regex.Pattern; import java.util.stream.Collectors; +import javax.net.ssl.SSLContext; import static java.util.Collections.sort; import static java.util.Collections.unmodifiableList; @@ -1043,6 +1043,7 @@ private static void deleteAllSLMPolicies() throws IOException { } } + @SuppressWarnings("unchecked") private static void deleteAllAutoFollowPatterns() throws IOException { final List> patterns; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContext.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContext.java index f37ebc5ee9df2..397dbf0ec5a7c 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContext.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContext.java @@ -122,6 +122,7 @@ public ClientYamlTestResponse callApi(String apiName, Map params * This functionality is supported in 7.x, but is not supported in 6.x (or is not the default * behavior). Here we modify the request so that it will work against a 6.x node. */ + @SuppressWarnings("unchecked") private void adaptRequestForOlderVersion(String apiName, List> bodies, Map requestParams) { diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ContainsAssertion.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ContainsAssertion.java index 3d3b463f5cfce..9cbda4707b242 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ContainsAssertion.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ContainsAssertion.java @@ -39,6 +39,7 @@ public ContainsAssertion(XContentLocation location, String field, Object expecte } @Override + @SuppressWarnings("unchecked") protected void doAssert(Object actualValue, Object expectedValue) { // add support for matching objects ({a:b}) against list of objects ([ {a:b, c:d} ]) if(expectedValue instanceof Map && actualValue instanceof List) { diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/GreaterThanAssertion.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/GreaterThanAssertion.java index d2eed66244c8b..5f2b6647ba995 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/GreaterThanAssertion.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/GreaterThanAssertion.java @@ -42,6 +42,7 @@ public GreaterThanAssertion(XContentLocation location, String field, Object expe } @Override + @SuppressWarnings({"rawtypes", "unchecked"}) protected void doAssert(Object actualValue, Object expectedValue) { logger.trace("assert that [{}] is greater than [{}] (field: [{}])", actualValue, expectedValue, getField()); assertThat("value of [" + getField() + "] is not comparable (got [" + safeClass(actualValue) + "])", diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/GreaterThanEqualToAssertion.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/GreaterThanEqualToAssertion.java index 85265737abeac..2402b224bb17e 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/GreaterThanEqualToAssertion.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/GreaterThanEqualToAssertion.java @@ -43,6 +43,7 @@ public GreaterThanEqualToAssertion(XContentLocation location, String field, Obje } @Override + @SuppressWarnings({"rawtypes", "unchecked"}) protected void doAssert(Object actualValue, Object expectedValue) { logger.trace("assert that [{}] is greater than or equal to [{}] (field: [{}])", actualValue, expectedValue, getField()); assertThat("value of [" + getField() + "] is not comparable (got [" + safeClass(actualValue) + "])", diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LessThanAssertion.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LessThanAssertion.java index 1653ca4806ed0..0e0f792aa8331 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LessThanAssertion.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LessThanAssertion.java @@ -43,6 +43,7 @@ public LessThanAssertion(XContentLocation location, String field, Object expecte } @Override + @SuppressWarnings({"rawtypes", "unchecked"}) protected void doAssert(Object actualValue, Object expectedValue) { logger.trace("assert that [{}] is less than [{}] (field: [{}])", actualValue, expectedValue, getField()); assertThat("value of [" + getField() + "] is not comparable (got [" + safeClass(actualValue) + "])", diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LessThanOrEqualToAssertion.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LessThanOrEqualToAssertion.java index b4e7cf67d40de..83ba784d9e08e 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LessThanOrEqualToAssertion.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LessThanOrEqualToAssertion.java @@ -43,6 +43,7 @@ public LessThanOrEqualToAssertion(XContentLocation location, String field, Objec } @Override + @SuppressWarnings({"rawtypes", "unchecked"}) protected void doAssert(Object actualValue, Object expectedValue) { logger.trace("assert that [{}] is less than or equal to [{}] (field: [{}])", actualValue, expectedValue, getField()); assertThat("value of [" + getField() + "] is not comparable (got [" + safeClass(actualValue) + "])",