Skip to content

Commit ac39aae

Browse files
committed
eliminate unchecked suppressions for randomFrom by adding safevarargs
1 parent 08c9bbc commit ac39aae

File tree

12 files changed

+5
-16
lines changed

12 files changed

+5
-16
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -713,11 +713,15 @@ public static int randomInt(int max) {
713713
}
714714

715715
/** Pick a random object from the given array. The array must not be empty. */
716+
@SafeVarargs
717+
@SuppressWarnings("varargs")
716718
public static <T> T randomFrom(T... array) {
717719
return randomFrom(random(), array);
718720
}
719721

720722
/** Pick a random object from the given array. The array must not be empty. */
723+
@SafeVarargs
724+
@SuppressWarnings("varargs")
721725
public static <T> T randomFrom(Random random, T... array) {
722726
return RandomPicks.randomFrom(random, array);
723727
}

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/dataframe/analyses/ClassificationTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ protected NamedWriteableRegistry getNamedWriteableRegistry() {
8989
return new NamedWriteableRegistry(entries);
9090
}
9191

92-
@SuppressWarnings({"unchecked"})
9392
public static Classification createRandom() {
9493
String dependentVariableName = randomAlphaOfLength(10);
9594
BoostedTreeParams boostedTreeParams = BoostedTreeParamsTests.createRandom();

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/dataframe/analyses/RegressionTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ public static Regression createRandom() {
8282
return createRandom(BoostedTreeParamsTests.createRandom());
8383
}
8484

85-
@SuppressWarnings({"unchecked"})
8685
private static Regression createRandom(BoostedTreeParams boostedTreeParams) {
8786
String dependentVariableName = randomAlphaOfLength(10);
8887
String predictionFieldName = randomBoolean() ? null : randomAlphaOfLength(10);

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/InferenceToXContentCompressorTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import static org.hamcrest.Matchers.equalTo;
2424

25-
@SuppressWarnings({"unchecked"})
2625
public class InferenceToXContentCompressorTests extends ESTestCase {
2726

2827
public void testInflateAndDeflate() throws IOException {

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/NamedXContentObjectsTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ public void chooseStrictOrLenient() {
147147
lenient = randomBoolean();
148148
}
149149

150-
@SuppressWarnings({"unchecked"})
151150
@Override
152151
public NamedObjectContainer createTestInstance() {
153152
int max = randomIntBetween(1, 10);

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfigTests.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public class TrainedModelConfigTests extends AbstractBWCSerializationTestCase<Tr
5353

5454
private boolean lenient;
5555

56-
@SuppressWarnings({"unchecked"})
5756
public static TrainedModelConfig.Builder createTestInstance(String modelId) {
5857
List<String> tags = Arrays.asList(generateRandomStringArray(randomIntBetween(0, 5), 15, false));
5958
return TrainedModelConfig.builder()
@@ -130,7 +129,6 @@ protected boolean assertToXContentEquivalence() {
130129
return false;
131130
}
132131

133-
@SuppressWarnings({"unchecked"})
134132
public void testToXContentWithParams() throws IOException {
135133
TrainedModelConfig.LazyModelDefinition lazyModelDefinition = TrainedModelConfig.LazyModelDefinition
136134
.fromParsedDefinition(TrainedModelDefinitionTests.createRandomBuilder().build());
@@ -170,8 +168,7 @@ public void testToXContentWithParams() throws IOException {
170168
assertThat(reference.utf8ToString(), containsString("\"definition\""));
171169
assertThat(reference.utf8ToString(), not(containsString("compressed_definition")));
172170
}
173-
174-
@SuppressWarnings({"unchecked"})
171+
175172
public void testParseWithBothDefinitionAndCompressedSupplied() throws IOException {
176173
TrainedModelConfig.LazyModelDefinition lazyModelDefinition = TrainedModelConfig.LazyModelDefinition
177174
.fromParsedDefinition(TrainedModelDefinitionTests.createRandomBuilder().build());

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelDefinitionTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ protected boolean assertToXContentEquivalence() {
5959
return false;
6060
}
6161

62-
@SuppressWarnings({"unchecked"})
6362
public static TrainedModelDefinition.Builder createRandomBuilder(TargetType targetType) {
6463
int numberOfProcessors = randomIntBetween(1, 10);
6564
return new TrainedModelDefinition.Builder()

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/preprocessing/MultiTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ public static Multi createRandom() {
4646
return createRandom(randomBoolean() ? null : randomBoolean());
4747
}
4848

49-
@SuppressWarnings("unchecked")
5049
public static Multi createRandom(Boolean isCustom) {
5150
final PreProcessor[] processors;
5251
if (isCustom == null || isCustom == false) {

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/trainedmodel/ensemble/EnsembleTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public static Ensemble createRandom(TargetType targetType) {
6565
return createRandom(targetType, featureNames);
6666
}
6767

68-
@SuppressWarnings({"unchecked"})
6968
public static Ensemble createRandom(TargetType targetType, List<String> featureNames) {
7069
int numberOfModels = randomIntBetween(1, 10);
7170
List<String> treeFeatureNames = featureNames.isEmpty() ?

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/role/PutRoleRequestTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ private PutRoleRequest buildRequestWithApplicationPrivilege(String appName, Stri
131131
return request;
132132
}
133133

134-
@SuppressWarnings("unchecked")
135134
private PutRoleRequest buildRandomRequest() {
136135

137136
final PutRoleRequest request = new PutRoleRequest();

0 commit comments

Comments
 (0)