fixed failing spotless check

Signed-off-by: martinpkr <[email protected]>
martinpkr · Jun 2, 2024 · 7d599cf · 7d599cf
1 parent dd4f668
commit 7d599cf
Showing 1 changed file with 0 additions and 12 deletions.
diff --git 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<WorkflowData> 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);