Skip to content

Commit cd44467

Browse files
authored
Re-enable compiler warnings in :test:framework (#75449)
Part of #40366.
1 parent 9b88db7 commit cd44467

File tree

14 files changed

+21
-9
lines changed

14 files changed

+21
-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'
@@ -110,6 +108,6 @@ tasks.register("verifyVersions") {
110108
}
111109

112110
tasks.named('splitPackagesAudit').configure {
113-
// for now we always run tests with the classpath, so we are ok with split packages for tests
111+
// for now we always run tests with the classpath, so we are ok with split packages for tests
114112
onlyIf { false }
115113
}

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
@@ -478,6 +478,7 @@ public synchronized void close() throws Exception {
478478
}
479479

480480
@Override
481+
@SuppressWarnings("unchecked")
481482
public Iterator<IndexShard> iterator() {
482483
return Iterators.concat(replicas.iterator(), Collections.singleton(primary).iterator());
483484
}

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
@@ -435,6 +435,7 @@ protected <A extends InternalAggregation, C extends Aggregator> A searchAndReduc
435435
* for each leaf as though it were a separate index. If false this aggregates
436436
* all leaves together, like we do in production.
437437
*/
438+
@SuppressWarnings("unchecked")
438439
protected <A extends InternalAggregation, C extends Aggregator> A searchAndReduce(IndexSettings indexSettings,
439440
IndexSearcher searcher,
440441
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
@@ -163,6 +163,7 @@ protected RepositoryData getRepositoryData(String repoName, Version version) {
163163
}
164164
}
165165

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

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,6 +1091,8 @@ public static Settings.Builder settings(Version version) {
10911091
/**
10921092
* Returns size random values
10931093
*/
1094+
@SafeVarargs
1095+
@SuppressWarnings("varargs")
10941096
public static <T> List<T> randomSubsetOf(int size, T... values) {
10951097
List<T> list = arrayAsArrayList(values);
10961098
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
@@ -322,6 +322,7 @@ protected T createUnmappedInstance(String name, Map<String, Object> metadata) {
322322
}
323323

324324
@Override
325+
@SuppressWarnings("unchecked")
325326
protected final Class<T> categoryClass() {
326327
return (Class<T>) InternalAggregation.class;
327328
}

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;
@@ -64,7 +64,6 @@
6464
import org.junit.AfterClass;
6565
import org.junit.Before;
6666

67-
import javax.net.ssl.SSLContext;
6867
import java.io.BufferedReader;
6968
import java.io.IOException;
7069
import java.io.InputStream;
@@ -97,6 +96,7 @@
9796
import java.util.function.Predicate;
9897
import java.util.regex.Pattern;
9998
import java.util.stream.Collectors;
99+
import javax.net.ssl.SSLContext;
100100

101101
import static java.util.Collections.sort;
102102
import static java.util.Collections.unmodifiableList;
@@ -1010,6 +1010,7 @@ private static void deleteAllSLMPolicies() throws IOException {
10101010
}
10111011
}
10121012

1013+
@SuppressWarnings("unchecked")
10131014
private static void deleteAllAutoFollowPatterns() throws IOException {
10141015
final List<Map<?, ?>> patterns;
10151016

test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ContainsAssertion.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public ContainsAssertion(XContentLocation location, String field, Object expecte
3939
}
4040

4141
@Override
42+
@SuppressWarnings("unchecked")
4243
protected void doAssert(Object actualValue, Object expectedValue) {
4344
// add support for matching objects ({a:b}) against list of objects ([ {a:b, c:d} ])
4445
if(expectedValue instanceof Map && actualValue instanceof List) {

0 commit comments

Comments
 (0)