Fix the refactor change brought by core backport

plugin/src/main/java/org/opensearch/ml/autoredeploy/MLModelAutoReDeployer.java

@@ -25,8 +25,8 @@
 import org.opensearch.client.Client;
 import org.opensearch.client.OpenSearchClient;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.query.TermsQueryBuilder;
 import org.opensearch.ml.common.MLModel;
 import org.opensearch.ml.common.model.MLModelState;
@@ -108,7 +108,7 @@ public MLModelAutoReDeployer(
 
     private void undeployModelsOnDataNodes() {
         List<String> dataNodeIds = new ArrayList<>();
-        clusterService.state().nodes().getDataNodes().iterator().forEachRemaining(x -> { dataNodeIds.add(x.value.getId()); });
+        clusterService.state().nodes().getDataNodes().values().iterator().forEachRemaining(x -> { dataNodeIds.add(x.getId()); });
         if (dataNodeIds.size() > 0)
             triggerUndeployModelsOnDataNodes(dataNodeIds);
     }

plugin/src/main/java/org/opensearch/ml/cluster/DiscoveryNodeHelper.java

@@ -18,8 +18,8 @@
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.ml.common.CommonValue;
 import org.opensearch.ml.utils.MLNodeUtils;
 

plugin/src/main/java/org/opensearch/ml/task/MLTaskManager.java

@@ -30,9 +30,9 @@
 import org.opensearch.action.update.UpdateRequest;
 import org.opensearch.action.update.UpdateResponse;
 import org.opensearch.client.Client;
-import org.opensearch.common.Strings;
 import org.opensearch.common.util.concurrent.ThreadContext;
 import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.ml.common.MLTask;

plugin/src/main/java/org/opensearch/ml/utils/RestActionUtils.java

@@ -20,9 +20,10 @@
 import org.opensearch.client.Client;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
+import org.opensearch.common.Nullable;
 import org.opensearch.commons.ConfigConstants;
 import org.opensearch.commons.authuser.User;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BytesRestResponse;
 import org.opensearch.rest.RestChannel;
 import org.opensearch.rest.RestRequest;
@@ -88,7 +89,7 @@ public static String getParameterId(RestRequest request, String idName) {
      * @return instance of {@link org.opensearch.search.fetch.subphase.FetchSourceContext}
      */
     public static FetchSourceContext getSourceContext(RestRequest request, SearchSourceBuilder searchSourceBuilder) {
-        String userAgent = Strings.coalesceToEmpty(request.header("User-Agent"));
+        String userAgent = coalesceToEmpty(request.header("User-Agent"));
         if (searchSourceBuilder.fetchSource() != null) {
             final String[] includes = searchSourceBuilder.fetchSource().includes();
             final String[] excludes = searchSourceBuilder.fetchSource().excludes();
@@ -167,6 +168,10 @@ public static Optional<String[]> splitCommaSeparatedParam(RestRequest request, S
         return Optional.ofNullable(request.param(paramName)).map(s -> s.split(","));
     }
 
+    private static String coalesceToEmpty(@Nullable String s) {
+        return s == null ? "" : s;
+    }
+
     public static Optional<String> getStringParam(RestRequest request, String paramName) {
         return Optional.ofNullable(request.param(paramName));
     }

plugin/src/test/java/org/opensearch/ml/autoredeploy/MLModelAutoReDeployerTests.java

@@ -18,10 +18,9 @@
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Consumer;
 
-import javax.swing.*;
-
 import org.apache.lucene.search.TotalHits;
 import org.junit.Before;
 import org.mockito.Mock;
@@ -38,7 +37,6 @@
 import org.opensearch.cluster.node.DiscoveryNodes;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.bytes.BytesReference;
-import org.opensearch.common.collect.ImmutableOpenMap;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.transport.TransportAddress;
@@ -355,7 +353,7 @@ public void test_undeployModelsOnDataNodes_success() throws Exception {
         DiscoveryNodes discoveryNodes = mock(DiscoveryNodes.class);
         DiscoveryNode dataNode = mock(DiscoveryNode.class);
         when(dataNode.getId()).thenReturn("mockDataNodeId");
-        ImmutableOpenMap<String, DiscoveryNode> dataNodes = ImmutableOpenMap.<String, DiscoveryNode>builder().fPut("0", dataNode).build();
+        final Map<String, DiscoveryNode> dataNodes = Map.of("0", dataNode);
         when(discoveryNodes.getDataNodes()).thenReturn(dataNodes);
         when(clusterState.nodes()).thenReturn(discoveryNodes);
 
@@ -398,7 +396,7 @@ public void test_undeployModelsOnDataNodes_undeployModel_failed() throws Excepti
         DiscoveryNodes discoveryNodes = mock(DiscoveryNodes.class);
         DiscoveryNode dataNode = mock(DiscoveryNode.class);
         when(dataNode.getId()).thenReturn("mockDataNodeId");
-        ImmutableOpenMap<String, DiscoveryNode> dataNodes = ImmutableOpenMap.<String, DiscoveryNode>builder().fPut("0", dataNode).build();
+        final Map<String, DiscoveryNode> dataNodes = Map.of("0", dataNode);
         when(discoveryNodes.getDataNodes()).thenReturn(dataNodes);
         when(clusterState.nodes()).thenReturn(discoveryNodes);
 
@@ -440,7 +438,7 @@ public void test_undeployModelsOnDataNodes_undeployModel_responseNull() throws E
         DiscoveryNodes discoveryNodes = mock(DiscoveryNodes.class);
         DiscoveryNode dataNode = mock(DiscoveryNode.class);
         when(dataNode.getId()).thenReturn("mockDataNodeId");
-        ImmutableOpenMap<String, DiscoveryNode> dataNodes = ImmutableOpenMap.<String, DiscoveryNode>builder().fPut("0", dataNode).build();
+        final Map<String, DiscoveryNode> dataNodes = Map.of("0", dataNode);
         when(discoveryNodes.getDataNodes()).thenReturn(dataNodes);
         when(clusterState.nodes()).thenReturn(discoveryNodes);
 
@@ -497,7 +495,7 @@ public void test_undeployModelsOnDataNodes_runOnMlNodesIsFalse_notRun() {
         DiscoveryNodes discoveryNodes = mock(DiscoveryNodes.class);
         DiscoveryNode dataNode = mock(DiscoveryNode.class);
         when(dataNode.getId()).thenReturn("mockDataNodeId");
-        ImmutableOpenMap<String, DiscoveryNode> dataNodes = ImmutableOpenMap.<String, DiscoveryNode>builder().fPut("0", dataNode).build();
+        final Map<String, DiscoveryNode> dataNodes = Map.of("0", dataNode);
         when(discoveryNodes.getDataNodes()).thenReturn(dataNodes);
         when(clusterState.nodes()).thenReturn(discoveryNodes);
 
@@ -634,10 +632,7 @@ private MLModel buildModelWithJsonFile(String file) throws Exception {
     private void mockClusterDataNodes(ClusterService clusterService) {
         ClusterState clusterState = mock(ClusterState.class);
         DiscoveryNodes discoveryNodes = mock(DiscoveryNodes.class);
-        ImmutableOpenMap<String, DiscoveryNode> dataNodes = ImmutableOpenMap
-            .<String, DiscoveryNode>builder(1)
-            .fPut("dataNodeId", mock(DiscoveryNode.class))
-            .build();
+        final Map<String, DiscoveryNode> dataNodes = Map.of("dataNodeId", mock(DiscoveryNode.class));
         when(discoveryNodes.getDataNodes()).thenReturn(dataNodes);
         when(discoveryNodes.getSize()).thenReturn(2); // a ml node join cluster.
         when(clusterState.nodes()).thenReturn(discoveryNodes);

plugin/src/test/java/org/opensearch/ml/rest/RestMLDeleteModelActionTests.java

@@ -21,8 +21,8 @@
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.delete.DeleteResponse;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.ml.common.transport.model.MLModelDeleteAction;
 import org.opensearch.ml.common.transport.model.MLModelDeleteRequest;

plugin/src/test/java/org/opensearch/ml/rest/RestMLDeleteModelGroupActionTests.java

@@ -23,8 +23,8 @@
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.delete.DeleteResponse;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.ml.common.transport.model_group.MLModelGroupDeleteAction;
 import org.opensearch.ml.common.transport.model_group.MLModelGroupDeleteRequest;

plugin/src/test/java/org/opensearch/ml/rest/RestMLDeleteTaskActionTests.java

@@ -21,8 +21,8 @@
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.delete.DeleteResponse;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.ml.common.transport.task.MLTaskDeleteAction;
 import org.opensearch.ml.common.transport.task.MLTaskDeleteRequest;

plugin/src/test/java/org/opensearch/ml/rest/RestMLDeployModelActionTests.java

@@ -17,10 +17,10 @@
 import org.mockito.Mock;
 import org.opensearch.action.ActionListener;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesArray;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.ml.common.transport.deploy.MLDeployModelAction;
 import org.opensearch.ml.common.transport.deploy.MLDeployModelRequest;

plugin/src/test/java/org/opensearch/ml/rest/RestMLExecuteActionTests.java

@@ -23,8 +23,8 @@
 import org.mockito.MockitoAnnotations;
 import org.opensearch.action.ActionListener;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.ml.common.FunctionName;
 import org.opensearch.ml.common.input.Input;
 import org.opensearch.ml.common.transport.execute.MLExecuteTaskAction;

plugin/src/test/java/org/opensearch/ml/rest/RestMLGetModelActionTests.java

@@ -22,8 +22,8 @@
 import org.mockito.Mock;
 import org.opensearch.action.ActionListener;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.ml.common.transport.model.MLModelGetAction;
 import org.opensearch.ml.common.transport.model.MLModelGetRequest;

plugin/src/test/java/org/opensearch/ml/rest/RestMLGetTaskActionTests.java

@@ -20,8 +20,8 @@
 import org.mockito.Mock;
 import org.opensearch.action.ActionListener;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.ml.common.transport.task.*;
 import org.opensearch.rest.RestChannel;

plugin/src/test/java/org/opensearch/ml/rest/RestMLPredictionActionTests.java

@@ -25,8 +25,8 @@
 import org.mockito.MockitoAnnotations;
 import org.opensearch.action.ActionListener;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.ml.common.FunctionName;
 import org.opensearch.ml.common.MLModel;
 import org.opensearch.ml.common.input.MLInput;

plugin/src/test/java/org/opensearch/ml/rest/RestMLProfileActionTests.java

@@ -39,11 +39,11 @@
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.node.DiscoveryNodeRole;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.commons.authuser.User;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.ml.action.profile.MLProfileAction;
 import org.opensearch.ml.action.profile.MLProfileNodeResponse;

plugin/src/test/java/org/opensearch/ml/rest/RestMLRegisterModelActionTests.java

@@ -28,11 +28,11 @@
 import org.opensearch.action.ActionListener;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesArray;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.ml.common.transport.model.MLModelGetResponse;
 import org.opensearch.ml.common.transport.register.MLRegisterModelAction;

plugin/src/test/java/org/opensearch/ml/rest/RestMLRegisterModelGroupActionTests.java

@@ -25,10 +25,10 @@
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.get.GetResponse;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesArray;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.ml.common.transport.model_group.MLRegisterModelGroupAction;
 import org.opensearch.ml.common.transport.model_group.MLRegisterModelGroupInput;

plugin/src/test/java/org/opensearch/ml/rest/RestMLRegisterModelMetaActionTests.java

@@ -26,11 +26,11 @@
 import org.opensearch.action.ActionListener;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesArray;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.ml.common.transport.model.MLModelGetResponse;
 import org.opensearch.ml.common.transport.upload_chunk.MLRegisterModelMetaAction;

plugin/src/test/java/org/opensearch/ml/rest/RestMLSearchModelActionTests.java

@@ -30,9 +30,9 @@
 import org.opensearch.action.search.SearchResponseSections;
 import org.opensearch.action.search.ShardSearchFailure;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.ml.common.transport.model.MLModelSearchAction;
 import org.opensearch.ml.utils.TestHelper;

plugin/src/test/java/org/opensearch/ml/rest/RestMLSearchModelGroupActionTests.java

@@ -30,9 +30,9 @@
 import org.opensearch.action.search.SearchResponseSections;
 import org.opensearch.action.search.ShardSearchFailure;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.ml.common.transport.model_group.MLModelGroupSearchAction;
 import org.opensearch.ml.utils.TestHelper;

plugin/src/test/java/org/opensearch/ml/rest/RestMLSearchTaskActionTests.java

@@ -9,7 +9,7 @@
 
 import org.hamcrest.Matchers;
 import org.junit.Before;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.RestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.test.OpenSearchTestCase;

plugin/src/test/java/org/opensearch/ml/rest/RestMLTrainAndPredictActionTests.java

@@ -22,8 +22,8 @@
 import org.mockito.MockitoAnnotations;
 import org.opensearch.action.ActionListener;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.ml.common.MLTaskState;
 import org.opensearch.ml.common.input.MLInput;
 import org.opensearch.ml.common.output.MLTrainingOutput;

plugin/src/test/java/org/opensearch/ml/rest/RestMLTrainingActionTests.java

@@ -25,8 +25,8 @@
 import org.mockito.MockitoAnnotations;
 import org.opensearch.action.ActionListener;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.ml.common.MLTaskState;
 import org.opensearch.ml.common.input.MLInput;
 import org.opensearch.ml.common.output.MLTrainingOutput;

plugin/src/test/java/org/opensearch/ml/rest/RestMLUndeployModelActionTests.java

@@ -28,11 +28,11 @@
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesArray;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.ml.common.transport.model.MLModelGetResponse;
 import org.opensearch.ml.common.transport.undeploy.MLUndeployModelsAction;

plugin/src/test/java/org/opensearch/ml/rest/RestMLUpdateModelGroupActionTests.java

@@ -26,10 +26,10 @@
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.get.GetResponse;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesArray;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.ml.common.transport.model_group.MLUpdateModelGroupAction;
 import org.opensearch.ml.common.transport.model_group.MLUpdateModelGroupInput;

plugin/src/test/java/org/opensearch/ml/rest/RestMLUploadModelChunkActionTests.java

@@ -25,10 +25,10 @@
 import org.opensearch.action.ActionListener;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesArray;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.ml.common.transport.model.MLModelGetResponse;
 import org.opensearch.ml.common.transport.upload_chunk.MLUploadModelChunkAction;