diff --git a/server/src/main/java/org/elasticsearch/common/util/CollectionUtils.java b/server/src/main/java/org/elasticsearch/common/util/CollectionUtils.java index 51694f7b90017..a2bd7d442d5af 100644 --- a/server/src/main/java/org/elasticsearch/common/util/CollectionUtils.java +++ b/server/src/main/java/org/elasticsearch/common/util/CollectionUtils.java @@ -284,6 +284,8 @@ public static ArrayList iterableAsArrayList(Iterable element } } + @SafeVarargs + @SuppressWarnings("varargs") public static ArrayList arrayAsArrayList(E... elements) { if (elements == null) { throw new NullPointerException("elements"); 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 6f0aa36bff782..f0badad0c983c 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java @@ -762,11 +762,15 @@ public static int randomInt(int max) { } /** Pick a random object from the given array. The array must not be empty. */ + @SafeVarargs + @SuppressWarnings("varargs") public static T randomFrom(T... array) { return randomFrom(random(), array); } /** Pick a random object from the given array. The array must not be empty. */ + @SafeVarargs + @SuppressWarnings("varargs") public static T randomFrom(Random random, T... array) { return RandomPicks.randomFrom(random, array); } diff --git a/x-pack/plugin/core/build.gradle b/x-pack/plugin/core/build.gradle index 696bf2921e176..1bc46a89b2edd 100644 --- a/x-pack/plugin/core/build.gradle +++ b/x-pack/plugin/core/build.gradle @@ -106,9 +106,6 @@ tasks.named('forbiddenApisMain').configure { signaturesFiles += files('forbidden/hasher-signatures.txt') } -tasks.withType(JavaCompile).configureEach { - options.compilerArgs << "-Xlint:-rawtypes,-unchecked" -} // make LicenseSigner available for testing signed licenses sourceSets.test.resources { diff --git a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/search/PointInTimeIT.java b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/search/PointInTimeIT.java index 4b2aab3d95df4..a2d3f0f3c4ba0 100644 --- a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/search/PointInTimeIT.java +++ b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/search/PointInTimeIT.java @@ -427,6 +427,7 @@ public void testPITTiebreak() throws Exception { } } + @SuppressWarnings({"rawtypes","unchecked"}) private void assertPagination(PointInTimeBuilder pit, int expectedNumDocs, int size, SortBuilder... sorts) throws Exception { Set seen = new HashSet<>(); SearchRequestBuilder builder = client().prepareSearch() diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/AbstractGetResourcesResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/AbstractGetResourcesResponse.java index d94534d2b7083..6a48bd2f84ce6 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/AbstractGetResourcesResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/AbstractGetResourcesResponse.java @@ -71,7 +71,7 @@ public boolean equals(Object obj) { if (obj instanceof AbstractGetResourcesResponse == false) { return false; } - AbstractGetResourcesResponse other = (AbstractGetResourcesResponse) obj; + AbstractGetResourcesResponse other = (AbstractGetResourcesResponse) obj; return Objects.equals(resources, other.resources); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/EvaluateDataFrameAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/EvaluateDataFrameAction.java index de97fe927359c..5d48291b256ab 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/EvaluateDataFrameAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/EvaluateDataFrameAction.java @@ -54,6 +54,7 @@ public static class Request extends ActionRequest implements ToXContentObject { private static final ParseField QUERY = new ParseField("query"); private static final ParseField EVALUATION = new ParseField("evaluation"); + @SuppressWarnings({ "unchecked"}) private static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>( NAME, a -> new Request((List) a[0], (QueryProvider) a[1], (Evaluation) a[2])); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/ExplainDataFrameAnalyticsAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/ExplainDataFrameAnalyticsAction.java index 312f6a48cbd99..586ab16a4a2ce 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/ExplainDataFrameAnalyticsAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/ExplainDataFrameAnalyticsAction.java @@ -37,6 +37,7 @@ public static class Response extends ActionResponse implements ToXContentObject public static final ParseField FIELD_SELECTION = new ParseField("field_selection"); public static final ParseField MEMORY_ESTIMATION = new ParseField("memory_estimation"); + @SuppressWarnings({ "unchecked"}) static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>( TYPE.getPreferredName(), diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSource.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSource.java index 02a3245a1cd8d..351dc8a4e0242 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSource.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/DataFrameAnalyticsSource.java @@ -44,6 +44,7 @@ public class DataFrameAnalyticsSource implements Writeable, ToXContentObject { public static final ParseField QUERY = new ParseField("query"); public static final ParseField _SOURCE = new ParseField("_source"); + @SuppressWarnings({ "unchecked"}) public static ConstructingObjectParser createParser(boolean ignoreUnknownFields) { ConstructingObjectParser parser = new ConstructingObjectParser<>("data_frame_analytics_source", ignoreUnknownFields, a -> new DataFrameAnalyticsSource( diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/outlierdetection/ConfusionMatrix.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/outlierdetection/ConfusionMatrix.java index 27c9a741e9591..0df2539797910 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/outlierdetection/ConfusionMatrix.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/outlierdetection/ConfusionMatrix.java @@ -28,6 +28,7 @@ public class ConfusionMatrix extends AbstractConfusionMatrixMetric { public static final ParseField NAME = new ParseField("confusion_matrix"); + @SuppressWarnings("unchecked") private static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>(NAME.getPreferredName(), a -> new ConfusionMatrix((List) a[0])); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/outlierdetection/OutlierDetection.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/outlierdetection/OutlierDetection.java index 3d520eafcd1dc..f83bba6532f21 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/outlierdetection/OutlierDetection.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/outlierdetection/OutlierDetection.java @@ -38,6 +38,7 @@ public class OutlierDetection implements Evaluation { private static final ParseField METRICS = new ParseField("metrics"); + @SuppressWarnings("unchecked") public static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>( NAME.getPreferredName(), a -> new OutlierDetection((String) a[0], (String) a[1], (List) a[2])); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/outlierdetection/Precision.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/outlierdetection/Precision.java index 9777da06e6d18..9e3931ec6b516 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/outlierdetection/Precision.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/outlierdetection/Precision.java @@ -26,6 +26,7 @@ public class Precision extends AbstractConfusionMatrixMetric { public static final ParseField NAME = new ParseField("precision"); + @SuppressWarnings("unchecked") private static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>(NAME.getPreferredName(), a -> new Precision((List) a[0])); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/outlierdetection/Recall.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/outlierdetection/Recall.java index 6a48971636515..fb3f4e8c4bdba 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/outlierdetection/Recall.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/outlierdetection/Recall.java @@ -26,6 +26,7 @@ public class Recall extends AbstractConfusionMatrixMetric { public static final ParseField NAME = new ParseField("recall"); + @SuppressWarnings("unchecked") private static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>(NAME.getPreferredName(), a -> new Recall((List) a[0])); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/stats/classification/ValidationLoss.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/stats/classification/ValidationLoss.java index 44ad17169a00e..fd35e5c93f687 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/stats/classification/ValidationLoss.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/stats/classification/ValidationLoss.java @@ -30,6 +30,7 @@ public static ValidationLoss fromXContent(XContentParser parser, boolean ignoreU return createParser(ignoreUnknownFields).apply(parser, null); } + @SuppressWarnings("unchecked") private static ConstructingObjectParser createParser(boolean ignoreUnknownFields) { ConstructingObjectParser parser = new ConstructingObjectParser<>("classification_validation_loss", ignoreUnknownFields, diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/stats/common/FoldValues.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/stats/common/FoldValues.java index 5aea49de3ebeb..c175a9c8d5745 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/stats/common/FoldValues.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/stats/common/FoldValues.java @@ -29,6 +29,7 @@ public static FoldValues fromXContent(XContentParser parser, boolean ignoreUnkno return createParser(ignoreUnknownFields).apply(parser, null); } + @SuppressWarnings("unchecked") private static ConstructingObjectParser createParser(boolean ignoreUnknownFields) { ConstructingObjectParser parser = new ConstructingObjectParser<>("fold_values", ignoreUnknownFields, a -> new FoldValues((int) a[0], (List) a[1])); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/stats/regression/ValidationLoss.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/stats/regression/ValidationLoss.java index f08ad83a560aa..f20cfcb3713d6 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/stats/regression/ValidationLoss.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/stats/regression/ValidationLoss.java @@ -30,6 +30,7 @@ public static ValidationLoss fromXContent(XContentParser parser, boolean ignoreU return createParser(ignoreUnknownFields).apply(parser, null); } + @SuppressWarnings("unchecked") private static ConstructingObjectParser createParser(boolean ignoreUnknownFields) { ConstructingObjectParser parser = new ConstructingObjectParser<>("regression_validation_loss", ignoreUnknownFields, diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/RuleScope.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/RuleScope.java index 70d7d804f4964..256cfeca65582 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/RuleScope.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/RuleScope.java @@ -32,6 +32,7 @@ public class RuleScope implements ToXContentObject, Writeable { + @SuppressWarnings("unchecked") public static ContextParser parser(boolean ignoreUnknownFields) { return (p, c) -> { Map unparsedScope = p.map(); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/results/Influence.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/results/Influence.java index ff9cbad06d6bf..b8d4e8d3af9a5 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/results/Influence.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/results/Influence.java @@ -34,6 +34,7 @@ public class Influence implements ToXContentObject, Writeable { public static final ConstructingObjectParser STRICT_PARSER = createParser(false); public static final ConstructingObjectParser LENIENT_PARSER = createParser(true); + @SuppressWarnings({ "unchecked"}) private static ConstructingObjectParser createParser(boolean ignoreUnknownFields) { ConstructingObjectParser parser = new ConstructingObjectParser<>(INFLUENCER.getPreferredName(), ignoreUnknownFields, a -> new Influence((String) a[0], (List) a[1])); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/job/RollupJobStatus.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/job/RollupJobStatus.java index f53c11b7cc83d..9e84d06442c3a 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/job/RollupJobStatus.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/rollup/job/RollupJobStatus.java @@ -50,6 +50,7 @@ public class RollupJobStatus implements Task.Status, PersistentTaskState { private static final ParseField CURRENT_POSITION = new ParseField("current_position"); private static final ParseField UPGRADED_DOC_ID = new ParseField("upgraded_doc_id"); + @SuppressWarnings("unchecked") public static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>(NAME, args -> new RollupJobStatus((IndexerState) args[0], diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/SecurityContext.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/SecurityContext.java index 7ea38c15313ab..728aadbe776e8 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/SecurityContext.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/SecurityContext.java @@ -167,6 +167,7 @@ public void executeAfterRewritingAuthentication(Consumer consumer } } + @SuppressWarnings("unchecked") private Map rewriteMetadataForApiKeyRoleDescriptors(Version streamVersion, Authentication authentication) { Map metadata = authentication.getMetadata(); if (authentication.getAuthenticationType() == AuthenticationType.API_KEY) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetBitsetCache.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetBitsetCache.java index 95375abdad741..c651cba918378 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetBitsetCache.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/DocumentSubsetBitsetCache.java @@ -283,8 +283,7 @@ public static List> getSettings() { public Map usageStats() { final ByteSizeValue ram = new ByteSizeValue(ramBytesUsed(), ByteSizeUnit.BYTES); - return new MapBuilder() - .put("count", entryCount()) + return new MapBuilder().put("count", entryCount()) .put("memory", ram.toString()) .put("memory_in_bytes", ram.getBytes()) .immutableMap(); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReader.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReader.java index 7fc495abb3ea8..562e28c7efcf8 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReader.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReader.java @@ -159,6 +159,7 @@ public Fields getTermVectors(int docID) throws IOException { } /** Filter a map by a {@link CharacterRunAutomaton} that defines the fields to retain. */ + @SuppressWarnings("unchecked") static Map filter(Map map, CharacterRunAutomaton includeAutomaton, int initialState) { Map filtered = new HashMap<>(); for (Map.Entry entry : map.entrySet()) { @@ -196,6 +197,7 @@ static Map filter(Map map, CharacterRunAutomaton incl } /** Filter a list by a {@link CharacterRunAutomaton} that defines the fields to retain. */ + @SuppressWarnings("unchecked") private static List filter(Iterable iterable, CharacterRunAutomaton includeAutomaton, int initialState) { List filtered = new ArrayList<>(); for (Object value : iterable) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/CertParsingUtils.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/CertParsingUtils.java index 3aaa4ac143f5c..2747fe8508c70 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/CertParsingUtils.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ssl/CertParsingUtils.java @@ -96,7 +96,7 @@ public static Certificate[] readCertificates(List certPaths) throws Certif CertificateFactory certFactory = CertificateFactory.getInstance("X.509"); for (Path path : certPaths) { try (InputStream input = Files.newInputStream(path)) { - certificates.addAll((Collection) certFactory.generateCertificates(input)); + certificates.addAll(certFactory.generateCertificates(input)); if (certificates.isEmpty()) { throw new CertificateException("failed to parse any certificates from [" + path.toAbsolutePath() + "]"); } @@ -105,6 +105,7 @@ public static Certificate[] readCertificates(List certPaths) throws Certif return certificates.toArray(new Certificate[0]); } + @SuppressWarnings("unchecked") public static X509Certificate[] readX509Certificates(List certPaths) throws CertificateException, IOException { Collection certificates = new ArrayList<>(); CertificateFactory certFactory = CertificateFactory.getInstance("X.509"); @@ -118,7 +119,7 @@ public static X509Certificate[] readX509Certificates(List certPaths) throw public static List readCertificates(InputStream input) throws CertificateException, IOException { CertificateFactory certFactory = CertificateFactory.getInstance("X.509"); - Collection certificates = (Collection) certFactory.generateCertificates(input); + Collection certificates = certFactory.generateCertificates(input); return new ArrayList<>(certificates); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/SourceConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/SourceConfig.java index a907ea7acc04e..ef528e6b13995 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/SourceConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/SourceConfig.java @@ -42,11 +42,11 @@ public class SourceConfig implements Writeable, ToXContentObject { public static final ConstructingObjectParser STRICT_PARSER = createParser(false); public static final ConstructingObjectParser LENIENT_PARSER = createParser(true); + @SuppressWarnings("unchecked") private static ConstructingObjectParser createParser(boolean lenient) { ConstructingObjectParser parser = new ConstructingObjectParser<>("data_frame_config_source", lenient, args -> { - @SuppressWarnings("unchecked") String[] index = ((List)args[0]).toArray(new String[0]); // default handling: if the user does not specify a query, we default to match_all QueryConfig queryConfig = args[1] == null ? QueryConfig.matchAll() : (QueryConfig) args[1]; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/latest/LatestConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/latest/LatestConfig.java index 5986c341bf9f6..d9da0f2b31b91 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/latest/LatestConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/latest/LatestConfig.java @@ -44,6 +44,7 @@ public class LatestConfig implements Writeable, ToXContentObject { private static final ConstructingObjectParser STRICT_PARSER = createParser(false); private static final ConstructingObjectParser LENIENT_PARSER = createParser(true); + @SuppressWarnings("unchecked") private static ConstructingObjectParser createParser(boolean lenient) { ConstructingObjectParser parser = new ConstructingObjectParser<>(NAME, lenient, args -> new LatestConfig((List) args[0], (String) args[1])); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/actions/ActionWrapper.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/actions/ActionWrapper.java index 6aaf839320eda..ff87230970908 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/actions/ActionWrapper.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/actions/ActionWrapper.java @@ -53,7 +53,7 @@ public class ActionWrapper implements ToXContentObject { @Nullable private final ExecutableCondition condition; @Nullable - private final ExecutableTransform transform; + private final ExecutableTransform transform; private final ActionThrottler throttler; private final ExecutableAction action; @Nullable @@ -62,7 +62,7 @@ public class ActionWrapper implements ToXContentObject { public ActionWrapper(String id, ActionThrottler throttler, @Nullable ExecutableCondition condition, - @Nullable ExecutableTransform transform, + @Nullable ExecutableTransform transform, ExecutableAction action, @Nullable String path, @Nullable Integer maxIterations) { @@ -83,7 +83,7 @@ public ExecutableCondition condition() { return condition; } - public ExecutableTransform transform() { + public ExecutableTransform transform() { return transform; } @@ -109,6 +109,7 @@ public ExecutableAction action() { * @param ctx The current watch's context * @return Never {@code null} */ + @SuppressWarnings("unchecked") public ActionWrapperResult execute(WatchExecutionContext ctx) { ActionWrapperResult result = ctx.actionsResults().get(id); if (result != null) { @@ -175,7 +176,7 @@ public ActionWrapperResult execute(WatchExecutionContext ctx) { Object object = ObjectPath.eval(path, toMap(ctx)); int runs = 0; if (object instanceof Collection) { - Collection collection = Collection.class.cast(object); + Collection collection = (Collection) object; if (collection.isEmpty()) { throw new ElasticsearchException("foreach object [{}] was an empty list, could not run any action", path); } else { @@ -296,7 +297,7 @@ static ActionWrapper parse(String watchId, String actionId, XContentParser parse assert parser.currentToken() == XContentParser.Token.START_OBJECT; ExecutableCondition condition = null; - ExecutableTransform transform = null; + ExecutableTransform transform = null; TimeValue throttlePeriod = null; String path = null; ExecutableAction action = null; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/actions/ExecutableAction.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/actions/ExecutableAction.java index d916c18cef61b..cbe08054b7111 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/actions/ExecutableAction.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/actions/ExecutableAction.java @@ -49,7 +49,7 @@ public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - ExecutableAction that = (ExecutableAction) o; + ExecutableAction that = (ExecutableAction) o; return action.equals(that.action); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/client/WatchSourceBuilder.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/client/WatchSourceBuilder.java index 12e9f4ba65c52..dfcf28b7c3971 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/client/WatchSourceBuilder.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/client/WatchSourceBuilder.java @@ -44,7 +44,7 @@ public class WatchSourceBuilder implements ToXContentObject { private TimeValue defaultThrottlePeriod = null; private Map metadata; - public WatchSourceBuilder trigger(Trigger.Builder trigger) { + public WatchSourceBuilder trigger(Trigger.Builder trigger) { return trigger(trigger.build()); } @@ -53,7 +53,7 @@ public WatchSourceBuilder trigger(Trigger trigger) { return this; } - public WatchSourceBuilder input(Input.Builder input) { + public WatchSourceBuilder input(Input.Builder input) { return input(input.build()); } @@ -72,7 +72,7 @@ public WatchSourceBuilder transform(Transform transform) { return this; } - public WatchSourceBuilder transform(Transform.Builder transform) { + public WatchSourceBuilder transform(Transform.Builder transform) { return transform(transform.build()); } @@ -81,23 +81,25 @@ public WatchSourceBuilder defaultThrottlePeriod(TimeValue throttlePeriod) { return this; } - public WatchSourceBuilder addAction(String id, Action.Builder action) { + public WatchSourceBuilder addAction(String id, Action.Builder action) { return addAction(id, null, null, action.build()); } - public WatchSourceBuilder addAction(String id, TimeValue throttlePeriod, Action.Builder action) { + public WatchSourceBuilder addAction(String id, TimeValue throttlePeriod, Action.Builder action) { return addAction(id, throttlePeriod, null, action.build()); } - public WatchSourceBuilder addAction(String id, Transform.Builder transform, Action.Builder action) { + public WatchSourceBuilder addAction(String id, Transform.Builder transform, + Action.Builder action) { return addAction(id, null, transform.build(), action.build()); } - public WatchSourceBuilder addAction(String id, Condition condition, Action.Builder action) { + public WatchSourceBuilder addAction(String id, Condition condition, Action.Builder action) { return addAction(id, null, condition, null, action.build()); } - public WatchSourceBuilder addAction(String id, TimeValue throttlePeriod, Transform.Builder transform, Action.Builder action) { + public WatchSourceBuilder addAction(String id, TimeValue throttlePeriod, Transform.Builder transform, + Action.Builder action) { return addAction(id, throttlePeriod, transform.build(), action.build()); } @@ -106,8 +108,8 @@ public WatchSourceBuilder addAction(String id, TimeValue throttlePeriod, Transfo return this; } - public WatchSourceBuilder addAction(String id, TimeValue throttlePeriod, Condition condition, Transform.Builder transform, - Action.Builder action) { + public WatchSourceBuilder addAction(String id, TimeValue throttlePeriod, Condition condition, + Transform.Builder transform, Action.Builder action) { return addAction(id, throttlePeriod, condition, transform.build(), action.build()); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/history/WatchRecord.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/history/WatchRecord.java index c6510d6c0cc25..7b8b7c206b9ac 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/history/WatchRecord.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/history/WatchRecord.java @@ -21,6 +21,7 @@ import org.elasticsearch.xpack.core.watcher.execution.WatchExecutionResult; import org.elasticsearch.xpack.core.watcher.execution.Wid; import org.elasticsearch.xpack.core.watcher.input.ExecutableInput; +import org.elasticsearch.xpack.core.watcher.input.Input; import org.elasticsearch.xpack.core.watcher.support.xcontent.WatcherParams; import org.elasticsearch.xpack.core.watcher.trigger.TriggerEvent; import org.elasticsearch.xpack.core.watcher.watch.Watch; @@ -56,13 +57,14 @@ public abstract class WatchRecord implements ToXContentObject { // only emitted to xcontent in "debug" mode protected final Map vars; - @Nullable protected final ExecutableInput input; + @Nullable protected final ExecutableInput input; @Nullable protected final ExecutableCondition condition; @Nullable protected final Map metadata; @Nullable protected final WatchExecutionResult executionResult; - private WatchRecord(Wid id, TriggerEvent triggerEvent, ExecutionState state, Map vars, ExecutableInput input, - ExecutableCondition condition, Map metadata, Watch watch, WatchExecutionResult executionResult, + private WatchRecord(Wid id, TriggerEvent triggerEvent, ExecutionState state, Map vars, + ExecutableInput input, ExecutableCondition condition, + Map metadata, Watch watch, WatchExecutionResult executionResult, String nodeId, String user) { this.id = id; this.triggerEvent = triggerEvent; @@ -132,7 +134,7 @@ public String watchId() { return id.watchId(); } - public ExecutableInput input() { return input; } + public ExecutableInput input() { return input; } public ExecutionState state() { return state; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/support/WatcherUtils.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/support/WatcherUtils.java index a5758577ab1bc..821a8241b0a86 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/support/WatcherUtils.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/support/WatcherUtils.java @@ -40,6 +40,7 @@ public static Map flattenModel(Map map) { return result; } + @SuppressWarnings("unchecked") private static void flattenModel(String key, Object value, Map result) { if (value == null) { result.put(key, null); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/support/xcontent/XContentSource.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/support/xcontent/XContentSource.java index 3be402ea32ce6..3e0275460428a 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/support/xcontent/XContentSource.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/support/xcontent/XContentSource.java @@ -77,6 +77,7 @@ public boolean isMap() { /** * @return The source as a map */ + @SuppressWarnings("unchecked") public Map getAsMap() { return (Map) data(); } @@ -91,6 +92,7 @@ public boolean isList() { /** * @return The source as a list */ + @SuppressWarnings("unchecked") public List getAsList() { return (List) data(); } @@ -101,6 +103,7 @@ public List getAsList() { * @param path a dot notation path to the requested value * @return The extracted value or {@code null} if no value is associated with the given path */ + @SuppressWarnings("unchecked") public T getValue(String path) { return (T) ObjectPath.eval(path, data()); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transform/TransformRegistry.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transform/TransformRegistry.java index 8493730e8ec6f..0813e551c5d7e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transform/TransformRegistry.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transform/TransformRegistry.java @@ -18,22 +18,26 @@ public class TransformRegistry { - private final Map factories; + private final Map>> factories; - public TransformRegistry(Map factories) { - Map map = new HashMap<>(factories); + public TransformRegistry(Map>> factories) { + Map>> map + = new HashMap<>(factories); map.put(ChainTransform.TYPE, new ChainTransformFactory(this)); this.factories = Collections.unmodifiableMap(map); } - public TransformFactory factory(String type) { + public TransformFactory> factory(String type) { return factories.get(type); } - public ExecutableTransform parse(String watchId, XContentParser parser) throws IOException { + public ExecutableTransform parse(String watchId, XContentParser parser) + throws IOException { String type = null; XContentParser.Token token; - ExecutableTransform transform = null; + ExecutableTransform transform = null; while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) { if (token == XContentParser.Token.FIELD_NAME) { type = parser.currentName(); @@ -44,8 +48,10 @@ public ExecutableTransform parse(String watchId, XContentParser parser) throws I return transform; } - private ExecutableTransform parse(String watchId, String type, XContentParser parser) throws IOException { - TransformFactory factory = factories.get(type); + private ExecutableTransform parse(String watchId, String type, XContentParser parser) + throws IOException { + TransformFactory> factory = factories.get(type); if (factory == null) { throw new ElasticsearchParseException("could not parse transform for watch [{}], unknown transform type [{}]", watchId, type); } @@ -53,7 +59,8 @@ private ExecutableTransform parse(String watchId, String type, XContentParser pa } public Transform parseTransform(String watchId, String type, XContentParser parser) throws IOException { - TransformFactory factory = factories.get(type); + TransformFactory> factory = factories.get(type); if (factory == null) { throw new ElasticsearchParseException("could not parse transform for watch [{}], unknown transform type [{}]", watchId, type); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transform/chain/ChainTransform.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transform/chain/ChainTransform.java index 63c204a09cd95..e3837b1b244f6 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transform/chain/ChainTransform.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transform/chain/ChainTransform.java @@ -150,8 +150,8 @@ public Builder add(Transform... transforms) { return this; } - public Builder add(Transform.Builder... transforms) { - for (Transform.Builder transform: transforms) { + public Builder add(Transform.Builder... transforms) { + for (Transform.Builder transform: transforms) { this.transforms.add(transform.build()); } return this; diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transform/chain/ChainTransformFactory.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transform/chain/ChainTransformFactory.java index b0fb3cf2a4f5c..d40a47f5c7316 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transform/chain/ChainTransformFactory.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transform/chain/ChainTransformFactory.java @@ -36,6 +36,7 @@ public ChainTransform parseTransform(String watchId, XContentParser parser) thro } @Override + @SuppressWarnings({"rawtypes", "unchecked"}) public ExecutableChainTransform createExecutable(ChainTransform chainTransform) { ArrayList executables = new ArrayList<>(); for (Transform transform : chainTransform.getTransforms()) { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transform/chain/ExecutableChainTransform.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transform/chain/ExecutableChainTransform.java index 4e7c4475df7ee..bc23e1f595d73 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transform/chain/ExecutableChainTransform.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/transform/chain/ExecutableChainTransform.java @@ -23,6 +23,7 @@ import static org.elasticsearch.common.logging.LoggerMessageFormat.format; import static org.elasticsearch.xpack.core.watcher.transform.chain.ChainTransform.TYPE; +@SuppressWarnings("rawtypes") public class ExecutableChainTransform extends ExecutableTransform { private final List transforms; @@ -51,7 +52,6 @@ public ChainTransform.Result execute(WatchExecutionContext ctx, Payload payload) } } - ChainTransform.Result doExecute(WatchExecutionContext ctx, Payload payload, List results) throws IOException { for (ExecutableTransform transform : transforms) { Transform.Result result = transform.execute(ctx, payload); diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/watch/Watch.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/watch/Watch.java index dded2d2e168e2..528f74a531208 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/watch/Watch.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/watcher/watch/Watch.java @@ -15,7 +15,9 @@ import org.elasticsearch.xpack.core.watcher.actions.ActionWrapper; import org.elasticsearch.xpack.core.watcher.condition.ExecutableCondition; import org.elasticsearch.xpack.core.watcher.input.ExecutableInput; +import org.elasticsearch.xpack.core.watcher.input.Input; import org.elasticsearch.xpack.core.watcher.transform.ExecutableTransform; +import org.elasticsearch.xpack.core.watcher.transform.Transform; import org.elasticsearch.xpack.core.watcher.trigger.Trigger; import java.io.IOException; @@ -30,9 +32,9 @@ public class Watch implements ToXContentObject { private final String id; private final Trigger trigger; - private final ExecutableInput input; + private final ExecutableInput input; private final ExecutableCondition condition; - @Nullable private final ExecutableTransform transform; + @Nullable private final ExecutableTransform transform; private final List actions; @Nullable private final TimeValue throttlePeriod; @Nullable private final Map metadata; @@ -41,7 +43,8 @@ public class Watch implements ToXContentObject { private final long sourceSeqNo; private final long sourcePrimaryTerm; - public Watch(String id, Trigger trigger, ExecutableInput input, ExecutableCondition condition, @Nullable ExecutableTransform transform, + public Watch(String id, Trigger trigger, ExecutableInputinput, ExecutableCondition condition, + @Nullable ExecutableTransform transform, @Nullable TimeValue throttlePeriod, List actions, @Nullable Map metadata, WatchStatus status, long sourceSeqNo, long sourcePrimaryTerm) { this.id = id; @@ -65,13 +68,13 @@ public Trigger trigger() { return trigger; } - public ExecutableInput input() { return input;} + public ExecutableInput input() { return input;} public ExecutableCondition condition() { return condition; } - public ExecutableTransform transform() { + public ExecutableTransform transform() { return transform; } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/test/TestMatchers.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/test/TestMatchers.java index 48b12e379f3da..80358b4d9d695 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/test/TestMatchers.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/test/TestMatchers.java @@ -67,6 +67,7 @@ public void describeMismatch(Object item, Description description) { }; } + @SuppressWarnings("unchecked") public static Matcher> predicateMatches(T value) { return new CustomMatcher>("Matches " + value) { @Override diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/LocalStateCompositeXPackPlugin.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/LocalStateCompositeXPackPlugin.java index 4c348e3af554b..1d4f4ecb4a795 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/LocalStateCompositeXPackPlugin.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/LocalStateCompositeXPackPlugin.java @@ -553,6 +553,7 @@ public Map getSnapshotCommitSup return suppliers; } + @SuppressWarnings("unchecked") private List filterPlugins(Class type) { return plugins.stream().filter(x -> type.isAssignableFrom(x.getClass())).map(p -> ((T)p)) .collect(Collectors.toList()); diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/action/TransportXPackInfoActionTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/action/TransportXPackInfoActionTests.java index fd0fae5cde3b4..4546f7d5a17b0 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/action/TransportXPackInfoActionTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/action/TransportXPackInfoActionTests.java @@ -42,6 +42,7 @@ public class TransportXPackInfoActionTests extends ESTestCase { + @SuppressWarnings("unchecked") public void testDoExecute() throws Exception { EnumSet categories = EnumSet.noneOf(XPackInfoRequest.Category.class); int maxCategoryCount = randomIntBetween(0, XPackInfoRequest.Category.values().length); diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/CloseFollowerIndexStepTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/CloseFollowerIndexStepTests.java index 3eaa2858db9a9..3e14093713fa8 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/CloseFollowerIndexStepTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/CloseFollowerIndexStepTests.java @@ -103,7 +103,7 @@ public void testCloseFollowingIndexFailed() { Mockito.doAnswer(invocation -> { CloseIndexRequest closeIndexRequest = (CloseIndexRequest) invocation.getArguments()[0]; assertThat(closeIndexRequest.indices()[0], equalTo("follower-index")); - ActionListener listener = (ActionListener) invocation.getArguments()[1]; + ActionListenerlistener = (ActionListener) invocation.getArguments()[1]; listener.onFailure(error); return null; }).when(indicesClient).close(Mockito.any(), Mockito.any()); diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/PauseFollowerIndexStepTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/PauseFollowerIndexStepTests.java index e0365e8472db5..9153e23438e8f 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/PauseFollowerIndexStepTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/PauseFollowerIndexStepTests.java @@ -123,7 +123,7 @@ public void testPauseFollowingIndexFailed() { Mockito.doAnswer(invocation -> { PauseFollowAction.Request request = (PauseFollowAction.Request) invocation.getArguments()[1]; assertThat(request.getFollowIndex(), equalTo("follower-index")); - ActionListener listener = (ActionListener) invocation.getArguments()[2]; + ActionListener listener = (ActionListener) invocation.getArguments()[2]; listener.onFailure(error); return null; }).when(client).execute(Mockito.same(PauseFollowAction.INSTANCE), Mockito.any(), Mockito.any()); diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/UnfollowFollowerIndexStepTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/UnfollowFollowerIndexStepTests.java index d41a1340c1885..d3cc881bf6928 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/UnfollowFollowerIndexStepTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/UnfollowFollowerIndexStepTests.java @@ -114,7 +114,7 @@ public void testUnFollowUnfollowFailed() { Mockito.doAnswer(invocation -> { UnfollowAction.Request request = (UnfollowAction.Request) invocation.getArguments()[1]; assertThat(request.getFollowerIndex(), equalTo("follower-index")); - ActionListener listener = (ActionListener) invocation.getArguments()[2]; + ActionListener listener = (ActionListener) invocation.getArguments()[2]; listener.onFailure(error); return null; }).when(client).execute(Mockito.same(UnfollowAction.INSTANCE), Mockito.any(), Mockito.any()); @@ -151,7 +151,7 @@ public void testFailureToReleaseRetentionLeases() { Mockito.doAnswer(invocation -> { UnfollowAction.Request request = (UnfollowAction.Request) invocation.getArguments()[1]; assertThat(request.getFollowerIndex(), equalTo("follower-index")); - ActionListener listener = (ActionListener) invocation.getArguments()[2]; + ActionListener listener = (ActionListener) invocation.getArguments()[2]; listener.onFailure(error); return null; }).when(client).execute(Mockito.same(UnfollowAction.INSTANCE), Mockito.any(), Mockito.any()); diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfigTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfigTests.java index 51b373edc4e01..ec0b3b711940b 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfigTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/inference/TrainedModelConfigTests.java @@ -168,7 +168,7 @@ public void testToXContentWithParams() throws IOException { assertThat(reference.utf8ToString(), containsString("\"definition\"")); assertThat(reference.utf8ToString(), not(containsString("compressed_definition"))); } - + public void testParseWithBothDefinitionAndCompressedSupplied() throws IOException { TrainedModelConfig.LazyModelDefinition lazyModelDefinition = TrainedModelConfig.LazyModelDefinition .fromParsedDefinition(TrainedModelDefinitionTests.createRandomBuilder().build()); diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/integration/MlRestTestStateCleaner.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/integration/MlRestTestStateCleaner.java index 6b6d76188cef3..5a74298350f2c 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/integration/MlRestTestStateCleaner.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/integration/MlRestTestStateCleaner.java @@ -119,6 +119,7 @@ private void deleteAllJobs() throws IOException { } } + @SuppressWarnings({"unchecked"}) private void deleteAllDataFrameAnalytics() throws IOException { stopAllDataFrameAnalytics(); diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/persistence/ElasticsearchMappingsTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/persistence/ElasticsearchMappingsTests.java index 711b9442d94fb..c38a2a380a5de 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/persistence/ElasticsearchMappingsTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/persistence/ElasticsearchMappingsTests.java @@ -186,7 +186,7 @@ public void testAddDocMappingIfMissing() throws IOException { when(client.threadPool()).thenReturn(threadPool); doAnswer( invocationOnMock -> { - ActionListener listener = (ActionListener) invocationOnMock.getArguments()[2]; + ActionListener listener = (ActionListener) invocationOnMock.getArguments()[2]; listener.onResponse(AcknowledgedResponse.TRUE); return null; }) diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/results/AnomalyRecordTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/results/AnomalyRecordTests.java index c649eb72d8204..00f64af0542d5 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/results/AnomalyRecordTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/results/AnomalyRecordTests.java @@ -133,6 +133,7 @@ public void testToXContentIncludesInputFields() throws IOException { assertEquals(influence2.getInfluencerFieldValues(), serialisedInfFieldValues2); } + @SuppressWarnings({"unchecked"}) public void testToXContentOrdersDuplicateInputFields() throws IOException { AnomalyRecord record = createTestInstance(); record.setByFieldName("car-make"); diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/utils/MlIndexAndAliasTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/utils/MlIndexAndAliasTests.java index b52b901a325ff..273e1cf2bdd7c 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/utils/MlIndexAndAliasTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/utils/MlIndexAndAliasTests.java @@ -86,6 +86,7 @@ public class MlIndexAndAliasTests extends ESTestCase { private ArgumentCaptor createRequestCaptor; private ArgumentCaptor aliasesRequestCaptor; + @SuppressWarnings("unchecked") @Before public void setUpMocks() { threadPool = mock(ThreadPool.class); @@ -101,7 +102,6 @@ public void setUpMocks() { clusterAdminClient = mock(ClusterAdminClient.class); doAnswer(invocationOnMock -> { - @SuppressWarnings("unchecked") ActionListener listener = (ActionListener) invocationOnMock.getArguments()[1]; listener.onResponse(new ClusterHealthResponse()); return null; diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/token/InvalidateTokenResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/token/InvalidateTokenResponseTests.java index b06a0e5e4ae7b..5d36c9418a7fc 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/token/InvalidateTokenResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/token/InvalidateTokenResponseTests.java @@ -63,8 +63,8 @@ public void testSerialization() throws IOException { } public void testToXContent() throws IOException { - List invalidatedTokens = Arrays.asList(generateRandomStringArray(20, 15, false)); - List previouslyInvalidatedTokens = Arrays.asList(generateRandomStringArray(20, 15, false)); + List invalidatedTokens = Arrays.asList(generateRandomStringArray(20, 15, false)); + List previouslyInvalidatedTokens = Arrays.asList(generateRandomStringArray(20, 15, false)); TokensInvalidationResult result = new TokensInvalidationResult(invalidatedTokens, previouslyInvalidatedTokens, Arrays.asList(new ElasticsearchException("foo", new IllegalArgumentException("this is an error message")), new ElasticsearchException("bar", new IllegalArgumentException("this is an error message2"))), RestStatus.OK); diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/watcher/common/stats/CountersTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/watcher/common/stats/CountersTests.java index 1e778a9a17cfc..80a42e111c541 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/watcher/common/stats/CountersTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/watcher/common/stats/CountersTests.java @@ -16,6 +16,7 @@ public class CountersTests extends ESTestCase { + @SuppressWarnings("unchecked") public void testCounters() { Counters counters = new Counters(); counters.inc("f", 200); diff --git a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/HistoryIntegrationTests.java b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/HistoryIntegrationTests.java index ea4919e1a5ddf..3fd077e1bb289 100644 --- a/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/HistoryIntegrationTests.java +++ b/x-pack/plugin/watcher/src/internalClusterTest/java/org/elasticsearch/xpack/watcher/test/integration/HistoryIntegrationTests.java @@ -79,7 +79,7 @@ public void testFailedInputResultWithDotsInFieldNameGetsStored() throws Exceptio // The result of the search input will be a failure, because a missing index does not exist when // the query is executed @SuppressWarnings({"rawtypes"}) - Input.Builder input = searchInput(request); + Input.Builder input = searchInput(request); // wrapping this randomly into a chained input to test this as well boolean useChained = randomBoolean(); if (useChained) { @@ -119,8 +119,8 @@ public void testFailedInputResultWithDotsInFieldNameGetsStored() throws Exceptio // See https://github.com/elastic/x-plugins/issues/2913 public void testPayloadInputWithDotsInFieldNameWorks() throws Exception { - @SuppressWarnings({"rawtypes"}) - Input.Builder input = simpleInput("foo.bar", "bar"); + + Input.Builder input = simpleInput("foo.bar", "bar"); // wrapping this randomly into a chained input to test this as well boolean useChained = randomBoolean(); diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java index 48ef0fde367b1..82c1e17565d1e 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/Watcher.java @@ -72,6 +72,8 @@ import org.elasticsearch.xpack.core.watcher.execution.TriggeredWatchStoreField; import org.elasticsearch.xpack.core.watcher.history.HistoryStoreField; import org.elasticsearch.xpack.core.watcher.input.none.NoneInput; +import org.elasticsearch.xpack.core.watcher.transform.ExecutableTransform; +import org.elasticsearch.xpack.core.watcher.transform.Transform; import org.elasticsearch.xpack.core.watcher.transform.TransformFactory; import org.elasticsearch.xpack.core.watcher.transform.TransformRegistry; import org.elasticsearch.xpack.core.watcher.transport.actions.QueryWatchesAction; @@ -312,7 +314,8 @@ public Collection createComponents(Client client, ClusterService cluster parsers.put(ScriptCondition.TYPE, (c, id, p) -> ScriptCondition.parse(scriptService, id, p)); final ConditionRegistry conditionRegistry = new ConditionRegistry(Collections.unmodifiableMap(parsers), getClock()); - final Map transformFactories = new HashMap<>(); + final Map>> + transformFactories = new HashMap<>(); transformFactories.put(ScriptTransform.TYPE, new ScriptTransformFactory(scriptService)); transformFactories.put(SearchTransform.TYPE, new SearchTransformFactory(settings, client, xContentRegistry, scriptService)); final TransformRegistry transformRegistry = new TransformRegistry(Collections.unmodifiableMap(transformFactories)); diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformBuilders.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformBuilders.java index 08f147a437261..8971c2f8a77fa 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformBuilders.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/transform/TransformBuilders.java @@ -33,7 +33,7 @@ public static ScriptTransform.Builder scriptTransform(Script script) { return ScriptTransform.builder(script); } - public static ChainTransform.Builder chainTransform(Transform.Builder... transforms) { + public static ChainTransform.Builder chainTransform(Transform.Builder... transforms) { return ChainTransform.builder().add(transforms); } diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherServiceTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherServiceTests.java index 95103770221fa..90b4267eee266 100644 --- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherServiceTests.java +++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherServiceTests.java @@ -48,6 +48,7 @@ import org.elasticsearch.search.SearchShardTarget; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; +import org.elasticsearch.xpack.core.watcher.input.ExecutableInput; import org.elasticsearch.xpack.core.watcher.trigger.Trigger; import org.elasticsearch.xpack.core.watcher.watch.Watch; import org.elasticsearch.xpack.core.watcher.watch.WatchStatus; @@ -236,7 +237,7 @@ public void testPausingWatcherServiceAlsoPausesTriggerService() { when(watch.trigger()).thenReturn(trigger); when(watch.id()).thenReturn(id); when(watch.condition()).thenReturn(InternalAlwaysCondition.INSTANCE); - ExecutableNoneInput noneInput = new ExecutableNoneInput(); + ExecutableInput noneInput = new ExecutableNoneInput(); when(watch.input()).thenReturn(noneInput); triggerService.add(watch); diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/transform/TransformInputTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/transform/TransformInputTests.java index 4c7d9e8ddb459..7154c0f1ed242 100644 --- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/transform/TransformInputTests.java +++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/input/transform/TransformInputTests.java @@ -20,6 +20,7 @@ import org.elasticsearch.xpack.core.watcher.input.ExecutableInput; import org.elasticsearch.xpack.core.watcher.input.Input; import org.elasticsearch.xpack.core.watcher.transform.ExecutableTransform; +import org.elasticsearch.xpack.core.watcher.transform.Transform; import org.elasticsearch.xpack.core.watcher.transform.TransformFactory; import org.elasticsearch.xpack.core.watcher.transform.TransformRegistry; import org.elasticsearch.xpack.core.watcher.watch.Payload; @@ -61,8 +62,9 @@ public void testExecute() { } public void testParserValid() throws Exception { - Map transformFactories = Collections.singletonMap("script", - new ScriptTransformFactory(scriptService)); + Map>> transformFactories = + Collections.singletonMap("script", new ScriptTransformFactory(scriptService)); TransformRegistry registry = new TransformRegistry(transformFactories); TransformInputFactory factory = new TransformInputFactory(registry); @@ -85,8 +87,9 @@ public void testParserValid() throws Exception { public void testParserInvalid() throws Exception { XContentBuilder jsonBuilder = jsonBuilder().value("just a string"); - Map transformFactories = Collections.singletonMap("script", - new ScriptTransformFactory(scriptService)); + Map>> transformFactories = + Collections.singletonMap("script", new ScriptTransformFactory(scriptService)); TransformRegistry registry = new TransformRegistry(transformFactories); TransformInputFactory factory = new TransformInputFactory(registry); XContentParser parser = createParser(jsonBuilder); @@ -104,8 +107,9 @@ public void testTransformResultToXContent() throws Exception { } public void testTransformInputToXContentIsSameAsParsing() throws Exception { - Map transformFactories = Collections.singletonMap("script", - new ScriptTransformFactory(scriptService)); + Map>> transformFactories = + Collections.singletonMap("script", new ScriptTransformFactory(scriptService)); TransformRegistry registry = new TransformRegistry(transformFactories); TransformInputFactory factory = new TransformInputFactory(registry); diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/TriggerServiceTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/TriggerServiceTests.java index 30ba222bb97f7..d2e5716f4e7b7 100644 --- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/TriggerServiceTests.java +++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/trigger/TriggerServiceTests.java @@ -11,6 +11,7 @@ import org.elasticsearch.xpack.core.watcher.actions.ExecutableAction; import org.elasticsearch.xpack.core.watcher.common.stats.Counters; import org.elasticsearch.xpack.core.watcher.condition.ExecutableCondition; +import org.elasticsearch.xpack.core.watcher.input.ExecutableInput; import org.elasticsearch.xpack.core.watcher.transform.ExecutableTransform; import org.elasticsearch.xpack.core.watcher.trigger.Trigger; import org.elasticsearch.xpack.core.watcher.watch.Watch; @@ -144,7 +145,7 @@ private Watch createWatch(String id) { } private void setInput(Watch watch) { - ExecutableNoneInput noneInput = new ExecutableNoneInput(); + ExecutableInput noneInput = new ExecutableNoneInput(); when(watch.input()).thenReturn(noneInput); }