rename and remove useless method

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

Author: xinyual

ml-algorithms/src/main/java/org/opensearch/ml/engine/tools/AgentModelsSearcher.java

@@ -3,9 +3,7 @@
 import static org.opensearch.ml.common.CommonValue.ML_AGENT_INDEX;
 import static org.opensearch.ml.common.CommonValue.TOOL_MODEL_RELATED_FIELD_PREFIX;
 
-import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -28,20 +26,12 @@ public AgentModelsSearcher(Map<String, Tool.Factory> toolFactories) {
 
     public SearchRequest constructQueryRequest(String candidateModelId) {
         SearchRequest searchRequest = new SearchRequest(ML_AGENT_INDEX);
-        List<String> allKeyFields = collectAllKeys();
         BoolQueryBuilder shouldQuery = QueryBuilders.boolQuery();
-        for (String keyField : allKeyFields) {
+        for (String keyField : relatedModelIdSet) {
             shouldQuery.should(QueryBuilders.termsQuery(TOOL_MODEL_RELATED_FIELD_PREFIX + keyField, candidateModelId));
         }
         searchRequest.source(new SearchSourceBuilder().query(shouldQuery));
         return searchRequest;
     }
 
-    private List<String> collectAllKeys() {
-        Set<String> keys = new HashSet<>();
-        for (String modelKey : relatedModelIdSet) {
-            keys.add(modelKey);
-        }
-        return new ArrayList<>(keys);
-    }
 }

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

@@ -82,6 +82,7 @@ public class DeleteModelTransportAction extends HandledTransportAction<ActionReq
     static final String BULK_FAILURE_MSG = "Bulk failure while deleting model of ";
     static final String SEARCH_FAILURE_MSG = "Search failure while deleting model of ";
     static final String OS_STATUS_EXCEPTION_MESSAGE = "Failed to delete all model chunks";
+    static final String PIPELINE_TARGET_MODEL_KEY = "model_id";
     Client client;
     NamedXContentRegistry xContentRegistry;
     ClusterService clusterService;
@@ -497,13 +498,15 @@ private <T> Boolean isPipelineContainsModel(
         return false;
     }
 
-    private Boolean searchThroughConfig(Object searchCandidate, String candidateId, String prefixKey) {
+    private Boolean searchThroughConfig(Object searchCandidate, String candidateId, String targetModelKey) {
         Boolean flag = false;
-        if (searchCandidate instanceof String && Objects.equals(prefixKey, "model_id") && Objects.equals(candidateId, searchCandidate)) {
+        if (searchCandidate instanceof String
+            && Objects.equals(targetModelKey, PIPELINE_TARGET_MODEL_KEY)
+            && Objects.equals(candidateId, searchCandidate)) {
             return true;
         } else if (searchCandidate instanceof List<?>) {
             for (Object v : (List<?>) searchCandidate) {
-                flag = flag || searchThroughConfig(v, candidateId, prefixKey);
+                flag = flag || searchThroughConfig(v, candidateId, targetModelKey);
             }
         } else if (searchCandidate instanceof Map<?, ?>) {
             for (Map.Entry<String, Object> entry : ((Map<String, Object>) searchCandidate).entrySet()) {