From 59f99f43f3073dc1347d94d24110d71aa8aaac0f Mon Sep 17 00:00:00 2001 From: martinpkr Date: Sun, 2 Jun 2024 21:03:10 +0300 Subject: [PATCH] fixed failing spotless check Signed-off-by: martinpkr --- .../flowframework/workflow/ReindexStep.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/main/java/org/opensearch/flowframework/workflow/ReindexStep.java b/src/main/java/org/opensearch/flowframework/workflow/ReindexStep.java index b57723db0..c0da6369c 100644 --- a/src/main/java/org/opensearch/flowframework/workflow/ReindexStep.java +++ b/src/main/java/org/opensearch/flowframework/workflow/ReindexStep.java @@ -13,10 +13,6 @@ import org.opensearch.ExceptionsHelper; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.client.Client; -<<<<<<< HEAD -======= -import org.opensearch.common.Booleans; ->>>>>>> 4ee2171 (Added workflow step for ReIndex Step (#718)) import org.opensearch.core.action.ActionListener; import org.opensearch.core.common.Strings; import org.opensearch.core.rest.RestStatus; @@ -94,17 +90,9 @@ public PlainActionFuture execute( String sourceIndices = (String) inputs.get(SOURCE_INDEX); String destinationIndex = (String) inputs.get(DESTINATION_INDEX); -<<<<<<< HEAD Boolean refresh = ParseUtils.parseIfExists(inputs, REFRESH, Boolean.class); Float requestsPerSecond = ParseUtils.parseIfExists(inputs, REQUESTS_PER_SECOND, Float.class); Boolean requireAlias = ParseUtils.parseIfExists(inputs, REQUIRE_ALIAS, Boolean.class); -======= - Boolean refresh = inputs.containsKey(REFRESH) ? Booleans.parseBoolean(inputs.get(REFRESH).toString()) : null; - Float requestsPerSecond = inputs.containsKey(REQUESTS_PER_SECOND) - ? Float.parseFloat(inputs.get(REQUESTS_PER_SECOND).toString()) - : null; - Boolean requireAlias = inputs.containsKey(REQUIRE_ALIAS) ? Booleans.parseBoolean(inputs.get(REQUIRE_ALIAS).toString()) : null; ->>>>>>> 4ee2171 (Added workflow step for ReIndex Step (#718)) Integer slices = (Integer) inputs.get(SLICES); Integer maxDocs = (Integer) inputs.get(MAX_DOCS);