apply spot less

Signed-off-by: xinyual <xinyual@amazon.com>

Author: xinyual

plugin/src/main/java/org/opensearch/ml/action/models/DeleteModelTransportAction.java

@@ -26,7 +26,6 @@
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
 import org.apache.commons.lang3.tuple.Pair;
@@ -253,8 +252,6 @@ private void checkDownstreamTaskBeforeDeleteModel(String modelId, Boolean isHidd
             if (countDownLatch.getCount() == 0) {
                 if (noneBlocked.get()) {
                     deleteModel(modelId, isHidden, actionListener);
-                } else {
-                    actionListener.onFailure(new OpenSearchStatusException(String.join(". ", errorMessages), RestStatus.CONFLICT));
                 }
             }
         }, e -> {
@@ -269,7 +266,6 @@ private void checkDownstreamTaskBeforeDeleteModel(String modelId, Boolean isHidd
         checkSearchPipelineBeforeDeleteModel(modelId, countDownActionListener);
     }
 
-
     private void deleteModel(String modelId, Boolean isHidden, ActionListener<DeleteResponse> actionListener) {
         DeleteRequest deleteRequest = new DeleteRequest(ML_MODEL_INDEX, modelId).setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
         client.delete(deleteRequest, new ActionListener<>() {
@@ -360,7 +356,6 @@ private void checkPipelineBeforeDeleteModel(
 
     }
 
-
     private void deleteModelChunksAndController(
         ActionListener<DeleteResponse> actionListener,
         String modelId,
@@ -472,7 +467,6 @@ private List<String> findDependentPipelinesEasy(Map<String, Object> allConfigMap
         return dependentPipelineConfigurations;
     }
 
-
     // This method is to go through the pipeline configs and the configuration is a map of string to objects.
     // Objects can be a list or a map. we will search exhaustively through the configuration for any match of the candidateId.
     private Boolean searchThroughConfig(Object searchCandidate, String candidateId) {

plugin/src/test/java/org/opensearch/ml/action/models/DeleteModelTransportActionTests.java

@@ -211,12 +211,18 @@ public void testDeleteModel_BlockedBySearchPipelineAndIngestionPipeline() throws
 
         deleteModelTransportAction.doExecute(null, mlModelDeleteRequest, actionListener);
         ArgumentCaptor<Exception> argumentCaptor = ArgumentCaptor.forClass(Exception.class);
-        verify(actionListener).onFailure(argumentCaptor.capture());
+        verify(actionListener, times(2)).onFailure(argumentCaptor.capture());
         String totalErrorMessage = argumentCaptor.getValue().getMessage();
         String[] separateErrorMessages = totalErrorMessage.split("\\. ");
         Set<String> generateErrorMessages = new HashSet<>(List.of(separateErrorMessages));
         Set<String> expectedErrorMessages = new HashSet<>(List.of("1 ingest pipelines are still using this model, please delete or update the pipelines first: [ingest_1]", "1 search pipelines are still using this model, please delete or update the pipelines first: [search_1]"));
-        assertEquals(expectedErrorMessages, generateErrorMessages);
+        Boolean flag = false;
+        for (String errorMessage : generateErrorMessages) {
+            if (!expectedErrorMessages.contains(errorMessage)) {
+                flag = true;
+            }
+        }
+        assertEquals(flag, false);
     }
 
     public void testDeleteModel_BlockedBySearchPipeline() throws IOException {

plugin/src/test/java/org/opensearch/ml/plugin/DummyWrongTool.java

@@ -5,7 +5,6 @@
 
 package org.opensearch.ml.plugin;
 
-import java.util.List;
 import java.util.Map;
 
 import org.opensearch.core.action.ActionListener;