Skip to content

Commit 400029a

Browse files
committed
Re-enable compiler warnings in :test:framework (#75449)
Part of #40366.
1 parent c414f3b commit 400029a

15 files changed

+22
-9
lines changed

test/framework/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ dependencies {
3737
api "org.apache.commons:commons-lang3:${versions.commons_lang3}"
3838
}
3939

40-
tasks.named("compileJava").configure { options.compilerArgs << '-Xlint:-cast,-unchecked' }
41-
4240
// the main files are actually test files, so use the appropriate forbidden api sigs
4341
tasks.named('forbiddenApisMain').configure {
4442
replaceSignatureFiles 'jdk-signatures', 'es-all-signatures', 'es-test-signatures'
@@ -113,6 +111,6 @@ tasks.register("verifyVersions") {
113111
}
114112

115113
tasks.named('splitPackagesAudit').configure {
116-
// for now we always run tests with the classpath, so we are ok with split packages for tests
114+
// for now we always run tests with the classpath, so we are ok with split packages for tests
117115
onlyIf { false }
118116
}

test/framework/src/main/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,7 @@ public synchronized void close() throws Exception {
483483
}
484484

485485
@Override
486+
@SuppressWarnings("unchecked")
486487
public Iterator<IndexShard> iterator() {
487488
return Iterators.concat(replicas.iterator(), Collections.singleton(primary).iterator());
488489
}

test/framework/src/main/java/org/elasticsearch/ingest/TestTemplateService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ private TestTemplateService(boolean compilationException) {
3737
}
3838

3939
@Override
40+
@SuppressWarnings("unchecked")
4041
public <FactoryType> FactoryType compile(Script script, ScriptContext<FactoryType> context) {
4142
if (this.compilationException) {
4243
throw new RuntimeException("could not compile script");

test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,7 @@ protected <A extends InternalAggregation, C extends Aggregator> A searchAndReduc
441441
* for each leaf as though it were a separate index. If false this aggregates
442442
* all leaves together, like we do in production.
443443
*/
444+
@SuppressWarnings("unchecked")
444445
protected <A extends InternalAggregation, C extends Aggregator> A searchAndReduce(IndexSettings indexSettings,
445446
IndexSearcher searcher,
446447
Query query,

test/framework/src/main/java/org/elasticsearch/snapshots/AbstractSnapshotIntegTestCase.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ protected RepositoryData getRepositoryData(String repoName, Version version) {
164164
}
165165
}
166166

167+
@SuppressWarnings("cast")
167168
protected RepositoryData getRepositoryData(String repository) {
168169
return getRepositoryData((Repository) getRepositoryOnMaster(repository));
169170
}

test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1163,6 +1163,8 @@ public static Settings.Builder settings(Version version) {
11631163
/**
11641164
* Returns size random values
11651165
*/
1166+
@SafeVarargs
1167+
@SuppressWarnings("varargs")
11661168
public static <T> List<T> randomSubsetOf(int size, T... values) {
11671169
List<T> list = arrayAsArrayList(values);
11681170
return randomSubsetOf(size, list);

test/framework/src/main/java/org/elasticsearch/test/InternalAggregationTestCase.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,7 @@ protected T createUnmappedInstance(String name, Map<String, Object> metadata) {
327327
}
328328

329329
@Override
330+
@SuppressWarnings("unchecked")
330331
protected final Class<T> categoryClass() {
331332
return (Class<T>) InternalAggregation.class;
332333
}

test/framework/src/main/java/org/elasticsearch/test/disruption/NetworkDisruption.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ public String toString() {
181181
public abstract static class DisruptedLinks {
182182
private final Set<String> nodes;
183183

184+
@SafeVarargs
184185
protected DisruptedLinks(Set<String>... nodeSets) {
185186
Set<String> allNodes = new HashSet<>();
186187
for (Set<String> nodeSet : nodeSets) {

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,10 @@
3333
import org.elasticsearch.client.RestClient;
3434
import org.elasticsearch.client.RestClientBuilder;
3535
import org.elasticsearch.client.WarningsHandler;
36-
import org.elasticsearch.core.CharArrays;
37-
import org.elasticsearch.core.CheckedRunnable;
38-
import org.elasticsearch.core.Nullable;
3936
import org.elasticsearch.common.Strings;
40-
import org.elasticsearch.core.PathUtils;
4137
import org.elasticsearch.common.settings.SecureString;
4238
import org.elasticsearch.common.settings.Settings;
4339
import org.elasticsearch.common.ssl.PemUtils;
44-
import org.elasticsearch.core.TimeValue;
4540
import org.elasticsearch.common.util.concurrent.ThreadContext;
4641
import org.elasticsearch.common.util.set.Sets;
4742
import org.elasticsearch.common.xcontent.DeprecationHandler;
@@ -52,6 +47,11 @@
5247
import org.elasticsearch.common.xcontent.XContentType;
5348
import org.elasticsearch.common.xcontent.json.JsonXContent;
5449
import org.elasticsearch.common.xcontent.support.XContentMapValues;
50+
import org.elasticsearch.core.CharArrays;
51+
import org.elasticsearch.core.CheckedRunnable;
52+
import org.elasticsearch.core.Nullable;
53+
import org.elasticsearch.core.PathUtils;
54+
import org.elasticsearch.core.TimeValue;
5555
import org.elasticsearch.core.internal.io.IOUtils;
5656
import org.elasticsearch.index.IndexSettings;
5757
import org.elasticsearch.index.seqno.ReplicationTracker;
@@ -65,7 +65,6 @@
6565
import org.junit.AfterClass;
6666
import org.junit.Before;
6767

68-
import javax.net.ssl.SSLContext;
6968
import java.io.BufferedReader;
7069
import java.io.IOException;
7170
import java.io.InputStream;
@@ -99,6 +98,7 @@
9998
import java.util.function.Predicate;
10099
import java.util.regex.Pattern;
101100
import java.util.stream.Collectors;
101+
import javax.net.ssl.SSLContext;
102102

103103
import static java.util.Collections.sort;
104104
import static java.util.Collections.unmodifiableList;
@@ -1043,6 +1043,7 @@ private static void deleteAllSLMPolicies() throws IOException {
10431043
}
10441044
}
10451045

1046+
@SuppressWarnings("unchecked")
10461047
private static void deleteAllAutoFollowPatterns() throws IOException {
10471048
final List<Map<?, ?>> patterns;
10481049

test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ClientYamlTestExecutionContext.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ public ClientYamlTestResponse callApi(String apiName, Map<String, String> params
122122
* This functionality is supported in 7.x, but is not supported in 6.x (or is not the default
123123
* behavior). Here we modify the request so that it will work against a 6.x node.
124124
*/
125+
@SuppressWarnings("unchecked")
125126
private void adaptRequestForOlderVersion(String apiName,
126127
List<Map<String, Object>> bodies,
127128
Map<String, String> requestParams) {

0 commit comments

Comments
 (0)