diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/ClusterRequestConverters.java b/client/rest-high-level/src/main/java/org/opensearch/client/ClusterRequestConverters.java
index 4ff8e75b521b6..221c5a986e4dc 100644
--- a/client/rest-high-level/src/main/java/org/opensearch/client/ClusterRequestConverters.java
+++ b/client/rest-high-level/src/main/java/org/opensearch/client/ClusterRequestConverters.java
@@ -45,7 +45,7 @@
 import org.opensearch.client.indices.DeleteComponentTemplateRequest;
 import org.opensearch.client.indices.GetComponentTemplatesRequest;
 import org.opensearch.client.indices.PutComponentTemplateRequest;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 
diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/IndicesRequestConverters.java b/client/rest-high-level/src/main/java/org/opensearch/client/IndicesRequestConverters.java
index ca9154340a660..cff5a06f94271 100644
--- a/client/rest-high-level/src/main/java/org/opensearch/client/IndicesRequestConverters.java
+++ b/client/rest-high-level/src/main/java/org/opensearch/client/IndicesRequestConverters.java
@@ -73,7 +73,7 @@
 import org.opensearch.client.indices.SimulateIndexTemplateRequest;
 import org.opensearch.client.indices.rollover.RolloverRequest;
 import org.opensearch.cluster.metadata.IndexMetadata;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 import java.util.Locale;
diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java b/client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java
index 13845677cae54..d2d76522a0ce3 100644
--- a/client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java
+++ b/client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java
@@ -72,7 +72,6 @@
 import org.opensearch.cluster.health.ClusterHealthStatus;
 import org.opensearch.common.Nullable;
 import org.opensearch.common.Priority;
-import org.opensearch.common.Strings;
 import org.opensearch.common.SuppressForbidden;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.lucene.uid.Versions;
@@ -80,6 +79,7 @@
 import org.opensearch.common.util.CollectionUtils;
 import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.DeprecationHandler;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.ToXContent;
@@ -220,7 +220,7 @@ static Request bulk(BulkRequest bulkRequest) throws IOException {
 
                     if (opType == DocWriteRequest.OpType.INDEX || opType == DocWriteRequest.OpType.CREATE) {
                         IndexRequest indexRequest = (IndexRequest) action;
-                        if (Strings.hasLength(indexRequest.getPipeline())) {
+                        if (org.opensearch.core.common.Strings.hasLength(indexRequest.getPipeline())) {
                             metadata.field("pipeline", indexRequest.getPipeline());
                         }
                     } else if (opType == DocWriteRequest.OpType.UPDATE) {
@@ -338,7 +338,7 @@ static Request multiGet(MultiGetRequest multiGetRequest) throws IOException {
     }
 
     static Request index(IndexRequest indexRequest) {
-        String method = Strings.hasLength(indexRequest.id()) ? HttpPut.METHOD_NAME : HttpPost.METHOD_NAME;
+        String method = org.opensearch.core.common.Strings.hasLength(indexRequest.id()) ? HttpPut.METHOD_NAME : HttpPost.METHOD_NAME;
 
         String endpoint;
         if (indexRequest.opType() == DocWriteRequest.OpType.CREATE) {
@@ -747,7 +747,7 @@ static Request putScript(PutStoredScriptRequest putStoredScriptRequest) throws I
         Params params = new Params();
         params.withTimeout(putStoredScriptRequest.timeout());
         params.withClusterManagerTimeout(putStoredScriptRequest.clusterManagerNodeTimeout());
-        if (Strings.hasText(putStoredScriptRequest.context())) {
+        if (org.opensearch.core.common.Strings.hasText(putStoredScriptRequest.context())) {
             params.putParam("context", putStoredScriptRequest.context());
         }
         request.addParameters(params.asMap());
@@ -903,7 +903,7 @@ static class Params {
         Params() {}
 
         Params putParam(String name, String value) {
-            if (Strings.hasLength(value)) {
+            if (org.opensearch.core.common.Strings.hasLength(value)) {
                 parameters.put(name, value);
             }
             return this;
@@ -1298,7 +1298,7 @@ static class EndpointBuilder {
 
         EndpointBuilder addPathPart(String... parts) {
             for (String part : parts) {
-                if (Strings.hasLength(part)) {
+                if (org.opensearch.core.common.Strings.hasLength(part)) {
                     joiner.add(encodePart(part));
                 }
             }
@@ -1317,7 +1317,7 @@ EndpointBuilder addCommaSeparatedPathParts(List<String> parts) {
 
         EndpointBuilder addPathPartAsIs(String... parts) {
             for (String part : parts) {
-                if (Strings.hasLength(part)) {
+                if (org.opensearch.core.common.Strings.hasLength(part)) {
                     joiner.add(part);
                 }
             }
diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/SnapshotRequestConverters.java b/client/rest-high-level/src/main/java/org/opensearch/client/SnapshotRequestConverters.java
index 263d7db82ba08..91d87e87fc14a 100644
--- a/client/rest-high-level/src/main/java/org/opensearch/client/SnapshotRequestConverters.java
+++ b/client/rest-high-level/src/main/java/org/opensearch/client/SnapshotRequestConverters.java
@@ -47,7 +47,7 @@
 import org.opensearch.action.admin.cluster.snapshots.get.GetSnapshotsRequest;
 import org.opensearch.action.admin.cluster.snapshots.restore.RestoreSnapshotRequest;
 import org.opensearch.action.admin.cluster.snapshots.status.SnapshotsStatusRequest;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 
diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/core/CountRequest.java b/client/rest-high-level/src/main/java/org/opensearch/client/core/CountRequest.java
index ec81c5f343b92..22be6c2e7ac9d 100644
--- a/client/rest-high-level/src/main/java/org/opensearch/client/core/CountRequest.java
+++ b/client/rest-high-level/src/main/java/org/opensearch/client/core/CountRequest.java
@@ -36,7 +36,7 @@
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.IndicesRequest;
 import org.opensearch.action.support.IndicesOptions;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/indices/DetailAnalyzeResponse.java b/client/rest-high-level/src/main/java/org/opensearch/client/indices/DetailAnalyzeResponse.java
index 5cb39d856d42a..c2ac8169b0a4e 100644
--- a/client/rest-high-level/src/main/java/org/opensearch/client/indices/DetailAnalyzeResponse.java
+++ b/client/rest-high-level/src/main/java/org/opensearch/client/indices/DetailAnalyzeResponse.java
@@ -32,8 +32,8 @@
 
 package org.opensearch.client.indices;
 
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.ParseField;
-import org.opensearch.common.Strings;
 import org.opensearch.core.xcontent.ConstructingObjectParser;
 import org.opensearch.core.xcontent.XContentParser;
 
diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetFieldMappingsRequest.java b/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetFieldMappingsRequest.java
index 19792001170f3..70eae3a360005 100644
--- a/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetFieldMappingsRequest.java
+++ b/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetFieldMappingsRequest.java
@@ -34,7 +34,7 @@
 
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.Validatable;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 
 /** Request the mappings of specific fields */
 public class GetFieldMappingsRequest implements Validatable {
diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetIndexTemplatesRequest.java b/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetIndexTemplatesRequest.java
index c1bf001e525b3..dc1759a7272e8 100644
--- a/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetIndexTemplatesRequest.java
+++ b/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetIndexTemplatesRequest.java
@@ -35,8 +35,8 @@
 import org.opensearch.client.TimedRequest;
 import org.opensearch.client.Validatable;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetMappingsRequest.java b/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetMappingsRequest.java
index e049e70c7587c..2e5b0cb89cedb 100644
--- a/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetMappingsRequest.java
+++ b/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetMappingsRequest.java
@@ -34,7 +34,7 @@
 
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.TimedRequest;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 
 public class GetMappingsRequest extends TimedRequest {
 
diff --git a/client/rest-high-level/src/main/resources/forbidden/rest-high-level-signatures.txt b/client/rest-high-level/src/main/resources/forbidden/rest-high-level-signatures.txt
index 0d7749b39fb91..e9e793aa9a783 100644
--- a/client/rest-high-level/src/main/resources/forbidden/rest-high-level-signatures.txt
+++ b/client/rest-high-level/src/main/resources/forbidden/rest-high-level-signatures.txt
@@ -22,7 +22,7 @@ org.apache.hc.core5.http.ContentType#create(java.lang.String,java.nio.charset.Ch
 @defaultMessage ES's logging infrastructure uses log4j2 which we don't want to force on high level rest client users
 org.opensearch.common.logging.DeprecationLogger
 org.opensearch.common.logging.LogConfigurator
-org.opensearch.common.logging.LoggerMessageFormat
+org.opensearch.core.common.logging.LoggerMessageFormat
 org.opensearch.common.logging.Loggers
 org.opensearch.common.logging.NodeNamePatternConverter
 org.opensearch.common.logging.PrefixLogger
diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/CrudIT.java b/client/rest-high-level/src/test/java/org/opensearch/client/CrudIT.java
index 86efeb5d84b10..06a6fb6802e3c 100644
--- a/client/rest-high-level/src/test/java/org/opensearch/client/CrudIT.java
+++ b/client/rest-high-level/src/test/java/org/opensearch/client/CrudIT.java
@@ -58,11 +58,11 @@
 import org.opensearch.client.core.TermVectorsRequest;
 import org.opensearch.client.core.TermVectorsResponse;
 import org.opensearch.client.indices.GetIndexRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.ByteSizeUnit;
 import org.opensearch.common.unit.ByteSizeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.common.xcontent.XContentType;
diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/IndicesClientIT.java b/client/rest-high-level/src/test/java/org/opensearch/client/IndicesClientIT.java
index 3bde19ec7625b..524a300963b72 100644
--- a/client/rest-high-level/src/test/java/org/opensearch/client/IndicesClientIT.java
+++ b/client/rest-high-level/src/test/java/org/opensearch/client/IndicesClientIT.java
@@ -107,7 +107,6 @@
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.metadata.MappingMetadata;
 import org.opensearch.cluster.metadata.Template;
-import org.opensearch.common.Strings;
 import org.opensearch.common.ValidationException;
 import org.opensearch.common.bytes.BytesArray;
 import org.opensearch.common.compress.CompressedXContent;
@@ -116,6 +115,7 @@
 import org.opensearch.common.unit.ByteSizeUnit;
 import org.opensearch.common.unit.ByteSizeValue;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.common.xcontent.XContentType;
diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/IndicesRequestConvertersTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/IndicesRequestConvertersTests.java
index 7ed06129dc893..2ad9ee0ed1be1 100644
--- a/client/rest-high-level/src/test/java/org/opensearch/client/IndicesRequestConvertersTests.java
+++ b/client/rest-high-level/src/test/java/org/opensearch/client/IndicesRequestConvertersTests.java
@@ -72,11 +72,11 @@
 import org.opensearch.client.indices.ResizeRequest;
 import org.opensearch.client.indices.rollover.RolloverRequest;
 import org.opensearch.common.CheckedFunction;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.CollectionUtils;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.Strings;
 import org.opensearch.test.OpenSearchTestCase;
 import org.junit.Assert;
 import org.opensearch.common.unit.ByteSizeValue;
diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/RequestConvertersTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/RequestConvertersTests.java
index bc7286f0b0e08..dc18bc050ce38 100644
--- a/client/rest-high-level/src/test/java/org/opensearch/client/RequestConvertersTests.java
+++ b/client/rest-high-level/src/test/java/org/opensearch/client/RequestConvertersTests.java
@@ -65,7 +65,6 @@
 import org.opensearch.client.core.TermVectorsRequest;
 import org.opensearch.client.indices.AnalyzeRequest;
 import org.opensearch.common.CheckedBiConsumer;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesArray;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.collect.Tuple;
@@ -73,12 +72,13 @@
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.lucene.uid.Versions;
 import org.opensearch.common.unit.TimeValue;
-import org.opensearch.core.xcontent.ToXContent;
-import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentHelper;
-import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.common.xcontent.json.JsonXContent;
+import org.opensearch.core.common.Strings;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.VersionType;
 import org.opensearch.index.mapper.MapperService;
 import org.opensearch.index.query.MatchAllQueryBuilder;
@@ -1074,7 +1074,7 @@ public void testSearch() throws Exception {
         Request request = RequestConverters.search(searchRequest, searchEndpoint);
         StringJoiner endpoint = new StringJoiner("/", "/", "");
         String index = String.join(",", indices);
-        if (Strings.hasLength(index)) {
+        if (org.opensearch.core.common.Strings.hasLength(index)) {
             endpoint.add(index);
         }
         endpoint.add(searchEndpoint);
@@ -1179,7 +1179,7 @@ public void testCount() throws Exception {
         Request request = RequestConverters.count(countRequest);
         StringJoiner endpoint = new StringJoiner("/", "/", "");
         String index = String.join(",", indices);
-        if (Strings.hasLength(index)) {
+        if (org.opensearch.core.common.Strings.hasLength(index)) {
             endpoint.add(index);
         }
         endpoint.add("_count");
@@ -1316,7 +1316,7 @@ public void testCreatePit() throws IOException {
         Request request = RequestConverters.createPit(createPitRequest);
         StringJoiner endpoint = new StringJoiner("/", "/", "");
         String index = String.join(",", indices);
-        if (Strings.hasLength(index)) {
+        if (org.opensearch.core.common.Strings.hasLength(index)) {
             endpoint.add(index);
         }
         endpoint.add("_search/point_in_time");
@@ -1371,7 +1371,7 @@ public void testSearchTemplate() throws Exception {
         Request request = RequestConverters.searchTemplate(searchTemplateRequest);
         StringJoiner endpoint = new StringJoiner("/", "/", "");
         String index = String.join(",", indices);
-        if (Strings.hasLength(index)) {
+        if (org.opensearch.core.common.Strings.hasLength(index)) {
             endpoint.add(index);
         }
         endpoint.add("_search/template");
@@ -1613,7 +1613,7 @@ public void testFieldCaps() throws IOException {
         // a hash set before being added to the request, and can appear in a
         // non-deterministic order.
         assertThat(request.getParameters(), hasKey("fields"));
-        String[] requestFields = Strings.splitStringByCommaToArray(request.getParameters().get("fields"));
+        String[] requestFields = org.opensearch.core.common.Strings.splitStringByCommaToArray(request.getParameters().get("fields"));
         assertEquals(new HashSet<>(Arrays.asList(fields)), new HashSet<>(Arrays.asList(requestFields)));
 
         for (Map.Entry<String, String> param : indicesOptionsParams.entrySet()) {
@@ -1653,7 +1653,7 @@ public void testFieldCapsWithIndexFilter() throws IOException {
         // a hash set before being added to the request, and can appear in a
         // non-deterministic order.
         assertThat(request.getParameters(), hasKey("fields"));
-        String[] requestFields = Strings.splitStringByCommaToArray(request.getParameters().get("fields"));
+        String[] requestFields = org.opensearch.core.common.Strings.splitStringByCommaToArray(request.getParameters().get("fields"));
         assertEquals(new HashSet<>(Arrays.asList(fields)), new HashSet<>(Arrays.asList(requestFields)));
 
         for (Map.Entry<String, String> param : indicesOptionsParams.entrySet()) {
@@ -1681,7 +1681,7 @@ public void testRankEval() throws Exception {
         Request request = RequestConverters.rankEval(rankEvalRequest);
         StringJoiner endpoint = new StringJoiner("/", "/", "");
         String index = String.join(",", indices);
-        if (Strings.hasLength(index)) {
+        if (org.opensearch.core.common.Strings.hasLength(index)) {
             endpoint.add(index);
         }
         endpoint.add(RestRankEvalAction.ENDPOINT);
diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/indices/CloseIndexRequestTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/indices/CloseIndexRequestTests.java
index 15ae0bbca910a..1b93c478fcb7d 100644
--- a/client/rest-high-level/src/test/java/org/opensearch/client/indices/CloseIndexRequestTests.java
+++ b/client/rest-high-level/src/test/java/org/opensearch/client/indices/CloseIndexRequestTests.java
@@ -35,8 +35,8 @@
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.TimedRequest;
 import org.opensearch.client.ValidationException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.util.Optional;
diff --git a/libs/common/src/test/java/org/opensearch/bootstrap/JarHellTests.java b/libs/common/src/test/java/org/opensearch/bootstrap/JarHellTests.java
index 57f5f393ce49f..d1851850e78e1 100644
--- a/libs/common/src/test/java/org/opensearch/bootstrap/JarHellTests.java
+++ b/libs/common/src/test/java/org/opensearch/bootstrap/JarHellTests.java
@@ -32,8 +32,8 @@
 
 package org.opensearch.bootstrap;
 
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.PathUtils;
+import org.opensearch.core.common.Strings;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.io.IOException;
diff --git a/libs/core/src/main/java/org/opensearch/BaseExceptionsHelper.java b/libs/core/src/main/java/org/opensearch/BaseExceptionsHelper.java
new file mode 100644
index 0000000000000..01efa58017609
--- /dev/null
+++ b/libs/core/src/main/java/org/opensearch/BaseExceptionsHelper.java
@@ -0,0 +1,120 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+package org.opensearch;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opensearch.core.concurrency.OpenSearchRejectedExecutionException;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+/**
+ * Base helper class for OpenSearch Exceptions
+ *
+ * @opensearch.internal
+ */
+public abstract class BaseExceptionsHelper {
+    protected static final Logger logger = LogManager.getLogger(BaseExceptionsHelper.class);
+
+    public static Throwable unwrapCause(Throwable t) {
+        int counter = 0;
+        Throwable result = t;
+        while (result instanceof OpenSearchWrapperException) {
+            if (result.getCause() == null) {
+                return result;
+            }
+            if (result.getCause() == result) {
+                return result;
+            }
+            if (counter++ > 10) {
+                // dear god, if we got more than 10 levels down, WTF? just bail
+                logger.warn("Exception cause unwrapping ran for 10 levels...", t);
+                return result;
+            }
+            result = result.getCause();
+        }
+        return result;
+    }
+
+    /**
+     * @deprecated Don't swallow exceptions, allow them to propagate.
+     */
+    @Deprecated
+    public static String detailedMessage(Throwable t) {
+        if (t == null) {
+            return "Unknown";
+        }
+        if (t.getCause() != null) {
+            StringBuilder sb = new StringBuilder();
+            while (t != null) {
+                sb.append(t.getClass().getSimpleName());
+                if (t.getMessage() != null) {
+                    sb.append("[");
+                    sb.append(t.getMessage());
+                    sb.append("]");
+                }
+                sb.append("; ");
+                t = t.getCause();
+                if (t != null) {
+                    sb.append("nested: ");
+                }
+            }
+            return sb.toString();
+        } else {
+            return t.getClass().getSimpleName() + "[" + t.getMessage() + "]";
+        }
+    }
+
+    public static String stackTrace(Throwable e) {
+        StringWriter stackTraceStringWriter = new StringWriter();
+        PrintWriter printWriter = new PrintWriter(stackTraceStringWriter);
+        e.printStackTrace(printWriter);
+        return stackTraceStringWriter.toString();
+    }
+
+    public static String summaryMessage(Throwable t) {
+        if (t != null) {
+            if (t instanceof BaseOpenSearchException) {
+                return t.getClass().getSimpleName() + "[" + t.getMessage() + "]";
+            } else if (t instanceof IllegalArgumentException) {
+                return "Invalid argument";
+            } else if (t instanceof JsonParseException) {
+                return "Failed to parse JSON";
+            } else if (t instanceof OpenSearchRejectedExecutionException) {
+                return "Too many requests";
+            }
+        }
+        return "Internal failure";
+    }
+}
diff --git a/libs/core/src/main/java/org/opensearch/BaseOpenSearchException.java b/libs/core/src/main/java/org/opensearch/BaseOpenSearchException.java
new file mode 100644
index 0000000000000..26bf319b0ae15
--- /dev/null
+++ b/libs/core/src/main/java/org/opensearch/BaseOpenSearchException.java
@@ -0,0 +1,599 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
+package org.opensearch;
+
+import org.opensearch.common.Nullable;
+import org.opensearch.core.ParseField;
+import org.opensearch.core.common.Strings;
+import org.opensearch.core.common.logging.LoggerMessageFormat;
+import org.opensearch.core.xcontent.ToXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParseException;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static java.util.Collections.emptyMap;
+import static java.util.Collections.singletonMap;
+
+/**
+ * A core library base class for all opensearch exceptions.
+ *
+ * @opensearch.internal
+ */
+public abstract class BaseOpenSearchException extends RuntimeException {
+
+    /**
+     * Passed in the {@link ToXContent.Params} of {@link #generateThrowableXContent(XContentBuilder, ToXContent.Params, Throwable)}
+     * to control if the {@code stack_trace} element should render. Unlike most parameters to {@code toXContent} methods this parameter is
+     * internal only and not available as a URL parameter. Use the {@code error_trace} parameter instead.
+     */
+    public static final String REST_EXCEPTION_SKIP_STACK_TRACE = "rest.exception.stacktrace.skip";
+    public static final boolean REST_EXCEPTION_SKIP_STACK_TRACE_DEFAULT = true;
+    public static final String STACK_TRACE = "stack_trace";
+    protected static final String OPENSEARCH_PREFIX_KEY = "opensearch.";
+    /**
+     * Passed in the {@link ToXContent.Params} of {@link #generateThrowableXContent(XContentBuilder, ToXContent.Params, Throwable)}
+     * to control if the {@code caused_by} element should render. Unlike most parameters to {@code toXContent} methods this parameter is
+     * internal only and not available as a URL parameter.
+     */
+    protected static final String REST_EXCEPTION_SKIP_CAUSE = "rest.exception.cause.skip";
+    protected static final String TYPE = "type";
+    protected static final String REASON = "reason";
+    protected static final String CAUSED_BY = "caused_by";
+    protected static final ParseField SUPPRESSED = new ParseField("suppressed");
+    protected static final String HEADER = "header";
+    protected static final String ERROR = "error";
+    protected static final String ROOT_CAUSE = "root_cause";
+    protected static final String RESOURCE_METADATA_TYPE_KEY = "opensearch.resource.type";
+    protected static final String RESOURCE_METADATA_ID_KEY = "opensearch.resource.id";
+    protected static final Version UNKNOWN_VERSION_ADDED = Version.fromId(0);
+    protected static final String INDEX_METADATA_KEY = "opensearch.index";
+    protected static final String SHARD_METADATA_KEY = "opensearch.shard";
+    protected static final String INDEX_METADATA_KEY_UUID = "opensearch.index_uuid";
+    private static final boolean REST_EXCEPTION_SKIP_CAUSE_DEFAULT = false;
+    protected final Map<String, List<String>> metadata = new HashMap<>();
+    protected final Map<String, List<String>> headers = new HashMap<>();
+
+    /**
+     * Construct a <code>BaseOpenSearchException</code> with the specified cause exception.
+     */
+    public BaseOpenSearchException(Throwable cause) {
+        super(cause);
+    }
+
+    /**
+     * Construct a <code>OpenSearchException</code> with the specified detail message.
+     *
+     * The message can be parameterized using <code>{}</code> as placeholders for the given
+     * arguments
+     *
+     * @param msg  the detail message
+     * @param args the arguments for the message
+     */
+    public BaseOpenSearchException(String msg, Object... args) {
+        super(LoggerMessageFormat.format(msg, args));
+    }
+
+    /**
+     * Construct a <code>OpenSearchException</code> with the specified detail message
+     * and nested exception.
+     *
+     * The message can be parameterized using <code>{}</code> as placeholders for the given
+     * arguments
+     *
+     * @param msg   the detail message
+     * @param cause the nested exception
+     * @param args  the arguments for the message
+     */
+    public BaseOpenSearchException(String msg, Throwable cause, Object... args) {
+        super(LoggerMessageFormat.format(msg, args), cause);
+    }
+
+    protected static void innerToXContent(
+        XContentBuilder builder,
+        ToXContent.Params params,
+        Throwable throwable,
+        String type,
+        String message,
+        Map<String, List<String>> headers,
+        Map<String, List<String>> metadata,
+        Throwable cause
+    ) throws IOException {
+        builder.field(TYPE, type);
+        builder.field(REASON, message);
+
+        for (Map.Entry<String, List<String>> entry : metadata.entrySet()) {
+            headerToXContent(builder, entry.getKey().substring(OPENSEARCH_PREFIX_KEY.length()), entry.getValue());
+        }
+
+        if (throwable instanceof BaseOpenSearchException) {
+            BaseOpenSearchException exception = (BaseOpenSearchException) throwable;
+            exception.metadataToXContent(builder, params);
+        }
+
+        if (params.paramAsBoolean(REST_EXCEPTION_SKIP_CAUSE, REST_EXCEPTION_SKIP_CAUSE_DEFAULT) == false) {
+            if (cause != null) {
+                builder.field(CAUSED_BY);
+                builder.startObject();
+                BaseOpenSearchException.generateThrowableXContent(builder, params, cause);
+                builder.endObject();
+            }
+        }
+
+        if (headers.isEmpty() == false) {
+            builder.startObject(HEADER);
+            for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
+                headerToXContent(builder, entry.getKey(), entry.getValue());
+            }
+            builder.endObject();
+        }
+
+        if (params.paramAsBoolean(REST_EXCEPTION_SKIP_STACK_TRACE, REST_EXCEPTION_SKIP_STACK_TRACE_DEFAULT) == false) {
+            builder.field(STACK_TRACE, BaseExceptionsHelper.stackTrace(throwable));
+        }
+
+        Throwable[] allSuppressed = throwable.getSuppressed();
+        if (allSuppressed.length > 0) {
+            builder.startArray(SUPPRESSED.getPreferredName());
+            for (Throwable suppressed : allSuppressed) {
+                builder.startObject();
+                BaseOpenSearchException.generateThrowableXContent(builder, params, suppressed);
+                builder.endObject();
+            }
+            builder.endArray();
+        }
+    }
+
+    /**
+     * Static toXContent helper method that renders {@link BaseOpenSearchException} or {@link Throwable} instances
+     * as XContent, delegating the rendering to {@link #toXContent(XContentBuilder, ToXContent.Params)}
+     * or {@link #innerToXContent(XContentBuilder, ToXContent.Params, Throwable, String, String, Map, Map, Throwable)}.
+     *
+     * This method is usually used when the {@link Throwable} is rendered as a part of another XContent object, and its result can
+     * be parsed back using the {@code OpenSearchException.fromXContent(XContentParser)} method.
+     */
+    public static void generateThrowableXContent(XContentBuilder builder, ToXContent.Params params, Throwable t) throws IOException {
+        t = BaseExceptionsHelper.unwrapCause(t);
+
+        if (t instanceof BaseOpenSearchException) {
+            ((BaseOpenSearchException) t).toXContent(builder, params);
+        } else {
+            BaseOpenSearchException.innerToXContent(
+                builder,
+                params,
+                t,
+                BaseOpenSearchException.getExceptionName(t),
+                t.getMessage(),
+                emptyMap(),
+                emptyMap(),
+                t.getCause()
+            );
+        }
+    }
+
+    /**
+     * Returns an underscore case name for the given exception. This method strips {@code OpenSearch} prefixes from exception names.
+     */
+    public static String getExceptionName(Throwable ex) {
+        String simpleName = ex.getClass().getSimpleName();
+        if (simpleName.startsWith("OpenSearch")) {
+            simpleName = simpleName.substring("OpenSearch".length());
+        }
+        // TODO: do we really need to make the exception name in underscore casing?
+        return BaseOpenSearchException.toUnderscoreCase(simpleName);
+    }
+
+    // lower cases and adds underscores to transitions in a name
+    private static String toUnderscoreCase(String value) {
+        StringBuilder sb = new StringBuilder();
+        boolean changed = false;
+        for (int i = 0; i < value.length(); i++) {
+            char c = value.charAt(i);
+            if (Character.isUpperCase(c)) {
+                if (!changed) {
+                    // copy it over here
+                    for (int j = 0; j < i; j++) {
+                        sb.append(value.charAt(j));
+                    }
+                    changed = true;
+                    if (i == 0) {
+                        sb.append(Character.toLowerCase(c));
+                    } else {
+                        sb.append('_');
+                        sb.append(Character.toLowerCase(c));
+                    }
+                } else {
+                    sb.append('_');
+                    sb.append(Character.toLowerCase(c));
+                }
+            } else {
+                if (changed) {
+                    sb.append(c);
+                }
+            }
+        }
+        if (!changed) {
+            return value;
+        }
+        return sb.toString();
+    }
+
+    /**
+     * Render any exception as a xcontent, encapsulated within a field or object named "error". The level of details that are rendered
+     * depends on the value of the "detailed" parameter: when it's false only a simple message based on the type and message of the
+     * exception is rendered. When it's true all detail are provided including guesses root causes, cause and potentially stack
+     * trace.
+     *
+     * This method is usually used when the {@link Exception} is rendered as a full XContent object, and its output can be parsed
+     * by the {@code #OpenSearchException.failureFromXContent(XContentParser)} method.
+     */
+    public static void generateFailureXContent(XContentBuilder builder, ToXContent.Params params, @Nullable Exception e, boolean detailed)
+        throws IOException {
+        // No exception to render as an error
+        if (e == null) {
+            builder.field(ERROR, "unknown");
+            return;
+        }
+
+        // Render the exception with a simple message
+        if (detailed == false) {
+            Throwable t = e;
+            for (int counter = 0; counter < 10 && t != null; counter++) {
+                if (t instanceof BaseOpenSearchException) {
+                    break;
+                }
+                t = t.getCause();
+            }
+            builder.field(ERROR, BaseExceptionsHelper.summaryMessage(t != null ? t : e));
+            return;
+        }
+
+        // Render the exception with all details
+        final BaseOpenSearchException[] rootCauses = BaseOpenSearchException.guessRootCauses(e);
+        builder.startObject(ERROR);
+        {
+            builder.startArray(ROOT_CAUSE);
+            for (BaseOpenSearchException rootCause : rootCauses) {
+                builder.startObject();
+                rootCause.toXContent(builder, new ToXContent.DelegatingMapParams(singletonMap(REST_EXCEPTION_SKIP_CAUSE, "true"), params));
+                builder.endObject();
+            }
+            builder.endArray();
+        }
+        generateThrowableXContent(builder, params, e);
+        builder.endObject();
+    }
+
+    /**
+     * Returns the root cause of this exception or multiple if different shards caused different exceptions.
+     * If the given exception is not an instance of {@link BaseOpenSearchException} an empty array
+     * is returned.
+     */
+    public static BaseOpenSearchException[] guessRootCauses(Throwable t) {
+        Throwable ex = BaseExceptionsHelper.unwrapCause(t);
+        if (ex instanceof BaseOpenSearchException) {
+            // OpenSearchException knows how to guess its own root cause
+            return ((BaseOpenSearchException) ex).guessRootCauses();
+        }
+        if (ex instanceof XContentParseException) {
+            /*
+             * We'd like to unwrap parsing exceptions to the inner-most
+             * parsing exception because that is generally the most interesting
+             * exception to return to the user. If that exception is caused by
+             * an OpenSearchException we'd like to keep unwrapping because
+             * OpenSearchException instances tend to contain useful information
+             * for the user.
+             */
+            Throwable cause = ex.getCause();
+            if (cause != null) {
+                if (cause instanceof XContentParseException || cause instanceof BaseOpenSearchException) {
+                    return BaseOpenSearchException.guessRootCauses(ex.getCause());
+                }
+            }
+        }
+        return new BaseOpenSearchException[] { new BaseOpenSearchException(ex.getMessage(), ex) {
+            @Override
+            protected String getExceptionName() {
+                return BaseOpenSearchException.getExceptionName(getCause());
+            }
+        } };
+    }
+
+    static String buildMessage(String type, String reason, String stack) {
+        StringBuilder message = new StringBuilder("OpenSearch exception [");
+        message.append(TYPE).append('=').append(type).append(", ");
+        message.append(REASON).append('=').append(reason);
+        if (stack != null) {
+            message.append(", ").append(STACK_TRACE).append('=').append(stack);
+        }
+        message.append(']');
+        return message.toString();
+    }
+
+    /**
+     * Adds a new piece of metadata with the given key.
+     * If the provided key is already present, the corresponding metadata will be replaced
+     */
+    public void addMetadata(String key, String... values) {
+        addMetadata(key, Arrays.asList(values));
+    }
+
+    /**
+     * Adds a new piece of metadata with the given key.
+     * If the provided key is already present, the corresponding metadata will be replaced
+     */
+    public void addMetadata(String key, List<String> values) {
+        // we need to enforce this otherwise bw comp doesn't work properly, as "opensearch."
+        // was the previous criteria to split headers in two sets
+        if (key.startsWith(OPENSEARCH_PREFIX_KEY) == false) {
+            throw new IllegalArgumentException("exception metadata must start with [opensearch.], found [" + key + "] instead");
+        }
+        this.metadata.put(key, values);
+    }
+
+    /**
+     * Returns a set of all metadata keys on this exception
+     */
+    public Set<String> getMetadataKeys() {
+        return metadata.keySet();
+    }
+
+    /**
+     * Returns the list of metadata values for the given key or {@code null} if no metadata for the
+     * given key exists.
+     */
+    public List<String> getMetadata(String key) {
+        return metadata.get(key);
+    }
+
+    protected Map<String, List<String>> getMetadata() {
+        return metadata;
+    }
+
+    /**
+     * Adds a new header with the given key.
+     * This method will replace existing header if a header with the same key already exists
+     */
+    public void addHeader(String key, List<String> value) {
+        // we need to enforce this otherwise bw comp doesn't work properly, as "opensearch."
+        // was the previous criteria to split headers in two sets
+        if (key.startsWith(OPENSEARCH_PREFIX_KEY)) {
+            throw new IllegalArgumentException("exception headers must not start with [opensearch.], found [" + key + "] instead");
+        }
+        this.headers.put(key, value);
+    }
+
+    /**
+     * Adds a new header with the given key.
+     * This method will replace existing header if a header with the same key already exists
+     */
+    public void addHeader(String key, String... value) {
+        addHeader(key, Arrays.asList(value));
+    }
+
+    /**
+     * Returns a set of all header keys on this exception
+     */
+    public Set<String> getHeaderKeys() {
+        return headers.keySet();
+    }
+
+    /**
+     * Returns the list of header values for the given key or {@code null} if no header for the
+     * given key exists.
+     */
+    public List<String> getHeader(String key) {
+        return headers.get(key);
+    }
+
+    protected Map<String, List<String>> getHeaders() {
+        return headers;
+    }
+
+    /**
+     * Unwraps the actual cause from the exception for cases when the exception is a
+     * {@link OpenSearchWrapperException}.
+     *
+     * @see BaseExceptionsHelper#unwrapCause(Throwable)
+     */
+    public Throwable unwrapCause() {
+        return BaseExceptionsHelper.unwrapCause(this);
+    }
+
+    /**
+     * Return the detail message, including the message from the nested exception
+     * if there is one.
+     */
+    public String getDetailedMessage() {
+        if (getCause() != null) {
+            StringBuilder sb = new StringBuilder();
+            sb.append(toString()).append("; ");
+            if (getCause() instanceof BaseOpenSearchException) {
+                sb.append(((BaseOpenSearchException) getCause()).getDetailedMessage());
+            } else {
+                sb.append(getCause());
+            }
+            return sb.toString();
+        } else {
+            return toString();
+        }
+    }
+
+    /**
+     * Retrieve the innermost cause of this exception, if none, returns the current exception.
+     */
+    public Throwable getRootCause() {
+        Throwable rootCause = this;
+        Throwable cause = getCause();
+        while (cause != null && cause != rootCause) {
+            rootCause = cause;
+            cause = cause.getCause();
+        }
+        return rootCause;
+    }
+
+    /**
+     * Renders additional per exception information into the XContent
+     */
+    protected void metadataToXContent(XContentBuilder builder, ToXContent.Params params) throws IOException {}
+
+    protected static void headerToXContent(XContentBuilder builder, String key, List<String> values) throws IOException {
+        if (values != null && values.isEmpty() == false) {
+            if (values.size() == 1) {
+                builder.field(key, values.get(0));
+            } else {
+                builder.startArray(key);
+                for (String value : values) {
+                    builder.value(value);
+                }
+                builder.endArray();
+            }
+        }
+    }
+
+    public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params params) throws IOException {
+        Throwable ex = BaseExceptionsHelper.unwrapCause(this);
+        if (ex != this) {
+            generateThrowableXContent(builder, params, this);
+        } else {
+            innerToXContent(builder, params, this, getExceptionName(), getMessage(), headers, metadata, getCause());
+        }
+        return builder;
+    }
+
+    protected String getExceptionName() {
+        return getExceptionName(this);
+    }
+
+    /**
+     * Returns the root cause of this exception or multiple if different shards caused different exceptions
+     */
+    public BaseOpenSearchException[] guessRootCauses() {
+        final Throwable cause = getCause();
+        if (cause != null && cause instanceof BaseOpenSearchException) {
+            return ((BaseOpenSearchException) cause).guessRootCauses();
+        }
+        return new BaseOpenSearchException[] { this };
+    }
+
+    public void setResources(String type, String... id) {
+        assert type != null;
+        addMetadata(RESOURCE_METADATA_ID_KEY, id);
+        addMetadata(RESOURCE_METADATA_TYPE_KEY, type);
+    }
+
+    public List<String> getResourceId() {
+        return getMetadata(RESOURCE_METADATA_ID_KEY);
+    }
+
+    public String getResourceType() {
+        List<String> header = getMetadata(RESOURCE_METADATA_TYPE_KEY);
+        if (header != null && header.isEmpty() == false) {
+            assert header.size() == 1;
+            return header.get(0);
+        }
+        return null;
+    }
+
+    public String getIndexName() {
+        List<String> index = getMetadata(INDEX_METADATA_KEY);
+        if (index != null && index.isEmpty() == false) {
+            return index.get(0);
+        }
+        return null;
+    }
+
+    /**
+     * Get index uuid as a string
+     *
+     * @deprecated remove in favor of Index#toString once Index class is moved to core library
+     */
+    @Deprecated
+    private String getIndexUUID() {
+        List<String> index_uuid = getMetadata(INDEX_METADATA_KEY_UUID);
+        if (index_uuid != null && index_uuid.isEmpty() == false) {
+            return index_uuid.get(0);
+        }
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        if (metadata.containsKey(INDEX_METADATA_KEY)) {
+            builder.append(getIndexString());
+            if (metadata.containsKey(SHARD_METADATA_KEY)) {
+                builder.append('[').append(getShardIdString()).append(']');
+            }
+            builder.append(' ');
+        }
+        return builder.append(BaseExceptionsHelper.detailedMessage(this).trim()).toString();
+    }
+
+    /**
+     * Get index string
+     *
+     * @deprecated remove in favor of Index#toString once Index class is moved to core library
+     */
+    @Deprecated
+    private String getIndexString() {
+        String uuid = getIndexUUID();
+        if (uuid != null) {
+            String name = getIndexName();
+            if (Strings.UNKNOWN_UUID_VALUE.equals(uuid)) {
+                return "[" + name + "]";
+            }
+            return "[" + name + "/" + uuid + "]";
+        }
+        return null;
+    }
+
+    /**
+     * Get shard id string
+     *
+     * @deprecated remove in favor of ShardId#toString once ShardId class is moved to core library
+     */
+    @Deprecated
+    private String getShardIdString() {
+        String indexName = getIndexName();
+        List<String> shard = getMetadata(SHARD_METADATA_KEY);
+        if (indexName != null && shard != null && shard.isEmpty() == false) {
+            return "[" + indexName + "][" + Integer.parseInt(shard.get(0)) + "]";
+        }
+        return null;
+    }
+}
diff --git a/server/src/main/java/org/opensearch/OpenSearchWrapperException.java b/libs/core/src/main/java/org/opensearch/OpenSearchWrapperException.java
similarity index 100%
rename from server/src/main/java/org/opensearch/OpenSearchWrapperException.java
rename to libs/core/src/main/java/org/opensearch/OpenSearchWrapperException.java
diff --git a/libs/core/src/main/java/org/opensearch/core/common/Strings.java b/libs/core/src/main/java/org/opensearch/core/common/Strings.java
new file mode 100644
index 0000000000000..83f5d9db3dbf5
--- /dev/null
+++ b/libs/core/src/main/java/org/opensearch/core/common/Strings.java
@@ -0,0 +1,269 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.core.common;
+
+import java.util.Iterator;
+
+/**
+ * String utility class.
+ *
+ * TODO replace Strings in :server
+ *
+ * @opensearch.internal
+ */
+public class Strings {
+    public static final String UNKNOWN_UUID_VALUE = "_na_";
+    public static final String[] EMPTY_ARRAY = new String[0];
+
+    /**
+     * Split the specified string by commas to an array.
+     *
+     * @param s the string to split
+     * @return the array of split values
+     * @see String#split(String)
+     */
+    public static String[] splitStringByCommaToArray(final String s) {
+        if (s == null || s.isEmpty()) return Strings.EMPTY_ARRAY;
+        else return s.split(",");
+    }
+
+    /**
+     * Convenience method to return a Collection as a delimited (e.g. CSV)
+     * String. E.g. useful for <code>toString()</code> implementations.
+     *
+     * @param coll   the Collection to display
+     * @param delim  the delimiter to use (probably a ",")
+     * @param prefix the String to start each element with
+     * @param suffix the String to end each element with
+     * @return the delimited String
+     */
+    public static String collectionToDelimitedString(Iterable<?> coll, String delim, String prefix, String suffix) {
+        StringBuilder sb = new StringBuilder();
+        collectionToDelimitedString(coll, delim, prefix, suffix, sb);
+        return sb.toString();
+    }
+
+    public static void collectionToDelimitedString(Iterable<?> coll, String delim, String prefix, String suffix, StringBuilder sb) {
+        Iterator<?> it = coll.iterator();
+        while (it.hasNext()) {
+            sb.append(prefix).append(it.next()).append(suffix);
+            if (it.hasNext()) {
+                sb.append(delim);
+            }
+        }
+    }
+
+    /**
+     * Convenience method to return a Collection as a delimited (e.g. CSV)
+     * String. E.g. useful for <code>toString()</code> implementations.
+     *
+     * @param coll  the Collection to display
+     * @param delim the delimiter to use (probably a ",")
+     * @return the delimited String
+     */
+    public static String collectionToDelimitedString(Iterable<?> coll, String delim) {
+        return collectionToDelimitedString(coll, delim, "", "");
+    }
+
+    /**
+     * Convenience method to return a Collection as a CSV String.
+     * E.g. useful for <code>toString()</code> implementations.
+     *
+     * @param coll the Collection to display
+     * @return the delimited String
+     */
+    public static String collectionToCommaDelimitedString(Iterable<?> coll) {
+        return collectionToDelimitedString(coll, ",");
+    }
+
+    /**
+     * Convenience method to return a String array as a delimited (e.g. CSV)
+     * String. E.g. useful for <code>toString()</code> implementations.
+     *
+     * @param arr   the array to display
+     * @param delim the delimiter to use (probably a ",")
+     * @return the delimited String
+     */
+    public static String arrayToDelimitedString(Object[] arr, String delim) {
+        StringBuilder sb = new StringBuilder();
+        arrayToDelimitedString(arr, delim, sb);
+        return sb.toString();
+    }
+
+    public static void arrayToDelimitedString(Object[] arr, String delim, StringBuilder sb) {
+        if (isEmpty(arr)) {
+            return;
+        }
+        for (int i = 0; i < arr.length; i++) {
+            if (i > 0) {
+                sb.append(delim);
+            }
+            sb.append(arr[i]);
+        }
+    }
+
+    /**
+     * Convenience method to return a String array as a CSV String.
+     * E.g. useful for <code>toString()</code> implementations.
+     *
+     * @param arr the array to display
+     * @return the delimited String
+     */
+    public static String arrayToCommaDelimitedString(Object[] arr) {
+        return arrayToDelimitedString(arr, ",");
+    }
+
+    /**
+     * Determine whether the given array is empty:
+     * i.e. <code>null</code> or of zero length.
+     *
+     * @param array the array to check
+     */
+    private static boolean isEmpty(Object[] array) {
+        return (array == null || array.length == 0);
+    }
+
+    /**
+     * Check that the given CharSequence is neither <code>null</code> nor of length 0.
+     * Note: Will return <code>true</code> for a CharSequence that purely consists of whitespace.
+     * <pre>
+     * StringUtils.hasLength(null) = false
+     * StringUtils.hasLength("") = false
+     * StringUtils.hasLength(" ") = true
+     * StringUtils.hasLength("Hello") = true
+     * </pre>
+     *
+     * @param str the CharSequence to check (may be <code>null</code>)
+     * @return <code>true</code> if the CharSequence is not null and has length
+     * @see #hasText(String)
+     */
+    public static boolean hasLength(CharSequence str) {
+        return (str != null && str.length() > 0);
+    }
+
+    /**
+     * Check that the given String is neither <code>null</code> nor of length 0.
+     * Note: Will return <code>true</code> for a String that purely consists of whitespace.
+     *
+     * @param str the String to check (may be <code>null</code>)
+     * @return <code>true</code> if the String is not null and has length
+     * @see Strings#hasLength(CharSequence)
+     */
+    public static boolean hasLength(String str) {
+        return hasLength((CharSequence) str);
+    }
+
+    /**
+     * Check that the given CharSequence is either <code>null</code> or of length 0.
+     * Note: Will return <code>false</code> for a CharSequence that purely consists of whitespace.
+     * <pre>
+     * StringUtils.isEmpty(null) = true
+     * StringUtils.isEmpty("") = true
+     * StringUtils.isEmpty(" ") = false
+     * StringUtils.isEmpty("Hello") = false
+     * </pre>
+     *
+     * @param str the CharSequence to check (may be <code>null</code>)
+     * @return <code>true</code> if the CharSequence is either null or has a zero length
+     */
+    public static boolean isEmpty(CharSequence str) {
+        return hasLength(str) == false;
+    }
+
+    /**
+     * Check whether the given CharSequence has actual text.
+     * More specifically, returns <code>true</code> if the string not <code>null</code>,
+     * its length is greater than 0, and it contains at least one non-whitespace character.
+     * <pre>
+     * StringUtils.hasText(null) = false
+     * StringUtils.hasText("") = false
+     * StringUtils.hasText(" ") = false
+     * StringUtils.hasText("12345") = true
+     * StringUtils.hasText(" 12345 ") = true
+     * </pre>
+     *
+     * @param str the CharSequence to check (may be <code>null</code>)
+     * @return <code>true</code> if the CharSequence is not <code>null</code>,
+     *         its length is greater than 0, and it does not contain whitespace only
+     * @see Character#isWhitespace
+     */
+    public static boolean hasText(CharSequence str) {
+        if (!hasLength(str)) {
+            return false;
+        }
+        int strLen = str.length();
+        for (int i = 0; i < strLen; i++) {
+            if (!Character.isWhitespace(str.charAt(i))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Check whether the given String has actual text.
+     * More specifically, returns <code>true</code> if the string not <code>null</code>,
+     * its length is greater than 0, and it contains at least one non-whitespace character.
+     *
+     * @param str the String to check (may be <code>null</code>)
+     * @return <code>true</code> if the String is not <code>null</code>, its length is
+     *         greater than 0, and it does not contain whitespace only
+     * @see Strings#hasText(CharSequence)
+     */
+    public static boolean hasText(String str) {
+        return hasText((CharSequence) str);
+    }
+
+    /**
+     * Replace all occurrences of a substring within a string with
+     * another string.
+     *
+     * @param inString   String to examine
+     * @param oldPattern String to replace
+     * @param newPattern String to insert
+     * @return a String with the replacements
+     */
+    public static String replace(String inString, String oldPattern, String newPattern) {
+        if (!hasLength(inString) || !hasLength(oldPattern) || newPattern == null) {
+            return inString;
+        }
+        StringBuilder sb = new StringBuilder();
+        int pos = 0; // our position in the old string
+        int index = inString.indexOf(oldPattern);
+        // the index of an occurrence we've found, or -1
+        int patLen = oldPattern.length();
+        while (index >= 0) {
+            sb.append(inString, pos, index);
+            sb.append(newPattern);
+            pos = index + patLen;
+            index = inString.indexOf(oldPattern, pos);
+        }
+        sb.append(inString.substring(pos));
+        // remember to append any characters to the right of a match
+        return sb.toString();
+    }
+
+    /**
+     * Trim all occurrences of the supplied leading character from the given String.
+     *
+     * @param str              the String to check
+     * @param leadingCharacter the leading character to be trimmed
+     * @return the trimmed String
+     */
+    public static String trimLeadingCharacter(String str, char leadingCharacter) {
+        if (hasLength(str) == false) {
+            return str;
+        }
+        StringBuilder sb = new StringBuilder(str);
+        while (sb.length() > 0 && sb.charAt(0) == leadingCharacter) {
+            sb.deleteCharAt(0);
+        }
+        return sb.toString();
+    }
+}
diff --git a/server/src/main/java/org/opensearch/common/logging/LoggerMessageFormat.java b/libs/core/src/main/java/org/opensearch/core/common/logging/LoggerMessageFormat.java
similarity index 99%
rename from server/src/main/java/org/opensearch/common/logging/LoggerMessageFormat.java
rename to libs/core/src/main/java/org/opensearch/core/common/logging/LoggerMessageFormat.java
index a0dec5b8d0b70..59492193d16dc 100644
--- a/server/src/main/java/org/opensearch/common/logging/LoggerMessageFormat.java
+++ b/libs/core/src/main/java/org/opensearch/core/common/logging/LoggerMessageFormat.java
@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.common.logging;
+package org.opensearch.core.common.logging;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/libs/core/src/main/java/org/opensearch/core/common/logging/package-info.java b/libs/core/src/main/java/org/opensearch/core/common/logging/package-info.java
new file mode 100644
index 0000000000000..b3094b1e2782c
--- /dev/null
+++ b/libs/core/src/main/java/org/opensearch/core/common/logging/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+/** core logging classes */
+package org.opensearch.core.common.logging;
diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternReplaceCharFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternReplaceCharFilterFactory.java
index 3c6cdbf5c5a69..d6fca8ac67d55 100644
--- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternReplaceCharFilterFactory.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternReplaceCharFilterFactory.java
@@ -32,9 +32,9 @@
 package org.opensearch.analysis.common;
 
 import org.apache.lucene.analysis.pattern.PatternReplaceCharFilter;
-import org.opensearch.common.Strings;
 import org.opensearch.common.regex.Regex;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.env.Environment;
 import org.opensearch.index.IndexSettings;
 import org.opensearch.index.analysis.AbstractCharFilterFactory;
diff --git a/modules/geo/src/test/java/org/opensearch/geo/search/aggregations/bucket/geogrid/GeoTileGridParserTests.java b/modules/geo/src/test/java/org/opensearch/geo/search/aggregations/bucket/geogrid/GeoTileGridParserTests.java
index 0bf41f37c45a7..a39f66f571d0a 100644
--- a/modules/geo/src/test/java/org/opensearch/geo/search/aggregations/bucket/geogrid/GeoTileGridParserTests.java
+++ b/modules/geo/src/test/java/org/opensearch/geo/search/aggregations/bucket/geogrid/GeoTileGridParserTests.java
@@ -31,7 +31,7 @@
 
 package org.opensearch.geo.search.aggregations.bucket.geogrid;
 
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.core.xcontent.XContentParseException;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.common.xcontent.json.JsonXContent;
@@ -77,7 +77,7 @@ public void testParseErrorOnBooleanPrecision() throws Exception {
             () -> GeoTileGridAggregationBuilder.PARSER.parse(stParser, "geotile_grid")
         );
         assertThat(
-            ExceptionsHelper.detailedMessage(e),
+            BaseExceptionsHelper.detailedMessage(e),
             containsString("[geotile_grid] precision doesn't support values of type: VALUE_BOOLEAN")
         );
     }
diff --git a/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorFactoryTests.java b/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorFactoryTests.java
index 576136436ef33..f8487bf28b90d 100644
--- a/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorFactoryTests.java
+++ b/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorFactoryTests.java
@@ -33,7 +33,7 @@
 package org.opensearch.ingest.useragent;
 
 import org.opensearch.OpenSearchParseException;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.test.OpenSearchTestCase;
 import org.junit.BeforeClass;
 
diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MultiSearchTemplateResponse.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MultiSearchTemplateResponse.java
index 449e89cdc5f3c..5b6102d1a3ad4 100644
--- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MultiSearchTemplateResponse.java
+++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MultiSearchTemplateResponse.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.script.mustache;
 
-import org.opensearch.OpenSearchException;
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.action.ActionResponse;
 import org.opensearch.action.search.MultiSearchResponse;
 import org.opensearch.common.Nullable;
@@ -166,7 +166,7 @@ public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params par
         for (Item item : items) {
             if (item.isFailure()) {
                 builder.startObject();
-                OpenSearchException.generateFailureXContent(builder, params, item.getFailure(), true);
+                BaseOpenSearchException.generateFailureXContent(builder, params, item.getFailure(), true);
                 builder.endObject();
             } else {
                 item.getResponse().toXContent(builder, params);
diff --git a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateResponseTests.java b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateResponseTests.java
index 31bfc1ea70d54..aeb7cdc2c6a28 100644
--- a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateResponseTests.java
+++ b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateResponseTests.java
@@ -34,7 +34,7 @@
 import org.opensearch.OpenSearchException;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.ShardSearchFailure;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.search.internal.InternalSearchResponse;
diff --git a/modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java b/modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java
index 6eb974c77a5f3..35ceb60dec7ed 100644
--- a/modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java
+++ b/modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.index.rankeval;
 
-import org.opensearch.OpenSearchException;
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.support.IndicesOptions;
@@ -274,7 +274,7 @@ public void testBadQuery() {
 
         RankEvalResponse response = client().execute(RankEvalAction.INSTANCE, builder.request()).actionGet();
         assertEquals(1, response.getFailures().size());
-        OpenSearchException[] rootCauses = OpenSearchException.guessRootCauses(response.getFailures().get("broken_query"));
+        BaseOpenSearchException[] rootCauses = BaseOpenSearchException.guessRootCauses(response.getFailures().get("broken_query"));
         assertEquals("java.lang.NumberFormatException: For input string: \"noStringOnNumericFields\"", rootCauses[0].getCause().toString());
     }
 
diff --git a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalRequest.java b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalRequest.java
index d38307fc2194a..b3975174dd69e 100644
--- a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalRequest.java
+++ b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalRequest.java
@@ -38,9 +38,9 @@
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchType;
 import org.opensearch.action.support.IndicesOptions;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 import java.util.Arrays;
diff --git a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalResponse.java b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalResponse.java
index 180069ab91bd6..58a940e1618da 100644
--- a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalResponse.java
+++ b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalResponse.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.index.rankeval;
 
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.OpenSearchException;
 import org.opensearch.action.ActionResponse;
 import org.opensearch.core.ParseField;
@@ -136,7 +137,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         builder.startObject("failures");
         for (String key : failures.keySet()) {
             builder.startObject(key);
-            OpenSearchException.generateFailureXContent(builder, params, failures.get(key), true);
+            BaseOpenSearchException.generateFailureXContent(builder, params, failures.get(key), true);
             builder.endObject();
         }
         builder.endObject();
diff --git a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RestRankEvalAction.java b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RestRankEvalAction.java
index 670068fc0b250..cb5138117d0e1 100644
--- a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RestRankEvalAction.java
+++ b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RestRankEvalAction.java
@@ -35,7 +35,7 @@
 import org.opensearch.action.search.SearchType;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexValidator.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexValidator.java
index 71c3aad8713e1..d065afceab503 100644
--- a/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexValidator.java
+++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexValidator.java
@@ -45,10 +45,10 @@
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.regex.Regex;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.search.builder.SearchSourceBuilder;
 
diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/Reindexer.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/Reindexer.java
index d6365f33cf462..a5107597e4113 100644
--- a/modules/reindex/src/main/java/org/opensearch/index/reindex/Reindexer.java
+++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/Reindexer.java
@@ -57,9 +57,9 @@
 import org.opensearch.client.RestClient;
 import org.opensearch.client.RestClientBuilder;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.lucene.uid.Versions;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.DeprecationHandler;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.XContentBuilder;
diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java
index c453f5ad44318..d3049fff07192 100644
--- a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java
+++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java
@@ -50,11 +50,11 @@
 import org.opensearch.client.ResponseListener;
 import org.opensearch.client.RestClient;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.concurrent.ThreadContext;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.XContentParseException;
 import org.opensearch.core.xcontent.XContentParser;
diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java
index 61336156a83d0..e11ad3b5013c1 100644
--- a/modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java
+++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java
@@ -33,6 +33,7 @@
 package org.opensearch.index.reindex;
 
 import org.apache.lucene.search.TotalHits;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.OpenSearchException;
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.Version;
@@ -215,7 +216,7 @@ public void testStartRetriesOnRejectionButFailsOnTooManyRejections() throws Exce
         assertBusy(() -> assertEquals(testRequest.getMaxRetries() + 1, client.searchAttempts.get()));
         assertBusy(() -> assertTrue(listener.isDone()));
         ExecutionException e = expectThrows(ExecutionException.class, () -> listener.get());
-        assertThat(ExceptionsHelper.stackTrace(e), containsString(OpenSearchRejectedExecutionException.class.getSimpleName()));
+        assertThat(BaseExceptionsHelper.stackTrace(e), containsString(OpenSearchRejectedExecutionException.class.getSimpleName()));
         assertNull("There shouldn't be a search attempt pending that we didn't reject", client.lastSearch.get());
         assertEquals(testRequest.getMaxRetries(), testTask.getStatus().getSearchRetries());
     }
diff --git a/plugins/discovery-azure-classic/src/main/java/org/opensearch/cloud/azure/classic/management/AzureComputeServiceImpl.java b/plugins/discovery-azure-classic/src/main/java/org/opensearch/cloud/azure/classic/management/AzureComputeServiceImpl.java
index 6a8b8d83f539b..9dbf08a3e1a01 100644
--- a/plugins/discovery-azure-classic/src/main/java/org/opensearch/cloud/azure/classic/management/AzureComputeServiceImpl.java
+++ b/plugins/discovery-azure-classic/src/main/java/org/opensearch/cloud/azure/classic/management/AzureComputeServiceImpl.java
@@ -51,10 +51,10 @@
 import org.opensearch.OpenSearchException;
 import org.opensearch.SpecialPermission;
 import org.opensearch.cloud.azure.classic.AzureServiceRemoteException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.component.AbstractLifecycleComponent;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 
 public class AzureComputeServiceImpl extends AbstractLifecycleComponent implements AzureComputeService {
     private static final Logger logger = LogManager.getLogger(AzureComputeServiceImpl.class);
diff --git a/plugins/discovery-azure-classic/src/main/java/org/opensearch/discovery/azure/classic/AzureSeedHostsProvider.java b/plugins/discovery-azure-classic/src/main/java/org/opensearch/discovery/azure/classic/AzureSeedHostsProvider.java
index 0fe6904e83242..799cdaab75958 100644
--- a/plugins/discovery-azure-classic/src/main/java/org/opensearch/discovery/azure/classic/AzureSeedHostsProvider.java
+++ b/plugins/discovery-azure-classic/src/main/java/org/opensearch/discovery/azure/classic/AzureSeedHostsProvider.java
@@ -44,13 +44,13 @@
 import org.opensearch.cloud.azure.classic.AzureServiceRemoteException;
 import org.opensearch.cloud.azure.classic.management.AzureComputeService;
 import org.opensearch.cloud.azure.classic.management.AzureComputeService.Discovery;
-import org.opensearch.common.Strings;
 import org.opensearch.common.network.InetAddresses;
 import org.opensearch.common.network.NetworkAddress;
 import org.opensearch.common.network.NetworkService;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.discovery.SeedHostsProvider;
 import org.opensearch.transport.TransportService;
 
@@ -204,7 +204,7 @@ public List<TransportAddress> getSeedAddresses(HostsResolver hostsResolver) {
             }
 
             // If provided, we check the deployment name
-            if (Strings.hasLength(deploymentName) && !deploymentName.equals(deployment.getName())) {
+            if (org.opensearch.core.common.Strings.hasLength(deploymentName) && !deploymentName.equals(deployment.getName())) {
                 logger.debug("current deployment name [{}] different from [{}]. skipping...", deployment.getName(), deploymentName);
                 continue;
             }
diff --git a/plugins/discovery-ec2/src/internalClusterTest/java/org/opensearch/discovery/ec2/AbstractAwsTestCase.java b/plugins/discovery-ec2/src/internalClusterTest/java/org/opensearch/discovery/ec2/AbstractAwsTestCase.java
index 1e7422ea0ac02..9529d1e67ea09 100644
--- a/plugins/discovery-ec2/src/internalClusterTest/java/org/opensearch/discovery/ec2/AbstractAwsTestCase.java
+++ b/plugins/discovery-ec2/src/internalClusterTest/java/org/opensearch/discovery/ec2/AbstractAwsTestCase.java
@@ -32,10 +32,10 @@
 
 package org.opensearch.discovery.ec2;
 
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.PathUtils;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.settings.SettingsException;
+import org.opensearch.core.common.Strings;
 import org.opensearch.env.Environment;
 import org.opensearch.plugins.Plugin;
 import org.opensearch.test.OpenSearchIntegTestCase;
diff --git a/plugins/discovery-ec2/src/main/java/org/opensearch/discovery/ec2/AwsEc2ServiceImpl.java b/plugins/discovery-ec2/src/main/java/org/opensearch/discovery/ec2/AwsEc2ServiceImpl.java
index 7566a7094e635..0d8e70e23f609 100644
--- a/plugins/discovery-ec2/src/main/java/org/opensearch/discovery/ec2/AwsEc2ServiceImpl.java
+++ b/plugins/discovery-ec2/src/main/java/org/opensearch/discovery/ec2/AwsEc2ServiceImpl.java
@@ -44,8 +44,8 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.OpenSearchException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.util.LazyInitializable;
+import org.opensearch.core.common.Strings;
 
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -66,7 +66,7 @@ AmazonEC2 buildClient(AWSCredentialsProvider credentials, ClientConfiguration co
         final AmazonEC2ClientBuilder builder = AmazonEC2ClientBuilder.standard()
             .withCredentials(credentials)
             .withClientConfiguration(configuration);
-        if (Strings.hasText(endpoint)) {
+        if (org.opensearch.core.common.Strings.hasText(endpoint)) {
             logger.debug("using explicit ec2 endpoint [{}]", endpoint);
             builder.withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endpoint, null));
         }
diff --git a/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/Ec2NetworkTests.java b/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/Ec2NetworkTests.java
index f7faf33bf6b30..75224e6bab348 100644
--- a/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/Ec2NetworkTests.java
+++ b/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/Ec2NetworkTests.java
@@ -34,10 +34,10 @@
 
 import com.sun.net.httpserver.HttpServer;
 
-import org.opensearch.common.Strings;
 import org.opensearch.common.SuppressForbidden;
 import org.opensearch.common.network.NetworkService;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.RestStatus;
 import org.opensearch.test.OpenSearchTestCase;
 
diff --git a/plugins/discovery-gce/src/main/java/org/opensearch/cloud/gce/network/GceNameResolver.java b/plugins/discovery-gce/src/main/java/org/opensearch/cloud/gce/network/GceNameResolver.java
index 7482dfac401ef..808a1f2cfafaf 100644
--- a/plugins/discovery-gce/src/main/java/org/opensearch/cloud/gce/network/GceNameResolver.java
+++ b/plugins/discovery-gce/src/main/java/org/opensearch/cloud/gce/network/GceNameResolver.java
@@ -34,8 +34,8 @@
 
 import org.opensearch.cloud.gce.GceMetadataService;
 import org.opensearch.cloud.gce.util.Access;
-import org.opensearch.common.Strings;
 import org.opensearch.common.network.NetworkService.CustomNameResolver;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -97,7 +97,7 @@ private InetAddress[] resolve(String value) throws IOException {
         String gceMetadataPath;
         if (value.equals(GceAddressResolverType.GCE.configName)) {
             // We replace network placeholder with default network interface value: 0
-            gceMetadataPath = Strings.replace(GceAddressResolverType.GCE.gceName, "{{network}}", "0");
+            gceMetadataPath = org.opensearch.core.common.Strings.replace(GceAddressResolverType.GCE.gceName, "{{network}}", "0");
         } else if (value.equals(GceAddressResolverType.PRIVATE_DNS.configName)) {
             gceMetadataPath = GceAddressResolverType.PRIVATE_DNS.gceName;
         } else if (value.startsWith(GceAddressResolverType.PRIVATE_IP.configName)) {
diff --git a/plugins/discovery-gce/src/main/java/org/opensearch/discovery/gce/GceSeedHostsProvider.java b/plugins/discovery-gce/src/main/java/org/opensearch/discovery/gce/GceSeedHostsProvider.java
index 19247a7bb536d..c50ce4e080ede 100644
--- a/plugins/discovery-gce/src/main/java/org/opensearch/discovery/gce/GceSeedHostsProvider.java
+++ b/plugins/discovery-gce/src/main/java/org/opensearch/discovery/gce/GceSeedHostsProvider.java
@@ -41,7 +41,6 @@
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.logging.log4j.util.Supplier;
 import org.opensearch.cloud.gce.GceInstancesService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.network.NetworkAddress;
 import org.opensearch.common.network.NetworkService;
 import org.opensearch.common.settings.Setting;
@@ -49,6 +48,7 @@
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.discovery.SeedHostsProvider;
 import org.opensearch.transport.TransportService;
 
@@ -228,7 +228,7 @@ public List<TransportAddress> getSeedAddresses(HostsResolver hostsResolver) {
                         // Trying to get Public IP Address (For future use)
                         if (networkInterface.getAccessConfigs() != null) {
                             for (AccessConfig accessConfig : networkInterface.getAccessConfigs()) {
-                                if (Strings.hasText(accessConfig.getNatIP())) {
+                                if (org.opensearch.core.common.Strings.hasText(accessConfig.getNatIP())) {
                                     ip_public = accessConfig.getNatIP();
                                     break;
                                 }
diff --git a/plugins/discovery-gce/src/test/java/org/opensearch/discovery/gce/GceMockUtils.java b/plugins/discovery-gce/src/test/java/org/opensearch/discovery/gce/GceMockUtils.java
index 24790aa4a900d..6d6028eca713a 100644
--- a/plugins/discovery-gce/src/test/java/org/opensearch/discovery/gce/GceMockUtils.java
+++ b/plugins/discovery-gce/src/test/java/org/opensearch/discovery/gce/GceMockUtils.java
@@ -41,7 +41,7 @@
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.util.FileSystemUtils;
 import org.opensearch.common.io.Streams;
 
diff --git a/plugins/discovery-gce/src/test/java/org/opensearch/discovery/gce/GceNetworkTests.java b/plugins/discovery-gce/src/test/java/org/opensearch/discovery/gce/GceNetworkTests.java
index a1d7613bf2ba4..091a4f720d258 100644
--- a/plugins/discovery-gce/src/test/java/org/opensearch/discovery/gce/GceNetworkTests.java
+++ b/plugins/discovery-gce/src/test/java/org/opensearch/discovery/gce/GceNetworkTests.java
@@ -33,9 +33,9 @@
 package org.opensearch.discovery.gce;
 
 import org.opensearch.cloud.gce.network.GceNameResolver;
-import org.opensearch.common.Strings;
 import org.opensearch.common.network.NetworkService;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.io.IOException;
diff --git a/plugins/ingest-attachment/src/main/java/org/opensearch/ingest/attachment/AttachmentProcessor.java b/plugins/ingest-attachment/src/main/java/org/opensearch/ingest/attachment/AttachmentProcessor.java
index b8e8300755686..ea01071a7cad9 100644
--- a/plugins/ingest-attachment/src/main/java/org/opensearch/ingest/attachment/AttachmentProcessor.java
+++ b/plugins/ingest-attachment/src/main/java/org/opensearch/ingest/attachment/AttachmentProcessor.java
@@ -39,7 +39,7 @@
 import org.apache.tika.metadata.TikaCoreProperties;
 
 import org.opensearch.OpenSearchParseException;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.ingest.AbstractProcessor;
 import org.opensearch.ingest.IngestDocument;
 import org.opensearch.ingest.Processor;
@@ -129,12 +129,12 @@ public IngestDocument execute(IngestDocument ingestDocument) {
             throw new OpenSearchParseException("Error parsing document in field [{}]", e, field);
         }
 
-        if (properties.contains(Property.CONTENT) && Strings.hasLength(parsedContent)) {
+        if (properties.contains(Property.CONTENT) && org.opensearch.core.common.Strings.hasLength(parsedContent)) {
             // somehow tika seems to append a newline at the end automatically, lets remove that again
             additionalFields.put(Property.CONTENT.toLowerCase(), parsedContent.trim());
         }
 
-        if (properties.contains(Property.LANGUAGE) && Strings.hasLength(parsedContent)) {
+        if (properties.contains(Property.LANGUAGE) && org.opensearch.core.common.Strings.hasLength(parsedContent)) {
             OptimaizeLangDetector langDetector = new OptimaizeLangDetector();
             langDetector.loadModels();
             LanguageResult result = langDetector.detect(parsedContent);
@@ -151,19 +151,19 @@ public IngestDocument execute(IngestDocument ingestDocument) {
 
         if (properties.contains(Property.TITLE)) {
             String title = metadata.get(TikaCoreProperties.TITLE);
-            if (Strings.hasLength(title)) {
+            if (org.opensearch.core.common.Strings.hasLength(title)) {
                 additionalFields.put(Property.TITLE.toLowerCase(), title);
             }
         }
 
         if (properties.contains(Property.AUTHOR)) {
             String author = metadata.get("Author");
-            if (Strings.hasLength(author)) {
+            if (org.opensearch.core.common.Strings.hasLength(author)) {
                 additionalFields.put(Property.AUTHOR.toLowerCase(), author);
             } else {
                 // The MSOffice parser has deprecated "Author" in favor of "Creator"
                 author = metadata.get(TikaCoreProperties.CREATOR);
-                if (Strings.hasLength(author)) {
+                if (org.opensearch.core.common.Strings.hasLength(author)) {
                     additionalFields.put(Property.AUTHOR.toLowerCase(), author);
                 }
             }
@@ -171,12 +171,12 @@ public IngestDocument execute(IngestDocument ingestDocument) {
 
         if (properties.contains(Property.KEYWORDS)) {
             String keywords = metadata.get("Keywords");
-            if (Strings.hasLength(keywords)) {
+            if (org.opensearch.core.common.Strings.hasLength(keywords)) {
                 additionalFields.put(Property.KEYWORDS.toLowerCase(), keywords);
             } else {
                 // Fallback - EPUBs put their keywords as multiple subject fields by convention
                 keywords = metadata.get(TikaCoreProperties.SUBJECT);
-                if (Strings.hasLength(keywords)) {
+                if (org.opensearch.core.common.Strings.hasLength(keywords)) {
                     additionalFields.put(Property.KEYWORDS.toLowerCase(), keywords);
                 }
             }
@@ -184,7 +184,7 @@ public IngestDocument execute(IngestDocument ingestDocument) {
 
         if (properties.contains(Property.CONTENT_TYPE)) {
             String contentType = metadata.get(Metadata.CONTENT_TYPE);
-            if (Strings.hasLength(contentType)) {
+            if (org.opensearch.core.common.Strings.hasLength(contentType)) {
                 additionalFields.put(Property.CONTENT_TYPE.toLowerCase(), contentType);
             }
         }
diff --git a/plugins/mapper-annotated-text/src/test/java/org/opensearch/search/fetch/subphase/highlight/AnnotatedTextHighlighterTests.java b/plugins/mapper-annotated-text/src/test/java/org/opensearch/search/fetch/subphase/highlight/AnnotatedTextHighlighterTests.java
index 17a1abc64e8cd..7e6cf47fa92fd 100644
--- a/plugins/mapper-annotated-text/src/test/java/org/opensearch/search/fetch/subphase/highlight/AnnotatedTextHighlighterTests.java
+++ b/plugins/mapper-annotated-text/src/test/java/org/opensearch/search/fetch/subphase/highlight/AnnotatedTextHighlighterTests.java
@@ -56,7 +56,7 @@
 import org.apache.lucene.search.uhighlight.SplittingBreakIterator;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.tests.index.RandomIndexWriter;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.mapper.annotatedtext.AnnotatedTextFieldMapper.AnnotatedHighlighterAnalyzer;
 import org.opensearch.index.mapper.annotatedtext.AnnotatedTextFieldMapper.AnnotatedText;
 import org.opensearch.index.mapper.annotatedtext.AnnotatedTextFieldMapper.AnnotationAnalyzerWrapper;
diff --git a/plugins/repository-azure/src/internalClusterTest/java/org/opensearch/repositories/azure/AzureStorageCleanupThirdPartyTests.java b/plugins/repository-azure/src/internalClusterTest/java/org/opensearch/repositories/azure/AzureStorageCleanupThirdPartyTests.java
index 6d71a65a35a4c..e7c9e616994ac 100644
--- a/plugins/repository-azure/src/internalClusterTest/java/org/opensearch/repositories/azure/AzureStorageCleanupThirdPartyTests.java
+++ b/plugins/repository-azure/src/internalClusterTest/java/org/opensearch/repositories/azure/AzureStorageCleanupThirdPartyTests.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.repositories.azure;
 
+import org.opensearch.core.common.Strings;
 import reactor.core.scheduler.Schedulers;
 
 import com.azure.core.util.Context;
@@ -43,7 +44,6 @@
 import org.opensearch.action.ActionRunnable;
 import org.opensearch.action.support.PlainActionFuture;
 import org.opensearch.action.support.master.AcknowledgedResponse;
-import org.opensearch.common.Strings;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.settings.MockSecureSettings;
 import org.opensearch.common.settings.SecureSettings;
@@ -74,7 +74,7 @@ protected Collection<Class<? extends Plugin>> getPlugins() {
     @Override
     protected Settings nodeSettings() {
         final String endpoint = System.getProperty("test.azure.endpoint_suffix");
-        if (Strings.hasText(endpoint)) {
+        if (org.opensearch.core.common.Strings.hasText(endpoint)) {
             return Settings.builder().put(super.nodeSettings()).put("azure.client.default.endpoint_suffix", endpoint).build();
         }
         return super.nodeSettings();
@@ -83,7 +83,7 @@ protected Settings nodeSettings() {
     @Override
     protected SecureSettings credentials() {
         assertThat(System.getProperty("test.azure.account"), not(blankOrNullString()));
-        final boolean hasSasToken = Strings.hasText(System.getProperty("test.azure.sas_token"));
+        final boolean hasSasToken = org.opensearch.core.common.Strings.hasText(System.getProperty("test.azure.sas_token"));
         if (hasSasToken == false) {
             assertThat(System.getProperty("test.azure.key"), not(blankOrNullString()));
         } else {
diff --git a/plugins/repository-azure/src/main/java/org/opensearch/repositories/azure/AzureRepository.java b/plugins/repository-azure/src/main/java/org/opensearch/repositories/azure/AzureRepository.java
index 3bcc54a359f3f..a75578d68f405 100644
--- a/plugins/repository-azure/src/main/java/org/opensearch/repositories/azure/AzureRepository.java
+++ b/plugins/repository-azure/src/main/java/org/opensearch/repositories/azure/AzureRepository.java
@@ -37,12 +37,12 @@
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.opensearch.cluster.metadata.RepositoryMetadata;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.blobstore.BlobPath;
 import org.opensearch.common.blobstore.BlobStore;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Setting.Property;
 import org.opensearch.common.unit.ByteSizeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.indices.recovery.RecoverySettings;
 import org.opensearch.repositories.blobstore.MeteredBlobStoreRepository;
@@ -128,7 +128,7 @@ public AzureRepository(
         this.storageService = storageService;
 
         final String basePath = Strings.trimLeadingCharacter(Repository.BASE_PATH_SETTING.get(metadata.settings()), '/');
-        if (Strings.hasLength(basePath)) {
+        if (org.opensearch.core.common.Strings.hasLength(basePath)) {
             // Remove starting / if any
             BlobPath path = new BlobPath();
             for (final String elem : basePath.split("/")) {
diff --git a/plugins/repository-azure/src/main/java/org/opensearch/repositories/azure/AzureStorageSettings.java b/plugins/repository-azure/src/main/java/org/opensearch/repositories/azure/AzureStorageSettings.java
index 4a9aa51334d0a..22b9346e2f3e7 100644
--- a/plugins/repository-azure/src/main/java/org/opensearch/repositories/azure/AzureStorageSettings.java
+++ b/plugins/repository-azure/src/main/java/org/opensearch/repositories/azure/AzureStorageSettings.java
@@ -33,7 +33,6 @@
 package org.opensearch.repositories.azure;
 
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.collect.MapBuilder;
 import org.opensearch.common.settings.SecureSetting;
 import org.opensearch.common.settings.SecureString;
@@ -43,6 +42,8 @@
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.settings.SettingsException;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
+
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Collections;
@@ -278,8 +279,8 @@ public String getConnectString() {
     }
 
     private static String buildConnectString(String account, @Nullable String key, @Nullable String sasToken, String endpointSuffix) {
-        final boolean hasSasToken = Strings.hasText(sasToken);
-        final boolean hasKey = Strings.hasText(key);
+        final boolean hasSasToken = org.opensearch.core.common.Strings.hasText(sasToken);
+        final boolean hasKey = org.opensearch.core.common.Strings.hasText(key);
         if (hasSasToken == false && hasKey == false) {
             throw new SettingsException("Neither a secret key nor a shared access token was set.");
         }
@@ -293,7 +294,7 @@ private static String buildConnectString(String account, @Nullable String key, @
         } else {
             connectionStringBuilder.append(";SharedAccessSignature=").append(sasToken);
         }
-        if (Strings.hasText(endpointSuffix)) {
+        if (org.opensearch.core.common.Strings.hasText(endpointSuffix)) {
             connectionStringBuilder.append(";EndpointSuffix=").append(endpointSuffix);
         }
         return connectionStringBuilder.toString();
@@ -389,10 +390,13 @@ static ProxySettings validateAndCreateProxySettings(final Settings settings, fin
         final SecureString proxyPassword = getConfigValue(settings, clientName, PROXY_PASSWORD_SETTING);
         // Validate proxy settings
         if (proxyType == ProxySettings.ProxyType.DIRECT
-            && (proxyPort != 0 || Strings.hasText(proxyHost) || Strings.hasText(proxyUserName) || Strings.hasText(proxyPassword))) {
+            && (proxyPort != 0
+                || Strings.hasText(proxyHost)
+                || org.opensearch.core.common.Strings.hasText(proxyUserName)
+                || org.opensearch.core.common.Strings.hasText(proxyPassword))) {
             throw new SettingsException("Azure proxy port or host or username or password have been set but proxy type is not defined.");
         }
-        if (proxyType != ProxySettings.ProxyType.DIRECT && (proxyPort == 0 || Strings.isEmpty(proxyHost))) {
+        if (proxyType != ProxySettings.ProxyType.DIRECT && (proxyPort == 0 || org.opensearch.core.common.Strings.isEmpty(proxyHost))) {
             throw new SettingsException("Azure proxy type has been set but proxy host or port is not defined.");
         }
 
diff --git a/plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java b/plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java
index 60f751a8d950b..45384a16b0c0b 100644
--- a/plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java
+++ b/plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java
@@ -38,10 +38,10 @@
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpServer;
 import fixture.azure.AzureHttpHandler;
+import org.opensearch.core.common.Strings;
 import reactor.core.scheduler.Schedulers;
 
 import org.opensearch.cluster.metadata.RepositoryMetadata;
-import org.opensearch.common.Strings;
 import org.opensearch.common.SuppressForbidden;
 import org.opensearch.common.blobstore.BlobContainer;
 import org.opensearch.common.blobstore.BlobPath;
diff --git a/plugins/repository-gcs/src/main/java/org/opensearch/repositories/gcs/GoogleCloudStorageClientSettings.java b/plugins/repository-gcs/src/main/java/org/opensearch/repositories/gcs/GoogleCloudStorageClientSettings.java
index e8700570d2801..f84ec3371e73d 100644
--- a/plugins/repository-gcs/src/main/java/org/opensearch/repositories/gcs/GoogleCloudStorageClientSettings.java
+++ b/plugins/repository-gcs/src/main/java/org/opensearch/repositories/gcs/GoogleCloudStorageClientSettings.java
@@ -34,13 +34,13 @@
 import com.google.api.services.storage.StorageScopes;
 import com.google.auth.oauth2.ServiceAccountCredentials;
 
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.SecureSetting;
 import org.opensearch.common.settings.SecureString;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.settings.SettingsException;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -221,7 +221,9 @@ public String getHost() {
     }
 
     public String getProjectId() {
-        return Strings.hasLength(projectId) ? projectId : (credential != null ? credential.getProjectId() : null);
+        return org.opensearch.core.common.Strings.hasLength(projectId)
+            ? projectId
+            : (credential != null ? credential.getProjectId() : null);
     }
 
     public TimeValue getConnectTimeout() {
@@ -278,12 +280,15 @@ static ProxySettings validateAndCreateProxySettings(final Settings settings, fin
         final SecureString proxyPassword = getConfigValue(settings, clientName, PROXY_PASSWORD_SETTING);
         // Validate proxy settings
         if (proxyType == Proxy.Type.DIRECT
-            && (proxyPort != 0 || Strings.hasText(proxyHost) || Strings.hasText(proxyUserName) || Strings.hasText(proxyPassword))) {
+            && (proxyPort != 0
+                || Strings.hasText(proxyHost)
+                || org.opensearch.core.common.Strings.hasText(proxyUserName)
+                || org.opensearch.core.common.Strings.hasText(proxyPassword))) {
             throw new SettingsException(
                 "Google Cloud Storage proxy port or host or username or password have been set but proxy type is not defined."
             );
         }
-        if (proxyType != Proxy.Type.DIRECT && (proxyPort == 0 || Strings.isEmpty(proxyHost))) {
+        if (proxyType != Proxy.Type.DIRECT && (proxyPort == 0 || org.opensearch.core.common.Strings.isEmpty(proxyHost))) {
             throw new SettingsException("Google Cloud Storage proxy type has been set but proxy host or port is not defined.");
         }
         if (proxyType == Proxy.Type.DIRECT) {
diff --git a/plugins/repository-gcs/src/main/java/org/opensearch/repositories/gcs/GoogleCloudStorageRepository.java b/plugins/repository-gcs/src/main/java/org/opensearch/repositories/gcs/GoogleCloudStorageRepository.java
index 0d6d246f0bcba..4016400e9ea2d 100644
--- a/plugins/repository-gcs/src/main/java/org/opensearch/repositories/gcs/GoogleCloudStorageRepository.java
+++ b/plugins/repository-gcs/src/main/java/org/opensearch/repositories/gcs/GoogleCloudStorageRepository.java
@@ -36,11 +36,11 @@
 import org.apache.logging.log4j.Logger;
 import org.opensearch.cluster.metadata.RepositoryMetadata;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.blobstore.BlobPath;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.unit.ByteSizeUnit;
 import org.opensearch.common.unit.ByteSizeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.indices.recovery.RecoverySettings;
 import org.opensearch.repositories.RepositoryException;
@@ -98,7 +98,7 @@ class GoogleCloudStorageRepository extends MeteredBlobStoreRepository {
         this.storageService = storageService;
 
         String basePath = BASE_PATH.get(metadata.settings());
-        if (Strings.hasLength(basePath)) {
+        if (org.opensearch.core.common.Strings.hasLength(basePath)) {
             BlobPath path = new BlobPath();
             for (String elem : basePath.split("/")) {
                 path = path.add(elem);
diff --git a/plugins/repository-gcs/src/main/java/org/opensearch/repositories/gcs/GoogleCloudStorageService.java b/plugins/repository-gcs/src/main/java/org/opensearch/repositories/gcs/GoogleCloudStorageService.java
index f4b501327d52c..0995e587c2806 100644
--- a/plugins/repository-gcs/src/main/java/org/opensearch/repositories/gcs/GoogleCloudStorageService.java
+++ b/plugins/repository-gcs/src/main/java/org/opensearch/repositories/gcs/GoogleCloudStorageService.java
@@ -45,9 +45,9 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.opensearch.common.Strings;
 import org.opensearch.common.collect.MapBuilder;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 import java.net.Authenticator;
@@ -118,7 +118,7 @@ public Storage client(final String clientName, final String repositoryName, fina
                     "Unknown client name ["
                         + clientName
                         + "]. Existing client configs: "
-                        + Strings.collectionToDelimitedString(clientSettings.keySet(), ",")
+                        + org.opensearch.core.common.Strings.collectionToDelimitedString(clientSettings.keySet(), ",")
                 );
             }
 
@@ -202,15 +202,15 @@ StorageOptions createStorageOptions(
             .setTransportOptions(httpTransportOptions)
             .setHeaderProvider(() -> {
                 final MapBuilder<String, String> mapBuilder = MapBuilder.newMapBuilder();
-                if (Strings.hasLength(clientSettings.getApplicationName())) {
+                if (org.opensearch.core.common.Strings.hasLength(clientSettings.getApplicationName())) {
                     mapBuilder.put("user-agent", clientSettings.getApplicationName());
                 }
                 return mapBuilder.immutableMap();
             });
-        if (Strings.hasLength(clientSettings.getHost())) {
+        if (org.opensearch.core.common.Strings.hasLength(clientSettings.getHost())) {
             storageOptionsBuilder.setHost(clientSettings.getHost());
         }
-        if (Strings.hasLength(clientSettings.getProjectId())) {
+        if (org.opensearch.core.common.Strings.hasLength(clientSettings.getProjectId())) {
             storageOptionsBuilder.setProjectId(clientSettings.getProjectId());
         }
         if (clientSettings.getCredential() == null) {
diff --git a/plugins/repository-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageBlobContainerRetriesTests.java b/plugins/repository-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageBlobContainerRetriesTests.java
index 6850b204e0112..4800394e428b9 100644
--- a/plugins/repository-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageBlobContainerRetriesTests.java
+++ b/plugins/repository-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageBlobContainerRetriesTests.java
@@ -40,7 +40,6 @@
 
 import org.apache.hc.core5.http.HttpStatus;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.SuppressForbidden;
 import org.opensearch.common.UUIDs;
 import org.opensearch.common.blobstore.BlobContainer;
@@ -57,6 +56,7 @@
 import org.opensearch.common.unit.ByteSizeValue;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.concurrent.CountDown;
+import org.opensearch.core.common.Strings;
 import org.opensearch.repositories.blobstore.AbstractBlobContainerRetriesTestCase;
 import org.opensearch.repositories.blobstore.OpenSearchMockAPIBasedRepositoryIntegTestCase;
 import org.opensearch.rest.RestStatus;
diff --git a/plugins/repository-hdfs/src/main/java/org/opensearch/repositories/hdfs/HdfsRepository.java b/plugins/repository-hdfs/src/main/java/org/opensearch/repositories/hdfs/HdfsRepository.java
index 7191fb4106eea..de6bebb8185bb 100644
--- a/plugins/repository-hdfs/src/main/java/org/opensearch/repositories/hdfs/HdfsRepository.java
+++ b/plugins/repository-hdfs/src/main/java/org/opensearch/repositories/hdfs/HdfsRepository.java
@@ -45,11 +45,11 @@
 import org.opensearch.SpecialPermission;
 import org.opensearch.cluster.metadata.RepositoryMetadata;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.SuppressForbidden;
 import org.opensearch.common.blobstore.BlobPath;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.ByteSizeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.env.Environment;
 import org.opensearch.indices.recovery.RecoverySettings;
@@ -103,7 +103,7 @@ public HdfsRepository(
                 )
             );
         }
-        if (Strings.hasLength(uri.getPath()) && uri.getPath().equals("/") == false) {
+        if (org.opensearch.core.common.Strings.hasLength(uri.getPath()) && uri.getPath().equals("/") == false) {
             throw new IllegalArgumentException(
                 String.format(
                     Locale.ROOT,
diff --git a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3BlobContainer.java b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3BlobContainer.java
index c2c272b2527a2..b0498da9f8e30 100644
--- a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3BlobContainer.java
+++ b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3BlobContainer.java
@@ -51,7 +51,6 @@
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.common.Nullable;
 import org.opensearch.common.SetOnce;
-import org.opensearch.common.Strings;
 import org.opensearch.common.blobstore.BlobContainer;
 import org.opensearch.common.blobstore.BlobMetadata;
 import org.opensearch.common.blobstore.BlobPath;
@@ -62,6 +61,7 @@
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.unit.ByteSizeUnit;
 import org.opensearch.common.unit.ByteSizeValue;
+import org.opensearch.core.common.Strings;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3ClientSettings.java b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3ClientSettings.java
index a20cc156545ce..88bf4ca4b2d57 100644
--- a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3ClientSettings.java
+++ b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3ClientSettings.java
@@ -477,7 +477,9 @@ static ProxySettings validateAndCreateProxySettings(final Settings settings, fin
         final int proxyPort = getConfigValue(settings, clientName, PROXY_PORT_SETTING);
         final SecureString proxyUserName = getConfigValue(settings, clientName, PROXY_USERNAME_SETTING);
         final SecureString proxyPassword = getConfigValue(settings, clientName, PROXY_PASSWORD_SETTING);
-        if (awsProtocol != Protocol.HTTPS && proxyType == ProxySettings.ProxyType.DIRECT && Strings.hasText(proxyHost)) {
+        if (awsProtocol != Protocol.HTTPS
+            && proxyType == ProxySettings.ProxyType.DIRECT
+            && org.opensearch.core.common.Strings.hasText(proxyHost)) {
             // This is backward compatibility for the current behaviour.
             // The default value for Protocol settings is HTTPS,
             // The expectation of ex-developers that protocol is the same as the proxy protocol
@@ -496,10 +498,13 @@ static ProxySettings validateAndCreateProxySettings(final Settings settings, fin
         }
         // Validate proxy settings
         if (proxyType == ProxySettings.ProxyType.DIRECT
-            && (proxyPort != 80 || Strings.hasText(proxyHost) || Strings.hasText(proxyUserName) || Strings.hasText(proxyPassword))) {
+            && (proxyPort != 80
+                || org.opensearch.core.common.Strings.hasText(proxyHost)
+                || org.opensearch.core.common.Strings.hasText(proxyUserName)
+                || org.opensearch.core.common.Strings.hasText(proxyPassword))) {
             throw new SettingsException("S3 proxy port or host or username or password have been set but proxy type is not defined.");
         }
-        if (proxyType != ProxySettings.ProxyType.DIRECT && Strings.isEmpty(proxyHost)) {
+        if (proxyType != ProxySettings.ProxyType.DIRECT && org.opensearch.core.common.Strings.isEmpty(proxyHost)) {
             throw new SettingsException("S3 proxy type has been set but proxy host or port is not defined.");
         }
         if (proxyType == ProxySettings.ProxyType.DIRECT) {
diff --git a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3Repository.java b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3Repository.java
index 8094817035845..117b4f009ec03 100644
--- a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3Repository.java
+++ b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3Repository.java
@@ -41,7 +41,6 @@
 import org.opensearch.cluster.metadata.Metadata;
 import org.opensearch.cluster.metadata.RepositoryMetadata;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.blobstore.BlobPath;
 import org.opensearch.common.blobstore.BlobStore;
 import org.opensearch.common.logging.DeprecationLogger;
@@ -50,6 +49,7 @@
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.unit.ByteSizeUnit;
 import org.opensearch.common.unit.ByteSizeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.indices.recovery.RecoverySettings;
 import org.opensearch.monitor.jvm.JvmInfo;
diff --git a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3Service.java b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3Service.java
index ac74857737107..8e23bb62fc04a 100644
--- a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3Service.java
+++ b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3Service.java
@@ -59,9 +59,9 @@
 import org.apache.logging.log4j.Logger;
 import org.opensearch.cluster.metadata.RepositoryMetadata;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.collect.MapBuilder;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.repositories.s3.S3ClientSettings.IrsaCredentials;
 
 import javax.net.ssl.SSLContext;
@@ -176,7 +176,7 @@ S3ClientSettings settings(RepositoryMetadata repositoryMetadata) {
             "Unknown s3 client name ["
                 + clientName
                 + "]. Existing client configs: "
-                + Strings.collectionToDelimitedString(staticClientSettings.keySet(), ",")
+                + org.opensearch.core.common.Strings.collectionToDelimitedString(staticClientSettings.keySet(), ",")
         );
     }
 
@@ -188,13 +188,15 @@ AmazonS3WithCredentials buildClient(final S3ClientSettings clientSettings) {
         builder.withCredentials(credentials);
         builder.withClientConfiguration(buildConfiguration(clientSettings));
 
-        String endpoint = Strings.hasLength(clientSettings.endpoint) ? clientSettings.endpoint : Constants.S3_HOSTNAME;
+        String endpoint = org.opensearch.core.common.Strings.hasLength(clientSettings.endpoint)
+            ? clientSettings.endpoint
+            : Constants.S3_HOSTNAME;
         if ((endpoint.startsWith("http://") || endpoint.startsWith("https://")) == false) {
             // Manually add the schema to the endpoint to work around https://github.com/aws/aws-sdk-java/issues/2274
             // TODO: Remove this once fixed in the AWS SDK
             endpoint = clientSettings.protocol.toString() + "://" + endpoint;
         }
-        final String region = Strings.hasLength(clientSettings.region) ? clientSettings.region : null;
+        final String region = org.opensearch.core.common.Strings.hasLength(clientSettings.region) ? clientSettings.region : null;
         logger.debug("using endpoint [{}] and region [{}]", endpoint, region);
 
         // If the endpoint configuration isn't set on the builder then the default behaviour is to try
@@ -252,7 +254,7 @@ protected PasswordAuthentication getPasswordAuthentication() {
             }
         }
 
-        if (Strings.hasLength(clientSettings.signerOverride)) {
+        if (org.opensearch.core.common.Strings.hasLength(clientSettings.signerOverride)) {
             clientConfiguration.setSignerOverride(clientSettings.signerOverride);
         }
 
diff --git a/qa/die-with-dignity/src/javaRestTest/java/org/opensearch/qa/die_with_dignity/DieWithDignityIT.java b/qa/die-with-dignity/src/javaRestTest/java/org/opensearch/qa/die_with_dignity/DieWithDignityIT.java
index aedb05e8dcbd5..1e8a75c1b662e 100644
--- a/qa/die-with-dignity/src/javaRestTest/java/org/opensearch/qa/die_with_dignity/DieWithDignityIT.java
+++ b/qa/die-with-dignity/src/javaRestTest/java/org/opensearch/qa/die_with_dignity/DieWithDignityIT.java
@@ -76,7 +76,7 @@ public void testDieWithDignity() throws Exception {
         try {
             while (it.hasNext() && (fatalError == false || fatalErrorInThreadExiting == false)) {
                 final String line = it.next();
-                if (line.matches(".*ERROR.*o\\.o\\.ExceptionsHelper.*javaRestTest-0.*fatal error.*")) {
+                if (line.matches(".*ERROR.*o\\.o\\.(Base)?ExceptionsHelper.*javaRestTest-0.*fatal error.*")) {
                     fatalError = true;
                 } else if (line.matches(
                     ".*ERROR.*o\\.o\\.b\\.OpenSearchUncaughtExceptionHandler.*javaRestTest-0.*"
diff --git a/qa/mixed-cluster/src/test/java/org/opensearch/backwards/SearchingIT.java b/qa/mixed-cluster/src/test/java/org/opensearch/backwards/SearchingIT.java
index 839fe01ed81d6..6166d6f3b086e 100644
--- a/qa/mixed-cluster/src/test/java/org/opensearch/backwards/SearchingIT.java
+++ b/qa/mixed-cluster/src/test/java/org/opensearch/backwards/SearchingIT.java
@@ -55,7 +55,7 @@ public void testMultiGet() throws Exception {
         try (RestHighLevelClient client = new RestHighLevelClient(RestClient.builder(nodes.toArray(HttpHost[]::new)))) {
             MultiGetResponse response = client.mget(multiGetRequest, RequestOptions.DEFAULT);
             assertEquals(1, response.getResponses().length);
-    
+
             assertTrue(response.getResponses()[0].isFailed());
             assertNotNull(response.getResponses()[0].getFailure());
             assertEquals(response.getResponses()[0].getFailure().getId(), "id1");
diff --git a/server/src/internalClusterTest/java/org/opensearch/action/RejectionActionIT.java b/server/src/internalClusterTest/java/org/opensearch/action/RejectionActionIT.java
index bda24b48b7f10..f2f55b238ab7c 100644
--- a/server/src/internalClusterTest/java/org/opensearch/action/RejectionActionIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/action/RejectionActionIT.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.action;
 
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.action.search.SearchPhaseExecutionException;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.search.SearchType;
@@ -105,7 +105,7 @@ public void onFailure(Exception e) {
                 }
             } else {
                 Exception t = (Exception) response;
-                Throwable unwrap = ExceptionsHelper.unwrapCause(t);
+                Throwable unwrap = BaseExceptionsHelper.unwrapCause(t);
                 if (unwrap instanceof SearchPhaseExecutionException) {
                     SearchPhaseExecutionException e = (SearchPhaseExecutionException) unwrap;
                     for (ShardSearchFailure failure : e.shardFailures()) {
diff --git a/server/src/internalClusterTest/java/org/opensearch/action/admin/ReloadSecureSettingsIT.java b/server/src/internalClusterTest/java/org/opensearch/action/admin/ReloadSecureSettingsIT.java
index c220591b47856..56112ebdbc999 100644
--- a/server/src/internalClusterTest/java/org/opensearch/action/admin/ReloadSecureSettingsIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/action/admin/ReloadSecureSettingsIT.java
@@ -35,11 +35,11 @@
 import org.opensearch.OpenSearchException;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.admin.cluster.node.reload.NodesReloadSecureSettingsResponse;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.KeyStoreWrapper;
 import org.opensearch.common.settings.SecureSettings;
 import org.opensearch.common.settings.SecureString;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.env.Environment;
 import org.opensearch.plugins.Plugin;
 import org.opensearch.plugins.PluginsService;
diff --git a/server/src/internalClusterTest/java/org/opensearch/action/admin/cluster/node/tasks/TasksIT.java b/server/src/internalClusterTest/java/org/opensearch/action/admin/cluster/node/tasks/TasksIT.java
index 62180412dbf98..bbb9481c47e52 100644
--- a/server/src/internalClusterTest/java/org/opensearch/action/admin/cluster/node/tasks/TasksIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/action/admin/cluster/node/tasks/TasksIT.java
@@ -59,11 +59,11 @@
 import org.opensearch.action.support.replication.TransportReplicationActionTests;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.regex.Regex;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.plugins.Plugin;
 import org.opensearch.search.builder.SearchSourceBuilder;
diff --git a/server/src/internalClusterTest/java/org/opensearch/action/search/TransportSearchIT.java b/server/src/internalClusterTest/java/org/opensearch/action/search/TransportSearchIT.java
index 321f66627ccf0..895d7ebea88b6 100644
--- a/server/src/internalClusterTest/java/org/opensearch/action/search/TransportSearchIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/action/search/TransportSearchIT.java
@@ -36,7 +36,7 @@
 import org.apache.lucene.search.CollectionTerminatedException;
 import org.apache.lucene.search.ScoreMode;
 
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.admin.cluster.node.stats.NodeStats;
 import org.opensearch.action.admin.cluster.node.stats.NodesStatsRequest;
@@ -47,13 +47,13 @@
 import org.opensearch.action.support.WriteRequest;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.metadata.IndexMetadata;
-import org.opensearch.common.Strings;
 import org.opensearch.common.breaker.CircuitBreaker;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.concurrent.AtomicArray;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ObjectParser;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.index.IndexSettings;
@@ -415,7 +415,7 @@ public void onFailure(Exception e) {
                     SearchPhaseExecutionException.class,
                     () -> client.prepareSearch("test").addAggregation(new TestAggregationBuilder("test")).get()
                 );
-                assertThat(ExceptionsHelper.unwrapCause(exc).getCause().getMessage(), containsString("<reduce_aggs>"));
+                assertThat(BaseExceptionsHelper.unwrapCause(exc).getCause().getMessage(), containsString("<reduce_aggs>"));
             });
 
             final AtomicArray<Exception> exceptions = new AtomicArray<>(10);
@@ -443,7 +443,7 @@ public void onFailure(Exception exc) {
             latch.await();
             assertThat(exceptions.asList().size(), equalTo(10));
             for (Exception exc : exceptions.asList()) {
-                assertThat(ExceptionsHelper.unwrapCause(exc).getCause().getMessage(), containsString("<reduce_aggs>"));
+                assertThat(BaseExceptionsHelper.unwrapCause(exc).getCause().getMessage(), containsString("<reduce_aggs>"));
             }
             assertBusy(() -> assertThat(requestBreakerUsed(), equalTo(0L)));
         } finally {
@@ -482,7 +482,7 @@ public void onFailure(Exception exc) {
         latch.await();
         assertThat(exceptions.asList().size(), equalTo(10));
         for (Exception exc : exceptions.asList()) {
-            assertThat(ExceptionsHelper.unwrapCause(exc).getCause().getMessage(), containsString("boom"));
+            assertThat(BaseExceptionsHelper.unwrapCause(exc).getCause().getMessage(), containsString("boom"));
         }
         assertBusy(() -> assertThat(requestBreakerUsed(), equalTo(0L)));
     }
diff --git a/server/src/internalClusterTest/java/org/opensearch/action/termvectors/GetTermVectorsIT.java b/server/src/internalClusterTest/java/org/opensearch/action/termvectors/GetTermVectorsIT.java
index cb9a81027d492..e84f40b3813eb 100644
--- a/server/src/internalClusterTest/java/org/opensearch/action/termvectors/GetTermVectorsIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/action/termvectors/GetTermVectorsIT.java
@@ -43,9 +43,9 @@
 import org.opensearch.action.admin.cluster.shards.ClusterSearchShardsResponse;
 import org.opensearch.action.admin.indices.alias.Alias;
 import org.opensearch.action.index.IndexRequestBuilder;
-import org.opensearch.common.Strings;
 import org.opensearch.common.lucene.uid.Versions;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.index.engine.VersionConflictEngineException;
diff --git a/server/src/internalClusterTest/java/org/opensearch/blocks/SimpleBlocksIT.java b/server/src/internalClusterTest/java/org/opensearch/blocks/SimpleBlocksIT.java
index 8ede3e25b2e1a..872da7bb12b8e 100644
--- a/server/src/internalClusterTest/java/org/opensearch/blocks/SimpleBlocksIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/blocks/SimpleBlocksIT.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.blocks;
 
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.admin.indices.create.CreateIndexResponse;
 import org.opensearch.action.admin.indices.exists.indices.IndicesExistsResponse;
@@ -428,7 +428,7 @@ public void testAddBlockWhileIndexingDocuments() throws Exception {
         try {
             try (BackgroundIndexer indexer = new BackgroundIndexer(indexName, "_doc", client(), 1000)) {
                 indexer.setFailureAssertion(t -> {
-                    Throwable cause = ExceptionsHelper.unwrapCause(t);
+                    Throwable cause = BaseExceptionsHelper.unwrapCause(t);
                     assertThat(cause, instanceOf(ClusterBlockException.class));
                     ClusterBlockException e = (ClusterBlockException) cause;
                     assertThat(e.blocks(), hasSize(1));
@@ -474,7 +474,7 @@ public void testAddBlockWhileDeletingIndices() throws Exception {
         final APIBlock block = randomAddableBlock();
 
         Consumer<Exception> exceptionConsumer = t -> {
-            Throwable cause = ExceptionsHelper.unwrapCause(t);
+            Throwable cause = BaseExceptionsHelper.unwrapCause(t);
             if (cause instanceof ClusterBlockException) {
                 ClusterBlockException e = (ClusterBlockException) cause;
                 assertThat(e.blocks(), hasSize(1));
diff --git a/server/src/internalClusterTest/java/org/opensearch/cluster/ClusterInfoServiceIT.java b/server/src/internalClusterTest/java/org/opensearch/cluster/ClusterInfoServiceIT.java
index 7ec5daf2b908b..17e8526acfd74 100644
--- a/server/src/internalClusterTest/java/org/opensearch/cluster/ClusterInfoServiceIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/cluster/ClusterInfoServiceIT.java
@@ -45,9 +45,9 @@
 import org.opensearch.cluster.routing.ShardRouting;
 import org.opensearch.cluster.routing.allocation.decider.EnableAllocationDecider;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.IndexService;
 import org.opensearch.index.shard.IndexShard;
 import org.opensearch.index.store.Store;
diff --git a/server/src/internalClusterTest/java/org/opensearch/cluster/SimpleClusterStateIT.java b/server/src/internalClusterTest/java/org/opensearch/cluster/SimpleClusterStateIT.java
index c1cfbbbf1fda4..d2c4859e35b1d 100644
--- a/server/src/internalClusterTest/java/org/opensearch/cluster/SimpleClusterStateIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/cluster/SimpleClusterStateIT.java
@@ -45,13 +45,13 @@
 import org.opensearch.cluster.routing.RoutingTable;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.Priority;
-import org.opensearch.common.Strings;
 import org.opensearch.common.UUIDs;
 import org.opensearch.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.ByteSizeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
diff --git a/server/src/internalClusterTest/java/org/opensearch/cluster/allocation/FilteringAllocationIT.java b/server/src/internalClusterTest/java/org/opensearch/cluster/allocation/FilteringAllocationIT.java
index 398adbd0d1ca5..ecf29873f13a5 100644
--- a/server/src/internalClusterTest/java/org/opensearch/cluster/allocation/FilteringAllocationIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/cluster/allocation/FilteringAllocationIT.java
@@ -42,9 +42,9 @@
 import org.opensearch.cluster.routing.ShardRoutingState;
 import org.opensearch.cluster.routing.allocation.decider.FilterAllocationDecider;
 import org.opensearch.cluster.routing.allocation.decider.ThrottlingAllocationDecider;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.test.OpenSearchIntegTestCase;
 import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope;
@@ -287,8 +287,8 @@ public void testTransientSettingsStillApplied() {
         Set<String> includeNodes = new HashSet<>(nodes.subList(3, 6));
         logger.info(
             "--> exclude: [{}], include: [{}]",
-            Strings.collectionToCommaDelimitedString(excludeNodes),
-            Strings.collectionToCommaDelimitedString(includeNodes)
+            org.opensearch.core.common.Strings.collectionToCommaDelimitedString(excludeNodes),
+            org.opensearch.core.common.Strings.collectionToCommaDelimitedString(includeNodes)
         );
         ensureStableCluster(6);
         client().admin().indices().prepareCreate("test").get();
@@ -299,7 +299,10 @@ public void testTransientSettingsStillApplied() {
         }
 
         Settings exclude = Settings.builder()
-            .put("cluster.routing.allocation.exclude._name", Strings.collectionToCommaDelimitedString(excludeNodes))
+            .put(
+                "cluster.routing.allocation.exclude._name",
+                org.opensearch.core.common.Strings.collectionToCommaDelimitedString(excludeNodes)
+            )
             .build();
 
         logger.info("--> updating settings");
@@ -317,7 +320,7 @@ public void testTransientSettingsStillApplied() {
                 "shard on "
                     + node
                     + " but should only be on the include node list: "
-                    + Strings.collectionToCommaDelimitedString(includeNodes),
+                    + org.opensearch.core.common.Strings.collectionToCommaDelimitedString(includeNodes),
                 includeNodes.contains(node)
             );
         }
diff --git a/server/src/internalClusterTest/java/org/opensearch/discovery/StableClusterManagerDisruptionIT.java b/server/src/internalClusterTest/java/org/opensearch/discovery/StableClusterManagerDisruptionIT.java
index ffbaa35f61b72..c12718704e194 100644
--- a/server/src/internalClusterTest/java/org/opensearch/discovery/StableClusterManagerDisruptionIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/discovery/StableClusterManagerDisruptionIT.java
@@ -42,10 +42,10 @@
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.Priority;
-import org.opensearch.common.Strings;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.util.set.Sets;
+import org.opensearch.core.common.Strings;
 import org.opensearch.plugins.Plugin;
 import org.opensearch.test.OpenSearchIntegTestCase;
 import org.opensearch.test.disruption.LongGCDisruption;
diff --git a/server/src/internalClusterTest/java/org/opensearch/indices/IndicesLifecycleListenerIT.java b/server/src/internalClusterTest/java/org/opensearch/indices/IndicesLifecycleListenerIT.java
index d0b9f7c4134fb..72aeff20767bb 100644
--- a/server/src/internalClusterTest/java/org/opensearch/indices/IndicesLifecycleListenerIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/indices/IndicesLifecycleListenerIT.java
@@ -42,8 +42,8 @@
 import org.opensearch.cluster.routing.allocation.decider.EnableAllocationDecider;
 import org.opensearch.common.CheckedRunnable;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.Index;
 import org.opensearch.index.shard.IndexEventListener;
 import org.opensearch.index.shard.IndexShard;
@@ -323,7 +323,10 @@ public void afterIndexShardClosed(ShardId shardId, @Nullable IndexShard indexSha
         public String toString() {
             StringBuilder sb = new StringBuilder();
             for (Map.Entry<ShardId, List<IndexShardState>> entry : shardStates.entrySet()) {
-                sb.append(entry.getKey()).append(" --> ").append(Strings.collectionToCommaDelimitedString(entry.getValue())).append("\n");
+                sb.append(entry.getKey())
+                    .append(" --> ")
+                    .append(org.opensearch.core.common.Strings.collectionToCommaDelimitedString(entry.getValue()))
+                    .append("\n");
             }
             return sb.toString();
         }
diff --git a/server/src/internalClusterTest/java/org/opensearch/indices/IndicesOptionsIntegrationIT.java b/server/src/internalClusterTest/java/org/opensearch/indices/IndicesOptionsIntegrationIT.java
index 1f3d865811939..4d0399080b814 100644
--- a/server/src/internalClusterTest/java/org/opensearch/indices/IndicesOptionsIntegrationIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/indices/IndicesOptionsIntegrationIT.java
@@ -52,10 +52,10 @@
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.action.support.master.AcknowledgedResponse;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Setting.Property;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.plugins.Plugin;
 import org.opensearch.test.OpenSearchIntegTestCase;
diff --git a/server/src/internalClusterTest/java/org/opensearch/indices/memory/breaker/CircuitBreakerServiceIT.java b/server/src/internalClusterTest/java/org/opensearch/indices/memory/breaker/CircuitBreakerServiceIT.java
index 2dc6b2085b866..6ef3848cec9bb 100644
--- a/server/src/internalClusterTest/java/org/opensearch/indices/memory/breaker/CircuitBreakerServiceIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/indices/memory/breaker/CircuitBreakerServiceIT.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.indices.memory.breaker;
 
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.action.admin.cluster.node.stats.NodeStats;
 import org.opensearch.action.admin.cluster.node.stats.NodesStatsResponse;
 import org.opensearch.action.bulk.BulkItemResponse;
@@ -421,7 +421,7 @@ public void testLimitsRequestSize() {
             } else {
                 // each item must have failed with CircuitBreakingException
                 for (BulkItemResponse bulkItemResponse : response) {
-                    Throwable cause = ExceptionsHelper.unwrapCause(bulkItemResponse.getFailure().getCause());
+                    Throwable cause = BaseExceptionsHelper.unwrapCause(bulkItemResponse.getFailure().getCause());
                     assertThat(cause, instanceOf(CircuitBreakingException.class));
                     assertEquals(((CircuitBreakingException) cause).getByteLimit(), inFlightRequestsLimit.getBytes());
                 }
diff --git a/server/src/internalClusterTest/java/org/opensearch/indices/state/CloseIndexIT.java b/server/src/internalClusterTest/java/org/opensearch/indices/state/CloseIndexIT.java
index 28bd5a6ae252d..995f11bcd79c6 100644
--- a/server/src/internalClusterTest/java/org/opensearch/indices/state/CloseIndexIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/indices/state/CloseIndexIT.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.indices.state;
 
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.admin.indices.close.CloseIndexRequestBuilder;
 import org.opensearch.action.admin.indices.close.CloseIndexResponse;
@@ -647,7 +647,7 @@ static void assertIndexIsOpened(final String... indices) {
     }
 
     static void assertException(final Throwable throwable, final String indexName) {
-        final Throwable t = ExceptionsHelper.unwrapCause(throwable);
+        final Throwable t = BaseExceptionsHelper.unwrapCause(throwable);
         if (t instanceof ClusterBlockException) {
             ClusterBlockException clusterBlockException = (ClusterBlockException) t;
             assertThat(clusterBlockException.blocks(), hasSize(1));
diff --git a/server/src/internalClusterTest/java/org/opensearch/indices/state/ReopenWhileClosingIT.java b/server/src/internalClusterTest/java/org/opensearch/indices/state/ReopenWhileClosingIT.java
index 028baa0176367..d6f6ba8dded03 100644
--- a/server/src/internalClusterTest/java/org/opensearch/indices/state/ReopenWhileClosingIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/indices/state/ReopenWhileClosingIT.java
@@ -39,10 +39,10 @@
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.Glob;
-import org.opensearch.common.Strings;
 import org.opensearch.common.lease.Releasable;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.util.concurrent.RunOnce;
+import org.opensearch.core.common.Strings;
 import org.opensearch.plugins.Plugin;
 import org.opensearch.test.OpenSearchIntegTestCase;
 import org.opensearch.test.transport.MockTransportService;
@@ -107,7 +107,7 @@ public void testReopenDuringCloseOnMultipleIndices() throws Exception {
             createIndexWithDocs(indices.get(i), dataOnlyNodes);
         }
 
-        ensureYellowAndNoInitializingShards(indices.toArray(Strings.EMPTY_ARRAY));
+        ensureYellowAndNoInitializingShards(indices.toArray(org.opensearch.common.Strings.EMPTY_ARRAY));
 
         final CountDownLatch block = new CountDownLatch(1);
         final Releasable releaseBlock = interceptVerifyShardBeforeCloseActions(randomFrom(indices), block::countDown);
diff --git a/server/src/internalClusterTest/java/org/opensearch/search/aggregations/bucket/DateHistogramIT.java b/server/src/internalClusterTest/java/org/opensearch/search/aggregations/bucket/DateHistogramIT.java
index 617c5745c9bba..6f97b8ef40ffe 100644
--- a/server/src/internalClusterTest/java/org/opensearch/search/aggregations/bucket/DateHistogramIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/search/aggregations/bucket/DateHistogramIT.java
@@ -31,7 +31,7 @@
 
 package org.opensearch.search.aggregations.bucket;
 
-import org.opensearch.OpenSearchException;
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.action.index.IndexRequestBuilder;
 import org.opensearch.action.search.SearchPhaseExecutionException;
 import org.opensearch.action.search.SearchResponse;
@@ -650,9 +650,9 @@ public void testSingleValuedFieldOrderedByIllegalAgg() throws Exception {
                 .get();
             fail("Expected an exception");
         } catch (SearchPhaseExecutionException e) {
-            OpenSearchException[] rootCauses = e.guessRootCauses();
+            BaseOpenSearchException[] rootCauses = e.guessRootCauses();
             if (rootCauses.length == 1) {
-                OpenSearchException rootCause = rootCauses[0];
+                BaseOpenSearchException rootCause = rootCauses[0];
                 if (rootCause instanceof AggregationExecutionException) {
                     AggregationExecutionException aggException = (AggregationExecutionException) rootCause;
                     assertThat(aggException.getMessage(), Matchers.startsWith("Invalid aggregation order path"));
diff --git a/server/src/internalClusterTest/java/org/opensearch/search/aggregations/bucket/HistogramIT.java b/server/src/internalClusterTest/java/org/opensearch/search/aggregations/bucket/HistogramIT.java
index dae788abe0d10..e56c2b3c713bd 100644
--- a/server/src/internalClusterTest/java/org/opensearch/search/aggregations/bucket/HistogramIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/search/aggregations/bucket/HistogramIT.java
@@ -32,7 +32,7 @@
 package org.opensearch.search.aggregations.bucket;
 
 import com.carrotsearch.hppc.LongHashSet;
-import org.opensearch.OpenSearchException;
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.action.index.IndexRequestBuilder;
 import org.opensearch.action.search.SearchPhaseExecutionException;
 import org.opensearch.action.search.SearchResponse;
@@ -689,9 +689,9 @@ public void testSingleValuedFieldOrderedByIllegalAgg() throws Exception {
                 .get();
             fail("Expected an exception");
         } catch (SearchPhaseExecutionException e) {
-            OpenSearchException[] rootCauses = e.guessRootCauses();
+            BaseOpenSearchException[] rootCauses = e.guessRootCauses();
             if (rootCauses.length == 1) {
-                OpenSearchException rootCause = rootCauses[0];
+                BaseOpenSearchException rootCause = rootCauses[0];
                 if (rootCause instanceof AggregationExecutionException) {
                     AggregationExecutionException aggException = (AggregationExecutionException) rootCause;
                     assertThat(aggException.getMessage(), Matchers.startsWith("Invalid aggregation order path"));
diff --git a/server/src/internalClusterTest/java/org/opensearch/search/aggregations/bucket/terms/StringTermsIT.java b/server/src/internalClusterTest/java/org/opensearch/search/aggregations/bucket/terms/StringTermsIT.java
index fa8e823545b36..96b256dc81ce1 100644
--- a/server/src/internalClusterTest/java/org/opensearch/search/aggregations/bucket/terms/StringTermsIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/search/aggregations/bucket/terms/StringTermsIT.java
@@ -31,6 +31,7 @@
 
 package org.opensearch.search.aggregations.bucket.terms;
 
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.OpenSearchException;
 import org.opensearch.action.search.SearchPhaseExecutionException;
 import org.opensearch.action.search.SearchResponse;
@@ -420,9 +421,9 @@ public void testSingleValuedFieldOrderedByIllegalAgg() throws Exception {
                 .get();
             fail("Expected an exception");
         } catch (SearchPhaseExecutionException e) {
-            OpenSearchException[] rootCauses = e.guessRootCauses();
+            BaseOpenSearchException[] rootCauses = e.guessRootCauses();
             if (rootCauses.length == 1) {
-                OpenSearchException rootCause = rootCauses[0];
+                BaseOpenSearchException rootCause = rootCauses[0];
                 if (rootCause instanceof AggregationExecutionException) {
                     AggregationExecutionException aggException = (AggregationExecutionException) rootCause;
                     assertThat(aggException.getMessage(), startsWith("Invalid aggregation order path"));
diff --git a/server/src/internalClusterTest/java/org/opensearch/search/aggregations/pipeline/DerivativeIT.java b/server/src/internalClusterTest/java/org/opensearch/search/aggregations/pipeline/DerivativeIT.java
index 406c57d044259..eb6153493323c 100644
--- a/server/src/internalClusterTest/java/org/opensearch/search/aggregations/pipeline/DerivativeIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/search/aggregations/pipeline/DerivativeIT.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.search.aggregations.pipeline;
 
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.action.index.IndexRequestBuilder;
 import org.opensearch.action.search.SearchPhaseExecutionException;
 import org.opensearch.action.search.SearchResponse;
@@ -639,7 +639,7 @@ public void testSingleValueAggDerivative_invalidPath() throws Exception {
                 .get();
             fail("Expected an Exception but didn't get one");
         } catch (Exception e) {
-            Throwable cause = ExceptionsHelper.unwrapCause(e);
+            Throwable cause = BaseExceptionsHelper.unwrapCause(e);
             if (cause == null) {
                 throw e;
             } else if (cause instanceof SearchPhaseExecutionException) {
diff --git a/server/src/internalClusterTest/java/org/opensearch/search/aggregations/pipeline/ExtendedStatsBucketIT.java b/server/src/internalClusterTest/java/org/opensearch/search/aggregations/pipeline/ExtendedStatsBucketIT.java
index 85fe794b05fc6..fc4a2908ae563 100644
--- a/server/src/internalClusterTest/java/org/opensearch/search/aggregations/pipeline/ExtendedStatsBucketIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/search/aggregations/pipeline/ExtendedStatsBucketIT.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.search.aggregations.pipeline;
 
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.action.index.IndexRequestBuilder;
 import org.opensearch.action.search.SearchPhaseExecutionException;
 import org.opensearch.action.search.SearchResponse;
@@ -489,7 +489,7 @@ public void testBadSigmaAsSubAgg() throws Exception {
                 )
                 .get()
         );
-        Throwable cause = ExceptionsHelper.unwrapCause(ex);
+        Throwable cause = BaseExceptionsHelper.unwrapCause(ex);
         if (cause == null) {
             throw ex;
         } else if (cause instanceof SearchPhaseExecutionException) {
diff --git a/server/src/internalClusterTest/java/org/opensearch/search/aggregations/pipeline/PercentilesBucketIT.java b/server/src/internalClusterTest/java/org/opensearch/search/aggregations/pipeline/PercentilesBucketIT.java
index 1da079781dc63..4d7fa05ba5043 100644
--- a/server/src/internalClusterTest/java/org/opensearch/search/aggregations/pipeline/PercentilesBucketIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/search/aggregations/pipeline/PercentilesBucketIT.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.search.aggregations.pipeline;
 
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.action.index.IndexRequestBuilder;
 import org.opensearch.action.search.SearchPhaseExecutionException;
 import org.opensearch.action.search.SearchResponse;
@@ -439,7 +439,7 @@ public void testBadPercents() throws Exception {
 
             fail("Illegal percent's were provided but no exception was thrown.");
         } catch (Exception e) {
-            Throwable cause = ExceptionsHelper.unwrapCause(e);
+            Throwable cause = BaseExceptionsHelper.unwrapCause(e);
             if (cause == null) {
                 throw e;
             } else if (cause instanceof SearchPhaseExecutionException) {
@@ -474,7 +474,7 @@ public void testBadPercents_asSubAgg() throws Exception {
 
             fail("Illegal percent's were provided but no exception was thrown.");
         } catch (Exception e) {
-            Throwable cause = ExceptionsHelper.unwrapCause(e);
+            Throwable cause = BaseExceptionsHelper.unwrapCause(e);
             if (cause == null) {
                 throw e;
             } else if (cause instanceof SearchPhaseExecutionException) {
diff --git a/server/src/internalClusterTest/java/org/opensearch/search/preference/SearchPreferenceIT.java b/server/src/internalClusterTest/java/org/opensearch/search/preference/SearchPreferenceIT.java
index 1b68320bcbdf5..e38e5c53d4416 100644
--- a/server/src/internalClusterTest/java/org/opensearch/search/preference/SearchPreferenceIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/search/preference/SearchPreferenceIT.java
@@ -41,9 +41,9 @@
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.routing.OperationRouting;
 import org.opensearch.cluster.routing.allocation.decider.EnableAllocationDecider;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.Strings;
 import org.opensearch.node.Node;
 import org.opensearch.rest.RestStatus;
 import org.opensearch.test.OpenSearchIntegTestCase;
@@ -206,15 +206,15 @@ public void testNodesOnlyRandom() {
             allNodeHosts.add(node.getHostname());
         }
 
-        String node_expr = "_only_nodes:" + Strings.arrayToCommaDelimitedString(allNodeIds.toArray());
+        String node_expr = "_only_nodes:" + org.opensearch.core.common.Strings.arrayToCommaDelimitedString(allNodeIds.toArray());
         request = client.prepareSearch("test").setQuery(matchAllQuery()).setPreference(node_expr);
         assertSearchOnRandomNodes(request);
 
-        node_expr = "_only_nodes:" + Strings.arrayToCommaDelimitedString(allNodeNames.toArray());
+        node_expr = "_only_nodes:" + org.opensearch.core.common.Strings.arrayToCommaDelimitedString(allNodeNames.toArray());
         request = client.prepareSearch("test").setQuery(matchAllQuery()).setPreference(node_expr);
         assertSearchOnRandomNodes(request);
 
-        node_expr = "_only_nodes:" + Strings.arrayToCommaDelimitedString(allNodeHosts.toArray());
+        node_expr = "_only_nodes:" + org.opensearch.core.common.Strings.arrayToCommaDelimitedString(allNodeHosts.toArray());
         request = client.prepareSearch("test").setQuery(matchAllQuery()).setPreference(node_expr);
         assertSearchOnRandomNodes(request);
 
diff --git a/server/src/internalClusterTest/java/org/opensearch/snapshots/ConcurrentSnapshotsIT.java b/server/src/internalClusterTest/java/org/opensearch/snapshots/ConcurrentSnapshotsIT.java
index 0a1de615d4f3c..e2c2c1dfe62d8 100644
--- a/server/src/internalClusterTest/java/org/opensearch/snapshots/ConcurrentSnapshotsIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/snapshots/ConcurrentSnapshotsIT.java
@@ -45,11 +45,11 @@
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.SnapshotDeletionsInProgress;
 import org.opensearch.cluster.SnapshotsInProgress;
-import org.opensearch.common.Strings;
 import org.opensearch.common.UUIDs;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.concurrent.UncategorizedExecutionException;
+import org.opensearch.core.common.Strings;
 import org.opensearch.discovery.AbstractDisruptionTestCase;
 import org.opensearch.plugins.Plugin;
 import org.opensearch.repositories.RepositoryData;
diff --git a/server/src/internalClusterTest/java/org/opensearch/snapshots/DedicatedClusterSnapshotRestoreIT.java b/server/src/internalClusterTest/java/org/opensearch/snapshots/DedicatedClusterSnapshotRestoreIT.java
index 32e6656a50071..973ab82c6750e 100644
--- a/server/src/internalClusterTest/java/org/opensearch/snapshots/DedicatedClusterSnapshotRestoreIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/snapshots/DedicatedClusterSnapshotRestoreIT.java
@@ -57,9 +57,9 @@
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.CheckedFunction;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.ParseField;
 import org.opensearch.common.Priority;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.Writeable;
diff --git a/server/src/internalClusterTest/java/org/opensearch/snapshots/SharedClusterSnapshotRestoreIT.java b/server/src/internalClusterTest/java/org/opensearch/snapshots/SharedClusterSnapshotRestoreIT.java
index fc642d3204ad0..767fd5ea8fde3 100644
--- a/server/src/internalClusterTest/java/org/opensearch/snapshots/SharedClusterSnapshotRestoreIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/snapshots/SharedClusterSnapshotRestoreIT.java
@@ -34,8 +34,8 @@
 
 import org.apache.lucene.util.BytesRef;
 
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.OpenSearchException;
-import org.opensearch.ExceptionsHelper;
 import org.opensearch.Version;
 import org.opensearch.action.ActionFuture;
 import org.opensearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse;
@@ -1986,7 +1986,7 @@ public void testSnapshotSucceedsAfterSnapshotFailure() throws Exception {
             }
         } catch (SnapshotException | RepositoryException ex) {
             // sometimes, the snapshot will fail with a top level I/O exception
-            assertThat(ExceptionsHelper.stackTrace(ex), containsString("Random IOException"));
+            assertThat(BaseExceptionsHelper.stackTrace(ex), containsString("Random IOException"));
         }
 
         logger.info("--> snapshot with no I/O failures");
diff --git a/server/src/internalClusterTest/java/org/opensearch/snapshots/SnapshotStatusApisIT.java b/server/src/internalClusterTest/java/org/opensearch/snapshots/SnapshotStatusApisIT.java
index ebde9f2ab4d1d..72c64b56c19c1 100644
--- a/server/src/internalClusterTest/java/org/opensearch/snapshots/SnapshotStatusApisIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/snapshots/SnapshotStatusApisIT.java
@@ -45,11 +45,11 @@
 import org.opensearch.action.admin.cluster.snapshots.status.SnapshotsStatusResponse;
 import org.opensearch.client.Client;
 import org.opensearch.cluster.SnapshotsInProgress;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.ByteSizeUnit;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.io.IOUtils;
+import org.opensearch.core.common.Strings;
 import org.opensearch.repositories.blobstore.BlobStoreRepository;
 import org.opensearch.threadpool.ThreadPool;
 
diff --git a/server/src/main/java/org/opensearch/ExceptionsHelper.java b/server/src/main/java/org/opensearch/ExceptionsHelper.java
index 486fb7a3c72ee..111ac8e5ef276 100644
--- a/server/src/main/java/org/opensearch/ExceptionsHelper.java
+++ b/server/src/main/java/org/opensearch/ExceptionsHelper.java
@@ -33,8 +33,6 @@
 package org.opensearch;
 
 import com.fasterxml.jackson.core.JsonParseException;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.lucene.index.CorruptIndexException;
 import org.apache.lucene.index.IndexFormatTooNewException;
 import org.apache.lucene.index.IndexFormatTooOldException;
@@ -48,8 +46,6 @@
 import org.opensearch.rest.RestStatus;
 
 import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -69,9 +65,7 @@
  *
  * @opensearch.internal
  */
-public final class ExceptionsHelper {
-
-    private static final Logger logger = LogManager.getLogger(ExceptionsHelper.class);
+public final class ExceptionsHelper extends BaseExceptionsHelper {
 
     public static RuntimeException convertToRuntime(Exception e) {
         if (e instanceof RuntimeException) {
@@ -104,77 +98,6 @@ public static RestStatus status(Throwable t) {
         return RestStatus.INTERNAL_SERVER_ERROR;
     }
 
-    public static String summaryMessage(Throwable t) {
-        if (t != null) {
-            if (t instanceof OpenSearchException) {
-                return t.getClass().getSimpleName() + "[" + t.getMessage() + "]";
-            } else if (t instanceof IllegalArgumentException) {
-                return "Invalid argument";
-            } else if (t instanceof JsonParseException) {
-                return "Failed to parse JSON";
-            } else if (t instanceof OpenSearchRejectedExecutionException) {
-                return "Too many requests";
-            }
-        }
-        return "Internal failure";
-    }
-
-    public static Throwable unwrapCause(Throwable t) {
-        int counter = 0;
-        Throwable result = t;
-        while (result instanceof OpenSearchWrapperException) {
-            if (result.getCause() == null) {
-                return result;
-            }
-            if (result.getCause() == result) {
-                return result;
-            }
-            if (counter++ > 10) {
-                // dear god, if we got more than 10 levels down, WTF? just bail
-                logger.warn("Exception cause unwrapping ran for 10 levels...", t);
-                return result;
-            }
-            result = result.getCause();
-        }
-        return result;
-    }
-
-    /**
-     * @deprecated Don't swallow exceptions, allow them to propagate.
-     */
-    @Deprecated
-    public static String detailedMessage(Throwable t) {
-        if (t == null) {
-            return "Unknown";
-        }
-        if (t.getCause() != null) {
-            StringBuilder sb = new StringBuilder();
-            while (t != null) {
-                sb.append(t.getClass().getSimpleName());
-                if (t.getMessage() != null) {
-                    sb.append("[");
-                    sb.append(t.getMessage());
-                    sb.append("]");
-                }
-                sb.append("; ");
-                t = t.getCause();
-                if (t != null) {
-                    sb.append("nested: ");
-                }
-            }
-            return sb.toString();
-        } else {
-            return t.getClass().getSimpleName() + "[" + t.getMessage() + "]";
-        }
-    }
-
-    public static String stackTrace(Throwable e) {
-        StringWriter stackTraceStringWriter = new StringWriter();
-        PrintWriter printWriter = new PrintWriter(stackTraceStringWriter);
-        e.printStackTrace(printWriter);
-        return stackTraceStringWriter.toString();
-    }
-
     public static String formatStackTrace(final StackTraceElement[] stackTrace) {
         return Arrays.stream(stackTrace).skip(1).map(e -> "\tat " + e).collect(Collectors.joining("\n"));
     }
diff --git a/server/src/main/java/org/opensearch/OpenSearchException.java b/server/src/main/java/org/opensearch/OpenSearchException.java
index 35881e1804f0f..14d527216b0e0 100644
--- a/server/src/main/java/org/opensearch/OpenSearchException.java
+++ b/server/src/main/java/org/opensearch/OpenSearchException.java
@@ -39,16 +39,12 @@
 import org.opensearch.cluster.routing.UnsupportedWeightedRoutingStateException;
 import org.opensearch.cluster.service.ClusterManagerThrottlingException;
 import org.opensearch.common.CheckedFunction;
-import org.opensearch.common.Nullable;
-import org.opensearch.core.ParseField;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.io.stream.Writeable;
-import org.opensearch.common.logging.LoggerMessageFormat;
 import org.opensearch.core.xcontent.ToXContentFragment;
 import org.opensearch.core.xcontent.XContentBuilder;
-import org.opensearch.core.xcontent.XContentParseException;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.Index;
 import org.opensearch.index.shard.ShardId;
@@ -69,8 +65,6 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import static java.util.Collections.emptyMap;
-import static java.util.Collections.singletonMap;
 import static java.util.Collections.unmodifiableMap;
 import static org.opensearch.Version.V_2_1_0;
 import static org.opensearch.Version.V_2_4_0;
@@ -87,52 +81,18 @@
  *
  * @opensearch.internal
  */
-public class OpenSearchException extends RuntimeException implements ToXContentFragment, Writeable {
-
-    private static final Version UNKNOWN_VERSION_ADDED = Version.fromId(0);
+public class OpenSearchException extends BaseOpenSearchException implements ToXContentFragment, Writeable {
 
     /**
      * Setting a higher base exception id to avoid conflicts.
      */
     private static final int CUSTOM_ELASTICSEARCH_EXCEPTIONS_BASE_ID = 10000;
 
-    /**
-     * Passed in the {@link Params} of {@link #generateThrowableXContent(XContentBuilder, Params, Throwable)}
-     * to control if the {@code caused_by} element should render. Unlike most parameters to {@code toXContent} methods this parameter is
-     * internal only and not available as a URL parameter.
-     */
-    private static final String REST_EXCEPTION_SKIP_CAUSE = "rest.exception.cause.skip";
-    /**
-     * Passed in the {@link Params} of {@link #generateThrowableXContent(XContentBuilder, Params, Throwable)}
-     * to control if the {@code stack_trace} element should render. Unlike most parameters to {@code toXContent} methods this parameter is
-     * internal only and not available as a URL parameter. Use the {@code error_trace} parameter instead.
-     */
-    public static final String REST_EXCEPTION_SKIP_STACK_TRACE = "rest.exception.stacktrace.skip";
-    public static final boolean REST_EXCEPTION_SKIP_STACK_TRACE_DEFAULT = true;
-    private static final boolean REST_EXCEPTION_SKIP_CAUSE_DEFAULT = false;
-    private static final String INDEX_METADATA_KEY = "opensearch.index";
-    private static final String INDEX_METADATA_KEY_UUID = "opensearch.index_uuid";
-    private static final String SHARD_METADATA_KEY = "opensearch.shard";
-    private static final String RESOURCE_METADATA_TYPE_KEY = "opensearch.resource.type";
-    private static final String RESOURCE_METADATA_ID_KEY = "opensearch.resource.id";
-
-    private static final String TYPE = "type";
-    private static final String REASON = "reason";
-    private static final String CAUSED_BY = "caused_by";
-    private static final ParseField SUPPRESSED = new ParseField("suppressed");
-    public static final String STACK_TRACE = "stack_trace";
-    private static final String HEADER = "header";
-    private static final String ERROR = "error";
-    private static final String ROOT_CAUSE = "root_cause";
-
     private static final Map<Integer, CheckedFunction<StreamInput, ? extends OpenSearchException, IOException>> ID_TO_SUPPLIER;
     private static final Map<Class<? extends OpenSearchException>, OpenSearchExceptionHandle> CLASS_TO_OPENSEARCH_EXCEPTION_HANDLE;
 
     private static final Pattern OS_METADATA = Pattern.compile("^opensearch\\.");
 
-    private final Map<String, List<String>> metadata = new HashMap<>();
-    private final Map<String, List<String>> headers = new HashMap<>();
-
     /**
      * Construct a <code>OpenSearchException</code> with the specified cause exception.
      */
@@ -150,7 +110,7 @@ public OpenSearchException(Throwable cause) {
      * @param args the arguments for the message
      */
     public OpenSearchException(String msg, Object... args) {
-        super(LoggerMessageFormat.format(msg, args));
+        super(msg, args);
     }
 
     /**
@@ -165,7 +125,7 @@ public OpenSearchException(String msg, Object... args) {
      * @param args  the arguments for the message
      */
     public OpenSearchException(String msg, Throwable cause, Object... args) {
-        super(LoggerMessageFormat.format(msg, args), cause);
+        super(msg, cause, args);
     }
 
     public OpenSearchException(StreamInput in) throws IOException {
@@ -175,86 +135,6 @@ public OpenSearchException(StreamInput in) throws IOException {
         metadata.putAll(in.readMapOfLists(StreamInput::readString, StreamInput::readString));
     }
 
-    /**
-     * Adds a new piece of metadata with the given key.
-     * If the provided key is already present, the corresponding metadata will be replaced
-     */
-    public void addMetadata(String key, String... values) {
-        addMetadata(key, Arrays.asList(values));
-    }
-
-    /**
-     * Adds a new piece of metadata with the given key.
-     * If the provided key is already present, the corresponding metadata will be replaced
-     */
-    public void addMetadata(String key, List<String> values) {
-        // we need to enforce this otherwise bw comp doesn't work properly, as "opensearch."
-        // was the previous criteria to split headers in two sets
-        if (key.startsWith("opensearch.") == false) {
-            throw new IllegalArgumentException("exception metadata must start with [opensearch.], found [" + key + "] instead");
-        }
-        this.metadata.put(key, values);
-    }
-
-    /**
-     * Returns a set of all metadata keys on this exception
-     */
-    public Set<String> getMetadataKeys() {
-        return metadata.keySet();
-    }
-
-    /**
-     * Returns the list of metadata values for the given key or {@code null} if no metadata for the
-     * given key exists.
-     */
-    public List<String> getMetadata(String key) {
-        return metadata.get(key);
-    }
-
-    protected Map<String, List<String>> getMetadata() {
-        return metadata;
-    }
-
-    /**
-     * Adds a new header with the given key.
-     * This method will replace existing header if a header with the same key already exists
-     */
-    public void addHeader(String key, List<String> value) {
-        // we need to enforce this otherwise bw comp doesn't work properly, as "opensearch."
-        // was the previous criteria to split headers in two sets
-        if (key.startsWith("opensearch.")) {
-            throw new IllegalArgumentException("exception headers must not start with [opensearch.], found [" + key + "] instead");
-        }
-        this.headers.put(key, value);
-    }
-
-    /**
-     * Adds a new header with the given key.
-     * This method will replace existing header if a header with the same key already exists
-     */
-    public void addHeader(String key, String... value) {
-        addHeader(key, Arrays.asList(value));
-    }
-
-    /**
-     * Returns a set of all header keys on this exception
-     */
-    public Set<String> getHeaderKeys() {
-        return headers.keySet();
-    }
-
-    /**
-     * Returns the list of header values for the given key or {@code null} if no header for the
-     * given key exists.
-     */
-    public List<String> getHeader(String key) {
-        return headers.get(key);
-    }
-
-    protected Map<String, List<String>> getHeaders() {
-        return headers;
-    }
-
     /**
      * Returns the rest status code associated with this exception.
      */
@@ -267,48 +147,6 @@ public RestStatus status() {
         }
     }
 
-    /**
-     * Unwraps the actual cause from the exception for cases when the exception is a
-     * {@link OpenSearchWrapperException}.
-     *
-     * @see ExceptionsHelper#unwrapCause(Throwable)
-     */
-    public Throwable unwrapCause() {
-        return ExceptionsHelper.unwrapCause(this);
-    }
-
-    /**
-     * Return the detail message, including the message from the nested exception
-     * if there is one.
-     */
-    public String getDetailedMessage() {
-        if (getCause() != null) {
-            StringBuilder sb = new StringBuilder();
-            sb.append(toString()).append("; ");
-            if (getCause() instanceof OpenSearchException) {
-                sb.append(((OpenSearchException) getCause()).getDetailedMessage());
-            } else {
-                sb.append(getCause());
-            }
-            return sb.toString();
-        } else {
-            return super.toString();
-        }
-    }
-
-    /**
-     * Retrieve the innermost cause of this exception, if none, returns the current exception.
-     */
-    public Throwable getRootCause() {
-        Throwable rootCause = this;
-        Throwable cause = getCause();
-        while (cause != null && cause != rootCause) {
-            rootCause = cause;
-            cause = cause.getCause();
-        }
-        return rootCause;
-    }
-
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         out.writeOptionalString(this.getMessage());
@@ -348,91 +186,6 @@ public static int getId(Class<? extends OpenSearchException> exception) {
         return CLASS_TO_OPENSEARCH_EXCEPTION_HANDLE.get(exception).id;
     }
 
-    @Override
-    public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-        Throwable ex = ExceptionsHelper.unwrapCause(this);
-        if (ex != this) {
-            generateThrowableXContent(builder, params, this);
-        } else {
-            innerToXContent(builder, params, this, getExceptionName(), getMessage(), headers, metadata, getCause());
-        }
-        return builder;
-    }
-
-    protected static void innerToXContent(
-        XContentBuilder builder,
-        Params params,
-        Throwable throwable,
-        String type,
-        String message,
-        Map<String, List<String>> headers,
-        Map<String, List<String>> metadata,
-        Throwable cause
-    ) throws IOException {
-        builder.field(TYPE, type);
-        builder.field(REASON, message);
-
-        for (Map.Entry<String, List<String>> entry : metadata.entrySet()) {
-            headerToXContent(builder, entry.getKey().substring("opensearch.".length()), entry.getValue());
-        }
-
-        if (throwable instanceof OpenSearchException) {
-            OpenSearchException exception = (OpenSearchException) throwable;
-            exception.metadataToXContent(builder, params);
-        }
-
-        if (params.paramAsBoolean(REST_EXCEPTION_SKIP_CAUSE, REST_EXCEPTION_SKIP_CAUSE_DEFAULT) == false) {
-            if (cause != null) {
-                builder.field(CAUSED_BY);
-                builder.startObject();
-                generateThrowableXContent(builder, params, cause);
-                builder.endObject();
-            }
-        }
-
-        if (headers.isEmpty() == false) {
-            builder.startObject(HEADER);
-            for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
-                headerToXContent(builder, entry.getKey(), entry.getValue());
-            }
-            builder.endObject();
-        }
-
-        if (params.paramAsBoolean(REST_EXCEPTION_SKIP_STACK_TRACE, REST_EXCEPTION_SKIP_STACK_TRACE_DEFAULT) == false) {
-            builder.field(STACK_TRACE, ExceptionsHelper.stackTrace(throwable));
-        }
-
-        Throwable[] allSuppressed = throwable.getSuppressed();
-        if (allSuppressed.length > 0) {
-            builder.startArray(SUPPRESSED.getPreferredName());
-            for (Throwable suppressed : allSuppressed) {
-                builder.startObject();
-                generateThrowableXContent(builder, params, suppressed);
-                builder.endObject();
-            }
-            builder.endArray();
-        }
-    }
-
-    private static void headerToXContent(XContentBuilder builder, String key, List<String> values) throws IOException {
-        if (values != null && values.isEmpty() == false) {
-            if (values.size() == 1) {
-                builder.field(key, values.get(0));
-            } else {
-                builder.startArray(key);
-                for (String value : values) {
-                    builder.value(value);
-                }
-                builder.endArray();
-            }
-        }
-    }
-
-    /**
-     * Renders additional per exception information into the XContent
-     */
-    protected void metadataToXContent(XContentBuilder builder, Params params) throws IOException {}
-
     /**
      * Generate a {@link OpenSearchException} from a {@link XContentParser}. This does not
      * return the original exception type (ie NodeClosedException for example) but just wraps
@@ -540,7 +293,7 @@ public static OpenSearchException innerFromXContent(XContentParser parser, boole
             // by addMetadata. The prefix will get stripped out when printing metadata out so it will be effectively invisible.
             // TODO move subclasses that print out simple metadata to using addMetadata directly and support also numbers and booleans.
             // TODO rename metadataToXContent and have only SearchPhaseExecutionException use it, which prints out complex objects
-            e.addMetadata("opensearch." + entry.getKey(), entry.getValue());
+            e.addMetadata(OPENSEARCH_PREFIX_KEY + entry.getKey(), entry.getValue());
         }
         for (Map.Entry<String, List<String>> header : headers.entrySet()) {
             e.addHeader(header.getKey(), header.getValue());
@@ -557,70 +310,6 @@ public static OpenSearchException innerFromXContent(XContentParser parser, boole
         return e;
     }
 
-    /**
-     * Static toXContent helper method that renders {@link OpenSearchException} or {@link Throwable} instances
-     * as XContent, delegating the rendering to {@link #toXContent(XContentBuilder, Params)}
-     * or {@link #innerToXContent(XContentBuilder, Params, Throwable, String, String, Map, Map, Throwable)}.
-     *
-     * This method is usually used when the {@link Throwable} is rendered as a part of another XContent object, and its result can
-     * be parsed back using the {@link #fromXContent(XContentParser)} method.
-     */
-    public static void generateThrowableXContent(XContentBuilder builder, Params params, Throwable t) throws IOException {
-        t = ExceptionsHelper.unwrapCause(t);
-
-        if (t instanceof OpenSearchException) {
-            ((OpenSearchException) t).toXContent(builder, params);
-        } else {
-            innerToXContent(builder, params, t, getExceptionName(t), t.getMessage(), emptyMap(), emptyMap(), t.getCause());
-        }
-    }
-
-    /**
-     * Render any exception as a xcontent, encapsulated within a field or object named "error". The level of details that are rendered
-     * depends on the value of the "detailed" parameter: when it's false only a simple message based on the type and message of the
-     * exception is rendered. When it's true all detail are provided including guesses root causes, cause and potentially stack
-     * trace.
-     *
-     * This method is usually used when the {@link Exception} is rendered as a full XContent object, and its output can be parsed
-     * by the {@link #failureFromXContent(XContentParser)} method.
-     */
-    public static void generateFailureXContent(XContentBuilder builder, Params params, @Nullable Exception e, boolean detailed)
-        throws IOException {
-        // No exception to render as an error
-        if (e == null) {
-            builder.field(ERROR, "unknown");
-            return;
-        }
-
-        // Render the exception with a simple message
-        if (detailed == false) {
-            Throwable t = e;
-            for (int counter = 0; counter < 10 && t != null; counter++) {
-                if (t instanceof OpenSearchException) {
-                    break;
-                }
-                t = t.getCause();
-            }
-            builder.field(ERROR, ExceptionsHelper.summaryMessage(t != null ? t : e));
-            return;
-        }
-
-        // Render the exception with all details
-        final OpenSearchException[] rootCauses = OpenSearchException.guessRootCauses(e);
-        builder.startObject(ERROR);
-        {
-            builder.startArray(ROOT_CAUSE);
-            for (OpenSearchException rootCause : rootCauses) {
-                builder.startObject();
-                rootCause.toXContent(builder, new DelegatingMapParams(singletonMap(REST_EXCEPTION_SKIP_CAUSE, "true"), params));
-                builder.endObject();
-            }
-            builder.endArray();
-        }
-        generateThrowableXContent(builder, params, e);
-        builder.endObject();
-    }
-
     /**
      * Parses the output of {@link #generateFailureXContent(XContentBuilder, Params, Exception, boolean)}
      */
@@ -640,79 +329,6 @@ public static OpenSearchException failureFromXContent(XContentParser parser) thr
         return innerFromXContent(parser, true);
     }
 
-    /**
-     * Returns the root cause of this exception or multiple if different shards caused different exceptions
-     */
-    public OpenSearchException[] guessRootCauses() {
-        final Throwable cause = getCause();
-        if (cause != null && cause instanceof OpenSearchException) {
-            return ((OpenSearchException) cause).guessRootCauses();
-        }
-        return new OpenSearchException[] { this };
-    }
-
-    /**
-     * Returns the root cause of this exception or multiple if different shards caused different exceptions.
-     * If the given exception is not an instance of {@link OpenSearchException} an empty array
-     * is returned.
-     */
-    public static OpenSearchException[] guessRootCauses(Throwable t) {
-        Throwable ex = ExceptionsHelper.unwrapCause(t);
-        if (ex instanceof OpenSearchException) {
-            // OpenSearchException knows how to guess its own root cause
-            return ((OpenSearchException) ex).guessRootCauses();
-        }
-        if (ex instanceof XContentParseException) {
-            /*
-             * We'd like to unwrap parsing exceptions to the inner-most
-             * parsing exception because that is generally the most interesting
-             * exception to return to the user. If that exception is caused by
-             * an OpenSearchException we'd like to keep unwrapping because
-             * OpenSearchException instances tend to contain useful information
-             * for the user.
-             */
-            Throwable cause = ex.getCause();
-            if (cause != null) {
-                if (cause instanceof XContentParseException || cause instanceof OpenSearchException) {
-                    return guessRootCauses(ex.getCause());
-                }
-            }
-        }
-        return new OpenSearchException[] { new OpenSearchException(ex.getMessage(), ex) {
-            @Override
-            protected String getExceptionName() {
-                return getExceptionName(getCause());
-            }
-        } };
-    }
-
-    protected String getExceptionName() {
-        return getExceptionName(this);
-    }
-
-    /**
-     * Returns an underscore case name for the given exception. This method strips {@code OpenSearch} prefixes from exception names.
-     */
-    public static String getExceptionName(Throwable ex) {
-        String simpleName = ex.getClass().getSimpleName();
-        if (simpleName.startsWith("OpenSearch")) {
-            simpleName = simpleName.substring("OpenSearch".length());
-        }
-        // TODO: do we really need to make the exception name in underscore casing?
-        return toUnderscoreCase(simpleName);
-    }
-
-    static String buildMessage(String type, String reason, String stack) {
-        StringBuilder message = new StringBuilder("OpenSearch exception [");
-        message.append(TYPE).append('=').append(type).append(", ");
-        message.append(REASON).append('=').append(reason);
-        if (stack != null) {
-            message.append(", ").append(STACK_TRACE).append('=').append(stack);
-        }
-        message.append(']');
-        return message.toString();
-    }
-
     @Override
     public String toString() {
         StringBuilder builder = new StringBuilder();
@@ -723,7 +339,7 @@ public String toString() {
             }
             builder.append(' ');
         }
-        return builder.append(ExceptionsHelper.detailedMessage(this).trim()).toString();
+        return builder.append(BaseExceptionsHelper.detailedMessage(this).trim()).toString();
     }
 
     /**
@@ -1742,58 +1358,4 @@ public void setShard(ShardId shardId) {
         }
     }
 
-    public void setResources(String type, String... id) {
-        assert type != null;
-        addMetadata(RESOURCE_METADATA_ID_KEY, id);
-        addMetadata(RESOURCE_METADATA_TYPE_KEY, type);
-    }
-
-    public List<String> getResourceId() {
-        return getMetadata(RESOURCE_METADATA_ID_KEY);
-    }
-
-    public String getResourceType() {
-        List<String> header = getMetadata(RESOURCE_METADATA_TYPE_KEY);
-        if (header != null && header.isEmpty() == false) {
-            assert header.size() == 1;
-            return header.get(0);
-        }
-        return null;
-    }
-
-    // lower cases and adds underscores to transitions in a name
-    private static String toUnderscoreCase(String value) {
-        StringBuilder sb = new StringBuilder();
-        boolean changed = false;
-        for (int i = 0; i < value.length(); i++) {
-            char c = value.charAt(i);
-            if (Character.isUpperCase(c)) {
-                if (!changed) {
-                    // copy it over here
-                    for (int j = 0; j < i; j++) {
-                        sb.append(value.charAt(j));
-                    }
-                    changed = true;
-                    if (i == 0) {
-                        sb.append(Character.toLowerCase(c));
-                    } else {
-                        sb.append('_');
-                        sb.append(Character.toLowerCase(c));
-                    }
-                } else {
-                    sb.append('_');
-                    sb.append(Character.toLowerCase(c));
-                }
-            } else {
-                if (changed) {
-                    sb.append(c);
-                }
-            }
-        }
-        if (!changed) {
-            return value;
-        }
-        return sb.toString();
-    }
-
 }
diff --git a/server/src/main/java/org/opensearch/action/TaskOperationFailure.java b/server/src/main/java/org/opensearch/action/TaskOperationFailure.java
index f938abba9f9b2..d6de08f0947b7 100644
--- a/server/src/main/java/org/opensearch/action/TaskOperationFailure.java
+++ b/server/src/main/java/org/opensearch/action/TaskOperationFailure.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.action;
 
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.OpenSearchException;
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.core.ParseField;
@@ -144,7 +145,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         if (reason != null) {
             builder.field(REASON);
             builder.startObject();
-            OpenSearchException.generateThrowableXContent(builder, params, reason);
+            BaseOpenSearchException.generateThrowableXContent(builder, params, reason);
             builder.endObject();
         }
         return builder;
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequest.java
index 4b52f553a88e3..3ad74b3cd732f 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequest.java
@@ -37,11 +37,11 @@
 import org.opensearch.cluster.coordination.CoordinationMetadata.VotingConfigExclusion;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.node.DiscoveryNodes;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -72,7 +72,7 @@ public class AddVotingConfigExclusionsRequest extends ClusterManagerNodeRequest<
      * @param nodeNames Names of the nodes to add - see {@link AddVotingConfigExclusionsRequest#resolveVotingConfigExclusions(ClusterState)}
      */
     public AddVotingConfigExclusionsRequest(String... nodeNames) {
-        this(Strings.EMPTY_ARRAY, Strings.EMPTY_ARRAY, nodeNames, TimeValue.timeValueSeconds(30));
+        this(org.opensearch.common.Strings.EMPTY_ARRAY, Strings.EMPTY_ARRAY, nodeNames, TimeValue.timeValueSeconds(30));
     }
 
     /**
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/get/GetDecommissionStateRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/get/GetDecommissionStateRequest.java
index 1f301aa2b5273..773c12c525817 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/get/GetDecommissionStateRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/get/GetDecommissionStateRequest.java
@@ -10,9 +10,9 @@
 
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.support.clustermanager.ClusterManagerNodeReadRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/put/DecommissionRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/put/DecommissionRequest.java
index 44f047137eece..1ea80d098e10e 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/put/DecommissionRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/put/DecommissionRequest.java
@@ -11,10 +11,10 @@
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.support.clustermanager.ClusterManagerNodeRequest;
 import org.opensearch.cluster.decommission.DecommissionAttribute;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 
@@ -123,7 +123,8 @@ public ActionRequestValidationException validate() {
             validationException = addValidationError("decommission attribute is missing", validationException);
             return validationException;
         }
-        if (decommissionAttribute.attributeName() == null || Strings.isEmpty(decommissionAttribute.attributeName())) {
+        if (decommissionAttribute.attributeName() == null
+            || org.opensearch.core.common.Strings.isEmpty(decommissionAttribute.attributeName())) {
             validationException = addValidationError("attribute name is missing", validationException);
         }
         if (decommissionAttribute.attributeValue() == null || Strings.isEmpty(decommissionAttribute.attributeValue())) {
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/health/TransportClusterHealthAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/health/TransportClusterHealthAction.java
index d475826b059d8..606b74b9b85df 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/health/TransportClusterHealthAction.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/health/TransportClusterHealthAction.java
@@ -57,11 +57,11 @@
 import org.opensearch.cluster.routing.WeightedRoutingUtils;
 import org.opensearch.cluster.routing.allocation.AllocationService;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.CollectionUtils;
+import org.opensearch.core.common.Strings;
 import org.opensearch.discovery.ClusterManagerNotDiscoveredException;
 import org.opensearch.discovery.Discovery;
 import org.opensearch.index.IndexNotFoundException;
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsResponse.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsResponse.java
index f6d9a5c7b6453..a35a188fb1233 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsResponse.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsResponse.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.action.admin.cluster.node.reload;
 
-import org.opensearch.OpenSearchException;
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.action.FailedNodeException;
 import org.opensearch.action.support.nodes.BaseNodeResponse;
 import org.opensearch.action.support.nodes.BaseNodesResponse;
@@ -83,7 +83,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             final Exception e = node.reloadException();
             if (e != null) {
                 builder.startObject("reload_exception");
-                OpenSearchException.generateThrowableXContent(builder, params, e);
+                BaseOpenSearchException.generateThrowableXContent(builder, params, e);
                 builder.endObject();
             }
             builder.endObject();
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/remotestore/restore/RestoreRemoteStoreRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/remotestore/restore/RestoreRemoteStoreRequest.java
index 3addd5a0c3a30..3bc72ae80c083 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/remotestore/restore/RestoreRemoteStoreRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/remotestore/restore/RestoreRemoteStoreRequest.java
@@ -130,7 +130,7 @@ public RestoreRemoteStoreRequest source(Map<String, Object> source) {
             String name = entry.getKey();
             if (name.equals("indices")) {
                 if (entry.getValue() instanceof String) {
-                    indices(Strings.splitStringByCommaToArray((String) entry.getValue()));
+                    indices(org.opensearch.core.common.Strings.splitStringByCommaToArray((String) entry.getValue()));
                 } else if (entry.getValue() instanceof ArrayList) {
                     indices((ArrayList<String>) entry.getValue());
                 } else {
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java
index d042e60638c47..ca70dcce9d0c0 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/repositories/get/GetRepositoriesRequest.java
@@ -34,9 +34,9 @@
 
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.support.clustermanager.ClusterManagerNodeReadRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java
index 218dfcbc816d9..94c4269e77109 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java
@@ -58,10 +58,10 @@
 import org.opensearch.cluster.service.ClusterManagerTaskThrottler;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.Priority;
-import org.opensearch.common.Strings;
 import org.opensearch.common.collect.ImmutableOpenIntMap;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.Strings;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.transport.TransportService;
 
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java
index fb3da57db7291..4e2bb613e1cba 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/shards/ClusterSearchShardsRequest.java
@@ -37,9 +37,9 @@
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.action.support.clustermanager.ClusterManagerNodeReadRequest;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 import java.util.Objects;
@@ -146,7 +146,7 @@ public ClusterSearchShardsRequest routing(String routing) {
      * The routing values to control the shards that the search will be executed on.
      */
     public ClusterSearchShardsRequest routing(String... routings) {
-        this.routing = Strings.arrayToCommaDelimitedString(routings);
+        this.routing = org.opensearch.core.common.Strings.arrayToCommaDelimitedString(routings);
         return this;
     }
 
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/clone/CloneSnapshotRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/clone/CloneSnapshotRequestBuilder.java
index a9472937040e9..6de90bb4e7a06 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/clone/CloneSnapshotRequestBuilder.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/clone/CloneSnapshotRequestBuilder.java
@@ -37,7 +37,7 @@
 import org.opensearch.action.support.master.AcknowledgedResponse;
 import org.opensearch.action.support.clustermanager.ClusterManagerNodeOperationRequestBuilder;
 import org.opensearch.client.OpenSearchClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 
 /**
  * Transport request builder for cloning a snapshot
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java
index dcd7ddc6674e0..7d287673a498b 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java
@@ -446,7 +446,7 @@ public CreateSnapshotRequest source(Map<String, Object> source) {
             String name = entry.getKey();
             if (name.equals("indices")) {
                 if (entry.getValue() instanceof String) {
-                    indices(Strings.splitStringByCommaToArray((String) entry.getValue()));
+                    indices(org.opensearch.core.common.Strings.splitStringByCommaToArray((String) entry.getValue()));
                 } else if (entry.getValue() instanceof List) {
                     indices((List<String>) entry.getValue());
                 } else {
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java
index bb50cbf4316a9..5aa695f9bc1dd 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java
@@ -34,9 +34,9 @@
 
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.support.clustermanager.ClusterManagerNodeRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java
index 04a92a38510b8..4d53ccbc3804c 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java
@@ -533,7 +533,7 @@ public RestoreSnapshotRequest source(Map<String, Object> source) {
             String name = entry.getKey();
             if (name.equals("indices")) {
                 if (entry.getValue() instanceof String) {
-                    indices(Strings.splitStringByCommaToArray((String) entry.getValue()));
+                    indices(org.opensearch.core.common.Strings.splitStringByCommaToArray((String) entry.getValue()));
                 } else if (entry.getValue() instanceof ArrayList) {
                     indices((ArrayList<String>) entry.getValue());
                 } else {
@@ -572,7 +572,7 @@ public RestoreSnapshotRequest source(Map<String, Object> source) {
                 indexSettings((Map<String, Object>) entry.getValue());
             } else if (name.equals("ignore_index_settings")) {
                 if (entry.getValue() instanceof String) {
-                    ignoreIndexSettings(Strings.splitStringByCommaToArray((String) entry.getValue()));
+                    ignoreIndexSettings(org.opensearch.core.common.Strings.splitStringByCommaToArray((String) entry.getValue()));
                 } else if (entry.getValue() instanceof List) {
                     ignoreIndexSettings((List<String>) entry.getValue());
                 } else {
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java
index 7afa7a25c7c0e..5573f36e12a54 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java
@@ -34,9 +34,9 @@
 
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.support.clustermanager.ClusterManagerNodeRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java
index 0400c3afbaf99..e39af07a53f37 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java
@@ -46,11 +46,11 @@
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.util.CollectionUtils;
 import org.opensearch.common.util.set.Sets;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.shard.ShardId;
 import org.opensearch.index.snapshots.IndexShardSnapshotStatus;
 import org.opensearch.repositories.IndexId;
@@ -299,7 +299,7 @@ private void buildResponse(
         }
         // Now add snapshots on disk that are not currently running
         final String repositoryName = request.repository();
-        if (Strings.hasText(repositoryName) && CollectionUtils.isEmpty(request.snapshots()) == false) {
+        if (org.opensearch.core.common.Strings.hasText(repositoryName) && CollectionUtils.isEmpty(request.snapshots()) == false) {
             loadRepositoryData(snapshotsInProgress, request, builder, currentSnapshotNames, repositoryName, listener);
         } else {
             listener.onResponse(new SnapshotsStatusResponse(Collections.unmodifiableList(builder)));
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/state/ClusterStateRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/state/ClusterStateRequest.java
index 1c6afaf08a89c..10cf009713022 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/state/ClusterStateRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/state/ClusterStateRequest.java
@@ -36,10 +36,10 @@
 import org.opensearch.action.IndicesRequest;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.action.support.clustermanager.ClusterManagerNodeReadRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 
@@ -102,7 +102,7 @@ public ClusterStateRequest all() {
         metadata = true;
         blocks = true;
         customs = true;
-        indices = Strings.EMPTY_ARRAY;
+        indices = org.opensearch.common.Strings.EMPTY_ARRAY;
         return this;
     }
 
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/stats/ClusterStatsNodes.java b/server/src/main/java/org/opensearch/action/admin/cluster/stats/ClusterStatsNodes.java
index cf66ed480c7a7..4cda2c87e52f2 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/stats/ClusterStatsNodes.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/stats/ClusterStatsNodes.java
@@ -40,12 +40,12 @@
 import org.opensearch.action.admin.cluster.node.stats.NodeStats;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.node.DiscoveryNodeRole;
-import org.opensearch.common.Strings;
 import org.opensearch.common.network.NetworkModule;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.common.unit.ByteSizeValue;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContentFragment;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.discovery.DiscoveryModule;
@@ -684,7 +684,7 @@ static class NetworkTypes implements ToXContentFragment {
                     NetworkModule.TRANSPORT_DEFAULT_TYPE_SETTING.get(settings)
                 );
                 final String httpType = settings.get(NetworkModule.HTTP_TYPE_KEY, NetworkModule.HTTP_DEFAULT_TYPE_SETTING.get(settings));
-                if (Strings.hasText(transportType)) {
+                if (org.opensearch.core.common.Strings.hasText(transportType)) {
                     transportTypes.computeIfAbsent(transportType, k -> new AtomicInteger()).incrementAndGet();
                 }
                 if (Strings.hasText(httpType)) {
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java
index 466941038bd33..583f208287e68 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/storedscripts/PutStoredScriptRequest.java
@@ -37,6 +37,7 @@
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContentFragment;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentHelper;
@@ -152,7 +153,7 @@ public void writeTo(StreamOutput out) throws IOException {
 
     @Override
     public String toString() {
-        String source = "_na_";
+        String source = Strings.UNKNOWN_UUID_VALUE;
 
         try {
             source = XContentHelper.convertToJson(content, false, xContentType);
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/alias/IndicesAliasesRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/alias/IndicesAliasesRequest.java
index 489db8e0958f8..8520becf65f10 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/alias/IndicesAliasesRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/alias/IndicesAliasesRequest.java
@@ -321,7 +321,7 @@ public AliasActions indices(String... indices) {
                 throw new IllegalArgumentException("[indices] can't be empty");
             }
             for (String index : indices) {
-                if (false == Strings.hasLength(index)) {
+                if (false == org.opensearch.core.common.Strings.hasLength(index)) {
                     throw new IllegalArgumentException("[indices] can't contain empty string");
                 }
             }
@@ -333,7 +333,7 @@ public AliasActions indices(String... indices) {
          * Set the index this action is operating on.
          */
         public AliasActions index(String index) {
-            if (false == Strings.hasLength(index)) {
+            if (false == org.opensearch.core.common.Strings.hasLength(index)) {
                 throw new IllegalArgumentException("[index] can't be empty string");
             }
             this.indices = new String[] { index };
@@ -351,7 +351,7 @@ public AliasActions aliases(String... aliases) {
                 throw new IllegalArgumentException("[aliases] can't be empty");
             }
             for (String alias : aliases) {
-                if (false == Strings.hasLength(alias)) {
+                if (false == org.opensearch.core.common.Strings.hasLength(alias)) {
                     throw new IllegalArgumentException("[aliases] can't contain empty string");
                 }
             }
@@ -367,7 +367,7 @@ public AliasActions alias(String alias) {
             if (type == AliasActions.Type.REMOVE_INDEX) {
                 throw new IllegalArgumentException("[alias] is unsupported for [" + type + "]");
             }
-            if (false == Strings.hasLength(alias)) {
+            if (false == org.opensearch.core.common.Strings.hasLength(alias)) {
                 throw new IllegalArgumentException("[alias] can't be empty string");
             }
             this.aliases = new String[] { alias };
@@ -530,18 +530,18 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             if (0 != aliases.length) {
                 builder.array(ALIASES.getPreferredName(), aliases);
             }
-            if (false == Strings.isEmpty(filter)) {
+            if (false == org.opensearch.core.common.Strings.isEmpty(filter)) {
                 try (InputStream stream = new BytesArray(filter).streamInput()) {
                     builder.rawField(FILTER.getPreferredName(), stream, XContentType.JSON);
                 }
             }
-            if (false == Strings.isEmpty(routing)) {
+            if (false == org.opensearch.core.common.Strings.isEmpty(routing)) {
                 builder.field(ROUTING.getPreferredName(), routing);
             }
-            if (false == Strings.isEmpty(indexRouting)) {
+            if (false == org.opensearch.core.common.Strings.isEmpty(indexRouting)) {
                 builder.field(INDEX_ROUTING.getPreferredName(), indexRouting);
             }
-            if (false == Strings.isEmpty(searchRouting)) {
+            if (false == org.opensearch.core.common.Strings.isEmpty(searchRouting)) {
                 builder.field(SEARCH_ROUTING.getPreferredName(), searchRouting);
             }
             if (null != writeIndex) {
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/alias/get/GetAliasesRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/alias/get/GetAliasesRequest.java
index 81dd9a6045cf5..c7a7e16ef112c 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/alias/get/GetAliasesRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/alias/get/GetAliasesRequest.java
@@ -35,9 +35,9 @@
 import org.opensearch.action.AliasesRequest;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.action.support.clustermanager.ClusterManagerNodeReadRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java
index 35913c2579aa9..6346876dc78c9 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/cache/clear/ClearIndicesCacheRequest.java
@@ -33,9 +33,9 @@
 package org.opensearch.action.admin.indices.cache.clear;
 
 import org.opensearch.action.support.broadcast.BroadcastRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/close/CloseIndexResponse.java b/server/src/main/java/org/opensearch/action/admin/indices/close/CloseIndexResponse.java
index b806e78cd93ff..b7b589606561b 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/close/CloseIndexResponse.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/close/CloseIndexResponse.java
@@ -31,7 +31,7 @@
 
 package org.opensearch.action.admin.indices.close;
 
-import org.opensearch.OpenSearchException;
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.action.support.DefaultShardOperationFailedException;
 import org.opensearch.action.support.master.ShardsAcknowledgedResponse;
 import org.opensearch.common.Nullable;
@@ -172,7 +172,7 @@ public XContentBuilder toXContent(final XContentBuilder builder, final Params pa
                     builder.field("closed", false);
                     if (exception != null) {
                         builder.startObject("exception");
-                        OpenSearchException.generateFailureXContent(builder, params, exception, true);
+                        BaseOpenSearchException.generateFailureXContent(builder, params, exception, true);
                         builder.endObject();
                     } else {
                         builder.startObject("failedShards");
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/dangling/find/FindDanglingIndexRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/dangling/find/FindDanglingIndexRequest.java
index 5c1e3c0a23eae..f9c6d8d2f1d50 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/dangling/find/FindDanglingIndexRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/dangling/find/FindDanglingIndexRequest.java
@@ -33,9 +33,9 @@
 package org.opensearch.action.admin.indices.dangling.find;
 
 import org.opensearch.action.support.nodes.BaseNodesRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/dangling/list/ListDanglingIndicesRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/dangling/list/ListDanglingIndicesRequest.java
index ba5fd8fc139ec..a361d321bfd46 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/dangling/list/ListDanglingIndicesRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/dangling/list/ListDanglingIndicesRequest.java
@@ -33,9 +33,9 @@
 package org.opensearch.action.admin.indices.dangling.list;
 
 import org.opensearch.action.support.nodes.BaseNodesRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/datastream/CreateDataStreamAction.java b/server/src/main/java/org/opensearch/action/admin/indices/datastream/CreateDataStreamAction.java
index ddc93dd1fcf6c..9f1069e60c625 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/datastream/CreateDataStreamAction.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/datastream/CreateDataStreamAction.java
@@ -48,10 +48,10 @@
 import org.opensearch.cluster.metadata.MetadataCreateDataStreamService;
 import org.opensearch.cluster.metadata.MetadataCreateDataStreamService.CreateDataStreamClusterStateUpdateRequest;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.transport.TransportService;
 
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/datastream/DeleteDataStreamAction.java b/server/src/main/java/org/opensearch/action/admin/indices/datastream/DeleteDataStreamAction.java
index 9260904025df2..ca032e66a34f7 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/datastream/DeleteDataStreamAction.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/datastream/DeleteDataStreamAction.java
@@ -54,13 +54,13 @@
 import org.opensearch.cluster.service.ClusterManagerTaskThrottler;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.Priority;
-import org.opensearch.common.Strings;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.regex.Regex;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.CollectionUtils;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.Index;
 import org.opensearch.snapshots.SnapshotInProgressException;
 import org.opensearch.snapshots.SnapshotsService;
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/exists/indices/IndicesExistsRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/exists/indices/IndicesExistsRequest.java
index 0b83478933cd4..294f395437931 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/exists/indices/IndicesExistsRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/exists/indices/IndicesExistsRequest.java
@@ -36,9 +36,9 @@
 import org.opensearch.action.IndicesRequest;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.action.support.clustermanager.ClusterManagerNodeReadRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java
index 176eca5e35cec..1ce2c2473c455 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetFieldMappingsIndexRequest.java
@@ -37,9 +37,9 @@
 import org.opensearch.action.OriginalIndices;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.action.support.single.shard.SingleShardRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java
index db00f3d5244ac..55a36a95dfd2d 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/GetFieldMappingsRequest.java
@@ -37,9 +37,9 @@
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.IndicesRequest;
 import org.opensearch.action.support.IndicesOptions;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 import java.util.Arrays;
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/mapping/put/PutMappingRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/mapping/put/PutMappingRequest.java
index 37c3bce7425cd..fad48bc260081 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/mapping/put/PutMappingRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/mapping/put/PutMappingRequest.java
@@ -248,7 +248,7 @@ public static XContentBuilder simpleMapping(String... source) {
                 String fieldName = source[i++];
                 if (RESERVED_FIELDS.contains(fieldName)) {
                     builder.startObject(fieldName);
-                    String[] s1 = Strings.splitStringByCommaToArray(source[i]);
+                    String[] s1 = org.opensearch.core.common.Strings.splitStringByCommaToArray(source[i]);
                     for (String s : s1) {
                         String[] s2 = Strings.split(s, "=");
                         if (s2.length != 2) {
@@ -268,7 +268,7 @@ public static XContentBuilder simpleMapping(String... source) {
                 }
 
                 builder.startObject(fieldName);
-                String[] s1 = Strings.splitStringByCommaToArray(source[i]);
+                String[] s1 = org.opensearch.core.common.Strings.splitStringByCommaToArray(source[i]);
                 for (String s : s1) {
                     String[] s2 = Strings.split(s, "=");
                     if (s2.length != 2) {
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/readonly/AddIndexBlockResponse.java b/server/src/main/java/org/opensearch/action/admin/indices/readonly/AddIndexBlockResponse.java
index 6d89170fefd7c..6d31dfb98b7c8 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/readonly/AddIndexBlockResponse.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/readonly/AddIndexBlockResponse.java
@@ -31,7 +31,7 @@
 
 package org.opensearch.action.admin.indices.readonly;
 
-import org.opensearch.OpenSearchException;
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.action.support.DefaultShardOperationFailedException;
 import org.opensearch.action.support.master.ShardsAcknowledgedResponse;
 import org.opensearch.common.Nullable;
@@ -172,7 +172,7 @@ public XContentBuilder toXContent(final XContentBuilder builder, final Params pa
                 if (hasFailures()) {
                     if (exception != null) {
                         builder.startObject("exception");
-                        OpenSearchException.generateFailureXContent(builder, params, exception, true);
+                        BaseOpenSearchException.generateFailureXContent(builder, params, exception, true);
                         builder.endObject();
                     } else {
                         builder.startArray("failed_shards");
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/recovery/RecoveryRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/recovery/RecoveryRequest.java
index 8b1fe1e88da22..d89c86a8f8e79 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/recovery/RecoveryRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/recovery/RecoveryRequest.java
@@ -34,9 +34,9 @@
 
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.action.support.broadcast.BroadcastRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/replication/SegmentReplicationStatsRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/replication/SegmentReplicationStatsRequest.java
index 1142bf697db27..6df990aecd3e3 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/replication/SegmentReplicationStatsRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/replication/SegmentReplicationStatsRequest.java
@@ -10,9 +10,9 @@
 
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.action.support.broadcast.BroadcastRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/resolve/ResolveIndexAction.java b/server/src/main/java/org/opensearch/action/admin/indices/resolve/ResolveIndexAction.java
index e2de74f34222b..fa98b2577fcde 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/resolve/ResolveIndexAction.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/resolve/ResolveIndexAction.java
@@ -51,13 +51,13 @@
 import org.opensearch.cluster.metadata.Metadata;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.Nullable;
-import org.opensearch.core.ParseField;
 import org.opensearch.common.Strings;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.io.stream.Writeable;
 import org.opensearch.common.util.concurrent.CountDown;
+import org.opensearch.core.ParseField;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.tasks.Task;
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/rollover/MetadataRolloverService.java b/server/src/main/java/org/opensearch/action/admin/indices/rollover/MetadataRolloverService.java
index 266da30155583..a51135a3d0ec1 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/rollover/MetadataRolloverService.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/rollover/MetadataRolloverService.java
@@ -410,7 +410,7 @@ static void validate(Metadata metadata, String rolloverTarget, String newIndexNa
                 "rollover target is a ["
                     + indexAbstraction.getType().getDisplayName()
                     + "] but one of ["
-                    + Strings.collectionToCommaDelimitedString(
+                    + org.opensearch.core.common.Strings.collectionToCommaDelimitedString(
                         VALID_ROLLOVER_TARGETS.stream().map(IndexAbstraction.Type::getDisplayName).collect(Collectors.toList())
                     )
                     + "] was expected"
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/segments/IndicesSegmentsRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/segments/IndicesSegmentsRequest.java
index dd8c02a97c0f7..948b95b5a77be 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/segments/IndicesSegmentsRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/segments/IndicesSegmentsRequest.java
@@ -33,9 +33,9 @@
 package org.opensearch.action.admin.indices.segments;
 
 import org.opensearch.action.support.broadcast.BroadcastRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/segments/PitSegmentsRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/segments/PitSegmentsRequest.java
index 35a4deba7bb43..ef1704dedf414 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/segments/PitSegmentsRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/segments/PitSegmentsRequest.java
@@ -10,9 +10,9 @@
 
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.support.broadcast.BroadcastRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentParser;
 
 import java.io.IOException;
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/segments/TransportPitSegmentsAction.java b/server/src/main/java/org/opensearch/action/admin/indices/segments/TransportPitSegmentsAction.java
index 348a99fe89a34..5c22a39cf3a40 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/segments/TransportPitSegmentsAction.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/segments/TransportPitSegmentsAction.java
@@ -27,11 +27,11 @@
 import org.opensearch.cluster.routing.ShardsIterator;
 import org.opensearch.cluster.routing.UnassignedInfo;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.index.shard.ShardId;
 import org.opensearch.indices.IndicesService;
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/settings/get/GetSettingsRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/settings/get/GetSettingsRequest.java
index b917e6734e932..37587bd5e4c25 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/settings/get/GetSettingsRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/settings/get/GetSettingsRequest.java
@@ -37,9 +37,9 @@
 import org.opensearch.action.ValidateActions;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.action.support.clustermanager.ClusterManagerNodeReadRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 import java.util.Arrays;
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/shards/IndicesShardStoresRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/shards/IndicesShardStoresRequest.java
index e73addbc56ce0..a910e849fe87a 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/shards/IndicesShardStoresRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/shards/IndicesShardStoresRequest.java
@@ -36,9 +36,9 @@
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.action.support.clustermanager.ClusterManagerNodeReadRequest;
 import org.opensearch.cluster.health.ClusterHealthStatus;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 import java.util.EnumSet;
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/shards/IndicesShardStoresResponse.java b/server/src/main/java/org/opensearch/action/admin/indices/shards/IndicesShardStoresResponse.java
index 01321bb09323d..cc1d667fb383f 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/shards/IndicesShardStoresResponse.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/shards/IndicesShardStoresResponse.java
@@ -33,7 +33,7 @@
 package org.opensearch.action.admin.indices.shards;
 
 import com.carrotsearch.hppc.cursors.IntObjectCursor;
-import org.opensearch.OpenSearchException;
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.action.ActionResponse;
 import org.opensearch.action.support.DefaultShardOperationFailedException;
 import org.opensearch.cluster.node.DiscoveryNode;
@@ -202,7 +202,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             builder.field(Fields.ALLOCATED, allocationStatus.value());
             if (storeException != null) {
                 builder.startObject(Fields.STORE_EXCEPTION);
-                OpenSearchException.generateThrowableXContent(builder, params, storeException);
+                BaseOpenSearchException.generateThrowableXContent(builder, params, storeException);
                 builder.endObject();
             }
             return builder;
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/stats/CommonStatsFlags.java b/server/src/main/java/org/opensearch/action/admin/indices/stats/CommonStatsFlags.java
index 6b819ac34cef9..c93299e350ca6 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/stats/CommonStatsFlags.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/stats/CommonStatsFlags.java
@@ -33,10 +33,10 @@
 package org.opensearch.action.admin.indices.stats;
 
 import org.opensearch.Version;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.io.stream.Writeable;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 import java.util.Collections;
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java
index c0a990c0d8bbd..e97c97d78b6e6 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/template/get/GetIndexTemplatesRequest.java
@@ -33,9 +33,9 @@
 
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.support.clustermanager.ClusterManagerNodeReadRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/template/put/PutComponentTemplateAction.java b/server/src/main/java/org/opensearch/action/admin/indices/template/put/PutComponentTemplateAction.java
index f94e79b685bbc..594bde675239a 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/template/put/PutComponentTemplateAction.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/template/put/PutComponentTemplateAction.java
@@ -38,9 +38,9 @@
 import org.opensearch.action.support.clustermanager.ClusterManagerNodeRequest;
 import org.opensearch.cluster.metadata.ComponentTemplate;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/template/put/PutComposableIndexTemplateAction.java b/server/src/main/java/org/opensearch/action/admin/indices/template/put/PutComposableIndexTemplateAction.java
index 7b05aaa0da711..bd2ca61cc94c7 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/template/put/PutComposableIndexTemplateAction.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/template/put/PutComposableIndexTemplateAction.java
@@ -41,10 +41,10 @@
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.metadata.ComposableIndexTemplate;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.regex.Regex;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 import java.util.Objects;
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/upgrade/get/UpgradeStatusRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/upgrade/get/UpgradeStatusRequest.java
index 48a19ccdf0b94..f3f0bc70ce201 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/upgrade/get/UpgradeStatusRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/upgrade/get/UpgradeStatusRequest.java
@@ -33,8 +33,8 @@
 package org.opensearch.action.admin.indices.upgrade.get;
 
 import org.opensearch.action.support.broadcast.BroadcastRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/validate/query/ValidateQueryRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/validate/query/ValidateQueryRequest.java
index ce2507605772e..91485d84eceb3 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/validate/query/ValidateQueryRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/validate/query/ValidateQueryRequest.java
@@ -37,11 +37,11 @@
 import org.opensearch.action.ValidateActions;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.action.support.broadcast.BroadcastRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.query.MatchAllQueryBuilder;
 import org.opensearch.index.query.QueryBuilder;
 
diff --git a/server/src/main/java/org/opensearch/action/bulk/BulkItemResponse.java b/server/src/main/java/org/opensearch/action/bulk/BulkItemResponse.java
index c712a18e85013..fafbb5dbcd6bf 100644
--- a/server/src/main/java/org/opensearch/action/bulk/BulkItemResponse.java
+++ b/server/src/main/java/org/opensearch/action/bulk/BulkItemResponse.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.action.bulk;
 
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.OpenSearchException;
 import org.opensearch.Version;
@@ -94,7 +95,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             builder.field(_ID, failure.getId());
             builder.field(STATUS, failure.getStatus().getStatus());
             builder.startObject(ERROR);
-            OpenSearchException.generateThrowableXContent(builder, params, failure.getCause());
+            BaseOpenSearchException.generateThrowableXContent(builder, params, failure.getCause());
             builder.endObject();
         }
         builder.endObject();
@@ -356,7 +357,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
                 builder.field(ID_FIELD, id);
             }
             builder.startObject(CAUSE_FIELD);
-            OpenSearchException.generateThrowableXContent(builder, params, cause);
+            BaseOpenSearchException.generateThrowableXContent(builder, params, cause);
             builder.endObject();
             builder.field(STATUS_FIELD, status.getStatus());
             return builder;
diff --git a/server/src/main/java/org/opensearch/action/bulk/BulkRequest.java b/server/src/main/java/org/opensearch/action/bulk/BulkRequest.java
index 3af4227bf46ca..96ef3633809cf 100644
--- a/server/src/main/java/org/opensearch/action/bulk/BulkRequest.java
+++ b/server/src/main/java/org/opensearch/action/bulk/BulkRequest.java
@@ -455,7 +455,11 @@ public void writeTo(StreamOutput out) throws IOException {
 
     @Override
     public String getDescription() {
-        return "requests[" + requests.size() + "], indices[" + Strings.collectionToDelimitedString(indices, ", ") + "]";
+        return "requests["
+            + requests.size()
+            + "], indices["
+            + org.opensearch.core.common.Strings.collectionToDelimitedString(indices, ", ")
+            + "]";
     }
 
     private void applyGlobalMandatoryParameters(DocWriteRequest<?> request) {
diff --git a/server/src/main/java/org/opensearch/action/bulk/TransportBulkAction.java b/server/src/main/java/org/opensearch/action/bulk/TransportBulkAction.java
index ebba7c93af023..830570dcbd134 100644
--- a/server/src/main/java/org/opensearch/action/bulk/TransportBulkAction.java
+++ b/server/src/main/java/org/opensearch/action/bulk/TransportBulkAction.java
@@ -35,9 +35,9 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.lucene.util.SparseFixedBitSet;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.core.Assertions;
 import org.opensearch.OpenSearchParseException;
-import org.opensearch.ExceptionsHelper;
 import org.opensearch.ResourceAlreadyExistsException;
 import org.opensearch.Version;
 import org.opensearch.action.ActionListener;
@@ -325,7 +325,7 @@ protected void doRun() {
 
                         @Override
                         public void onFailure(Exception e) {
-                            if (!(ExceptionsHelper.unwrapCause(e) instanceof ResourceAlreadyExistsException)) {
+                            if (!(BaseExceptionsHelper.unwrapCause(e) instanceof ResourceAlreadyExistsException)) {
                                 // fail all requests involving this index, if create didn't work
                                 for (int i = 0; i < bulkRequest.requests.size(); i++) {
                                     DocWriteRequest<?> request = bulkRequest.requests.get(i);
diff --git a/server/src/main/java/org/opensearch/action/bulk/TransportShardBulkAction.java b/server/src/main/java/org/opensearch/action/bulk/TransportShardBulkAction.java
index 6af512b011653..c41a15ac41c4c 100644
--- a/server/src/main/java/org/opensearch/action/bulk/TransportShardBulkAction.java
+++ b/server/src/main/java/org/opensearch/action/bulk/TransportShardBulkAction.java
@@ -36,7 +36,7 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.logging.log4j.util.MessageSupplier;
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.ActionListenerResponseHandler;
 import org.opensearch.action.ActionRunnable;
@@ -706,7 +706,7 @@ && isConflictException(executionResult.getFailure().getCause())
     }
 
     private static boolean isConflictException(final Exception e) {
-        return ExceptionsHelper.unwrapCause(e) instanceof VersionConflictEngineException;
+        return BaseExceptionsHelper.unwrapCause(e) instanceof VersionConflictEngineException;
     }
 
     /**
diff --git a/server/src/main/java/org/opensearch/action/delete/DeleteRequest.java b/server/src/main/java/org/opensearch/action/delete/DeleteRequest.java
index 86880c0211c1d..b9bd556688ca1 100644
--- a/server/src/main/java/org/opensearch/action/delete/DeleteRequest.java
+++ b/server/src/main/java/org/opensearch/action/delete/DeleteRequest.java
@@ -39,10 +39,10 @@
 import org.opensearch.action.DocWriteRequest;
 import org.opensearch.action.support.replication.ReplicatedWriteRequest;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.lucene.uid.Versions;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.VersionType;
 import org.opensearch.index.mapper.MapperService;
 import org.opensearch.index.shard.ShardId;
diff --git a/server/src/main/java/org/opensearch/action/explain/ExplainRequest.java b/server/src/main/java/org/opensearch/action/explain/ExplainRequest.java
index 58297dffc6762..8e20a921c7b3f 100644
--- a/server/src/main/java/org/opensearch/action/explain/ExplainRequest.java
+++ b/server/src/main/java/org/opensearch/action/explain/ExplainRequest.java
@@ -37,9 +37,9 @@
 import org.opensearch.action.ValidateActions;
 import org.opensearch.action.support.single.shard.SingleShardRequest;
 import org.opensearch.core.ParseField;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.index.mapper.MapperService;
diff --git a/server/src/main/java/org/opensearch/action/explain/ExplainRequestBuilder.java b/server/src/main/java/org/opensearch/action/explain/ExplainRequestBuilder.java
index a582b29346665..3031cb6067469 100644
--- a/server/src/main/java/org/opensearch/action/explain/ExplainRequestBuilder.java
+++ b/server/src/main/java/org/opensearch/action/explain/ExplainRequestBuilder.java
@@ -35,7 +35,7 @@
 import org.opensearch.action.support.single.shard.SingleShardOperationRequestBuilder;
 import org.opensearch.client.OpenSearchClient;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.search.fetch.subphase.FetchSourceContext;
 
diff --git a/server/src/main/java/org/opensearch/action/fieldcaps/FieldCapabilitiesRequest.java b/server/src/main/java/org/opensearch/action/fieldcaps/FieldCapabilitiesRequest.java
index 353f299affc01..4065fc8f4be33 100644
--- a/server/src/main/java/org/opensearch/action/fieldcaps/FieldCapabilitiesRequest.java
+++ b/server/src/main/java/org/opensearch/action/fieldcaps/FieldCapabilitiesRequest.java
@@ -37,9 +37,9 @@
 import org.opensearch.action.IndicesRequest;
 import org.opensearch.action.ValidateActions;
 import org.opensearch.action.support.IndicesOptions;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/server/src/main/java/org/opensearch/action/fieldcaps/TransportFieldCapabilitiesAction.java b/server/src/main/java/org/opensearch/action/fieldcaps/TransportFieldCapabilitiesAction.java
index 2d669a5f1aad9..84f13b7d22c92 100644
--- a/server/src/main/java/org/opensearch/action/fieldcaps/TransportFieldCapabilitiesAction.java
+++ b/server/src/main/java/org/opensearch/action/fieldcaps/TransportFieldCapabilitiesAction.java
@@ -40,9 +40,9 @@
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.util.concurrent.CountDown;
+import org.opensearch.core.common.Strings;
 import org.opensearch.tasks.Task;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.transport.RemoteClusterAware;
diff --git a/server/src/main/java/org/opensearch/action/fieldcaps/TransportFieldCapabilitiesIndexAction.java b/server/src/main/java/org/opensearch/action/fieldcaps/TransportFieldCapabilitiesIndexAction.java
index fc23ce97517f9..7fa9e43bee21d 100644
--- a/server/src/main/java/org/opensearch/action/fieldcaps/TransportFieldCapabilitiesIndexAction.java
+++ b/server/src/main/java/org/opensearch/action/fieldcaps/TransportFieldCapabilitiesIndexAction.java
@@ -56,7 +56,7 @@
 import org.opensearch.common.Nullable;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.logging.LoggerMessageFormat;
+import org.opensearch.core.common.logging.LoggerMessageFormat;
 import org.opensearch.index.mapper.MappedFieldType;
 import org.opensearch.index.mapper.MapperService;
 import org.opensearch.index.mapper.ObjectMapper;
diff --git a/server/src/main/java/org/opensearch/action/get/GetRequest.java b/server/src/main/java/org/opensearch/action/get/GetRequest.java
index 33b4979c41b37..ff0450404f7f9 100644
--- a/server/src/main/java/org/opensearch/action/get/GetRequest.java
+++ b/server/src/main/java/org/opensearch/action/get/GetRequest.java
@@ -37,10 +37,10 @@
 import org.opensearch.action.RealtimeRequest;
 import org.opensearch.action.ValidateActions;
 import org.opensearch.action.support.single.shard.SingleShardRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.lucene.uid.Versions;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.VersionType;
 import org.opensearch.index.mapper.MapperService;
 import org.opensearch.search.fetch.subphase.FetchSourceContext;
diff --git a/server/src/main/java/org/opensearch/action/get/GetRequestBuilder.java b/server/src/main/java/org/opensearch/action/get/GetRequestBuilder.java
index c1004a990747d..1a9d7c5c5aeca 100644
--- a/server/src/main/java/org/opensearch/action/get/GetRequestBuilder.java
+++ b/server/src/main/java/org/opensearch/action/get/GetRequestBuilder.java
@@ -35,7 +35,7 @@
 import org.opensearch.action.support.single.shard.SingleShardOperationRequestBuilder;
 import org.opensearch.client.OpenSearchClient;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.VersionType;
 import org.opensearch.search.fetch.subphase.FetchSourceContext;
 
@@ -111,7 +111,7 @@ public GetRequestBuilder setFetchSource(boolean fetch) {
      */
     public GetRequestBuilder setFetchSource(@Nullable String include, @Nullable String exclude) {
         return setFetchSource(
-            include == null ? Strings.EMPTY_ARRAY : new String[] { include },
+            include == null ? org.opensearch.common.Strings.EMPTY_ARRAY : new String[] { include },
             exclude == null ? Strings.EMPTY_ARRAY : new String[] { exclude }
         );
     }
diff --git a/server/src/main/java/org/opensearch/action/get/MultiGetResponse.java b/server/src/main/java/org/opensearch/action/get/MultiGetResponse.java
index 88f78d2ca6815..3e2aa1316a7cc 100644
--- a/server/src/main/java/org/opensearch/action/get/MultiGetResponse.java
+++ b/server/src/main/java/org/opensearch/action/get/MultiGetResponse.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.action.get;
 
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.OpenSearchException;
 import org.opensearch.Version;
 import org.opensearch.action.ActionResponse;
@@ -130,7 +131,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             builder.startObject();
             builder.field(INDEX.getPreferredName(), index);
             builder.field(ID.getPreferredName(), id);
-            OpenSearchException.generateFailureXContent(builder, params, exception, true);
+            BaseOpenSearchException.generateFailureXContent(builder, params, exception, true);
             builder.endObject();
             return builder;
         }
diff --git a/server/src/main/java/org/opensearch/action/index/IndexRequest.java b/server/src/main/java/org/opensearch/action/index/IndexRequest.java
index 18de7d5e56a3a..2182b8d1ffa4c 100644
--- a/server/src/main/java/org/opensearch/action/index/IndexRequest.java
+++ b/server/src/main/java/org/opensearch/action/index/IndexRequest.java
@@ -57,6 +57,7 @@
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.MediaType;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.index.VersionType;
@@ -681,7 +682,7 @@ private void writeBody(StreamOutput out) throws IOException {
 
     @Override
     public String toString() {
-        String sSource = "_na_";
+        String sSource = Strings.UNKNOWN_UUID_VALUE;
         try {
             if (source.length() > MAX_SOURCE_LENGTH_IN_TOSTRING) {
                 sSource = "n/a, actual length: ["
diff --git a/server/src/main/java/org/opensearch/action/ingest/GetPipelineRequest.java b/server/src/main/java/org/opensearch/action/ingest/GetPipelineRequest.java
index 1c7b7efe61455..f6bbf44a09782 100644
--- a/server/src/main/java/org/opensearch/action/ingest/GetPipelineRequest.java
+++ b/server/src/main/java/org/opensearch/action/ingest/GetPipelineRequest.java
@@ -34,9 +34,9 @@
 
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.support.clustermanager.ClusterManagerNodeReadRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 
diff --git a/server/src/main/java/org/opensearch/action/ingest/SimulateDocumentBaseResult.java b/server/src/main/java/org/opensearch/action/ingest/SimulateDocumentBaseResult.java
index db88214cff0ec..0fdd340c420b3 100644
--- a/server/src/main/java/org/opensearch/action/ingest/SimulateDocumentBaseResult.java
+++ b/server/src/main/java/org/opensearch/action/ingest/SimulateDocumentBaseResult.java
@@ -31,6 +31,7 @@
 
 package org.opensearch.action.ingest;
 
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.OpenSearchException;
 import org.opensearch.core.ParseField;
 import org.opensearch.common.io.stream.StreamInput;
@@ -125,7 +126,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         if (failure == null) {
             ingestDocument.toXContent(builder, params);
         } else {
-            OpenSearchException.generateFailureXContent(builder, params, failure, true);
+            BaseOpenSearchException.generateFailureXContent(builder, params, failure, true);
         }
         builder.endObject();
         return builder;
diff --git a/server/src/main/java/org/opensearch/action/ingest/SimulateProcessorResult.java b/server/src/main/java/org/opensearch/action/ingest/SimulateProcessorResult.java
index 509705fe856e8..badddd5152bc9 100644
--- a/server/src/main/java/org/opensearch/action/ingest/SimulateProcessorResult.java
+++ b/server/src/main/java/org/opensearch/action/ingest/SimulateProcessorResult.java
@@ -31,6 +31,7 @@
 
 package org.opensearch.action.ingest;
 
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.OpenSearchException;
 import org.opensearch.core.ParseField;
 import org.opensearch.common.collect.Tuple;
@@ -269,10 +270,10 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
 
         if (failure != null && ingestDocument != null) {
             builder.startObject(IGNORED_ERROR_FIELD);
-            OpenSearchException.generateFailureXContent(builder, params, failure, true);
+            BaseOpenSearchException.generateFailureXContent(builder, params, failure, true);
             builder.endObject();
         } else if (failure != null) {
-            OpenSearchException.generateFailureXContent(builder, params, failure, true);
+            BaseOpenSearchException.generateFailureXContent(builder, params, failure, true);
         }
 
         if (ingestDocument != null) {
diff --git a/server/src/main/java/org/opensearch/action/search/AbstractSearchAsyncAction.java b/server/src/main/java/org/opensearch/action/search/AbstractSearchAsyncAction.java
index 9a94737c84385..43cf4c4e8dc79 100644
--- a/server/src/main/java/org/opensearch/action/search/AbstractSearchAsyncAction.java
+++ b/server/src/main/java/org/opensearch/action/search/AbstractSearchAsyncAction.java
@@ -34,8 +34,8 @@
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.ExceptionsHelper;
-import org.opensearch.OpenSearchException;
 import org.opensearch.Version;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.NoShardAvailableActionException;
@@ -367,7 +367,7 @@ public final void executeNextPhase(SearchPhase currentPhase, SearchPhase nextPha
             final ShardOperationFailedException[] shardSearchFailures = ExceptionsHelper.groupBy(buildShardFailures());
             Throwable cause = shardSearchFailures.length == 0
                 ? null
-                : OpenSearchException.guessRootCauses(shardSearchFailures[0].getCause())[0];
+                : BaseOpenSearchException.guessRootCauses(shardSearchFailures[0].getCause())[0];
             logger.debug(() -> new ParameterizedMessage("All shards failed for phase: [{}]", getName()), cause);
             onPhaseFailure(currentPhase, "all shards failed", cause);
         } else {
@@ -381,7 +381,7 @@ public final void executeNextPhase(SearchPhase currentPhase, SearchPhase nextPha
                     if (logger.isDebugEnabled()) {
                         int numShardFailures = shardSearchFailures.length;
                         shardSearchFailures = ExceptionsHelper.groupBy(shardSearchFailures);
-                        Throwable cause = OpenSearchException.guessRootCauses(shardSearchFailures[0].getCause())[0];
+                        Throwable cause = BaseOpenSearchException.guessRootCauses(shardSearchFailures[0].getCause())[0];
                         logger.debug(
                             () -> new ParameterizedMessage("{} shards failed for phase: [{}]", numShardFailures, getName()),
                             cause
diff --git a/server/src/main/java/org/opensearch/action/search/ClearScrollController.java b/server/src/main/java/org/opensearch/action/search/ClearScrollController.java
index 4bb3cbb88ba01..eb0fa49a94050 100644
--- a/server/src/main/java/org/opensearch/action/search/ClearScrollController.java
+++ b/server/src/main/java/org/opensearch/action/search/ClearScrollController.java
@@ -38,8 +38,8 @@
 import org.opensearch.action.support.GroupedActionListener;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.node.DiscoveryNodes;
-import org.opensearch.common.Strings;
 import org.opensearch.common.util.concurrent.CountDown;
+import org.opensearch.core.common.Strings;
 import org.opensearch.transport.Transport;
 import org.opensearch.transport.TransportResponse;
 
diff --git a/server/src/main/java/org/opensearch/action/search/CreatePitController.java b/server/src/main/java/org/opensearch/action/search/CreatePitController.java
index 745139fd1f1e8..2130c1f91b59d 100644
--- a/server/src/main/java/org/opensearch/action/search/CreatePitController.java
+++ b/server/src/main/java/org/opensearch/action/search/CreatePitController.java
@@ -18,11 +18,11 @@
 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.inject.Inject;
 import org.opensearch.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.shard.ShardId;
 import org.opensearch.search.SearchPhaseResult;
 import org.opensearch.search.SearchShardTarget;
diff --git a/server/src/main/java/org/opensearch/action/search/CreatePitRequest.java b/server/src/main/java/org/opensearch/action/search/CreatePitRequest.java
index f2c7fc374e181..a679a66eb4acc 100644
--- a/server/src/main/java/org/opensearch/action/search/CreatePitRequest.java
+++ b/server/src/main/java/org/opensearch/action/search/CreatePitRequest.java
@@ -13,10 +13,10 @@
 import org.opensearch.action.IndicesRequest;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.tasks.Task;
diff --git a/server/src/main/java/org/opensearch/action/search/GetSearchPipelineRequest.java b/server/src/main/java/org/opensearch/action/search/GetSearchPipelineRequest.java
index 4a1d3eaba87a0..15fefb1671707 100644
--- a/server/src/main/java/org/opensearch/action/search/GetSearchPipelineRequest.java
+++ b/server/src/main/java/org/opensearch/action/search/GetSearchPipelineRequest.java
@@ -10,9 +10,9 @@
 
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.support.clustermanager.ClusterManagerNodeReadRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 import java.util.Objects;
diff --git a/server/src/main/java/org/opensearch/action/search/MultiSearchResponse.java b/server/src/main/java/org/opensearch/action/search/MultiSearchResponse.java
index 618b51a81074a..d3c4dcab79d7f 100644
--- a/server/src/main/java/org/opensearch/action/search/MultiSearchResponse.java
+++ b/server/src/main/java/org/opensearch/action/search/MultiSearchResponse.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.action.search;
 
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.OpenSearchException;
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.action.ActionResponse;
@@ -191,7 +192,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         for (Item item : items) {
             builder.startObject();
             if (item.isFailure()) {
-                OpenSearchException.generateFailureXContent(builder, params, item.getFailure(), true);
+                BaseOpenSearchException.generateFailureXContent(builder, params, item.getFailure(), true);
                 builder.field(Fields.STATUS, ExceptionsHelper.status(item.getFailure()).getStatus());
             } else {
                 item.getResponse().innerToXContent(builder, params);
diff --git a/server/src/main/java/org/opensearch/action/search/PitService.java b/server/src/main/java/org/opensearch/action/search/PitService.java
index 5a756d2b5d4aa..ad9bd1273d898 100644
--- a/server/src/main/java/org/opensearch/action/search/PitService.java
+++ b/server/src/main/java/org/opensearch/action/search/PitService.java
@@ -17,9 +17,9 @@
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.Strings;
 import org.opensearch.threadpool.ThreadPool;
 import org.opensearch.transport.Transport;
 import org.opensearch.transport.TransportException;
diff --git a/server/src/main/java/org/opensearch/action/search/SearchContextId.java b/server/src/main/java/org/opensearch/action/search/SearchContextId.java
index d54f3039395fe..68c5f3dc49596 100644
--- a/server/src/main/java/org/opensearch/action/search/SearchContextId.java
+++ b/server/src/main/java/org/opensearch/action/search/SearchContextId.java
@@ -33,7 +33,6 @@
 package org.opensearch.action.search;
 
 import org.opensearch.Version;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.io.stream.ByteBufferStreamInput;
 import org.opensearch.common.io.stream.BytesStreamOutput;
@@ -41,6 +40,7 @@
 import org.opensearch.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.shard.ShardId;
 import org.opensearch.search.SearchPhaseResult;
 import org.opensearch.search.SearchShardTarget;
diff --git a/server/src/main/java/org/opensearch/action/search/SearchPhaseExecutionException.java b/server/src/main/java/org/opensearch/action/search/SearchPhaseExecutionException.java
index bd3a0eb93b375..b129536930c56 100644
--- a/server/src/main/java/org/opensearch/action/search/SearchPhaseExecutionException.java
+++ b/server/src/main/java/org/opensearch/action/search/SearchPhaseExecutionException.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.action.search;
 
+import org.opensearch.BaseExceptionsHelper;
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.OpenSearchException;
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.action.ShardOperationFailedException;
@@ -121,7 +123,7 @@ public Throwable getCause() {
         Throwable cause = super.getCause();
         if (cause == null) {
             // fall back to guessed root cause
-            for (OpenSearchException rootCause : guessRootCauses()) {
+            for (BaseOpenSearchException rootCause : guessRootCauses()) {
                 return rootCause;
             }
         }
@@ -159,7 +161,7 @@ protected void metadataToXContent(XContentBuilder builder, Params params) throws
 
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-        Throwable ex = ExceptionsHelper.unwrapCause(this);
+        Throwable ex = BaseExceptionsHelper.unwrapCause(this);
         if (ex != this) {
             generateThrowableXContent(builder, params, this);
         } else {
@@ -172,14 +174,14 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
     }
 
     @Override
-    public OpenSearchException[] guessRootCauses() {
+    public BaseOpenSearchException[] guessRootCauses() {
         ShardOperationFailedException[] failures = ExceptionsHelper.groupBy(shardFailures);
-        List<OpenSearchException> rootCauses = new ArrayList<>(failures.length);
+        List<BaseOpenSearchException> rootCauses = new ArrayList<>(failures.length);
         for (ShardOperationFailedException failure : failures) {
-            OpenSearchException[] guessRootCauses = OpenSearchException.guessRootCauses(failure.getCause());
+            BaseOpenSearchException[] guessRootCauses = BaseOpenSearchException.guessRootCauses(failure.getCause());
             rootCauses.addAll(Arrays.asList(guessRootCauses));
         }
-        return rootCauses.toArray(new OpenSearchException[0]);
+        return rootCauses.toArray(new BaseOpenSearchException[0]);
     }
 
     @Override
diff --git a/server/src/main/java/org/opensearch/action/search/SearchRequest.java b/server/src/main/java/org/opensearch/action/search/SearchRequest.java
index 5c664bf4cc7a0..181c524054f91 100644
--- a/server/src/main/java/org/opensearch/action/search/SearchRequest.java
+++ b/server/src/main/java/org/opensearch/action/search/SearchRequest.java
@@ -38,10 +38,10 @@
 import org.opensearch.action.IndicesRequest;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.search.Scroll;
 import org.opensearch.search.builder.PointInTimeBuilder;
diff --git a/server/src/main/java/org/opensearch/action/search/ShardSearchFailure.java b/server/src/main/java/org/opensearch/action/search/ShardSearchFailure.java
index 5edfd92422cbf..12de50428c443 100644
--- a/server/src/main/java/org/opensearch/action/search/ShardSearchFailure.java
+++ b/server/src/main/java/org/opensearch/action/search/ShardSearchFailure.java
@@ -32,6 +32,8 @@
 
 package org.opensearch.action.search;
 
+import org.opensearch.BaseExceptionsHelper;
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.OpenSearchException;
 import org.opensearch.action.OriginalIndices;
@@ -88,12 +90,12 @@ public ShardSearchFailure(Exception e, @Nullable SearchShardTarget shardTarget)
         super(
             shardTarget == null ? null : shardTarget.getFullyQualifiedIndexName(),
             shardTarget == null ? -1 : shardTarget.getShardId().getId(),
-            ExceptionsHelper.detailedMessage(e),
-            ExceptionsHelper.status(ExceptionsHelper.unwrapCause(e)),
-            ExceptionsHelper.unwrapCause(e)
+            BaseExceptionsHelper.detailedMessage(e),
+            ExceptionsHelper.status(BaseExceptionsHelper.unwrapCause(e)),
+            BaseExceptionsHelper.unwrapCause(e)
         );
 
-        final Throwable actual = ExceptionsHelper.unwrapCause(e);
+        final Throwable actual = BaseExceptionsHelper.unwrapCause(e);
         if (actual instanceof SearchException) {
             this.shardTarget = ((SearchException) actual).shard();
         } else if (shardTarget != null) {
@@ -116,7 +118,7 @@ public String toString() {
             + "], reason ["
             + reason
             + "], cause ["
-            + (cause == null ? "_na" : ExceptionsHelper.stackTrace(cause))
+            + (cause == null ? "_na" : BaseExceptionsHelper.stackTrace(cause))
             + "]";
     }
 
@@ -144,7 +146,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             }
             builder.field(REASON_FIELD);
             builder.startObject();
-            OpenSearchException.generateThrowableXContent(builder, params, cause);
+            BaseOpenSearchException.generateThrowableXContent(builder, params, cause);
             builder.endObject();
         }
         builder.endObject();
diff --git a/server/src/main/java/org/opensearch/action/search/TransportSearchAction.java b/server/src/main/java/org/opensearch/action/search/TransportSearchAction.java
index df75d7c799a6a..5ae4e13caa353 100644
--- a/server/src/main/java/org/opensearch/action/search/TransportSearchAction.java
+++ b/server/src/main/java/org/opensearch/action/search/TransportSearchAction.java
@@ -57,7 +57,6 @@
 import org.opensearch.cluster.routing.ShardIterator;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.breaker.CircuitBreaker;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.io.stream.NamedWriteableRegistry;
@@ -67,6 +66,7 @@
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.concurrent.AtomicArray;
 import org.opensearch.common.util.concurrent.CountDown;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.Index;
 import org.opensearch.index.query.Rewriteable;
 import org.opensearch.index.shard.ShardId;
diff --git a/server/src/main/java/org/opensearch/action/support/DefaultShardOperationFailedException.java b/server/src/main/java/org/opensearch/action/support/DefaultShardOperationFailedException.java
index 687aebf29b183..67423aaf9c936 100644
--- a/server/src/main/java/org/opensearch/action/support/DefaultShardOperationFailedException.java
+++ b/server/src/main/java/org/opensearch/action/support/DefaultShardOperationFailedException.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.action.support;
 
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.OpenSearchException;
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.action.ShardOperationFailedException;
@@ -135,7 +136,7 @@ protected XContentBuilder innerToXContent(XContentBuilder builder, Params params
         builder.field("status", status.name());
         if (reason != null) {
             builder.startObject("reason");
-            OpenSearchException.generateThrowableXContent(builder, params, cause);
+            BaseOpenSearchException.generateThrowableXContent(builder, params, cause);
             builder.endObject();
         }
         return builder;
diff --git a/server/src/main/java/org/opensearch/action/support/TransportActions.java b/server/src/main/java/org/opensearch/action/support/TransportActions.java
index 03e7509b3b8e3..62059ca3f0754 100644
--- a/server/src/main/java/org/opensearch/action/support/TransportActions.java
+++ b/server/src/main/java/org/opensearch/action/support/TransportActions.java
@@ -33,7 +33,7 @@
 package org.opensearch.action.support;
 
 import org.apache.lucene.store.AlreadyClosedException;
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.action.NoShardAvailableActionException;
 import org.opensearch.action.UnavailableShardsException;
 import org.opensearch.index.IndexNotFoundException;
@@ -48,7 +48,7 @@
 public class TransportActions {
 
     public static boolean isShardNotAvailableException(final Throwable e) {
-        final Throwable actual = ExceptionsHelper.unwrapCause(e);
+        final Throwable actual = BaseExceptionsHelper.unwrapCause(e);
         return (actual instanceof ShardNotFoundException
             || actual instanceof IndexNotFoundException
             || actual instanceof IllegalIndexShardStateException
diff --git a/server/src/main/java/org/opensearch/action/support/clustermanager/info/ClusterInfoRequest.java b/server/src/main/java/org/opensearch/action/support/clustermanager/info/ClusterInfoRequest.java
index d0b9d291c16c7..0059f5c836202 100644
--- a/server/src/main/java/org/opensearch/action/support/clustermanager/info/ClusterInfoRequest.java
+++ b/server/src/main/java/org/opensearch/action/support/clustermanager/info/ClusterInfoRequest.java
@@ -36,9 +36,9 @@
 import org.opensearch.action.IndicesRequest;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.action.support.clustermanager.ClusterManagerNodeReadRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 
diff --git a/server/src/main/java/org/opensearch/action/support/replication/ReplicationOperation.java b/server/src/main/java/org/opensearch/action/support/replication/ReplicationOperation.java
index 423fbd12a6447..3cec823422eb2 100644
--- a/server/src/main/java/org/opensearch/action/support/replication/ReplicationOperation.java
+++ b/server/src/main/java/org/opensearch/action/support/replication/ReplicationOperation.java
@@ -34,6 +34,7 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.lucene.store.AlreadyClosedException;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.core.Assertions;
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.OpenSearchException;
@@ -333,7 +334,7 @@ public void onFinished() {
 
             @Override
             public boolean shouldRetry(Exception e) {
-                final Throwable cause = ExceptionsHelper.unwrapCause(e);
+                final Throwable cause = BaseExceptionsHelper.unwrapCause(e);
                 return cause instanceof CircuitBreakingException
                     || cause instanceof OpenSearchRejectedExecutionException
                     || cause instanceof ConnectTransportException;
@@ -358,7 +359,7 @@ private void updateCheckPoints(ShardRouting shard, LongSupplier localCheckpointS
     }
 
     private void onNoLongerPrimary(Exception failure) {
-        final Throwable cause = ExceptionsHelper.unwrapCause(failure);
+        final Throwable cause = BaseExceptionsHelper.unwrapCause(failure);
         final boolean nodeIsClosing = cause instanceof NodeClosedException;
         final String message;
         if (nodeIsClosing) {
diff --git a/server/src/main/java/org/opensearch/action/support/replication/ReplicationResponse.java b/server/src/main/java/org/opensearch/action/support/replication/ReplicationResponse.java
index 6f8f93ccc0ce3..f6d05134838f7 100644
--- a/server/src/main/java/org/opensearch/action/support/replication/ReplicationResponse.java
+++ b/server/src/main/java/org/opensearch/action/support/replication/ReplicationResponse.java
@@ -32,7 +32,8 @@
 
 package org.opensearch.action.support.replication;
 
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.OpenSearchException;
 import org.opensearch.action.ActionResponse;
 import org.opensearch.action.ShardOperationFailedException;
@@ -261,7 +262,7 @@ public Failure(StreamInput in) throws IOException {
             }
 
             public Failure(ShardId shardId, @Nullable String nodeId, Exception cause, RestStatus status, boolean primary) {
-                super(shardId.getIndexName(), shardId.getId(), ExceptionsHelper.detailedMessage(cause), status, cause);
+                super(shardId.getIndexName(), shardId.getId(), BaseExceptionsHelper.detailedMessage(cause), status, cause);
                 this.shardId = shardId;
                 this.nodeId = nodeId;
                 this.primary = primary;
@@ -304,7 +305,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
                 builder.field(_NODE, nodeId);
                 builder.field(REASON);
                 builder.startObject();
-                OpenSearchException.generateThrowableXContent(builder, params, cause);
+                BaseOpenSearchException.generateThrowableXContent(builder, params, cause);
                 builder.endObject();
                 builder.field(STATUS, status);
                 builder.field(PRIMARY, primary);
diff --git a/server/src/main/java/org/opensearch/action/support/single/shard/TransportSingleShardAction.java b/server/src/main/java/org/opensearch/action/support/single/shard/TransportSingleShardAction.java
index 927d3946a3643..39398392c0ee8 100644
--- a/server/src/main/java/org/opensearch/action/support/single/shard/TransportSingleShardAction.java
+++ b/server/src/main/java/org/opensearch/action/support/single/shard/TransportSingleShardAction.java
@@ -54,7 +54,7 @@
 import org.opensearch.common.Nullable;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.Writeable;
-import org.opensearch.common.logging.LoggerMessageFormat;
+import org.opensearch.core.common.logging.LoggerMessageFormat;
 import org.opensearch.index.shard.ShardId;
 import org.opensearch.tasks.Task;
 import org.opensearch.threadpool.ThreadPool;
diff --git a/server/src/main/java/org/opensearch/action/support/tasks/BaseTasksRequest.java b/server/src/main/java/org/opensearch/action/support/tasks/BaseTasksRequest.java
index 34a8412ea4129..9172bb0aca098 100644
--- a/server/src/main/java/org/opensearch/action/support/tasks/BaseTasksRequest.java
+++ b/server/src/main/java/org/opensearch/action/support/tasks/BaseTasksRequest.java
@@ -34,12 +34,12 @@
 
 import org.opensearch.action.ActionRequest;
 import org.opensearch.action.ActionRequestValidationException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.regex.Regex;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.CollectionUtils;
+import org.opensearch.core.common.Strings;
 import org.opensearch.tasks.Task;
 import org.opensearch.tasks.TaskId;
 
diff --git a/server/src/main/java/org/opensearch/action/termvectors/MultiTermVectorsResponse.java b/server/src/main/java/org/opensearch/action/termvectors/MultiTermVectorsResponse.java
index ff84ceb22e043..f1e05592731a5 100644
--- a/server/src/main/java/org/opensearch/action/termvectors/MultiTermVectorsResponse.java
+++ b/server/src/main/java/org/opensearch/action/termvectors/MultiTermVectorsResponse.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.action.termvectors;
 
-import org.opensearch.OpenSearchException;
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.Version;
 import org.opensearch.action.ActionResponse;
 import org.opensearch.common.io.stream.StreamInput;
@@ -141,7 +141,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
                 Failure failure = response.getFailure();
                 builder.field(Fields._INDEX, failure.getIndex());
                 builder.field(Fields._ID, failure.getId());
-                OpenSearchException.generateFailureXContent(builder, params, failure.getCause(), true);
+                BaseOpenSearchException.generateFailureXContent(builder, params, failure.getCause(), true);
                 builder.endObject();
             } else {
                 TermVectorsResponse getResponse = response.getResponse();
diff --git a/server/src/main/java/org/opensearch/action/update/UpdateRequest.java b/server/src/main/java/org/opensearch/action/update/UpdateRequest.java
index 7384c11554583..56913b1ec5915 100644
--- a/server/src/main/java/org/opensearch/action/update/UpdateRequest.java
+++ b/server/src/main/java/org/opensearch/action/update/UpdateRequest.java
@@ -42,12 +42,12 @@
 import org.opensearch.action.support.replication.ReplicationRequest;
 import org.opensearch.action.support.single.instance.InstanceShardOperationRequest;
 import org.opensearch.common.Nullable;
-import org.opensearch.core.ParseField;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.lucene.uid.Versions;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
+import org.opensearch.core.ParseField;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.ObjectParser;
 import org.opensearch.core.xcontent.ToXContentObject;
diff --git a/server/src/main/java/org/opensearch/cluster/ClusterState.java b/server/src/main/java/org/opensearch/cluster/ClusterState.java
index fda9b9a0ea588..e04ce938e7fdc 100644
--- a/server/src/main/java/org/opensearch/cluster/ClusterState.java
+++ b/server/src/main/java/org/opensearch/cluster/ClusterState.java
@@ -48,7 +48,6 @@
 import org.opensearch.cluster.routing.RoutingTable;
 import org.opensearch.cluster.routing.ShardRouting;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.UUIDs;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.io.stream.BytesStreamOutput;
@@ -58,6 +57,7 @@
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.io.stream.VersionedNamedWriteable;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContentFragment;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.discovery.Discovery;
@@ -602,7 +602,7 @@ public static class Builder {
 
         private final ClusterName clusterName;
         private long version = 0;
-        private String uuid = UNKNOWN_UUID;
+        private String uuid = Strings.UNKNOWN_UUID_VALUE;
         private Metadata metadata = Metadata.EMPTY_METADATA;
         private RoutingTable routingTable = RoutingTable.EMPTY_ROUTING_TABLE;
         private DiscoveryNodes nodes = DiscoveryNodes.EMPTY_NODES;
diff --git a/server/src/main/java/org/opensearch/cluster/action/shard/ShardStateAction.java b/server/src/main/java/org/opensearch/cluster/action/shard/ShardStateAction.java
index 002c5fd3b89db..853690fa1e242 100644
--- a/server/src/main/java/org/opensearch/cluster/action/shard/ShardStateAction.java
+++ b/server/src/main/java/org/opensearch/cluster/action/shard/ShardStateAction.java
@@ -35,6 +35,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.OpenSearchException;
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.action.ActionListener;
@@ -629,7 +630,7 @@ public String toString() {
             components.add("primary term [" + primaryTerm + "]");
             components.add("message [" + message + "]");
             if (failure != null) {
-                components.add("failure [" + ExceptionsHelper.detailedMessage(failure) + "]");
+                components.add("failure [" + BaseExceptionsHelper.detailedMessage(failure) + "]");
             }
             components.add("markAsStale [" + markAsStale + "]");
             return String.join(", ", components);
diff --git a/server/src/main/java/org/opensearch/cluster/decommission/DecommissionHelper.java b/server/src/main/java/org/opensearch/cluster/decommission/DecommissionHelper.java
index 2feee082ed8c8..6c76fd923aad0 100644
--- a/server/src/main/java/org/opensearch/cluster/decommission/DecommissionHelper.java
+++ b/server/src/main/java/org/opensearch/cluster/decommission/DecommissionHelper.java
@@ -13,8 +13,8 @@
 import org.opensearch.cluster.coordination.CoordinationMetadata.VotingConfigExclusion;
 import org.opensearch.cluster.metadata.Metadata;
 import org.opensearch.cluster.node.DiscoveryNode;
-import org.opensearch.common.Strings;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 
 import java.util.HashSet;
 import java.util.Iterator;
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/AliasAction.java b/server/src/main/java/org/opensearch/cluster/metadata/AliasAction.java
index 46702a0d78caf..4a8b54284d322 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/AliasAction.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/AliasAction.java
@@ -34,7 +34,7 @@
 
 import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 
 /**
  * Individual operation to perform on the cluster state as part of an {@link IndicesAliasesRequest}.
@@ -45,7 +45,7 @@ public abstract class AliasAction {
     private final String index;
 
     private AliasAction(String index) {
-        if (false == Strings.hasText(index)) {
+        if (false == org.opensearch.core.common.Strings.hasText(index)) {
             throw new IllegalArgumentException("[index] is required");
         }
         this.index = index;
@@ -120,7 +120,7 @@ public Add(
             @Nullable Boolean isHidden
         ) {
             super(index);
-            if (false == Strings.hasText(alias)) {
+            if (false == org.opensearch.core.common.Strings.hasText(alias)) {
                 throw new IllegalArgumentException("[alias] is required");
             }
             this.alias = alias;
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/AliasMetadata.java b/server/src/main/java/org/opensearch/cluster/metadata/AliasMetadata.java
index b5efad2966057..f9e13ca45acd3 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/AliasMetadata.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/AliasMetadata.java
@@ -94,7 +94,9 @@ private AliasMetadata(
         this.indexRouting = indexRouting;
         this.searchRouting = searchRouting;
         if (searchRouting != null) {
-            searchRoutingValues = Collections.unmodifiableSet(Sets.newHashSet(Strings.splitStringByCommaToArray(searchRouting)));
+            searchRoutingValues = Collections.unmodifiableSet(
+                Sets.newHashSet(org.opensearch.core.common.Strings.splitStringByCommaToArray(searchRouting))
+            );
         } else {
             searchRoutingValues = emptySet();
         }
@@ -244,7 +246,9 @@ public AliasMetadata(StreamInput in) throws IOException {
         }
         if (in.readBoolean()) {
             searchRouting = in.readString();
-            searchRoutingValues = Collections.unmodifiableSet(Sets.newHashSet(Strings.splitStringByCommaToArray(searchRouting)));
+            searchRoutingValues = Collections.unmodifiableSet(
+                Sets.newHashSet(org.opensearch.core.common.Strings.splitStringByCommaToArray(searchRouting))
+            );
         } else {
             searchRouting = null;
             searchRoutingValues = emptySet();
@@ -303,7 +307,7 @@ public Builder filter(CompressedXContent filter) {
         }
 
         public Builder filter(String filter) {
-            if (!Strings.hasLength(filter)) {
+            if (!org.opensearch.core.common.Strings.hasLength(filter)) {
                 this.filter = null;
                 return this;
             }
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/AliasValidator.java b/server/src/main/java/org/opensearch/cluster/metadata/AliasValidator.java
index 7e69eaf91c662..8cfb3456230b7 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/AliasValidator.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/AliasValidator.java
@@ -34,9 +34,9 @@
 
 import org.opensearch.action.admin.indices.alias.Alias;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.common.xcontent.XContentHelper;
@@ -86,7 +86,7 @@ public void validateAliasMetadata(AliasMetadata aliasMetadata, String index, Met
      */
     public void validateAliasStandalone(Alias alias) {
         validateAliasStandalone(alias.name(), alias.indexRouting());
-        if (Strings.hasLength(alias.filter())) {
+        if (org.opensearch.core.common.Strings.hasLength(alias.filter())) {
             try {
                 XContentHelper.convertToMap(XContentFactory.xContent(alias.filter()), alias.filter(), false);
             } catch (Exception e) {
@@ -101,7 +101,7 @@ public void validateAliasStandalone(Alias alias) {
     public void validateAlias(String alias, String index, @Nullable String indexRouting, Function<String, IndexMetadata> indexLookup) {
         validateAliasStandalone(alias, indexRouting);
 
-        if (!Strings.hasText(index)) {
+        if (!org.opensearch.core.common.Strings.hasText(index)) {
             throw new IllegalArgumentException("index name is required");
         }
 
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/IndexAbstraction.java b/server/src/main/java/org/opensearch/cluster/metadata/IndexAbstraction.java
index 11ead3e29c346..ee0f4c1c1a42d 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/IndexAbstraction.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/IndexAbstraction.java
@@ -33,8 +33,8 @@
 
 import org.opensearch.common.Nullable;
 import org.opensearch.common.SetOnce;
-import org.opensearch.common.Strings;
 import org.opensearch.common.collect.Tuple;
+import org.opensearch.core.common.Strings;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -297,7 +297,7 @@ public void computeAndValidateAliasProperties() {
                     "alias ["
                         + aliasName
                         + "] has more than one write index ["
-                        + Strings.collectionToCommaDelimitedString(writeIndicesStrings)
+                        + org.opensearch.core.common.Strings.collectionToCommaDelimitedString(writeIndicesStrings)
                         + "]"
                 );
             }
@@ -318,7 +318,7 @@ public void computeAndValidateAliasProperties() {
                     "alias ["
                         + aliasName
                         + "] has is_hidden set to true on indices ["
-                        + Strings.collectionToCommaDelimitedString(hiddenOn)
+                        + org.opensearch.core.common.Strings.collectionToCommaDelimitedString(hiddenOn)
                         + "] but does not have is_hidden set to true on indices ["
                         + Strings.collectionToCommaDelimitedString(nonHiddenOn)
                         + "]; alias must have the same is_hidden setting "
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java b/server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java
index 4ca79541637b1..2762adc2e3f94 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java
@@ -57,6 +57,7 @@
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.common.xcontent.XContentHelper;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.ToXContentFragment;
 import org.opensearch.core.xcontent.XContentBuilder;
@@ -605,7 +606,7 @@ public static APIBlock readFrom(StreamInput input) throws IOException {
         Function.identity(),
         Property.IndexScope
     );
-    public static final String INDEX_UUID_NA_VALUE = "_na_";
+    public static final String INDEX_UUID_NA_VALUE = Strings.UNKNOWN_UUID_VALUE;
 
     public static final String INDEX_ROUTING_REQUIRE_GROUP_PREFIX = "index.routing.allocation.require";
     public static final String INDEX_ROUTING_INCLUDE_GROUP_PREFIX = "index.routing.allocation.include";
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/IndexNameExpressionResolver.java b/server/src/main/java/org/opensearch/cluster/metadata/IndexNameExpressionResolver.java
index c981340a453e8..94f90f954f7e0 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/IndexNameExpressionResolver.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/IndexNameExpressionResolver.java
@@ -38,7 +38,6 @@
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.common.Booleans;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.regex.Regex;
@@ -48,6 +47,7 @@
 import org.opensearch.common.util.CollectionUtils;
 import org.opensearch.common.util.concurrent.ThreadContext;
 import org.opensearch.common.util.set.Sets;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.Index;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.indices.IndexClosedException;
@@ -619,7 +619,7 @@ public Map<String, Set<String>> resolveSearchRouting(ClusterState state, @Nullab
         // List of indices that don't require any routing
         Set<String> norouting = new HashSet<>();
         if (routing != null) {
-            paramRouting = Sets.newHashSet(Strings.splitStringByCommaToArray(routing));
+            paramRouting = Sets.newHashSet(org.opensearch.core.common.Strings.splitStringByCommaToArray(routing));
         }
 
         for (String expression : resolvedExpressions) {
@@ -696,7 +696,7 @@ public Map<String, Set<String>> resolveSearchRouting(ClusterState state, @Nullab
      */
     public Map<String, Set<String>> resolveSearchRoutingAllIndices(Metadata metadata, String routing) {
         if (routing != null) {
-            Set<String> r = Sets.newHashSet(Strings.splitStringByCommaToArray(routing));
+            Set<String> r = Sets.newHashSet(org.opensearch.core.common.Strings.splitStringByCommaToArray(routing));
             Map<String, Set<String>> routings = new HashMap<>();
             String[] concreteIndices = metadata.getConcreteAllIndices();
             for (String index : concreteIndices) {
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/Metadata.java b/server/src/main/java/org/opensearch/cluster/metadata/Metadata.java
index 69212dded858b..1f6695ddf6ae8 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/Metadata.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/Metadata.java
@@ -48,7 +48,6 @@
 import org.opensearch.cluster.coordination.CoordinationMetadata;
 import org.opensearch.cluster.decommission.DecommissionAttributeMetadata;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.UUIDs;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
@@ -56,6 +55,7 @@
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Setting.Property;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedObjectNotFoundException;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.ToXContentFragment;
@@ -104,7 +104,7 @@ public class Metadata implements Iterable<IndexMetadata>, Diffable<Metadata>, To
     private static final Logger logger = LogManager.getLogger(Metadata.class);
 
     public static final String ALL = "_all";
-    public static final String UNKNOWN_CLUSTER_UUID = "_na_";
+    public static final String UNKNOWN_CLUSTER_UUID = Strings.UNKNOWN_UUID_VALUE;
     public static final Pattern NUMBER_PATTERN = Pattern.compile("[0-9]+$");
 
     /**
@@ -379,7 +379,7 @@ public SortedMap<String, IndexAbstraction> getIndicesLookup() {
      * aliases then the result will <b>not</b> include the index's key.
      */
     public Map<String, List<AliasMetadata>> findAllAliases(final String[] concreteIndices) {
-        return findAliases(Strings.EMPTY_ARRAY, concreteIndices);
+        return findAliases(org.opensearch.common.Strings.EMPTY_ARRAY, concreteIndices);
     }
 
     /**
@@ -1519,12 +1519,12 @@ public Metadata build() {
             // TODO: I think we can remove these arrays. it isn't worth the effort, for operations on all indices.
             // When doing an operation across all indices, most of the time is spent on actually going to all shards and
             // do the required operations, the bottleneck isn't resolving expressions into concrete indices.
-            String[] allIndicesArray = allIndices.toArray(Strings.EMPTY_ARRAY);
-            String[] visibleIndicesArray = visibleIndices.toArray(Strings.EMPTY_ARRAY);
-            String[] allOpenIndicesArray = allOpenIndices.toArray(Strings.EMPTY_ARRAY);
-            String[] visibleOpenIndicesArray = visibleOpenIndices.toArray(Strings.EMPTY_ARRAY);
-            String[] allClosedIndicesArray = allClosedIndices.toArray(Strings.EMPTY_ARRAY);
-            String[] visibleClosedIndicesArray = visibleClosedIndices.toArray(Strings.EMPTY_ARRAY);
+            String[] allIndicesArray = allIndices.toArray(org.opensearch.common.Strings.EMPTY_ARRAY);
+            String[] visibleIndicesArray = visibleIndices.toArray(org.opensearch.common.Strings.EMPTY_ARRAY);
+            String[] allOpenIndicesArray = allOpenIndices.toArray(org.opensearch.common.Strings.EMPTY_ARRAY);
+            String[] visibleOpenIndicesArray = visibleOpenIndices.toArray(org.opensearch.common.Strings.EMPTY_ARRAY);
+            String[] allClosedIndicesArray = allClosedIndices.toArray(org.opensearch.common.Strings.EMPTY_ARRAY);
+            String[] visibleClosedIndicesArray = visibleClosedIndices.toArray(org.opensearch.common.Strings.EMPTY_ARRAY);
 
             return new Metadata(
                 clusterUUID,
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java b/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java
index bc57b2ff56da3..9f9e3d6c52b49 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java
@@ -1043,7 +1043,7 @@ public static List<AliasMetadata> resolveAndValidateAliases(
         List<AliasMetadata> resolvedAliases = new ArrayList<>();
         for (Alias alias : aliases) {
             aliasValidator.validateAlias(alias, index, metadata);
-            if (Strings.hasLength(alias.filter())) {
+            if (org.opensearch.core.common.Strings.hasLength(alias.filter())) {
                 aliasValidator.validateAliasFilter(alias.name(), alias.filter(), queryShardContext, xContentRegistry);
             }
             AliasMetadata aliasMetadata = AliasMetadata.builder(alias.name())
@@ -1308,7 +1308,7 @@ private static List<String> validatePrivateSettingsNotExplicitlySet(Settings set
     private static List<String> validateIndexCustomPath(Settings settings, @Nullable Path sharedDataPath) {
         String customPath = IndexMetadata.INDEX_DATA_PATH_SETTING.get(settings);
         List<String> validationErrors = new ArrayList<>();
-        if (!Strings.isEmpty(customPath)) {
+        if (!org.opensearch.core.common.Strings.isEmpty(customPath)) {
             if (sharedDataPath == null) {
                 validationErrors.add("path.shared_data must be set in order to use custom data paths");
             } else {
@@ -1426,7 +1426,10 @@ static void prepareResizeIndexSettings(
                 resizeIntoName,
                 indexSettingsBuilder.build()
             );
-            indexSettingsBuilder.put(initialRecoveryIdFilter, Strings.arrayToCommaDelimitedString(nodesToAllocateOn.toArray()));
+            indexSettingsBuilder.put(
+                initialRecoveryIdFilter,
+                org.opensearch.core.common.Strings.arrayToCommaDelimitedString(nodesToAllocateOn.toArray())
+            );
         } else if (type == ResizeType.SPLIT) {
             validateSplitIndex(currentState, resizeSourceIndex.getName(), resizeIntoName, indexSettingsBuilder.build());
             indexSettingsBuilder.putNull(initialRecoveryIdFilter);
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/MetadataIndexAliasesService.java b/server/src/main/java/org/opensearch/cluster/metadata/MetadataIndexAliasesService.java
index 939d6c7b9af3b..83e2511574867 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/MetadataIndexAliasesService.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/MetadataIndexAliasesService.java
@@ -43,8 +43,8 @@
 import org.opensearch.cluster.service.ClusterManagerTaskThrottler;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.Priority;
-import org.opensearch.common.Strings;
 import org.opensearch.common.inject.Inject;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.index.Index;
 import org.opensearch.index.IndexNotFoundException;
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/MetadataIndexStateService.java b/server/src/main/java/org/opensearch/cluster/metadata/MetadataIndexStateService.java
index 6de69c5a6f8f4..9a1ab9e5ee7c2 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/MetadataIndexStateService.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/MetadataIndexStateService.java
@@ -69,7 +69,6 @@
 import org.opensearch.cluster.routing.allocation.AllocationService;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.Priority;
-import org.opensearch.common.Strings;
 import org.opensearch.common.UUIDs;
 import org.opensearch.common.collect.ImmutableOpenIntMap;
 import org.opensearch.common.collect.Tuple;
@@ -80,6 +79,7 @@
 import org.opensearch.common.util.concurrent.AtomicArray;
 import org.opensearch.common.util.concurrent.ConcurrentCollections;
 import org.opensearch.common.util.concurrent.CountDown;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.Index;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.index.shard.ShardId;
@@ -187,7 +187,9 @@ public void closeIndices(final CloseIndexClusterStateUpdateRequest request, fina
         }
         if (writeIndices.size() > 0) {
             throw new IllegalArgumentException(
-                "cannot close the following data stream write indices [" + Strings.collectionToCommaDelimitedString(writeIndices) + "]"
+                "cannot close the following data stream write indices ["
+                    + org.opensearch.core.common.Strings.collectionToCommaDelimitedString(writeIndices)
+                    + "]"
             );
         }
 
@@ -366,7 +368,7 @@ static ClusterState addIndexClosedBlocks(
                 // Create a new index closed block
                 indexBlock = createIndexClosingBlock();
             }
-            assert Strings.hasLength(indexBlock.uuid()) : "Closing block should have a UUID";
+            assert org.opensearch.core.common.Strings.hasLength(indexBlock.uuid()) : "Closing block should have a UUID";
             blocks.addIndexBlock(index.getName(), indexBlock);
             blockedIndices.put(index, indexBlock);
         }
@@ -482,7 +484,7 @@ public void addIndexBlock(AddIndexBlockClusterStateUpdateRequest request, Action
         if (writeIndices.size() > 0) {
             throw new IllegalArgumentException(
                 "cannot add a block to the following data stream write indices ["
-                    + Strings.collectionToCommaDelimitedString(writeIndices)
+                    + org.opensearch.core.common.Strings.collectionToCommaDelimitedString(writeIndices)
                     + "]"
             );
         }
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/MetadataIndexTemplateService.java b/server/src/main/java/org/opensearch/cluster/metadata/MetadataIndexTemplateService.java
index c0f2bbfa40439..509187bb3f01e 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/MetadataIndexTemplateService.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/MetadataIndexTemplateService.java
@@ -551,7 +551,7 @@ public ClusterState addIndexTemplateV2(
                     + "match during index creation, please use a different priority",
                 name,
                 template.indexPatterns(),
-                Strings.collectionToCommaDelimitedString(overlaps.keySet()),
+                org.opensearch.core.common.Strings.collectionToCommaDelimitedString(overlaps.keySet()),
                 overlaps.entrySet().stream().map(e -> e.getKey() + " => " + e.getValue()).collect(Collectors.joining(",")),
                 template.priorityOrZero()
             );
@@ -566,7 +566,7 @@ public ClusterState addIndexTemplateV2(
                     + "existing older templates [%s] with patterns (%s); this template [%s] will take precedence during new index creation",
                 name,
                 template.indexPatterns(),
-                Strings.collectionToCommaDelimitedString(overlaps.keySet()),
+                org.opensearch.core.common.Strings.collectionToCommaDelimitedString(overlaps.keySet()),
                 overlaps.entrySet().stream().map(e -> e.getKey() + " => " + e.getValue()).collect(Collectors.joining(",")),
                 name
             );
@@ -953,7 +953,7 @@ static ClusterState innerPutTemplate(
                     + " of a composable template at index creation time",
                 request.name,
                 request.indexPatterns,
-                Strings.collectionToCommaDelimitedString(overlaps.keySet()),
+                org.opensearch.core.common.Strings.collectionToCommaDelimitedString(overlaps.keySet()),
                 overlaps.entrySet().stream().map(e -> e.getKey() + " => " + e.getValue()).collect(Collectors.joining(",")),
                 request.name
             );
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/MetadataMappingService.java b/server/src/main/java/org/opensearch/cluster/metadata/MetadataMappingService.java
index 665bdf0c4e2ff..9cb1eb6576ac5 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/MetadataMappingService.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/MetadataMappingService.java
@@ -48,11 +48,11 @@
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.Nullable;
 import org.opensearch.common.Priority;
-import org.opensearch.common.Strings;
 import org.opensearch.common.compress.CompressedXContent;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.io.IOUtils;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.Index;
 import org.opensearch.index.IndexService;
 import org.opensearch.index.mapper.DocumentMapper;
diff --git a/server/src/main/java/org/opensearch/cluster/node/DiscoveryNodes.java b/server/src/main/java/org/opensearch/cluster/node/DiscoveryNodes.java
index e214b5d6cd3b1..454725704ba94 100644
--- a/server/src/main/java/org/opensearch/cluster/node/DiscoveryNodes.java
+++ b/server/src/main/java/org/opensearch/cluster/node/DiscoveryNodes.java
@@ -37,12 +37,12 @@
 import org.opensearch.cluster.Diff;
 import org.opensearch.common.Booleans;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.regex.Regex;
 import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.common.util.set.Sets;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/server/src/main/java/org/opensearch/cluster/routing/OperationRouting.java b/server/src/main/java/org/opensearch/cluster/routing/OperationRouting.java
index c7026f6c1bfb1..9f1f4f5622a57 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/OperationRouting.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/OperationRouting.java
@@ -38,10 +38,10 @@
 import org.opensearch.cluster.node.DiscoveryNodes;
 import org.opensearch.cluster.routing.allocation.decider.AwarenessAllocationDecider;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.index.shard.ShardId;
 import org.opensearch.node.ResponseCollectorService;
diff --git a/server/src/main/java/org/opensearch/cluster/routing/UnassignedInfo.java b/server/src/main/java/org/opensearch/cluster/routing/UnassignedInfo.java
index 45fdf7ca641de..4e48441c7a39a 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/UnassignedInfo.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/UnassignedInfo.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.cluster.routing;
 
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.metadata.Metadata;
 import org.opensearch.cluster.routing.allocation.RoutingAllocation;
@@ -390,7 +390,7 @@ public String getDetails() {
         if (message == null) {
             return null;
         }
-        return message + (failure == null ? "" : ", failure " + ExceptionsHelper.detailedMessage(failure));
+        return message + (failure == null ? "" : ", failure " + BaseExceptionsHelper.detailedMessage(failure));
     }
 
     /**
diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/DiskThresholdMonitor.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/DiskThresholdMonitor.java
index 9f5402ba2ab91..87cc62b2fd481 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/allocation/DiskThresholdMonitor.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/DiskThresholdMonitor.java
@@ -50,10 +50,10 @@
 import org.opensearch.cluster.routing.ShardRouting;
 import org.opensearch.cluster.routing.allocation.decider.DiskThresholdDecider;
 import org.opensearch.common.Priority;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.util.set.Sets;
+import org.opensearch.core.common.Strings;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/FailedShard.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/FailedShard.java
index 61ca0f50e93b9..d08dbba3a249d 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/allocation/FailedShard.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/FailedShard.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.cluster.routing.allocation;
 
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.cluster.routing.ShardRouting;
 import org.opensearch.common.Nullable;
 
@@ -62,7 +62,7 @@ public String toString() {
             + ", message ["
             + message
             + "], failure ["
-            + (failure == null ? "null" : ExceptionsHelper.detailedMessage(failure))
+            + (failure == null ? "null" : BaseExceptionsHelper.detailedMessage(failure))
             + "], markAsStale ["
             + markAsStale
             + "]";
diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/NodeAllocationResult.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/NodeAllocationResult.java
index d50a474838a6b..ac2254befaf0b 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/allocation/NodeAllocationResult.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/NodeAllocationResult.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.cluster.routing.allocation;
 
-import org.opensearch.OpenSearchException;
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.routing.allocation.decider.Decision;
 import org.opensearch.common.Nullable;
@@ -300,7 +300,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
                 }
                 if (storeException != null) {
                     builder.startObject("store_exception");
-                    OpenSearchException.generateThrowableXContent(builder, params, storeException);
+                    BaseOpenSearchException.generateThrowableXContent(builder, params, storeException);
                     builder.endObject();
                 }
             }
diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java
index 3d7ba09c839fc..811dd1249e37d 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/AwarenessAllocationDecider.java
@@ -45,11 +45,11 @@
 import org.opensearch.cluster.routing.RoutingNode;
 import org.opensearch.cluster.routing.ShardRouting;
 import org.opensearch.cluster.routing.allocation.RoutingAllocation;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Setting.Property;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 
 import static java.util.Collections.emptyList;
 
diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java
index 574005cd6b6f3..bcce970117e59 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/SameShardAllocationDecider.java
@@ -35,11 +35,11 @@
 import org.opensearch.cluster.routing.RoutingNode;
 import org.opensearch.cluster.routing.ShardRouting;
 import org.opensearch.cluster.routing.allocation.RoutingAllocation;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Setting.Property;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 
 /**
  * An allocation decider that prevents multiple instances of the same shard to
@@ -101,15 +101,17 @@ public Decision canAllocate(ShardRouting shardRouting, RoutingNode node, Routing
                 // check if its on the same host as the one we want to allocate to
                 boolean checkNodeOnSameHostName = false;
                 boolean checkNodeOnSameHostAddress = false;
-                if (Strings.hasLength(checkNode.node().getHostAddress()) && Strings.hasLength(node.node().getHostAddress())) {
+                if (org.opensearch.core.common.Strings.hasLength(checkNode.node().getHostAddress())
+                    && org.opensearch.core.common.Strings.hasLength(node.node().getHostAddress())) {
                     if (checkNode.node().getHostAddress().equals(node.node().getHostAddress())) {
                         checkNodeOnSameHostAddress = true;
                     }
-                } else if (Strings.hasLength(checkNode.node().getHostName()) && Strings.hasLength(node.node().getHostName())) {
-                    if (checkNode.node().getHostName().equals(node.node().getHostName())) {
-                        checkNodeOnSameHostName = true;
+                } else if (org.opensearch.core.common.Strings.hasLength(checkNode.node().getHostName())
+                    && Strings.hasLength(node.node().getHostName())) {
+                        if (checkNode.node().getHostName().equals(node.node().getHostName())) {
+                            checkNodeOnSameHostName = true;
+                        }
                     }
-                }
                 if (checkNodeOnSameHostAddress || checkNodeOnSameHostName) {
                     for (ShardRouting assignedShard : assignedShards) {
                         if (checkNode.nodeId().equals(assignedShard.currentNodeId())) {
diff --git a/server/src/main/java/org/opensearch/common/Strings.java b/server/src/main/java/org/opensearch/common/Strings.java
index b7c119559e61b..fe618544eadba 100644
--- a/server/src/main/java/org/opensearch/common/Strings.java
+++ b/server/src/main/java/org/opensearch/common/Strings.java
@@ -33,8 +33,8 @@
 package org.opensearch.common;
 
 import org.apache.lucene.util.BytesRefBuilder;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.OpenSearchException;
-import org.opensearch.ExceptionsHelper;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.util.CollectionUtils;
 import org.opensearch.core.xcontent.MediaType;
@@ -66,7 +66,7 @@
  */
 public class Strings {
 
-    public static final String[] EMPTY_ARRAY = new String[0];
+    public static final String[] EMPTY_ARRAY = org.opensearch.core.common.Strings.EMPTY_ARRAY;
 
     public static void spaceify(int spaces, String from, StringBuilder to) throws Exception {
         try (BufferedReader reader = new BufferedReader(new StringReader(from))) {
@@ -84,127 +84,18 @@ public static void spaceify(int spaces, String from, StringBuilder to) throws Ex
     // General convenience methods for working with Strings
     // ---------------------------------------------------------------------
 
-    /**
-     * Check that the given CharSequence is neither <code>null</code> nor of length 0.
-     * Note: Will return <code>true</code> for a CharSequence that purely consists of whitespace.
-     * <pre>
-     * StringUtils.hasLength(null) = false
-     * StringUtils.hasLength("") = false
-     * StringUtils.hasLength(" ") = true
-     * StringUtils.hasLength("Hello") = true
-     * </pre>
-     *
-     * @param str the CharSequence to check (may be <code>null</code>)
-     * @return <code>true</code> if the CharSequence is not null and has length
-     * @see #hasText(String)
-     */
-    public static boolean hasLength(CharSequence str) {
-        return (str != null && str.length() > 0);
-    }
-
     /**
      * Check that the given BytesReference is neither <code>null</code> nor of length 0
      * Note: Will return <code>true</code> for a BytesReference that purely consists of whitespace.
      *
      * @param bytesReference the BytesReference to check (may be <code>null</code>)
      * @return <code>true</code> if the BytesReference is not null and has length
-     * @see #hasLength(CharSequence)
+     * @see org.opensearch.core.common.Strings#hasLength(CharSequence)
      */
     public static boolean hasLength(BytesReference bytesReference) {
         return (bytesReference != null && bytesReference.length() > 0);
     }
 
-    /**
-     * Check that the given String is neither <code>null</code> nor of length 0.
-     * Note: Will return <code>true</code> for a String that purely consists of whitespace.
-     *
-     * @param str the String to check (may be <code>null</code>)
-     * @return <code>true</code> if the String is not null and has length
-     * @see #hasLength(CharSequence)
-     */
-    public static boolean hasLength(String str) {
-        return hasLength((CharSequence) str);
-    }
-
-    /**
-     * Check that the given CharSequence is either <code>null</code> or of length 0.
-     * Note: Will return <code>false</code> for a CharSequence that purely consists of whitespace.
-     * <pre>
-     * StringUtils.isEmpty(null) = true
-     * StringUtils.isEmpty("") = true
-     * StringUtils.isEmpty(" ") = false
-     * StringUtils.isEmpty("Hello") = false
-     * </pre>
-     *
-     * @param str the CharSequence to check (may be <code>null</code>)
-     * @return <code>true</code> if the CharSequence is either null or has a zero length
-     */
-    public static boolean isEmpty(CharSequence str) {
-        return !hasLength(str);
-    }
-
-    /**
-     * Check whether the given CharSequence has actual text.
-     * More specifically, returns <code>true</code> if the string not <code>null</code>,
-     * its length is greater than 0, and it contains at least one non-whitespace character.
-     * <pre>
-     * StringUtils.hasText(null) = false
-     * StringUtils.hasText("") = false
-     * StringUtils.hasText(" ") = false
-     * StringUtils.hasText("12345") = true
-     * StringUtils.hasText(" 12345 ") = true
-     * </pre>
-     *
-     * @param str the CharSequence to check (may be <code>null</code>)
-     * @return <code>true</code> if the CharSequence is not <code>null</code>,
-     *         its length is greater than 0, and it does not contain whitespace only
-     * @see java.lang.Character#isWhitespace
-     */
-    public static boolean hasText(CharSequence str) {
-        if (!hasLength(str)) {
-            return false;
-        }
-        int strLen = str.length();
-        for (int i = 0; i < strLen; i++) {
-            if (!Character.isWhitespace(str.charAt(i))) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Check whether the given String has actual text.
-     * More specifically, returns <code>true</code> if the string not <code>null</code>,
-     * its length is greater than 0, and it contains at least one non-whitespace character.
-     *
-     * @param str the String to check (may be <code>null</code>)
-     * @return <code>true</code> if the String is not <code>null</code>, its length is
-     *         greater than 0, and it does not contain whitespace only
-     * @see #hasText(CharSequence)
-     */
-    public static boolean hasText(String str) {
-        return hasText((CharSequence) str);
-    }
-
-    /**
-     * Trim all occurrences of the supplied leading character from the given String.
-     *
-     * @param str              the String to check
-     * @param leadingCharacter the leading character to be trimmed
-     * @return the trimmed String
-     */
-    public static String trimLeadingCharacter(String str, char leadingCharacter) {
-        if (!hasLength(str)) {
-            return str;
-        }
-        StringBuilder sb = new StringBuilder(str);
-        while (sb.length() > 0 && sb.charAt(0) == leadingCharacter) {
-            sb.deleteCharAt(0);
-        }
-        return sb.toString();
-    }
-
     /**
      * Test whether the given string matches the given substring
      * at the given index.
@@ -223,35 +114,6 @@ public static boolean substringMatch(CharSequence str, int index, CharSequence s
         return true;
     }
 
-    /**
-     * Replace all occurrences of a substring within a string with
-     * another string.
-     *
-     * @param inString   String to examine
-     * @param oldPattern String to replace
-     * @param newPattern String to insert
-     * @return a String with the replacements
-     */
-    public static String replace(String inString, String oldPattern, String newPattern) {
-        if (!hasLength(inString) || !hasLength(oldPattern) || newPattern == null) {
-            return inString;
-        }
-        StringBuilder sb = new StringBuilder();
-        int pos = 0; // our position in the old string
-        int index = inString.indexOf(oldPattern);
-        // the index of an occurrence we've found, or -1
-        int patLen = oldPattern.length();
-        while (index >= 0) {
-            sb.append(inString, pos, index);
-            sb.append(newPattern);
-            pos = index + patLen;
-            index = inString.indexOf(oldPattern, pos);
-        }
-        sb.append(inString.substring(pos));
-        // remember to append any characters to the right of a match
-        return sb.toString();
-    }
-
     /**
      * Delete all occurrences of the given substring.
      *
@@ -260,7 +122,7 @@ public static String replace(String inString, String oldPattern, String newPatte
      * @return the resulting String
      */
     public static String delete(String inString, String pattern) {
-        return replace(inString, pattern, "");
+        return org.opensearch.core.common.Strings.replace(inString, pattern, "");
     }
 
     /**
@@ -272,7 +134,8 @@ public static String delete(String inString, String pattern) {
      * @return the resulting String
      */
     public static String deleteAny(String inString, String charsToDelete) {
-        if (!hasLength(inString) || !hasLength(charsToDelete)) {
+        if (org.opensearch.core.common.Strings.hasLength(inString) == false
+            || org.opensearch.core.common.Strings.hasLength(charsToDelete) == false) {
             return inString;
         }
         StringBuilder sb = new StringBuilder();
@@ -376,18 +239,6 @@ public static Set<String> tokenizeByCommaToSet(final String s) {
         return tokenizeToCollection(s, ",", HashSet::new);
     }
 
-    /**
-     * Split the specified string by commas to an array.
-     *
-     * @param s the string to split
-     * @return the array of split values
-     * @see String#split(String)
-     */
-    public static String[] splitStringByCommaToArray(final String s) {
-        if (s == null || s.isEmpty()) return Strings.EMPTY_ARRAY;
-        else return s.split(",");
-    }
-
     /**
      * Split a String at the first occurrence of the delimiter.
      * Does not include the delimiter in the result.
@@ -399,7 +250,8 @@ public static String[] splitStringByCommaToArray(final String s) {
      *         or <code>null</code> if the delimiter wasn't found in the given input String
      */
     public static String[] split(String toSplit, String delimiter) {
-        if (!hasLength(toSplit) || !hasLength(delimiter)) {
+        if (org.opensearch.core.common.Strings.hasLength(toSplit) == false
+            || org.opensearch.core.common.Strings.hasLength(delimiter) == false) {
             return null;
         }
         int offset = toSplit.indexOf(delimiter);
@@ -545,92 +397,6 @@ public static Set<String> commaDelimitedListToSet(String str) {
         return set;
     }
 
-    /**
-     * Convenience method to return a Collection as a delimited (e.g. CSV)
-     * String. E.g. useful for <code>toString()</code> implementations.
-     *
-     * @param coll   the Collection to display
-     * @param delim  the delimiter to use (probably a ",")
-     * @param prefix the String to start each element with
-     * @param suffix the String to end each element with
-     * @return the delimited String
-     */
-    public static String collectionToDelimitedString(Iterable<?> coll, String delim, String prefix, String suffix) {
-        StringBuilder sb = new StringBuilder();
-        collectionToDelimitedString(coll, delim, prefix, suffix, sb);
-        return sb.toString();
-    }
-
-    public static void collectionToDelimitedString(Iterable<?> coll, String delim, String prefix, String suffix, StringBuilder sb) {
-        Iterator<?> it = coll.iterator();
-        while (it.hasNext()) {
-            sb.append(prefix).append(it.next()).append(suffix);
-            if (it.hasNext()) {
-                sb.append(delim);
-            }
-        }
-    }
-
-    /**
-     * Convenience method to return a Collection as a delimited (e.g. CSV)
-     * String. E.g. useful for <code>toString()</code> implementations.
-     *
-     * @param coll  the Collection to display
-     * @param delim the delimiter to use (probably a ",")
-     * @return the delimited String
-     */
-    public static String collectionToDelimitedString(Iterable<?> coll, String delim) {
-        return collectionToDelimitedString(coll, delim, "", "");
-    }
-
-    /**
-     * Convenience method to return a Collection as a CSV String.
-     * E.g. useful for <code>toString()</code> implementations.
-     *
-     * @param coll the Collection to display
-     * @return the delimited String
-     */
-    public static String collectionToCommaDelimitedString(Iterable<?> coll) {
-        return collectionToDelimitedString(coll, ",");
-    }
-
-    /**
-     * Convenience method to return a String array as a delimited (e.g. CSV)
-     * String. E.g. useful for <code>toString()</code> implementations.
-     *
-     * @param arr   the array to display
-     * @param delim the delimiter to use (probably a ",")
-     * @return the delimited String
-     */
-    public static String arrayToDelimitedString(Object[] arr, String delim) {
-        StringBuilder sb = new StringBuilder();
-        arrayToDelimitedString(arr, delim, sb);
-        return sb.toString();
-    }
-
-    public static void arrayToDelimitedString(Object[] arr, String delim, StringBuilder sb) {
-        if (isEmpty(arr)) {
-            return;
-        }
-        for (int i = 0; i < arr.length; i++) {
-            if (i > 0) {
-                sb.append(delim);
-            }
-            sb.append(arr[i]);
-        }
-    }
-
-    /**
-     * Convenience method to return a String array as a CSV String.
-     * E.g. useful for <code>toString()</code> implementations.
-     *
-     * @param arr the array to display
-     * @return the delimited String
-     */
-    public static String arrayToCommaDelimitedString(Object[] arr) {
-        return arrayToDelimitedString(arr, ",");
-    }
-
     /**
      * Format the double value with a single decimal points, trimming trailing '.0'.
      */
@@ -654,16 +420,6 @@ public static String format1Decimals(double value, String suffix) {
         }
     }
 
-    /**
-     * Determine whether the given array is empty:
-     * i.e. <code>null</code> or of zero length.
-     *
-     * @param array the array to check
-     */
-    private static boolean isEmpty(Object[] array) {
-        return (array == null || array.length == 0);
-    }
-
     private Strings() {}
 
     public static byte[] toUTF8Bytes(CharSequence charSequence) {
@@ -766,7 +522,7 @@ private static String toString(MediaType mediaType, ToXContent toXContent, ToXCo
                 XContentBuilder builder = createBuilder(mediaType, pretty, human);
                 builder.startObject();
                 builder.field("error", "error building toString out of XContent: " + e.getMessage());
-                builder.field("stack_trace", ExceptionsHelper.stackTrace(e));
+                builder.field("stack_trace", BaseExceptionsHelper.stackTrace(e));
                 builder.endObject();
                 return toString(builder);
             } catch (IOException e2) {
diff --git a/server/src/main/java/org/opensearch/common/Table.java b/server/src/main/java/org/opensearch/common/Table.java
index 9c3462e7077cd..da14f628efa0f 100644
--- a/server/src/main/java/org/opensearch/common/Table.java
+++ b/server/src/main/java/org/opensearch/common/Table.java
@@ -33,6 +33,7 @@
 package org.opensearch.common;
 
 import org.opensearch.common.time.DateFormatter;
+import org.opensearch.core.common.Strings;
 
 import java.time.Instant;
 import java.time.ZoneOffset;
diff --git a/server/src/main/java/org/opensearch/common/io/stream/NotSerializableExceptionWrapper.java b/server/src/main/java/org/opensearch/common/io/stream/NotSerializableExceptionWrapper.java
index f642dd17ad688..c48b407d1a351 100644
--- a/server/src/main/java/org/opensearch/common/io/stream/NotSerializableExceptionWrapper.java
+++ b/server/src/main/java/org/opensearch/common/io/stream/NotSerializableExceptionWrapper.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.common.io.stream;
 
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.OpenSearchException;
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.rest.RestStatus;
@@ -53,8 +54,8 @@ public final class NotSerializableExceptionWrapper extends OpenSearchException {
     private final RestStatus status;
 
     public NotSerializableExceptionWrapper(Throwable other) {
-        super(OpenSearchException.getExceptionName(other) + ": " + other.getMessage(), other.getCause());
-        this.name = OpenSearchException.getExceptionName(other);
+        super(BaseOpenSearchException.getExceptionName(other) + ": " + other.getMessage(), other.getCause());
+        this.name = BaseOpenSearchException.getExceptionName(other);
         this.status = ExceptionsHelper.status(other);
         setStackTrace(other.getStackTrace());
         for (Throwable otherSuppressed : other.getSuppressed()) {
diff --git a/server/src/main/java/org/opensearch/common/io/stream/StreamInput.java b/server/src/main/java/org/opensearch/common/io/stream/StreamInput.java
index 2b51d6c469fcf..1deeb4c60d469 100644
--- a/server/src/main/java/org/opensearch/common/io/stream/StreamInput.java
+++ b/server/src/main/java/org/opensearch/common/io/stream/StreamInput.java
@@ -47,12 +47,12 @@
 import org.opensearch.Version;
 import org.opensearch.common.CharArrays;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesArray;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.settings.SecureString;
 import org.opensearch.common.text.Text;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.common.io.stream.BaseStreamInput;
 import org.opensearch.core.common.io.stream.BaseWriteable;
 import org.opensearch.core.concurrency.OpenSearchRejectedExecutionException;
diff --git a/server/src/main/java/org/opensearch/common/joda/Joda.java b/server/src/main/java/org/opensearch/common/joda/Joda.java
index 7a82b8ce49d21..37407eaf43927 100644
--- a/server/src/main/java/org/opensearch/common/joda/Joda.java
+++ b/server/src/main/java/org/opensearch/common/joda/Joda.java
@@ -84,7 +84,7 @@ public class Joda {
      * Parses a joda based pattern, including some named ones (similar to the built in Joda ISO ones).
      */
     public static JodaDateFormatter forPattern(String input) {
-        if (Strings.hasLength(input)) {
+        if (org.opensearch.core.common.Strings.hasLength(input)) {
             input = input.trim();
         }
         if (input == null || input.length() == 0) {
@@ -279,7 +279,7 @@ public static JodaDateFormatter forPattern(String input) {
             formatter = StrictISODateTimeFormat.yearMonth();
         } else if (FormatNames.STRICT_YEAR_MONTH_DAY.matches(input)) {
             formatter = StrictISODateTimeFormat.yearMonthDay();
-        } else if (Strings.hasLength(input) && input.contains("||")) {
+        } else if (org.opensearch.core.common.Strings.hasLength(input) && input.contains("||")) {
             String[] formats = Strings.delimitedListToStringArray(input, "||");
             DateTimeParser[] parsers = new DateTimeParser[formats.length];
 
diff --git a/server/src/main/java/org/opensearch/common/logging/HeaderWarning.java b/server/src/main/java/org/opensearch/common/logging/HeaderWarning.java
index 44eefe1e78580..c027ba1d1b9d5 100644
--- a/server/src/main/java/org/opensearch/common/logging/HeaderWarning.java
+++ b/server/src/main/java/org/opensearch/common/logging/HeaderWarning.java
@@ -35,6 +35,7 @@
 import org.opensearch.Build;
 import org.opensearch.Version;
 import org.opensearch.common.util.concurrent.ThreadContext;
+import org.opensearch.core.common.logging.LoggerMessageFormat;
 import org.opensearch.tasks.Task;
 
 import java.nio.charset.Charset;
diff --git a/server/src/main/java/org/opensearch/common/logging/OpenSearchJsonLayout.java b/server/src/main/java/org/opensearch/common/logging/OpenSearchJsonLayout.java
index dac9e299e9b7e..20c6acab84d07 100644
--- a/server/src/main/java/org/opensearch/common/logging/OpenSearchJsonLayout.java
+++ b/server/src/main/java/org/opensearch/common/logging/OpenSearchJsonLayout.java
@@ -103,7 +103,7 @@ protected OpenSearchJsonLayout(String typeName, Charset charset, String[] opense
     }
 
     private String pattern(String type, String[] opensearchMessageFields, int maxMessageLength) {
-        if (Strings.isEmpty(type)) {
+        if (org.opensearch.core.common.Strings.isEmpty(type)) {
             throw new IllegalArgumentException("layout parameter 'type_name' cannot be empty");
         }
 
diff --git a/server/src/main/java/org/opensearch/common/lucene/Lucene.java b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
index d6eb5780f87da..28549544db1ba 100644
--- a/server/src/main/java/org/opensearch/common/lucene/Lucene.java
+++ b/server/src/main/java/org/opensearch/common/lucene/Lucene.java
@@ -84,12 +84,12 @@
 import org.apache.lucene.util.Version;
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.SuppressForbidden;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.lucene.search.TopDocsAndMaxScore;
 import org.opensearch.common.util.iterable.Iterables;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.analysis.AnalyzerScope;
 import org.opensearch.index.analysis.NamedAnalyzer;
 import org.opensearch.index.fielddata.IndexFieldData;
diff --git a/server/src/main/java/org/opensearch/common/lucene/search/MoreLikeThisQuery.java b/server/src/main/java/org/opensearch/common/lucene/search/MoreLikeThisQuery.java
index 93d18b3533d5c..b4440b85e0037 100644
--- a/server/src/main/java/org/opensearch/common/lucene/search/MoreLikeThisQuery.java
+++ b/server/src/main/java/org/opensearch/common/lucene/search/MoreLikeThisQuery.java
@@ -48,7 +48,7 @@
 import org.apache.lucene.search.similarities.Similarity;
 import org.apache.lucene.search.similarities.TFIDFSimilarity;
 import org.apache.lucene.util.BytesRef;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/server/src/main/java/org/opensearch/common/lucene/search/Queries.java b/server/src/main/java/org/opensearch/common/lucene/search/Queries.java
index 125eab9512be8..40eb53ec351bc 100644
--- a/server/src/main/java/org/opensearch/common/lucene/search/Queries.java
+++ b/server/src/main/java/org/opensearch/common/lucene/search/Queries.java
@@ -47,7 +47,7 @@
 import org.apache.lucene.search.ScoreMode;
 import org.apache.lucene.search.Scorer;
 import org.apache.lucene.search.Weight;
-import org.opensearch.OpenSearchException;
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.common.Nullable;
 import org.opensearch.index.mapper.SeqNoFieldMapper;
 
@@ -83,7 +83,7 @@ public static Query newUnmappedFieldsQuery(Collection<String> fields) {
     }
 
     public static Query newLenientFieldQuery(String field, RuntimeException e) {
-        String message = OpenSearchException.getExceptionName(e) + ":[" + e.getMessage() + "]";
+        String message = BaseOpenSearchException.getExceptionName(e) + ":[" + e.getMessage() + "]";
         return Queries.newMatchNoDocsQuery("failed [" + field + "] query, caused by " + message);
     }
 
diff --git a/server/src/main/java/org/opensearch/common/settings/Settings.java b/server/src/main/java/org/opensearch/common/settings/Settings.java
index ecb6f844831eb..7ea022f7f90e5 100644
--- a/server/src/main/java/org/opensearch/common/settings/Settings.java
+++ b/server/src/main/java/org/opensearch/common/settings/Settings.java
@@ -425,7 +425,7 @@ public List<String> getAsList(String key, List<String> defaultValue, Boolean com
             if (valueFromPrefix instanceof List) {
                 return Collections.unmodifiableList((List<String>) valueFromPrefix);
             } else if (commaDelimited) {
-                String[] strings = Strings.splitStringByCommaToArray(get(key));
+                String[] strings = org.opensearch.core.common.Strings.splitStringByCommaToArray(get(key));
                 if (strings.length > 0) {
                     for (String string : strings) {
                         result.add(string.trim());
@@ -453,7 +453,7 @@ public Map<String, Settings> getGroups(String settingPrefix) throws SettingsExce
      * Returns group settings for the given setting prefix.
      */
     public Map<String, Settings> getGroups(String settingPrefix, boolean ignoreNonGrouped) throws SettingsException {
-        if (!Strings.hasLength(settingPrefix)) {
+        if (!org.opensearch.core.common.Strings.hasLength(settingPrefix)) {
             throw new IllegalArgumentException("illegal setting prefix " + settingPrefix);
         }
         if (settingPrefix.charAt(settingPrefix.length() - 1) != '.') {
@@ -1206,7 +1206,7 @@ public boolean shouldRemoveMissingPlaceholder(String placeholderName) {
                 String value = propertyPlaceholder.replacePlaceholders(Settings.toString(entry.getValue()), placeholderResolver);
                 // if the values exists and has length, we should maintain it in the map
                 // otherwise, the replace process resolved into removing it
-                if (Strings.hasLength(value)) {
+                if (org.opensearch.core.common.Strings.hasLength(value)) {
                     entry.setValue(value);
                 } else {
                     entryItr.remove();
diff --git a/server/src/main/java/org/opensearch/common/settings/SettingsFilter.java b/server/src/main/java/org/opensearch/common/settings/SettingsFilter.java
index 6edb5a91b634a..8ccba0c6d85ae 100644
--- a/server/src/main/java/org/opensearch/common/settings/SettingsFilter.java
+++ b/server/src/main/java/org/opensearch/common/settings/SettingsFilter.java
@@ -66,7 +66,7 @@ public SettingsFilter(Collection<String> patterns) {
             }
         }
         this.patterns = Collections.unmodifiableSet(new HashSet<>(patterns));
-        patternString = Strings.collectionToDelimitedString(patterns, ",");
+        patternString = org.opensearch.core.common.Strings.collectionToDelimitedString(patterns, ",");
     }
 
     /**
diff --git a/server/src/main/java/org/opensearch/common/time/DateFormatter.java b/server/src/main/java/org/opensearch/common/time/DateFormatter.java
index dec08b68644f2..91e53b3784a80 100644
--- a/server/src/main/java/org/opensearch/common/time/DateFormatter.java
+++ b/server/src/main/java/org/opensearch/common/time/DateFormatter.java
@@ -149,7 +149,7 @@ default String formatJoda(DateTime dateTime) {
 
     static DateFormatter forPattern(String input) {
 
-        if (Strings.hasLength(input) == false) {
+        if (org.opensearch.core.common.Strings.hasLength(input) == false) {
             throw new IllegalArgumentException("No date pattern provided");
         }
 
@@ -171,7 +171,7 @@ static String strip8Prefix(String input) {
     static List<String> splitCombinedPatterns(String input) {
         List<String> patterns = new ArrayList<>();
         for (String pattern : Strings.delimitedListToStringArray(input, "||")) {
-            if (Strings.hasLength(pattern) == false) {
+            if (org.opensearch.core.common.Strings.hasLength(pattern) == false) {
                 throw new IllegalArgumentException("Cannot have empty element in multi date format pattern: " + input);
             }
             patterns.add(pattern);
diff --git a/server/src/main/java/org/opensearch/common/time/DateFormatters.java b/server/src/main/java/org/opensearch/common/time/DateFormatters.java
index 26af6fc40429d..6c8b9282d8a77 100644
--- a/server/src/main/java/org/opensearch/common/time/DateFormatters.java
+++ b/server/src/main/java/org/opensearch/common/time/DateFormatters.java
@@ -32,10 +32,10 @@
 
 package org.opensearch.common.time;
 
-import org.opensearch.common.Strings;
 import org.opensearch.common.SuppressForbidden;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.util.LazyInitializable;
+import org.opensearch.core.common.Strings;
 
 import java.time.DayOfWeek;
 import java.time.Instant;
diff --git a/server/src/main/java/org/opensearch/common/xcontent/XContentParserUtils.java b/server/src/main/java/org/opensearch/common/xcontent/XContentParserUtils.java
index 3dd9cb8863174..5a91d9c2c1394 100644
--- a/server/src/main/java/org/opensearch/common/xcontent/XContentParserUtils.java
+++ b/server/src/main/java/org/opensearch/common/xcontent/XContentParserUtils.java
@@ -33,8 +33,8 @@
 package org.opensearch.common.xcontent;
 
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesArray;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.core.xcontent.XContentParser.Token;
diff --git a/server/src/main/java/org/opensearch/common/xcontent/support/XContentMapValues.java b/server/src/main/java/org/opensearch/common/xcontent/support/XContentMapValues.java
index 9170cfaf8eadf..adfa871cbfcbe 100644
--- a/server/src/main/java/org/opensearch/common/xcontent/support/XContentMapValues.java
+++ b/server/src/main/java/org/opensearch/common/xcontent/support/XContentMapValues.java
@@ -39,9 +39,9 @@
 import org.opensearch.OpenSearchParseException;
 import org.opensearch.common.Booleans;
 import org.opensearch.common.Numbers;
-import org.opensearch.common.Strings;
 import org.opensearch.common.regex.Regex;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/server/src/main/java/org/opensearch/gateway/AsyncShardFetch.java b/server/src/main/java/org/opensearch/gateway/AsyncShardFetch.java
index dcc25faa18bc1..35272d9f54dc6 100644
--- a/server/src/main/java/org/opensearch/gateway/AsyncShardFetch.java
+++ b/server/src/main/java/org/opensearch/gateway/AsyncShardFetch.java
@@ -33,8 +33,8 @@
 
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.OpenSearchTimeoutException;
-import org.opensearch.ExceptionsHelper;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.FailedNodeException;
 import org.opensearch.action.support.nodes.BaseNodeResponse;
@@ -251,7 +251,7 @@ protected synchronized void processAsyncFetch(List<T> responses, List<FailedNode
                         );
                     } else if (nodeEntry.isFailed() == false) {
                         // if the entry is there, for the right fetching round and not marked as failed already, process it
-                        Throwable unwrappedCause = ExceptionsHelper.unwrapCause(failure.getCause());
+                        Throwable unwrappedCause = BaseExceptionsHelper.unwrapCause(failure.getCause());
                         // if the request got rejected or timed out, we need to try it again next time...
                         if (unwrappedCause instanceof OpenSearchRejectedExecutionException
                             || unwrappedCause instanceof ReceiveTimeoutTransportException
diff --git a/server/src/main/java/org/opensearch/http/AbstractHttpServerTransport.java b/server/src/main/java/org/opensearch/http/AbstractHttpServerTransport.java
index d0f3d277a2cb9..8c3b5b6ceecbd 100644
--- a/server/src/main/java/org/opensearch/http/AbstractHttpServerTransport.java
+++ b/server/src/main/java/org/opensearch/http/AbstractHttpServerTransport.java
@@ -39,7 +39,6 @@
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.action.ActionListener;
-import org.opensearch.common.Strings;
 import org.opensearch.common.component.AbstractLifecycleComponent;
 import org.opensearch.common.network.CloseableChannel;
 import org.opensearch.common.network.NetworkAddress;
@@ -53,6 +52,7 @@
 import org.opensearch.common.unit.ByteSizeValue;
 import org.opensearch.common.util.BigArrays;
 import org.opensearch.common.util.concurrent.ThreadContext;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.rest.RestChannel;
 import org.opensearch.rest.RestRequest;
diff --git a/server/src/main/java/org/opensearch/http/HttpTracer.java b/server/src/main/java/org/opensearch/http/HttpTracer.java
index bdabbb04d57f3..7a763b9ffb790 100644
--- a/server/src/main/java/org/opensearch/http/HttpTracer.java
+++ b/server/src/main/java/org/opensearch/http/HttpTracer.java
@@ -36,9 +36,9 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.RestResponse;
 import org.opensearch.tasks.Task;
diff --git a/server/src/main/java/org/opensearch/index/Index.java b/server/src/main/java/org/opensearch/index/Index.java
index fe60a2b682d76..769ca12958e3b 100644
--- a/server/src/main/java/org/opensearch/index/Index.java
+++ b/server/src/main/java/org/opensearch/index/Index.java
@@ -32,11 +32,11 @@
 
 package org.opensearch.index;
 
-import org.opensearch.cluster.ClusterState;
 import org.opensearch.core.ParseField;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.io.stream.Writeable;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ObjectParser;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
@@ -91,7 +91,7 @@ public String toString() {
          * If we have a uuid we put it in the toString so it'll show up in logs which is useful as more and more things use the uuid rather
          * than the name as the lookup key for the index.
          */
-        if (ClusterState.UNKNOWN_UUID.equals(uuid)) {
+        if (Strings.UNKNOWN_UUID_VALUE.equals(uuid)) {
             return "[" + name + "]";
         }
         return "[" + name + "/" + uuid + "]";
diff --git a/server/src/main/java/org/opensearch/index/IndexSettings.java b/server/src/main/java/org/opensearch/index/IndexSettings.java
index 746cbb46aaaca..67fac626525f4 100644
--- a/server/src/main/java/org/opensearch/index/IndexSettings.java
+++ b/server/src/main/java/org/opensearch/index/IndexSettings.java
@@ -36,7 +36,6 @@
 import org.apache.lucene.sandbox.index.MergeOnFlushMergePolicy;
 import org.opensearch.Version;
 import org.opensearch.cluster.metadata.IndexMetadata;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.Loggers;
 import org.opensearch.common.settings.IndexScopedSettings;
 import org.opensearch.common.settings.Setting;
@@ -46,6 +45,7 @@
 import org.opensearch.common.unit.ByteSizeValue;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.FeatureFlags;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.translog.Translog;
 import org.opensearch.indices.IndicesService;
 import org.opensearch.indices.replication.common.ReplicationType;
@@ -970,7 +970,7 @@ public String getUUID() {
      * Returns <code>true</code> if the index has a custom data path
      */
     public boolean hasCustomDataPath() {
-        return !Strings.isEmpty(customDataPath());
+        return !org.opensearch.core.common.Strings.isEmpty(customDataPath());
     }
 
     /**
diff --git a/server/src/main/java/org/opensearch/index/SearchSlowLog.java b/server/src/main/java/org/opensearch/index/SearchSlowLog.java
index 687e2884dcfbe..0b2e3a6b7cbc3 100644
--- a/server/src/main/java/org/opensearch/index/SearchSlowLog.java
+++ b/server/src/main/java/org/opensearch/index/SearchSlowLog.java
@@ -35,12 +35,12 @@
 import com.fasterxml.jackson.core.io.JsonStringEncoder;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.OpenSearchLogMessage;
 import org.opensearch.common.logging.Loggers;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Setting.Property;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.index.shard.SearchOperationListener;
 import org.opensearch.search.internal.SearchContext;
diff --git a/server/src/main/java/org/opensearch/index/analysis/Analysis.java b/server/src/main/java/org/opensearch/index/analysis/Analysis.java
index e9a5896a0c48f..52860fbf1dc3b 100644
--- a/server/src/main/java/org/opensearch/index/analysis/Analysis.java
+++ b/server/src/main/java/org/opensearch/index/analysis/Analysis.java
@@ -69,8 +69,8 @@
 import org.apache.lucene.analysis.sv.SwedishAnalyzer;
 import org.apache.lucene.analysis.th.ThaiAnalyzer;
 import org.apache.lucene.analysis.tr.TurkishAnalyzer;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.env.Environment;
 
 import java.io.BufferedReader;
diff --git a/server/src/main/java/org/opensearch/index/engine/InternalEngine.java b/server/src/main/java/org/opensearch/index/engine/InternalEngine.java
index 3abda9de90cf6..22eeca64328e0 100644
--- a/server/src/main/java/org/opensearch/index/engine/InternalEngine.java
+++ b/server/src/main/java/org/opensearch/index/engine/InternalEngine.java
@@ -65,8 +65,8 @@
 import org.apache.lucene.store.LockObtainFailedException;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.InfoStream;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.core.Assertions;
-import org.opensearch.ExceptionsHelper;
 import org.opensearch.action.index.IndexRequest;
 import org.opensearch.common.Booleans;
 import org.opensearch.common.Nullable;
@@ -313,7 +313,7 @@ public void onFailure(String reason, Exception ex) {
             } catch (AssertionError e) {
                 // IndexWriter throws AssertionError on init, if asserts are enabled, if any files don't exist, but tests that
                 // randomly throw FNFE/NSFE can also hit this:
-                if (ExceptionsHelper.stackTrace(e).contains("org.apache.lucene.index.IndexWriter.filesExist")) {
+                if (BaseExceptionsHelper.stackTrace(e).contains("org.apache.lucene.index.IndexWriter.filesExist")) {
                     throw new EngineCreationFailureException(shardId, "failed to create engine", e);
                 } else {
                     throw e;
@@ -2522,7 +2522,7 @@ protected void commitIndexWriter(final IndexWriter writer, final String translog
              * If assertions are enabled, IndexWriter throws AssertionError on commit if any files don't exist, but tests that randomly
              * throw FileNotFoundException or NoSuchFileException can also hit this.
              */
-            if (ExceptionsHelper.stackTrace(e).contains("org.apache.lucene.index.IndexWriter.filesExist")) {
+            if (BaseExceptionsHelper.stackTrace(e).contains("org.apache.lucene.index.IndexWriter.filesExist")) {
                 final EngineException engineException = new EngineException(shardId, "failed to commit engine", e);
                 try {
                     failEngine("lucene commit failed", engineException);
diff --git a/server/src/main/java/org/opensearch/index/mapper/DocumentParser.java b/server/src/main/java/org/opensearch/index/mapper/DocumentParser.java
index 2acffdee49a3a..0d18426111e2b 100644
--- a/server/src/main/java/org/opensearch/index/mapper/DocumentParser.java
+++ b/server/src/main/java/org/opensearch/index/mapper/DocumentParser.java
@@ -37,12 +37,12 @@
 import org.opensearch.OpenSearchParseException;
 import org.opensearch.Version;
 import org.opensearch.cluster.metadata.IndexMetadata;
-import org.opensearch.common.Strings;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.time.DateFormatter;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
 import org.opensearch.common.xcontent.XContentHelper;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.index.IndexSettings;
@@ -208,7 +208,7 @@ private static String[] splitAndValidatePath(String fullFieldPath) {
             for (String part : parts) {
                 if (Strings.hasText(part) == false) {
                     // check if the field name contains only whitespace
-                    if (Strings.isEmpty(part) == false) {
+                    if (org.opensearch.core.common.Strings.isEmpty(part) == false) {
                         throw new IllegalArgumentException("object field cannot contain only whitespace: ['" + fullFieldPath + "']");
                     }
                     throw new IllegalArgumentException(
@@ -218,7 +218,7 @@ private static String[] splitAndValidatePath(String fullFieldPath) {
             }
             return parts;
         } else {
-            if (Strings.isEmpty(fullFieldPath)) {
+            if (org.opensearch.core.common.Strings.isEmpty(fullFieldPath)) {
                 throw new IllegalArgumentException("field name cannot be an empty string");
             }
             return new String[] { fullFieldPath };
diff --git a/server/src/main/java/org/opensearch/index/mapper/SourceFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/SourceFieldMapper.java
index 5ac254adfe9c6..4905d45adf189 100644
--- a/server/src/main/java/org/opensearch/index/mapper/SourceFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/SourceFieldMapper.java
@@ -39,16 +39,16 @@
 import org.apache.lucene.search.Query;
 import org.apache.lucene.util.BytesRef;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.util.CollectionUtils;
-import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.common.xcontent.support.XContentMapValues;
+import org.opensearch.core.common.Strings;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.index.query.QueryShardContext;
 import org.opensearch.index.query.QueryShardException;
 import org.opensearch.search.lookup.SearchLookup;
diff --git a/server/src/main/java/org/opensearch/index/query/BaseTermQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/BaseTermQueryBuilder.java
index f41ef5c734d6d..1a4a9ed185def 100644
--- a/server/src/main/java/org/opensearch/index/query/BaseTermQueryBuilder.java
+++ b/server/src/main/java/org/opensearch/index/query/BaseTermQueryBuilder.java
@@ -34,9 +34,9 @@
 
 import org.apache.lucene.util.BytesRef;
 import org.opensearch.core.ParseField;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 
 import java.io.IOException;
diff --git a/server/src/main/java/org/opensearch/index/query/CommonTermsQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/CommonTermsQueryBuilder.java
index 5ec1f17c34975..a22dd513c41b1 100644
--- a/server/src/main/java/org/opensearch/index/query/CommonTermsQueryBuilder.java
+++ b/server/src/main/java/org/opensearch/index/query/CommonTermsQueryBuilder.java
@@ -42,9 +42,9 @@
 import org.apache.lucene.util.BytesRefBuilder;
 import org.opensearch.core.ParseField;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.mapper.MappedFieldType;
diff --git a/server/src/main/java/org/opensearch/index/query/ExistsQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/ExistsQueryBuilder.java
index 936b6be5057e1..1d40793158a2c 100644
--- a/server/src/main/java/org/opensearch/index/query/ExistsQueryBuilder.java
+++ b/server/src/main/java/org/opensearch/index/query/ExistsQueryBuilder.java
@@ -40,10 +40,10 @@
 import org.apache.lucene.search.Query;
 import org.opensearch.core.ParseField;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.lucene.search.Queries;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.mapper.FieldNamesFieldMapper;
diff --git a/server/src/main/java/org/opensearch/index/query/FieldMaskingSpanQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/FieldMaskingSpanQueryBuilder.java
index 80b5dc8070ff2..2ff41b5f66152 100644
--- a/server/src/main/java/org/opensearch/index/query/FieldMaskingSpanQueryBuilder.java
+++ b/server/src/main/java/org/opensearch/index/query/FieldMaskingSpanQueryBuilder.java
@@ -37,9 +37,9 @@
 import org.apache.lucene.search.Query;
 import org.opensearch.core.ParseField;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.mapper.MappedFieldType;
diff --git a/server/src/main/java/org/opensearch/index/query/FuzzyQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/FuzzyQueryBuilder.java
index f56bfba5c4ca5..aaedc0b92eb47 100644
--- a/server/src/main/java/org/opensearch/index/query/FuzzyQueryBuilder.java
+++ b/server/src/main/java/org/opensearch/index/query/FuzzyQueryBuilder.java
@@ -37,11 +37,11 @@
 import org.apache.lucene.search.Query;
 import org.opensearch.core.ParseField;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.unit.Fuzziness;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.mapper.MappedFieldType;
diff --git a/server/src/main/java/org/opensearch/index/query/GeoDistanceQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/GeoDistanceQueryBuilder.java
index bc52d8fe6a6df..a00d7737fbbaa 100644
--- a/server/src/main/java/org/opensearch/index/query/GeoDistanceQueryBuilder.java
+++ b/server/src/main/java/org/opensearch/index/query/GeoDistanceQueryBuilder.java
@@ -36,7 +36,6 @@
 import org.apache.lucene.search.Query;
 import org.opensearch.core.ParseField;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.geo.GeoDistance;
 import org.opensearch.common.geo.GeoPoint;
 import org.opensearch.common.geo.GeoUtils;
@@ -45,6 +44,7 @@
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.unit.DistanceUnit;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.geometry.Circle;
@@ -99,7 +99,7 @@ public class GeoDistanceQueryBuilder extends AbstractQueryBuilder<GeoDistanceQue
      * @param fieldName name of indexed geo field to operate distance computation on.
      * */
     public GeoDistanceQueryBuilder(String fieldName) {
-        if (Strings.isEmpty(fieldName)) {
+        if (org.opensearch.core.common.Strings.isEmpty(fieldName)) {
             throw new IllegalArgumentException("fieldName must not be null or empty");
         }
         this.fieldName = fieldName;
@@ -166,7 +166,7 @@ public GeoDistanceQueryBuilder distance(String distance) {
 
     /** Sets the distance from the center for this query. */
     public GeoDistanceQueryBuilder distance(String distance, DistanceUnit unit) {
-        if (Strings.isEmpty(distance)) {
+        if (org.opensearch.core.common.Strings.isEmpty(distance)) {
             throw new IllegalArgumentException("distance must not be null or empty");
         }
         if (unit == null) {
diff --git a/server/src/main/java/org/opensearch/index/query/GeoPolygonQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/GeoPolygonQueryBuilder.java
index f5e40fec78c25..c6348d3c2e7be 100644
--- a/server/src/main/java/org/opensearch/index/query/GeoPolygonQueryBuilder.java
+++ b/server/src/main/java/org/opensearch/index/query/GeoPolygonQueryBuilder.java
@@ -40,11 +40,11 @@
 import org.apache.lucene.search.Query;
 import org.opensearch.core.ParseField;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.geo.GeoPoint;
 import org.opensearch.common.geo.GeoUtils;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.core.xcontent.XContentParser.Token;
diff --git a/server/src/main/java/org/opensearch/index/query/IdsQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/IdsQueryBuilder.java
index 2e71bf8053cbf..e6600b65c1803 100644
--- a/server/src/main/java/org/opensearch/index/query/IdsQueryBuilder.java
+++ b/server/src/main/java/org/opensearch/index/query/IdsQueryBuilder.java
@@ -34,12 +34,12 @@
 
 import org.apache.lucene.search.Query;
 import org.opensearch.Version;
-import org.opensearch.core.ParseField;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.logging.DeprecationLogger;
+import org.opensearch.core.common.Strings;
+import org.opensearch.core.ParseField;
 import org.opensearch.core.xcontent.ObjectParser;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
diff --git a/server/src/main/java/org/opensearch/index/query/MatchBoolPrefixQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/MatchBoolPrefixQueryBuilder.java
index 7aebf15e780b9..651bcee042fb6 100644
--- a/server/src/main/java/org/opensearch/index/query/MatchBoolPrefixQueryBuilder.java
+++ b/server/src/main/java/org/opensearch/index/query/MatchBoolPrefixQueryBuilder.java
@@ -35,12 +35,12 @@
 import org.apache.lucene.search.FuzzyQuery;
 import org.apache.lucene.search.Query;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.lucene.search.Queries;
 import org.opensearch.common.unit.Fuzziness;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.query.support.QueryParsers;
diff --git a/server/src/main/java/org/opensearch/index/query/MatchPhraseQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/MatchPhraseQueryBuilder.java
index 5f42825e9d0f7..c584c8af82e60 100644
--- a/server/src/main/java/org/opensearch/index/query/MatchPhraseQueryBuilder.java
+++ b/server/src/main/java/org/opensearch/index/query/MatchPhraseQueryBuilder.java
@@ -35,9 +35,9 @@
 import org.apache.lucene.search.Query;
 import org.opensearch.core.ParseField;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.search.MatchQuery;
diff --git a/server/src/main/java/org/opensearch/index/query/MoreLikeThisQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/MoreLikeThisQueryBuilder.java
index ab711d3a0ea00..cc5cae168e7b6 100644
--- a/server/src/main/java/org/opensearch/index/query/MoreLikeThisQueryBuilder.java
+++ b/server/src/main/java/org/opensearch/index/query/MoreLikeThisQueryBuilder.java
@@ -37,6 +37,7 @@
 import org.apache.lucene.search.BooleanClause;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.Query;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.OpenSearchParseException;
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.Version;
@@ -448,7 +449,7 @@ public String toString() {
                 toXContent(builder, EMPTY_PARAMS);
                 return Strings.toString(builder);
             } catch (Exception e) {
-                return "{ \"error\" : \"" + ExceptionsHelper.detailedMessage(e) + "\"}";
+                return "{ \"error\" : \"" + BaseExceptionsHelper.detailedMessage(e) + "\"}";
             }
         }
 
diff --git a/server/src/main/java/org/opensearch/index/query/MultiMatchQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/MultiMatchQueryBuilder.java
index 85ef0ebcbbe85..20ad986a6e999 100644
--- a/server/src/main/java/org/opensearch/index/query/MultiMatchQueryBuilder.java
+++ b/server/src/main/java/org/opensearch/index/query/MultiMatchQueryBuilder.java
@@ -37,11 +37,11 @@
 import org.opensearch.OpenSearchParseException;
 import org.opensearch.core.ParseField;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.io.stream.Writeable;
 import org.opensearch.common.unit.Fuzziness;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.DeprecationHandler;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
 import org.opensearch.core.xcontent.XContentBuilder;
@@ -294,7 +294,7 @@ public Object value() {
      * Adds a field to run the multi match against.
      */
     public MultiMatchQueryBuilder field(String field) {
-        if (Strings.isEmpty(field)) {
+        if (org.opensearch.core.common.Strings.isEmpty(field)) {
             throw new IllegalArgumentException("supplied field is null or empty.");
         }
         this.fieldsBoosts.put(field, AbstractQueryBuilder.DEFAULT_BOOST);
diff --git a/server/src/main/java/org/opensearch/index/query/PrefixQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/PrefixQueryBuilder.java
index af496bfd67872..546eb8a50f138 100644
--- a/server/src/main/java/org/opensearch/index/query/PrefixQueryBuilder.java
+++ b/server/src/main/java/org/opensearch/index/query/PrefixQueryBuilder.java
@@ -38,10 +38,10 @@
 import org.apache.lucene.search.Query;
 import org.opensearch.core.ParseField;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.mapper.MappedFieldType;
diff --git a/server/src/main/java/org/opensearch/index/query/RangeQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/RangeQueryBuilder.java
index 3eb401987e0ba..482c117595845 100644
--- a/server/src/main/java/org/opensearch/index/query/RangeQueryBuilder.java
+++ b/server/src/main/java/org/opensearch/index/query/RangeQueryBuilder.java
@@ -37,12 +37,12 @@
 import org.apache.lucene.util.BytesRef;
 import org.opensearch.core.ParseField;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.geo.ShapeRelation;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.time.DateFormatter;
 import org.opensearch.common.time.DateMathParser;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.mapper.FieldNamesFieldMapper;
@@ -91,7 +91,7 @@ public class RangeQueryBuilder extends AbstractQueryBuilder<RangeQueryBuilder> i
      * @param fieldName The field name
      */
     public RangeQueryBuilder(String fieldName) {
-        if (Strings.isEmpty(fieldName)) {
+        if (org.opensearch.core.common.Strings.isEmpty(fieldName)) {
             throw new IllegalArgumentException("field name is null or empty");
         }
         this.fieldName = fieldName;
@@ -303,7 +303,7 @@ public String format() {
     }
 
     DateMathParser getForceDateParser() { // pkg private for testing
-        if (Strings.hasText(format)) {
+        if (org.opensearch.core.common.Strings.hasText(format)) {
             return DateFormatter.forPattern(this.format).toDateMathParser();
         }
         return null;
diff --git a/server/src/main/java/org/opensearch/index/query/RegexpQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/RegexpQueryBuilder.java
index fd796c771197c..8a485284128c4 100644
--- a/server/src/main/java/org/opensearch/index/query/RegexpQueryBuilder.java
+++ b/server/src/main/java/org/opensearch/index/query/RegexpQueryBuilder.java
@@ -40,11 +40,11 @@
 import org.apache.lucene.util.automaton.RegExp;
 import org.opensearch.core.ParseField;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.lucene.BytesRefs;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.IndexSettings;
diff --git a/server/src/main/java/org/opensearch/index/query/SimpleQueryStringBuilder.java b/server/src/main/java/org/opensearch/index/query/SimpleQueryStringBuilder.java
index 4dfe6a590c8b6..2a48eed8c8072 100644
--- a/server/src/main/java/org/opensearch/index/query/SimpleQueryStringBuilder.java
+++ b/server/src/main/java/org/opensearch/index/query/SimpleQueryStringBuilder.java
@@ -37,11 +37,11 @@
 import org.apache.lucene.search.Query;
 import org.opensearch.core.ParseField;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.lucene.search.Queries;
 import org.opensearch.common.util.CollectionUtils;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.search.QueryParserHelper;
@@ -216,7 +216,7 @@ public String value() {
 
     /** Add a field to run the query against. */
     public SimpleQueryStringBuilder field(String field) {
-        if (Strings.isEmpty(field)) {
+        if (org.opensearch.core.common.Strings.isEmpty(field)) {
             throw new IllegalArgumentException("supplied field is null or empty");
         }
         this.fieldsAndWeights.put(field, AbstractQueryBuilder.DEFAULT_BOOST);
diff --git a/server/src/main/java/org/opensearch/index/query/SimpleQueryStringFlag.java b/server/src/main/java/org/opensearch/index/query/SimpleQueryStringFlag.java
index 500e41dc6f73f..ab02121349af4 100644
--- a/server/src/main/java/org/opensearch/index/query/SimpleQueryStringFlag.java
+++ b/server/src/main/java/org/opensearch/index/query/SimpleQueryStringFlag.java
@@ -68,7 +68,7 @@ public int value() {
     }
 
     static int resolveFlags(String flags) {
-        if (!Strings.hasLength(flags)) {
+        if (org.opensearch.core.common.Strings.hasLength(flags) == false) {
             return ALL.value();
         }
         int magic = NONE.value();
diff --git a/server/src/main/java/org/opensearch/index/query/SpanNearQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/SpanNearQueryBuilder.java
index d2ee440ef7536..46cddf8adac4e 100644
--- a/server/src/main/java/org/opensearch/index/query/SpanNearQueryBuilder.java
+++ b/server/src/main/java/org/opensearch/index/query/SpanNearQueryBuilder.java
@@ -326,7 +326,7 @@ public static class SpanGapQueryBuilder implements SpanQueryBuilder {
          * @param width The width of the gap introduced
          */
         public SpanGapQueryBuilder(String fieldName, int width) {
-            if (Strings.isEmpty(fieldName)) {
+            if (org.opensearch.core.common.Strings.isEmpty(fieldName)) {
                 throw new IllegalArgumentException("[span_gap] field name is null or empty");
             }
             // lucene has not coded any restriction on value of width.
diff --git a/server/src/main/java/org/opensearch/index/query/TermsQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/TermsQueryBuilder.java
index 028fa4be8a2c8..85b8b67c4bd03 100644
--- a/server/src/main/java/org/opensearch/index/query/TermsQueryBuilder.java
+++ b/server/src/main/java/org/opensearch/index/query/TermsQueryBuilder.java
@@ -42,11 +42,11 @@
 import org.opensearch.client.Client;
 import org.opensearch.common.ParsingException;
 import org.opensearch.common.SetOnce;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.common.xcontent.support.XContentMapValues;
@@ -90,7 +90,7 @@ public TermsQueryBuilder(String fieldName, TermsLookup termsLookup) {
      * constructor used internally for serialization of both value / termslookup variants
      */
     TermsQueryBuilder(String fieldName, List<Object> values, TermsLookup termsLookup) {
-        if (Strings.isEmpty(fieldName)) {
+        if (org.opensearch.core.common.Strings.isEmpty(fieldName)) {
             throw new IllegalArgumentException("field name cannot be null.");
         }
         if (values == null && termsLookup == null) {
diff --git a/server/src/main/java/org/opensearch/index/query/WildcardQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/WildcardQueryBuilder.java
index 7943eaf0bcb3d..b61e527b3524c 100644
--- a/server/src/main/java/org/opensearch/index/query/WildcardQueryBuilder.java
+++ b/server/src/main/java/org/opensearch/index/query/WildcardQueryBuilder.java
@@ -38,10 +38,10 @@
 import org.apache.lucene.search.Query;
 import org.opensearch.core.ParseField;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.mapper.MappedFieldType;
diff --git a/server/src/main/java/org/opensearch/index/query/WrapperQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/WrapperQueryBuilder.java
index a9532af8f091f..30d4ce575a499 100644
--- a/server/src/main/java/org/opensearch/index/query/WrapperQueryBuilder.java
+++ b/server/src/main/java/org/opensearch/index/query/WrapperQueryBuilder.java
@@ -36,11 +36,11 @@
 import org.apache.lucene.util.BytesRef;
 import org.opensearch.core.ParseField;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.core.xcontent.XContentParser;
diff --git a/server/src/main/java/org/opensearch/index/reindex/BulkByScrollTask.java b/server/src/main/java/org/opensearch/index/reindex/BulkByScrollTask.java
index 2fe0fe0259c33..8eed9f832885a 100644
--- a/server/src/main/java/org/opensearch/index/reindex/BulkByScrollTask.java
+++ b/server/src/main/java/org/opensearch/index/reindex/BulkByScrollTask.java
@@ -32,6 +32,7 @@
 
 package org.opensearch.index.reindex;
 
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.OpenSearchException;
 import org.opensearch.common.Nullable;
 import org.opensearch.core.ParseField;
@@ -999,7 +1000,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
                 status.toXContent(builder, params);
             } else {
                 builder.startObject();
-                OpenSearchException.generateThrowableXContent(builder, params, exception);
+                BaseOpenSearchException.generateThrowableXContent(builder, params, exception);
                 builder.endObject();
             }
             return builder;
diff --git a/server/src/main/java/org/opensearch/index/reindex/ReindexRequest.java b/server/src/main/java/org/opensearch/index/reindex/ReindexRequest.java
index d5bc6f79c15c1..df5e1ecd36d6c 100644
--- a/server/src/main/java/org/opensearch/index/reindex/ReindexRequest.java
+++ b/server/src/main/java/org/opensearch/index/reindex/ReindexRequest.java
@@ -37,13 +37,13 @@
 import org.opensearch.action.index.IndexRequest;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.core.ParseField;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.lucene.uid.Versions;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ObjectParser;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
@@ -402,7 +402,7 @@ private static String[] extractStringArray(Map<String, Object> source, String na
             List<String> list = (List<String>) value;
             return list.toArray(new String[0]);
         } else if (value instanceof String) {
-            return Strings.splitStringByCommaToArray((String) value);
+            return org.opensearch.core.common.Strings.splitStringByCommaToArray((String) value);
         } else {
             throw new IllegalArgumentException("Expected [" + name + "] to be a list or a string but was [" + value + ']');
         }
diff --git a/server/src/main/java/org/opensearch/index/reindex/ScrollableHitSource.java b/server/src/main/java/org/opensearch/index/reindex/ScrollableHitSource.java
index 452c10e481243..18ef8aba90983 100644
--- a/server/src/main/java/org/opensearch/index/reindex/ScrollableHitSource.java
+++ b/server/src/main/java/org/opensearch/index/reindex/ScrollableHitSource.java
@@ -33,7 +33,7 @@
 package org.opensearch.index.reindex;
 
 import org.apache.logging.log4j.Logger;
-import org.opensearch.OpenSearchException;
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.bulk.BackoffPolicy;
@@ -137,7 +137,7 @@ public void done(TimeValue extraKeepAlive) {
 
     public final void close(Runnable onCompletion) {
         String scrollId = this.scrollId.get();
-        if (Strings.hasLength(scrollId)) {
+        if (org.opensearch.core.common.Strings.hasLength(scrollId)) {
             clearScroll(scrollId, () -> cleanup(onCompletion));
         } else {
             cleanup(onCompletion);
@@ -489,7 +489,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             builder.field(REASON_FIELD);
             {
                 builder.startObject();
-                OpenSearchException.generateThrowableXContent(builder, params, reason);
+                BaseOpenSearchException.generateThrowableXContent(builder, params, reason);
                 builder.endObject();
             }
             builder.endObject();
diff --git a/server/src/main/java/org/opensearch/index/shard/StoreRecovery.java b/server/src/main/java/org/opensearch/index/shard/StoreRecovery.java
index 4618f9004f7b5..9393a5ac38ac2 100644
--- a/server/src/main/java/org/opensearch/index/shard/StoreRecovery.java
+++ b/server/src/main/java/org/opensearch/index/shard/StoreRecovery.java
@@ -42,7 +42,7 @@
 import org.apache.lucene.store.FilterDirectory;
 import org.apache.lucene.store.IOContext;
 import org.apache.lucene.store.IndexInput;
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.StepListener;
 import org.opensearch.cluster.metadata.IndexMetadata;
@@ -500,7 +500,7 @@ private void internalRecoverFromStore(IndexShard indexShard) throws IndexShardRe
                         files = Arrays.toString(store.directory().listAll());
                     } catch (Exception inner) {
                         inner.addSuppressed(e);
-                        files += " (failure=" + ExceptionsHelper.detailedMessage(inner) + ")";
+                        files += " (failure=" + BaseExceptionsHelper.detailedMessage(inner) + ")";
                     }
                     if (indexShouldExists) {
                         throw new IndexShardRecoveryException(
diff --git a/server/src/main/java/org/opensearch/index/termvectors/TermVectorsService.java b/server/src/main/java/org/opensearch/index/termvectors/TermVectorsService.java
index ff75c6e3ddc45..53734460a2d65 100644
--- a/server/src/main/java/org/opensearch/index/termvectors/TermVectorsService.java
+++ b/server/src/main/java/org/opensearch/index/termvectors/TermVectorsService.java
@@ -46,13 +46,13 @@
 import org.opensearch.action.termvectors.TermVectorsRequest;
 import org.opensearch.action.termvectors.TermVectorsResponse;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.document.DocumentField;
 import org.opensearch.common.lucene.uid.VersionsAndSeqNoResolver.DocIdAndVersion;
 import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.common.xcontent.support.XContentMapValues;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.engine.Engine;
 import org.opensearch.index.get.GetResult;
 import org.opensearch.index.mapper.DocumentMapperForType;
diff --git a/server/src/main/java/org/opensearch/index/translog/Translog.java b/server/src/main/java/org/opensearch/index/translog/Translog.java
index ba4d87ce84f07..3753cfaccb2fe 100644
--- a/server/src/main/java/org/opensearch/index/translog/Translog.java
+++ b/server/src/main/java/org/opensearch/index/translog/Translog.java
@@ -36,7 +36,6 @@
 import org.apache.lucene.store.AlreadyClosedException;
 import org.opensearch.Version;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.UUIDs;
 import org.opensearch.common.bytes.BytesArray;
 import org.opensearch.common.bytes.BytesReference;
@@ -49,6 +48,7 @@
 import org.opensearch.common.util.BigArrays;
 import org.opensearch.common.util.concurrent.ReleasableLock;
 import org.opensearch.common.util.io.IOUtils;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.IndexSettings;
 import org.opensearch.index.VersionType;
 import org.opensearch.index.engine.Engine;
diff --git a/server/src/main/java/org/opensearch/indices/recovery/MultiFileWriter.java b/server/src/main/java/org/opensearch/indices/recovery/MultiFileWriter.java
index ec3986017afac..5364bbbdc51c1 100644
--- a/server/src/main/java/org/opensearch/indices/recovery/MultiFileWriter.java
+++ b/server/src/main/java/org/opensearch/indices/recovery/MultiFileWriter.java
@@ -37,11 +37,11 @@
 import org.apache.lucene.store.IndexOutput;
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.BytesRefIterator;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.lease.Releasable;
 import org.opensearch.common.util.concurrent.AbstractRefCounted;
 import org.opensearch.common.util.concurrent.ConcurrentCollections;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.store.Store;
 import org.opensearch.index.store.StoreFileMetadata;
 import org.opensearch.indices.replication.common.ReplicationLuceneIndex;
diff --git a/server/src/main/java/org/opensearch/indices/recovery/PeerRecoveryTargetService.java b/server/src/main/java/org/opensearch/indices/recovery/PeerRecoveryTargetService.java
index b54171bb9a7d7..5fb84a165c498 100644
--- a/server/src/main/java/org/opensearch/indices/recovery/PeerRecoveryTargetService.java
+++ b/server/src/main/java/org/opensearch/indices/recovery/PeerRecoveryTargetService.java
@@ -36,7 +36,7 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.lucene.store.AlreadyClosedException;
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.OpenSearchException;
 import org.opensearch.OpenSearchTimeoutException;
 import org.opensearch.action.ActionListener;
@@ -679,7 +679,7 @@ private void onException(Exception e) {
                     e
                 );
             }
-            Throwable cause = ExceptionsHelper.unwrapCause(e);
+            Throwable cause = BaseExceptionsHelper.unwrapCause(e);
             if (cause instanceof CancellableThreads.ExecutionCancelledException) {
                 // this can also come from the source wrapped in a RemoteTransportException
                 onGoingRecoveries.fail(recoveryId, new RecoveryFailedException(request, "source has canceled the recovery", cause), false);
@@ -690,7 +690,7 @@ private void onException(Exception e) {
                 cause = cause.getCause();
             }
             // do it twice, in case we have double transport exception
-            cause = ExceptionsHelper.unwrapCause(cause);
+            cause = BaseExceptionsHelper.unwrapCause(cause);
             if (cause instanceof RecoveryEngineException) {
                 // unwrap an exception that was thrown as part of the recovery
                 cause = cause.getCause();
diff --git a/server/src/main/java/org/opensearch/indices/recovery/RetryableTransportClient.java b/server/src/main/java/org/opensearch/indices/recovery/RetryableTransportClient.java
index 77ffd75d0148a..f7d75b356d6a3 100644
--- a/server/src/main/java/org/opensearch/indices/recovery/RetryableTransportClient.java
+++ b/server/src/main/java/org/opensearch/indices/recovery/RetryableTransportClient.java
@@ -9,7 +9,7 @@
 package org.opensearch.indices.recovery;
 
 import org.apache.logging.log4j.Logger;
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.ActionListenerResponseHandler;
 import org.opensearch.action.support.RetryableAction;
@@ -127,10 +127,10 @@ private static boolean retryableException(Exception e) {
         if (e instanceof ConnectTransportException) {
             return true;
         } else if (e instanceof SendRequestTransportException) {
-            final Throwable cause = ExceptionsHelper.unwrapCause(e);
+            final Throwable cause = BaseExceptionsHelper.unwrapCause(e);
             return cause instanceof ConnectTransportException;
         } else if (e instanceof RemoteTransportException) {
-            final Throwable cause = ExceptionsHelper.unwrapCause(e);
+            final Throwable cause = BaseExceptionsHelper.unwrapCause(e);
             return cause instanceof CircuitBreakingException || cause instanceof OpenSearchRejectedExecutionException;
         }
         return false;
diff --git a/server/src/main/java/org/opensearch/indices/replication/SegmentReplicationTargetService.java b/server/src/main/java/org/opensearch/indices/replication/SegmentReplicationTargetService.java
index 1858449e13ae8..3652bc2f09bbf 100644
--- a/server/src/main/java/org/opensearch/indices/replication/SegmentReplicationTargetService.java
+++ b/server/src/main/java/org/opensearch/indices/replication/SegmentReplicationTargetService.java
@@ -11,7 +11,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.action.ActionListener;
 import org.opensearch.cluster.routing.ShardRouting;
 import org.opensearch.common.Nullable;
@@ -352,7 +352,7 @@ public void onResponse(Void o) {
 
                 @Override
                 public void onFailure(Exception e) {
-                    Throwable cause = ExceptionsHelper.unwrapCause(e);
+                    Throwable cause = BaseExceptionsHelper.unwrapCause(e);
                     if (cause instanceof CancellableThreads.ExecutionCancelledException) {
                         if (onGoingReplications.getTarget(replicationId) != null) {
                             IndexShard indexShard = onGoingReplications.getTarget(replicationId).indexShard();
diff --git a/server/src/main/java/org/opensearch/indices/replication/common/ReplicationTarget.java b/server/src/main/java/org/opensearch/indices/replication/common/ReplicationTarget.java
index 4d75ff4896706..415fb91874416 100644
--- a/server/src/main/java/org/opensearch/indices/replication/common/ReplicationTarget.java
+++ b/server/src/main/java/org/opensearch/indices/replication/common/ReplicationTarget.java
@@ -10,7 +10,7 @@
 
 import org.apache.logging.log4j.Logger;
 import org.apache.lucene.store.RateLimiter;
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.OpenSearchException;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.support.ChannelActionListener;
@@ -176,7 +176,7 @@ public void fail(ReplicationFailedException e, boolean sendShardFailure) {
                 notifyListener(e, sendShardFailure);
             } finally {
                 try {
-                    cancellableThreads.cancel("failed" + description() + "[" + ExceptionsHelper.stackTrace(e) + "]");
+                    cancellableThreads.cancel("failed" + description() + "[" + BaseExceptionsHelper.stackTrace(e) + "]");
                 } finally {
                     // release the initial reference. replication files will be cleaned as soon as ref count goes to zero, potentially now
                     decRef();
diff --git a/server/src/main/java/org/opensearch/ingest/IngestDocument.java b/server/src/main/java/org/opensearch/ingest/IngestDocument.java
index ecc5758299e42..e0de0a9488ad9 100644
--- a/server/src/main/java/org/opensearch/ingest/IngestDocument.java
+++ b/server/src/main/java/org/opensearch/ingest/IngestDocument.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.ingest;
 
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.VersionType;
 import org.opensearch.index.mapper.IdFieldMapper;
 import org.opensearch.index.mapper.IndexFieldMapper;
diff --git a/server/src/main/java/org/opensearch/plugins/ActionPlugin.java b/server/src/main/java/org/opensearch/plugins/ActionPlugin.java
index d9792d60ae735..031ac7d068ef9 100644
--- a/server/src/main/java/org/opensearch/plugins/ActionPlugin.java
+++ b/server/src/main/java/org/opensearch/plugins/ActionPlugin.java
@@ -43,12 +43,12 @@
 import org.opensearch.action.support.TransportActions;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.node.DiscoveryNodes;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.IndexScopedSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.settings.SettingsFilter;
 import org.opensearch.common.util.concurrent.ThreadContext;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.RestController;
 import org.opensearch.rest.RestHandler;
 import org.opensearch.rest.RestHeaderDefinition;
diff --git a/server/src/main/java/org/opensearch/plugins/PluginsService.java b/server/src/main/java/org/opensearch/plugins/PluginsService.java
index 8319d254892a7..28181e7457476 100644
--- a/server/src/main/java/org/opensearch/plugins/PluginsService.java
+++ b/server/src/main/java/org/opensearch/plugins/PluginsService.java
@@ -43,13 +43,13 @@
 import org.opensearch.Version;
 import org.opensearch.action.admin.cluster.node.info.PluginsAndModules;
 import org.opensearch.bootstrap.JarHell;
-import org.opensearch.common.Strings;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.component.LifecycleComponent;
 import org.opensearch.common.inject.Module;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Setting.Property;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.IndexModule;
 import org.opensearch.node.ReportingService;
 import org.opensearch.threadpool.ExecutorBuilder;
@@ -211,7 +211,7 @@ public PluginsService(
                 final String message = String.format(
                     Locale.ROOT,
                     "missing mandatory plugins [%s], found plugins [%s]",
-                    Strings.collectionToDelimitedString(missingPlugins, ", "),
+                    org.opensearch.core.common.Strings.collectionToDelimitedString(missingPlugins, ", "),
                     Strings.collectionToDelimitedString(pluginsNames, ", ")
                 );
                 throw new IllegalStateException(message);
diff --git a/server/src/main/java/org/opensearch/repositories/RepositoriesService.java b/server/src/main/java/org/opensearch/repositories/RepositoriesService.java
index c438abedfd37c..da696b41328df 100644
--- a/server/src/main/java/org/opensearch/repositories/RepositoriesService.java
+++ b/server/src/main/java/org/opensearch/repositories/RepositoriesService.java
@@ -594,7 +594,7 @@ private Repository createRepository(RepositoryMetadata repositoryMetadata, Map<S
     }
 
     private static void validate(final String repositoryName) {
-        if (Strings.hasLength(repositoryName) == false) {
+        if (org.opensearch.core.common.Strings.hasLength(repositoryName) == false) {
             throw new RepositoryException(repositoryName, "cannot be empty");
         }
         if (repositoryName.contains("#")) {
diff --git a/server/src/main/java/org/opensearch/repositories/fs/FsRepository.java b/server/src/main/java/org/opensearch/repositories/fs/FsRepository.java
index 9b08465196d8e..6f18cdab804e9 100644
--- a/server/src/main/java/org/opensearch/repositories/fs/FsRepository.java
+++ b/server/src/main/java/org/opensearch/repositories/fs/FsRepository.java
@@ -36,13 +36,13 @@
 import org.apache.logging.log4j.Logger;
 import org.opensearch.cluster.metadata.RepositoryMetadata;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.blobstore.BlobPath;
 import org.opensearch.common.blobstore.BlobStore;
 import org.opensearch.common.blobstore.fs.FsBlobStore;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Setting.Property;
 import org.opensearch.common.unit.ByteSizeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.env.Environment;
 import org.opensearch.indices.recovery.RecoverySettings;
diff --git a/server/src/main/java/org/opensearch/rest/BytesRestResponse.java b/server/src/main/java/org/opensearch/rest/BytesRestResponse.java
index 66788576a7215..26eaa487cc931 100644
--- a/server/src/main/java/org/opensearch/rest/BytesRestResponse.java
+++ b/server/src/main/java/org/opensearch/rest/BytesRestResponse.java
@@ -36,6 +36,7 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.logging.log4j.util.Supplier;
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.OpenSearchException;
 import org.opensearch.OpenSearchStatusException;
 import org.opensearch.ExceptionsHelper;
@@ -166,7 +167,7 @@ protected boolean skipStackTrace() {
     private void build(XContentBuilder builder, ToXContent.Params params, RestStatus status, boolean detailedErrorsEnabled, Exception e)
         throws IOException {
         builder.startObject();
-        OpenSearchException.generateFailureXContent(builder, params, e, detailedErrorsEnabled);
+        BaseOpenSearchException.generateFailureXContent(builder, params, e, detailedErrorsEnabled);
         builder.field(STATUS, status.getStatus());
         builder.endObject();
     }
diff --git a/server/src/main/java/org/opensearch/rest/DeprecationRestHandler.java b/server/src/main/java/org/opensearch/rest/DeprecationRestHandler.java
index e4e0acb2123eb..0cdb08a11b45e 100644
--- a/server/src/main/java/org/opensearch/rest/DeprecationRestHandler.java
+++ b/server/src/main/java/org/opensearch/rest/DeprecationRestHandler.java
@@ -32,8 +32,8 @@
 package org.opensearch.rest;
 
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
+import org.opensearch.core.common.Strings;
 
 import java.util.Objects;
 
diff --git a/server/src/main/java/org/opensearch/rest/RestController.java b/server/src/main/java/org/opensearch/rest/RestController.java
index c3ef93abc35d9..c60f53f58f9cf 100644
--- a/server/src/main/java/org/opensearch/rest/RestController.java
+++ b/server/src/main/java/org/opensearch/rest/RestController.java
@@ -38,7 +38,6 @@
 import org.opensearch.OpenSearchException;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.breaker.CircuitBreaker;
 import org.opensearch.common.bytes.BytesArray;
 import org.opensearch.common.bytes.BytesReference;
@@ -46,6 +45,7 @@
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.path.PathTrie;
 import org.opensearch.common.util.concurrent.ThreadContext;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.util.FeatureFlags;
 import org.opensearch.common.xcontent.XContentType;
@@ -470,7 +470,7 @@ private void handleUnsupportedHttpMethod(
             }
             BytesRestResponse bytesRestResponse = BytesRestResponse.createSimpleErrorResponse(channel, METHOD_NOT_ALLOWED, msg.toString());
             if (validMethodSet.isEmpty() == false) {
-                bytesRestResponse.addHeader("Allow", Strings.collectionToDelimitedString(validMethodSet, ","));
+                bytesRestResponse.addHeader("Allow", org.opensearch.core.common.Strings.collectionToDelimitedString(validMethodSet, ","));
             }
             channel.sendResponse(bytesRestResponse);
         } catch (final IOException e) {
@@ -491,7 +491,7 @@ private void handleOptionsRequest(RestChannel channel, Set<RestRequest.Method> v
         // When we have an OPTIONS HTTP request and no valid handlers, simply send OK by default (with the Access Control Origin header
         // which gets automatically added).
         if (validMethodSet.isEmpty() == false) {
-            bytesRestResponse.addHeader("Allow", Strings.collectionToDelimitedString(validMethodSet, ","));
+            bytesRestResponse.addHeader("Allow", org.opensearch.core.common.Strings.collectionToDelimitedString(validMethodSet, ","));
         }
         channel.sendResponse(bytesRestResponse);
     }
diff --git a/server/src/main/java/org/opensearch/rest/RestRequest.java b/server/src/main/java/org/opensearch/rest/RestRequest.java
index b4f70e359d618..36961ed3e20da 100644
--- a/server/src/main/java/org/opensearch/rest/RestRequest.java
+++ b/server/src/main/java/org/opensearch/rest/RestRequest.java
@@ -461,7 +461,7 @@ public String[] paramAsStringArray(String key, String[] defaultValue) {
         if (value == null) {
             return defaultValue;
         }
-        return Strings.splitStringByCommaToArray(value);
+        return org.opensearch.core.common.Strings.splitStringByCommaToArray(value);
     }
 
     public String[] paramAsStringArrayOrEmptyIfAll(String key) {
diff --git a/server/src/main/java/org/opensearch/rest/RestRequestFilter.java b/server/src/main/java/org/opensearch/rest/RestRequestFilter.java
index b173763b3813f..f24c5a15c4304 100644
--- a/server/src/main/java/org/opensearch/rest/RestRequestFilter.java
+++ b/server/src/main/java/org/opensearch/rest/RestRequestFilter.java
@@ -33,13 +33,13 @@
 package org.opensearch.rest;
 
 import org.opensearch.OpenSearchException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.collect.Tuple;
-import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.common.xcontent.support.XContentMapValues;
+import org.opensearch.core.common.Strings;
+import org.opensearch.core.xcontent.XContentBuilder;
 
 import java.io.IOException;
 import java.util.Map;
diff --git a/server/src/main/java/org/opensearch/rest/action/RestFieldCapabilitiesAction.java b/server/src/main/java/org/opensearch/rest/action/RestFieldCapabilitiesAction.java
index 2c1087327776c..a992ccef6b334 100644
--- a/server/src/main/java/org/opensearch/rest/action/RestFieldCapabilitiesAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/RestFieldCapabilitiesAction.java
@@ -35,7 +35,7 @@
 import org.opensearch.action.fieldcaps.FieldCapabilitiesRequest;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 
@@ -73,7 +73,7 @@ public String getName() {
 
     @Override
     public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
-        String[] indices = Strings.splitStringByCommaToArray(request.param("index"));
+        String[] indices = org.opensearch.core.common.Strings.splitStringByCommaToArray(request.param("index"));
         FieldCapabilitiesRequest fieldRequest = new FieldCapabilitiesRequest().fields(
             Strings.splitStringByCommaToArray(request.param("fields"))
         ).indices(indices);
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestAddVotingConfigExclusionAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestAddVotingConfigExclusionAction.java
index f04985886084b..976daad87ed70 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestAddVotingConfigExclusionAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestAddVotingConfigExclusionAction.java
@@ -37,8 +37,8 @@
 import org.opensearch.action.admin.cluster.configuration.AddVotingConfigExclusionsAction;
 import org.opensearch.action.admin.cluster.configuration.AddVotingConfigExclusionsRequest;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
@@ -104,8 +104,8 @@ AddVotingConfigExclusionsRequest resolveVotingConfigExclusionsRequest(final Rest
         }
 
         return new AddVotingConfigExclusionsRequest(
-            Strings.splitStringByCommaToArray(deprecatedNodeDescription),
-            Strings.splitStringByCommaToArray(nodeIds),
+            org.opensearch.core.common.Strings.splitStringByCommaToArray(deprecatedNodeDescription),
+            org.opensearch.core.common.Strings.splitStringByCommaToArray(nodeIds),
             Strings.splitStringByCommaToArray(nodeNames),
             TimeValue.parseTimeValue(request.param("timeout"), DEFAULT_TIMEOUT, getClass().getSimpleName() + ".timeout")
         );
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestCancelTasksAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestCancelTasksAction.java
index 779d172b5d723..c925ba9caa6e2 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestCancelTasksAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestCancelTasksAction.java
@@ -35,7 +35,7 @@
 import org.opensearch.action.admin.cluster.node.tasks.cancel.CancelTasksRequest;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.node.DiscoveryNodes;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.tasks.TaskId;
@@ -73,7 +73,7 @@ public List<Route> routes() {
 
     @Override
     public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
-        final String[] nodesIds = Strings.splitStringByCommaToArray(request.param("nodes"));
+        final String[] nodesIds = org.opensearch.core.common.Strings.splitStringByCommaToArray(request.param("nodes"));
         final TaskId taskId = new TaskId(request.param("task_id"));
         final String[] actions = Strings.splitStringByCommaToArray(request.param("actions"));
         final TaskId parentTaskId = new TaskId(request.param("parent_task_id"));
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterHealthAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterHealthAction.java
index c518d7a472b31..f4d7676456826 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterHealthAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterHealthAction.java
@@ -38,8 +38,8 @@
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.health.ClusterHealthStatus;
 import org.opensearch.common.Priority;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestStatusToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterRerouteAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterRerouteAction.java
index f95ed55bc3171..967a228ebd628 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterRerouteAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterRerouteAction.java
@@ -38,10 +38,10 @@
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.routing.allocation.command.AllocationCommands;
 import org.opensearch.core.ParseField;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.settings.SettingsFilter;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ObjectParser;
 import org.opensearch.core.xcontent.ObjectParser.ValueType;
 import org.opensearch.rest.BaseRestHandler;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterSearchShardsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterSearchShardsAction.java
index e1b1389c47891..3555576433104 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterSearchShardsAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterSearchShardsAction.java
@@ -36,7 +36,7 @@
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.Requests;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterStateAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterStateAction.java
index fbb2e182cb9cc..24f8e30f49ea8 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterStateAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestClusterStateAction.java
@@ -39,10 +39,10 @@
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.metadata.Metadata;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.settings.SettingsFilter;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.rest.BaseRestHandler;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestDeleteSnapshotAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestDeleteSnapshotAction.java
index 4b58e5fa86e46..bc64d1c698563 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestDeleteSnapshotAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestDeleteSnapshotAction.java
@@ -34,8 +34,8 @@
 
 import org.opensearch.action.admin.cluster.snapshots.delete.DeleteSnapshotRequest;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetRepositoriesAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetRepositoriesAction.java
index c23b01fc89c15..ebd77a34e1d39 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetRepositoriesAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetRepositoriesAction.java
@@ -34,10 +34,10 @@
 
 import org.opensearch.action.admin.cluster.repositories.get.GetRepositoriesRequest;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.settings.SettingsFilter;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetSnapshotsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetSnapshotsAction.java
index 1c93ee5473939..0fea9afba9e63 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetSnapshotsAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetSnapshotsAction.java
@@ -34,8 +34,8 @@
 
 import org.opensearch.action.admin.cluster.snapshots.get.GetSnapshotsRequest;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestListTasksAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestListTasksAction.java
index 6804cb4bd6f70..710e97a4cdec6 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestListTasksAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestListTasksAction.java
@@ -37,8 +37,8 @@
 import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.node.DiscoveryNodes;
-import org.opensearch.common.Strings;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.BytesRestResponse;
@@ -89,7 +89,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
 
     public static ListTasksRequest generateListTasksRequest(RestRequest request) {
         boolean detailed = request.paramAsBoolean("detailed", false);
-        String[] nodes = Strings.splitStringByCommaToArray(request.param("nodes"));
+        String[] nodes = org.opensearch.core.common.Strings.splitStringByCommaToArray(request.param("nodes"));
         String[] actions = Strings.splitStringByCommaToArray(request.param("actions"));
         TaskId parentTaskId = new TaskId(request.param("parent_task_id"));
         boolean waitForCompletion = request.paramAsBoolean("wait_for_completion", false);
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesHotThreadsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesHotThreadsAction.java
index 3c9321a8abaa4..61ef3d12a438f 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesHotThreadsAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesHotThreadsAction.java
@@ -121,7 +121,7 @@ public String getName() {
 
     @Override
     public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
-        String[] nodesIds = Strings.splitStringByCommaToArray(request.param("nodeId"));
+        String[] nodesIds = org.opensearch.core.common.Strings.splitStringByCommaToArray(request.param("nodeId"));
         NodesHotThreadsRequest nodesHotThreadsRequest = new NodesHotThreadsRequest(nodesIds);
         nodesHotThreadsRequest.threads(request.paramAsInt("threads", nodesHotThreadsRequest.threads()));
         nodesHotThreadsRequest.ignoreIdleThreads(request.paramAsBoolean("ignore_idle_threads", nodesHotThreadsRequest.ignoreIdleThreads()));
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesStatsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesStatsAction.java
index c0e956fc419d3..38f23be5d7d61 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesStatsAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesStatsAction.java
@@ -104,7 +104,7 @@ public String getName() {
 
     @Override
     public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
-        String[] nodesIds = Strings.splitStringByCommaToArray(request.param("nodeId"));
+        String[] nodesIds = org.opensearch.core.common.Strings.splitStringByCommaToArray(request.param("nodeId"));
         Set<String> metrics = Strings.tokenizeByCommaToSet(request.param("metric", "_all"));
 
         NodesStatsRequest nodesStatsRequest = new NodesStatsRequest(nodesIds);
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesUsageAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesUsageAction.java
index 29186a66df2ad..8a8afa0b68489 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesUsageAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestNodesUsageAction.java
@@ -75,7 +75,7 @@ public List<Route> routes() {
 
     @Override
     protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
-        String[] nodesIds = Strings.splitStringByCommaToArray(request.param("nodeId"));
+        String[] nodesIds = org.opensearch.core.common.Strings.splitStringByCommaToArray(request.param("nodeId"));
         Set<String> metrics = Strings.tokenizeByCommaToSet(request.param("metric", "_all"));
 
         NodesUsageRequest nodesUsageRequest = new NodesUsageRequest(nodesIds);
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestReloadSecureSettingsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestReloadSecureSettingsAction.java
index 2fb8104927b8d..4233c2bd4c0f6 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestReloadSecureSettingsAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestReloadSecureSettingsAction.java
@@ -37,8 +37,8 @@
 import org.opensearch.action.admin.cluster.node.reload.NodesReloadSecureSettingsResponse;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.core.ParseField;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.SecureString;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ObjectParser;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.rest.BaseRestHandler;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestSnapshotsStatusAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestSnapshotsStatusAction.java
index f02e477c51d4d..2b4b188ab0acd 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestSnapshotsStatusAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestSnapshotsStatusAction.java
@@ -34,8 +34,8 @@
 
 import org.opensearch.action.admin.cluster.snapshots.status.SnapshotsStatusRequest;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestAddIndexBlockAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestAddIndexBlockAction.java
index dc8e82321908b..577f70998b359 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestAddIndexBlockAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestAddIndexBlockAction.java
@@ -36,8 +36,8 @@
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.metadata.IndexMetadata;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestClearIndicesCacheAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestClearIndicesCacheAction.java
index e4f0d7d006d87..c09ec0e7daffb 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestClearIndicesCacheAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestClearIndicesCacheAction.java
@@ -35,7 +35,7 @@
 import org.opensearch.action.admin.indices.cache.clear.ClearIndicesCacheRequest;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestCloseIndexAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestCloseIndexAction.java
index 93ccbcd4a6f98..34994ee255357 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestCloseIndexAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestCloseIndexAction.java
@@ -36,8 +36,8 @@
 import org.opensearch.action.support.ActiveShardCount;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDataStreamsStatsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDataStreamsStatsAction.java
index 741be5c5ffc9c..e3e549fa2c587 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDataStreamsStatsAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDataStreamsStatsAction.java
@@ -35,7 +35,7 @@
 import org.opensearch.action.admin.indices.datastream.DataStreamsStatsAction;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteDataStreamAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteDataStreamAction.java
index 2665609511676..cebebc63fde29 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteDataStreamAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteDataStreamAction.java
@@ -33,7 +33,7 @@
 
 import org.opensearch.action.admin.indices.datastream.DeleteDataStreamAction;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteIndexAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteIndexAction.java
index 0b14422b5bea8..2056128f2ff3b 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteIndexAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestDeleteIndexAction.java
@@ -35,8 +35,8 @@
 import org.opensearch.action.admin.indices.delete.DeleteIndexRequest;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestFlushAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestFlushAction.java
index 03c91bced293f..59daaef33e4de 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestFlushAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestFlushAction.java
@@ -35,7 +35,7 @@
 import org.opensearch.action.admin.indices.flush.FlushRequest;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestForceMergeAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestForceMergeAction.java
index eefe284d572ba..06f1d5f46f90b 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestForceMergeAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestForceMergeAction.java
@@ -36,8 +36,8 @@
 import org.opensearch.action.admin.indices.forcemerge.ForceMergeRequest;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetAliasesAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetAliasesAction.java
index 214bc4ba418dd..6794f7742b690 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetAliasesAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetAliasesAction.java
@@ -38,8 +38,8 @@
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.metadata.AliasMetadata;
 import org.opensearch.cluster.metadata.Metadata;
-import org.opensearch.common.Strings;
 import org.opensearch.common.regex.Regex;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.rest.BaseRestHandler;
@@ -156,7 +156,11 @@ static RestResponse buildRestResponse(
                 status = RestStatus.NOT_FOUND;
                 final String message;
                 if (missingAliases.size() == 1) {
-                    message = String.format(Locale.ROOT, "alias [%s] missing", Strings.collectionToCommaDelimitedString(missingAliases));
+                    message = String.format(
+                        Locale.ROOT,
+                        "alias [%s] missing",
+                        org.opensearch.core.common.Strings.collectionToCommaDelimitedString(missingAliases)
+                    );
                 } else {
                     message = String.format(Locale.ROOT, "aliases [%s] missing", Strings.collectionToCommaDelimitedString(missingAliases));
                 }
@@ -193,7 +197,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
         final boolean namesProvided = request.hasParam("name");
         final String[] aliases = request.paramAsStringArrayOrEmptyIfAll("name");
         final GetAliasesRequest getAliasesRequest = new GetAliasesRequest(aliases);
-        final String[] indices = Strings.splitStringByCommaToArray(request.param("index"));
+        final String[] indices = org.opensearch.core.common.Strings.splitStringByCommaToArray(request.param("index"));
         getAliasesRequest.indices(indices);
         getAliasesRequest.indicesOptions(IndicesOptions.fromRequest(request, getAliasesRequest.indicesOptions()));
         getAliasesRequest.local(request.paramAsBoolean("local", getAliasesRequest.local()));
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetDataStreamsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetDataStreamsAction.java
index 4b447d1ac337a..2c7a8398a34c6 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetDataStreamsAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetDataStreamsAction.java
@@ -33,7 +33,7 @@
 
 import org.opensearch.action.admin.indices.datastream.GetDataStreamAction;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetFieldMappingAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetFieldMappingAction.java
index 5acf1aa0d42ab..69d00ccc7f1aa 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetFieldMappingAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetFieldMappingAction.java
@@ -39,8 +39,8 @@
 import org.opensearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetadata;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.BytesRestResponse;
@@ -80,7 +80,7 @@ public String getName() {
 
     @Override
     public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
-        final String[] indices = Strings.splitStringByCommaToArray(request.param("index"));
+        final String[] indices = org.opensearch.core.common.Strings.splitStringByCommaToArray(request.param("index"));
         final String[] fields = Strings.splitStringByCommaToArray(request.param("fields"));
 
         GetFieldMappingsRequest getMappingsRequest = new GetFieldMappingsRequest();
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetIndexTemplateAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetIndexTemplateAction.java
index 17f6d2e7dd560..2a86d356372a6 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetIndexTemplateAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetIndexTemplateAction.java
@@ -35,9 +35,9 @@
 import org.opensearch.action.admin.indices.template.get.GetIndexTemplatesRequest;
 import org.opensearch.action.admin.indices.template.get.GetIndexTemplatesResponse;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.RestStatus;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetIndicesAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetIndicesAction.java
index d0355516655c9..e6da756c580fd 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetIndicesAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetIndicesAction.java
@@ -35,9 +35,9 @@
 import org.opensearch.action.admin.indices.get.GetIndexRequest;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetMappingAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetMappingAction.java
index 622113d47a59d..b89d660ad8e7c 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetMappingAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetMappingAction.java
@@ -39,9 +39,9 @@
 import org.opensearch.action.admin.indices.mapping.get.GetMappingsResponse;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.BytesRestResponse;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetSettingsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetSettingsAction.java
index c4316c66588b6..3410900350039 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetSettingsAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestGetSettingsAction.java
@@ -35,8 +35,8 @@
 import org.opensearch.action.admin.indices.settings.get.GetSettingsRequest;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndexDeleteAliasesAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndexDeleteAliasesAction.java
index a41dfc67a868c..94ed830a5fdc5 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndexDeleteAliasesAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndexDeleteAliasesAction.java
@@ -34,8 +34,8 @@
 import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest;
 import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
@@ -68,7 +68,7 @@ public String getName() {
 
     @Override
     public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
-        final String[] indices = Strings.splitStringByCommaToArray(request.param("index"));
+        final String[] indices = org.opensearch.core.common.Strings.splitStringByCommaToArray(request.param("index"));
         final String[] aliases = Strings.splitStringByCommaToArray(request.param("name"));
         IndicesAliasesRequest indicesAliasesRequest = new IndicesAliasesRequest();
         indicesAliasesRequest.timeout(request.paramAsTime("timeout", indicesAliasesRequest.timeout()));
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndexPutAliasAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndexPutAliasAction.java
index c2cd810a2fec8..c26a771424b48 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndexPutAliasAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndexPutAliasAction.java
@@ -34,8 +34,8 @@
 import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest;
 import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
@@ -85,7 +85,7 @@ public String getName() {
 
     @Override
     public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
-        String[] indices = Strings.splitStringByCommaToArray(request.param("index"));
+        String[] indices = org.opensearch.core.common.Strings.splitStringByCommaToArray(request.param("index"));
         String alias = request.param("name");
         Map<String, Object> filter = null;
         String routing = null;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesSegmentsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesSegmentsAction.java
index 3906c48295b4f..f263158abcb7b 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesSegmentsAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesSegmentsAction.java
@@ -35,7 +35,7 @@
 import org.opensearch.action.admin.indices.segments.IndicesSegmentsRequest;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesShardStoresAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesShardStoresAction.java
index 041f48113527f..7ddcccf8458d5 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesShardStoresAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesShardStoresAction.java
@@ -37,7 +37,7 @@
 import org.opensearch.action.admin.indices.shards.IndicesShardStoresResponse;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.BytesRestResponse;
@@ -78,7 +78,7 @@ public boolean allowSystemIndexAccessByDefault() {
     @Override
     public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
         IndicesShardStoresRequest indicesShardStoresRequest = new IndicesShardStoresRequest(
-            Strings.splitStringByCommaToArray(request.param("index"))
+            org.opensearch.core.common.Strings.splitStringByCommaToArray(request.param("index"))
         );
         if (request.hasParam("status")) {
             indicesShardStoresRequest.shardStatuses(Strings.splitStringByCommaToArray(request.param("status")));
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesStatsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesStatsAction.java
index ba1407b36bfd9..8da9da5587bda 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesStatsAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestIndicesStatsAction.java
@@ -106,7 +106,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
         assert indicesStatsRequest.indicesOptions() == IndicesOptions.strictExpandOpenAndForbidClosed() : "IndicesStats default indices "
             + "options changed";
         indicesStatsRequest.indicesOptions(IndicesOptions.fromRequest(request, defaultIndicesOption));
-        indicesStatsRequest.indices(Strings.splitStringByCommaToArray(request.param("index")));
+        indicesStatsRequest.indices(org.opensearch.core.common.Strings.splitStringByCommaToArray(request.param("index")));
 
         Set<String> metrics = Strings.tokenizeByCommaToSet(request.param("metric", "_all"));
         // short cut, if no metrics have been specified in URI
@@ -140,7 +140,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
         }
 
         if (request.hasParam("groups")) {
-            indicesStatsRequest.groups(Strings.splitStringByCommaToArray(request.param("groups")));
+            indicesStatsRequest.groups(org.opensearch.core.common.Strings.splitStringByCommaToArray(request.param("groups")));
         }
 
         if (indicesStatsRequest.completion() && (request.hasParam("fields") || request.hasParam("completion_fields"))) {
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestOpenIndexAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestOpenIndexAction.java
index 05c51ab02d552..e246efaa9af01 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestOpenIndexAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestOpenIndexAction.java
@@ -38,8 +38,8 @@
 import org.opensearch.action.support.ActiveShardCount;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutIndexTemplateAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutIndexTemplateAction.java
index 6c499a933a6e2..86b0111e4b064 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutIndexTemplateAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutIndexTemplateAction.java
@@ -34,9 +34,9 @@
 
 import org.opensearch.action.admin.indices.template.put.PutIndexTemplateRequest;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.xcontent.XContentHelper;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutMappingAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutMappingAction.java
index 8d64e41fc766a..fd293dceb4cc1 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutMappingAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutMappingAction.java
@@ -35,9 +35,9 @@
 import org.opensearch.action.admin.indices.mapping.put.PutMappingRequest;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.xcontent.XContentHelper;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.mapper.MapperService;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestRecoveryAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestRecoveryAction.java
index 33c7b239e27ce..768e31d854200 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestRecoveryAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestRecoveryAction.java
@@ -35,7 +35,7 @@
 import org.opensearch.action.admin.indices.recovery.RecoveryRequest;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestRefreshAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestRefreshAction.java
index 2dc4c280956b5..2d26d09e09e6e 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestRefreshAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestRefreshAction.java
@@ -36,7 +36,7 @@
 import org.opensearch.action.admin.indices.refresh.RefreshResponse;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.RestStatus;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestResolveIndexAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestResolveIndexAction.java
index eee9804abec3b..2feca44c95a85 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestResolveIndexAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestResolveIndexAction.java
@@ -35,7 +35,7 @@
 import org.opensearch.action.admin.indices.resolve.ResolveIndexAction;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestSyncedFlushAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestSyncedFlushAction.java
index 8d093d7bd9e27..99d5d706f60c8 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestSyncedFlushAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestSyncedFlushAction.java
@@ -36,8 +36,8 @@
 import org.opensearch.action.admin.indices.flush.FlushResponse;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.BytesRestResponse;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpdateSettingsAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpdateSettingsAction.java
index e70732ff69717..cf595ab444cb3 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpdateSettingsAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpdateSettingsAction.java
@@ -35,9 +35,9 @@
 import org.opensearch.action.admin.indices.settings.put.UpdateSettingsRequest;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpgradeAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpgradeAction.java
index 1c925f030f582..4f53fde259454 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpgradeAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpgradeAction.java
@@ -35,7 +35,7 @@
 import org.opensearch.action.admin.indices.upgrade.post.UpgradeRequest;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpgradeStatusAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpgradeStatusAction.java
index a05b52b708770..79c8ada440df6 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpgradeStatusAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestUpgradeStatusAction.java
@@ -35,7 +35,7 @@
 import org.opensearch.action.admin.indices.upgrade.get.UpgradeStatusRequest;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestValidateQueryAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestValidateQueryAction.java
index bfd44c30ec59f..3e064bc0a170a 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestValidateQueryAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestValidateQueryAction.java
@@ -38,7 +38,7 @@
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.BytesRestResponse;
diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestAliasAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestAliasAction.java
index 6df5dc268d666..329734ea64ec9 100644
--- a/server/src/main/java/org/opensearch/rest/action/cat/RestAliasAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/cat/RestAliasAction.java
@@ -118,9 +118,13 @@ private Table buildTable(RestRequest request, GetAliasesResponse response) {
                 table.addCell(aliasMetadata.alias());
                 table.addCell(indexName);
                 table.addCell(aliasMetadata.filteringRequired() ? "*" : "-");
-                String indexRouting = Strings.hasLength(aliasMetadata.indexRouting()) ? aliasMetadata.indexRouting() : "-";
+                String indexRouting = org.opensearch.core.common.Strings.hasLength(aliasMetadata.indexRouting())
+                    ? aliasMetadata.indexRouting()
+                    : "-";
                 table.addCell(indexRouting);
-                String searchRouting = Strings.hasLength(aliasMetadata.searchRouting()) ? aliasMetadata.searchRouting() : "-";
+                String searchRouting = org.opensearch.core.common.Strings.hasLength(aliasMetadata.searchRouting())
+                    ? aliasMetadata.searchRouting()
+                    : "-";
                 table.addCell(searchRouting);
                 String isWriteIndex = aliasMetadata.writeIndex() == null ? "-" : aliasMetadata.writeIndex().toString();
                 table.addCell(isWriteIndex);
diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestAllocationAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestAllocationAction.java
index 60cbb0f366f37..f59241fad3a54 100644
--- a/server/src/main/java/org/opensearch/rest/action/cat/RestAllocationAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/cat/RestAllocationAction.java
@@ -42,10 +42,10 @@
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.routing.ShardRouting;
-import org.opensearch.common.Strings;
 import org.opensearch.common.Table;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.unit.ByteSizeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.RestResponse;
 import org.opensearch.rest.action.RestActionListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestCatRecoveryAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestCatRecoveryAction.java
index f18ace993599d..4f95e10ae3622 100644
--- a/server/src/main/java/org/opensearch/rest/action/cat/RestCatRecoveryAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/cat/RestCatRecoveryAction.java
@@ -39,10 +39,10 @@
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.routing.RecoverySource;
 import org.opensearch.cluster.routing.RecoverySource.SnapshotRecoverySource;
-import org.opensearch.common.Strings;
 import org.opensearch.common.Table;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.xcontent.XContentOpenSearchExtension;
+import org.opensearch.core.common.Strings;
 import org.opensearch.indices.recovery.RecoveryState;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.RestResponse;
diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestCatSegmentReplicationAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestCatSegmentReplicationAction.java
index 0130f9cd14c36..3dea8877e17de 100644
--- a/server/src/main/java/org/opensearch/rest/action/cat/RestCatSegmentReplicationAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/cat/RestCatSegmentReplicationAction.java
@@ -13,11 +13,11 @@
 import org.opensearch.action.admin.indices.replication.SegmentReplicationStatsResponse;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.Table;
 import org.opensearch.common.unit.ByteSizeValue;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.xcontent.XContentOpenSearchExtension;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.SegmentReplicationPerGroupStats;
 import org.opensearch.index.SegmentReplicationShardStats;
 import org.opensearch.indices.replication.SegmentReplicationState;
@@ -65,7 +65,7 @@ protected void documentation(StringBuilder sb) {
     @Override
     public BaseRestHandler.RestChannelConsumer doCatRequest(final RestRequest request, final NodeClient client) {
         final SegmentReplicationStatsRequest segmentReplicationStatsRequest = new SegmentReplicationStatsRequest(
-            Strings.splitStringByCommaToArray(request.param("index"))
+            org.opensearch.core.common.Strings.splitStringByCommaToArray(request.param("index"))
         );
         segmentReplicationStatsRequest.timeout(request.param("timeout"));
         segmentReplicationStatsRequest.detailed(request.paramAsBoolean("detailed", false));
diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestCountAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestCountAction.java
index a35c0047a03bf..9c054ffe1bcc7 100644
--- a/server/src/main/java/org/opensearch/rest/action/cat/RestCountAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/cat/RestCountAction.java
@@ -37,8 +37,8 @@
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.Table;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.RestResponse;
diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestIndicesAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestIndicesAction.java
index 6df47bbcd8dd2..a424f52c42b92 100644
--- a/server/src/main/java/org/opensearch/rest/action/cat/RestIndicesAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/cat/RestIndicesAction.java
@@ -51,12 +51,12 @@
 import org.opensearch.cluster.health.ClusterHealthStatus;
 import org.opensearch.cluster.health.ClusterIndexHealth;
 import org.opensearch.cluster.metadata.IndexMetadata;
-import org.opensearch.common.Strings;
 import org.opensearch.common.Table;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.time.DateFormatter;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.IndexSettings;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.RestResponse;
diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestSegmentsAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestSegmentsAction.java
index 1892a4f06bbf9..b88af4ac3eeed 100644
--- a/server/src/main/java/org/opensearch/rest/action/cat/RestSegmentsAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/cat/RestSegmentsAction.java
@@ -41,9 +41,9 @@
 import org.opensearch.action.admin.indices.segments.ShardSegments;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.node.DiscoveryNodes;
-import org.opensearch.common.Strings;
 import org.opensearch.common.Table;
 import org.opensearch.common.logging.DeprecationLogger;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.engine.Segment;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.RestResponse;
diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestShardsAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestShardsAction.java
index 5cb5a7876669e..c5750ef4093c5 100644
--- a/server/src/main/java/org/opensearch/rest/action/cat/RestShardsAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/cat/RestShardsAction.java
@@ -41,10 +41,10 @@
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.routing.ShardRouting;
 import org.opensearch.cluster.routing.UnassignedInfo;
-import org.opensearch.common.Strings;
 import org.opensearch.common.Table;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.cache.query.QueryCacheStats;
 import org.opensearch.index.engine.CommitStats;
 import org.opensearch.index.engine.Engine;
diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestTable.java b/server/src/main/java/org/opensearch/rest/action/cat/RestTable.java
index 69f1e6b3228cf..0e4b58c945b60 100644
--- a/server/src/main/java/org/opensearch/rest/action/cat/RestTable.java
+++ b/server/src/main/java/org/opensearch/rest/action/cat/RestTable.java
@@ -33,7 +33,6 @@
 package org.opensearch.rest.action.cat;
 
 import org.opensearch.common.Booleans;
-import org.opensearch.common.Strings;
 import org.opensearch.common.Table;
 import org.opensearch.common.io.Streams;
 import org.opensearch.common.io.UTF8StreamWriter;
@@ -42,6 +41,7 @@
 import org.opensearch.common.unit.ByteSizeValue;
 import org.opensearch.common.unit.SizeValue;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.rest.BytesRestResponse;
@@ -187,7 +187,7 @@ static List<DisplayHeader> buildDisplayHeaders(Table table, RestRequest request)
                     for (Table.Cell headerCell : table.getHeaders()) {
                         String aliases = headerCell.attr.get("alias");
                         if (aliases != null) {
-                            for (String alias : Strings.splitStringByCommaToArray(aliases)) {
+                            for (String alias : org.opensearch.core.common.Strings.splitStringByCommaToArray(aliases)) {
                                 if (possibility.equals(alias)) {
                                     dispHeader = new DisplayHeader(headerCell.value.toString(), alias);
                                     break;
@@ -247,7 +247,7 @@ private static Set<String> expandHeadersFromRequest(Table table, RestRequest req
         Set<String> headers = new LinkedHashSet<>(table.getHeaders().size());
 
         // check headers and aliases
-        for (String header : Strings.splitStringByCommaToArray(request.param("h"))) {
+        for (String header : org.opensearch.core.common.Strings.splitStringByCommaToArray(request.param("h"))) {
             if (Regex.isSimpleMatchPattern(header)) {
                 for (Table.Cell tableHeaderCell : table.getHeaders()) {
                     String configuredHeader = tableHeaderCell.value.toString();
diff --git a/server/src/main/java/org/opensearch/rest/action/document/RestGetAction.java b/server/src/main/java/org/opensearch/rest/action/document/RestGetAction.java
index 87bec22ac2d73..2abb3135319e5 100644
--- a/server/src/main/java/org/opensearch/rest/action/document/RestGetAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/document/RestGetAction.java
@@ -35,7 +35,7 @@
 import org.opensearch.action.get.GetRequest;
 import org.opensearch.action.get.GetResponse;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.VersionType;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
diff --git a/server/src/main/java/org/opensearch/rest/action/document/RestMultiGetAction.java b/server/src/main/java/org/opensearch/rest/action/document/RestMultiGetAction.java
index 4b9e1f07df59a..3190a016b613a 100644
--- a/server/src/main/java/org/opensearch/rest/action/document/RestMultiGetAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/document/RestMultiGetAction.java
@@ -34,8 +34,8 @@
 
 import org.opensearch.action.get.MultiGetRequest;
 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.XContentParser;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
diff --git a/server/src/main/java/org/opensearch/rest/action/ingest/RestGetPipelineAction.java b/server/src/main/java/org/opensearch/rest/action/ingest/RestGetPipelineAction.java
index 239f2c07e5610..c5611fc9b31a8 100644
--- a/server/src/main/java/org/opensearch/rest/action/ingest/RestGetPipelineAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/ingest/RestGetPipelineAction.java
@@ -34,8 +34,8 @@
 
 import org.opensearch.action.ingest.GetPipelineRequest;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.logging.DeprecationLogger;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestStatusToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/search/RestClearScrollAction.java b/server/src/main/java/org/opensearch/rest/action/search/RestClearScrollAction.java
index b9f57feab4296..04cfaacef5e76 100644
--- a/server/src/main/java/org/opensearch/rest/action/search/RestClearScrollAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/search/RestClearScrollAction.java
@@ -34,7 +34,7 @@
 
 import org.opensearch.action.search.ClearScrollRequest;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestStatusToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/search/RestCountAction.java b/server/src/main/java/org/opensearch/rest/action/search/RestCountAction.java
index 9ed818f2d7de2..acedd5a884596 100644
--- a/server/src/main/java/org/opensearch/rest/action/search/RestCountAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/search/RestCountAction.java
@@ -36,7 +36,7 @@
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.rest.BaseRestHandler;
diff --git a/server/src/main/java/org/opensearch/rest/action/search/RestCreatePitAction.java b/server/src/main/java/org/opensearch/rest/action/search/RestCreatePitAction.java
index 9439670880015..2134087fc627b 100644
--- a/server/src/main/java/org/opensearch/rest/action/search/RestCreatePitAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/search/RestCreatePitAction.java
@@ -11,8 +11,8 @@
 import org.opensearch.action.search.CreatePitRequest;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestStatusToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/search/RestExplainAction.java b/server/src/main/java/org/opensearch/rest/action/search/RestExplainAction.java
index bf29e0edfd2ab..f63b54c0443d7 100644
--- a/server/src/main/java/org/opensearch/rest/action/search/RestExplainAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/search/RestExplainAction.java
@@ -34,7 +34,7 @@
 
 import org.opensearch.action.explain.ExplainRequest;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
diff --git a/server/src/main/java/org/opensearch/rest/action/search/RestGetSearchPipelineAction.java b/server/src/main/java/org/opensearch/rest/action/search/RestGetSearchPipelineAction.java
index d5003de00ec35..d0c97cd82a628 100644
--- a/server/src/main/java/org/opensearch/rest/action/search/RestGetSearchPipelineAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/search/RestGetSearchPipelineAction.java
@@ -10,7 +10,7 @@
 
 import org.opensearch.action.search.GetSearchPipelineRequest;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestStatusToXContentListener;
diff --git a/server/src/main/java/org/opensearch/rest/action/search/RestMultiSearchAction.java b/server/src/main/java/org/opensearch/rest/action/search/RestMultiSearchAction.java
index 7e206c2e5d15d..190818ce08d0d 100644
--- a/server/src/main/java/org/opensearch/rest/action/search/RestMultiSearchAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/search/RestMultiSearchAction.java
@@ -38,13 +38,13 @@
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.common.CheckedBiConsumer;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContent;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.common.xcontent.XContentType;
diff --git a/server/src/main/java/org/opensearch/rest/action/search/RestSearchAction.java b/server/src/main/java/org/opensearch/rest/action/search/RestSearchAction.java
index d624e1bf826b2..ab7b786df15d7 100644
--- a/server/src/main/java/org/opensearch/rest/action/search/RestSearchAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/search/RestSearchAction.java
@@ -40,8 +40,8 @@
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.common.Booleans;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.NamedWriteableRegistry;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.rest.BaseRestHandler;
@@ -154,7 +154,7 @@ public static void parseSearchRequest(
         if (searchRequest.source() == null) {
             searchRequest.source(new SearchSourceBuilder());
         }
-        searchRequest.indices(Strings.splitStringByCommaToArray(request.param("index")));
+        searchRequest.indices(org.opensearch.core.common.Strings.splitStringByCommaToArray(request.param("index")));
         if (requestContentParser != null) {
             searchRequest.source().parseXContent(requestContentParser, true);
         }
@@ -265,7 +265,7 @@ private static void parseSearchSource(final SearchSourceBuilder searchSourceBuil
         String sDocValueFields = request.param("docvalue_fields");
         if (sDocValueFields != null) {
             if (Strings.hasText(sDocValueFields)) {
-                String[] sFields = Strings.splitStringByCommaToArray(sDocValueFields);
+                String[] sFields = org.opensearch.core.common.Strings.splitStringByCommaToArray(sDocValueFields);
                 for (String field : sFields) {
                     searchSourceBuilder.docValueField(field, null);
                 }
@@ -292,7 +292,7 @@ private static void parseSearchSource(final SearchSourceBuilder searchSourceBuil
 
         String sSorts = request.param("sort");
         if (sSorts != null) {
-            String[] sorts = Strings.splitStringByCommaToArray(sSorts);
+            String[] sorts = org.opensearch.core.common.Strings.splitStringByCommaToArray(sSorts);
             for (String sort : sorts) {
                 int delimiter = sort.lastIndexOf(":");
                 if (delimiter != -1) {
@@ -311,7 +311,7 @@ private static void parseSearchSource(final SearchSourceBuilder searchSourceBuil
 
         String sStats = request.param("stats");
         if (sStats != null) {
-            searchSourceBuilder.stats(Arrays.asList(Strings.splitStringByCommaToArray(sStats)));
+            searchSourceBuilder.stats(Arrays.asList(org.opensearch.core.common.Strings.splitStringByCommaToArray(sStats)));
         }
 
         String suggestField = request.param("suggest_field");
diff --git a/server/src/main/java/org/opensearch/script/ScriptService.java b/server/src/main/java/org/opensearch/script/ScriptService.java
index a7de3e2f354d3..11e72ee6a8b66 100644
--- a/server/src/main/java/org/opensearch/script/ScriptService.java
+++ b/server/src/main/java/org/opensearch/script/ScriptService.java
@@ -47,13 +47,13 @@
 import org.opensearch.cluster.metadata.Metadata;
 import org.opensearch.cluster.service.ClusterManagerTaskThrottler;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Setting.Property;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.io.IOUtils;
+import org.opensearch.core.common.Strings;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/server/src/main/java/org/opensearch/search/aggregations/metrics/TopHitsAggregationBuilder.java b/server/src/main/java/org/opensearch/search/aggregations/metrics/TopHitsAggregationBuilder.java
index 069a94701da7a..78b1ada7d1f13 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/metrics/TopHitsAggregationBuilder.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/metrics/TopHitsAggregationBuilder.java
@@ -34,9 +34,9 @@
 
 import org.opensearch.common.Nullable;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.IndexSettings;
diff --git a/server/src/main/java/org/opensearch/search/aggregations/support/AggregationPath.java b/server/src/main/java/org/opensearch/search/aggregations/support/AggregationPath.java
index 2bdb561879baa..9a61427f0c501 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/support/AggregationPath.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/support/AggregationPath.java
@@ -182,7 +182,7 @@ public AggregationPath(List<PathElement> tokens) {
 
     @Override
     public String toString() {
-        return Strings.arrayToDelimitedString(pathElements.toArray(), AGG_DELIM);
+        return org.opensearch.core.common.Strings.arrayToDelimitedString(pathElements.toArray(), AGG_DELIM);
     }
 
     public PathElement lastPathElement() {
diff --git a/server/src/main/java/org/opensearch/search/builder/SearchSourceBuilder.java b/server/src/main/java/org/opensearch/search/builder/SearchSourceBuilder.java
index 05a5e4cfa9833..0f44d719f0bb7 100644
--- a/server/src/main/java/org/opensearch/search/builder/SearchSourceBuilder.java
+++ b/server/src/main/java/org/opensearch/search/builder/SearchSourceBuilder.java
@@ -37,20 +37,20 @@
 import org.opensearch.common.Booleans;
 import org.opensearch.common.Nullable;
 import org.opensearch.common.util.FeatureFlags;
-import org.opensearch.core.ParseField;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.io.stream.Writeable;
 import org.opensearch.common.logging.DeprecationLogger;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.common.xcontent.XContentHelper;
+import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.Strings;
+import org.opensearch.core.ParseField;
 import org.opensearch.core.xcontent.ToXContentFragment;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
-import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.core.xcontent.XContentParser;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.index.query.QueryRewriteContext;
 import org.opensearch.index.query.Rewriteable;
@@ -763,7 +763,7 @@ public SearchSourceBuilder fetchSource(boolean fetch) {
      */
     public SearchSourceBuilder fetchSource(@Nullable String include, @Nullable String exclude) {
         return fetchSource(
-            include == null ? Strings.EMPTY_ARRAY : new String[] { include },
+            include == null ? org.opensearch.common.Strings.EMPTY_ARRAY : new String[] { include },
             exclude == null ? Strings.EMPTY_ARRAY : new String[] { exclude }
         );
     }
diff --git a/server/src/main/java/org/opensearch/search/collapse/CollapseBuilder.java b/server/src/main/java/org/opensearch/search/collapse/CollapseBuilder.java
index fcad490a39bf2..dc83a023d5bf7 100644
--- a/server/src/main/java/org/opensearch/search/collapse/CollapseBuilder.java
+++ b/server/src/main/java/org/opensearch/search/collapse/CollapseBuilder.java
@@ -33,10 +33,10 @@
 
 import org.opensearch.core.ParseField;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.io.stream.Writeable;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ObjectParser;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.ToXContentObject;
diff --git a/server/src/main/java/org/opensearch/search/fetch/StoredFieldsContext.java b/server/src/main/java/org/opensearch/search/fetch/StoredFieldsContext.java
index 2d42e7871b601..94df87201cf27 100644
--- a/server/src/main/java/org/opensearch/search/fetch/StoredFieldsContext.java
+++ b/server/src/main/java/org/opensearch/search/fetch/StoredFieldsContext.java
@@ -33,10 +33,10 @@
 package org.opensearch.search.fetch;
 
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.io.stream.Writeable;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.rest.RestRequest;
diff --git a/server/src/main/java/org/opensearch/search/fetch/subphase/FetchSourceContext.java b/server/src/main/java/org/opensearch/search/fetch/subphase/FetchSourceContext.java
index a64fa2c5b7fec..d9855c6985379 100644
--- a/server/src/main/java/org/opensearch/search/fetch/subphase/FetchSourceContext.java
+++ b/server/src/main/java/org/opensearch/search/fetch/subphase/FetchSourceContext.java
@@ -35,10 +35,10 @@
 import org.opensearch.common.Booleans;
 import org.opensearch.core.ParseField;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.io.stream.Writeable;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
@@ -71,12 +71,12 @@ public class FetchSourceContext implements Writeable, ToXContentObject {
 
     public FetchSourceContext(boolean fetchSource, String[] includes, String[] excludes) {
         this.fetchSource = fetchSource;
-        this.includes = includes == null ? Strings.EMPTY_ARRAY : includes;
-        this.excludes = excludes == null ? Strings.EMPTY_ARRAY : excludes;
+        this.includes = includes == null ? org.opensearch.common.Strings.EMPTY_ARRAY : includes;
+        this.excludes = excludes == null ? org.opensearch.common.Strings.EMPTY_ARRAY : excludes;
     }
 
     public FetchSourceContext(boolean fetchSource) {
-        this(fetchSource, Strings.EMPTY_ARRAY, Strings.EMPTY_ARRAY);
+        this(fetchSource, org.opensearch.common.Strings.EMPTY_ARRAY, org.opensearch.common.Strings.EMPTY_ARRAY);
     }
 
     public FetchSourceContext(StreamInput in) throws IOException {
@@ -116,13 +116,13 @@ public static FetchSourceContext parseFromRestRequest(RestRequest request) {
             } else if (Booleans.isFalse(source)) {
                 fetchSource = false;
             } else {
-                sourceIncludes = Strings.splitStringByCommaToArray(source);
+                sourceIncludes = org.opensearch.core.common.Strings.splitStringByCommaToArray(source);
             }
         }
 
         String sIncludes = request.param("_source_includes");
         if (sIncludes != null) {
-            sourceIncludes = Strings.splitStringByCommaToArray(sIncludes);
+            sourceIncludes = org.opensearch.core.common.Strings.splitStringByCommaToArray(sIncludes);
         }
 
         String sExcludes = request.param("_source_excludes");
@@ -139,8 +139,8 @@ public static FetchSourceContext parseFromRestRequest(RestRequest request) {
     public static FetchSourceContext fromXContent(XContentParser parser) throws IOException {
         XContentParser.Token token = parser.currentToken();
         boolean fetchSource = true;
-        String[] includes = Strings.EMPTY_ARRAY;
-        String[] excludes = Strings.EMPTY_ARRAY;
+        String[] includes = org.opensearch.common.Strings.EMPTY_ARRAY;
+        String[] excludes = org.opensearch.common.Strings.EMPTY_ARRAY;
         if (token == XContentParser.Token.VALUE_BOOLEAN) {
             fetchSource = parser.booleanValue();
         } else if (token == XContentParser.Token.VALUE_STRING) {
diff --git a/server/src/main/java/org/opensearch/search/fetch/subphase/highlight/UnifiedHighlighter.java b/server/src/main/java/org/opensearch/search/fetch/subphase/highlight/UnifiedHighlighter.java
index 5efaa7c9f766b..cc9fc4a123878 100644
--- a/server/src/main/java/org/opensearch/search/fetch/subphase/highlight/UnifiedHighlighter.java
+++ b/server/src/main/java/org/opensearch/search/fetch/subphase/highlight/UnifiedHighlighter.java
@@ -46,8 +46,8 @@
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.CollectionUtil;
 import org.opensearch.common.CheckedSupplier;
-import org.opensearch.common.Strings;
 import org.opensearch.common.text.Text;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.mapper.DocumentMapper;
 import org.opensearch.index.mapper.IdFieldMapper;
 import org.opensearch.index.mapper.MappedFieldType;
@@ -253,7 +253,7 @@ protected static String convertFieldValue(MappedFieldType type, Object value) {
     protected static String mergeFieldValues(List<Object> fieldValues, char valuesSeparator) {
         // postings highlighter accepts all values in a single string, as offsets etc. need to match with content
         // loaded from stored fields, we merge all values using a proper separator
-        String rawValue = Strings.collectionToDelimitedString(fieldValues, String.valueOf(valuesSeparator));
+        String rawValue = org.opensearch.core.common.Strings.collectionToDelimitedString(fieldValues, String.valueOf(valuesSeparator));
         return rawValue.substring(0, Math.min(rawValue.length(), Integer.MAX_VALUE - 1));
     }
 
diff --git a/server/src/main/java/org/opensearch/search/internal/AliasFilter.java b/server/src/main/java/org/opensearch/search/internal/AliasFilter.java
index b0d8b3cf47bec..d50911759aa44 100644
--- a/server/src/main/java/org/opensearch/search/internal/AliasFilter.java
+++ b/server/src/main/java/org/opensearch/search/internal/AliasFilter.java
@@ -32,10 +32,10 @@
 
 package org.opensearch.search.internal;
 
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.io.stream.Writeable;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.query.QueryBuilder;
 import org.opensearch.index.query.QueryRewriteContext;
 import org.opensearch.index.query.Rewriteable;
diff --git a/server/src/main/java/org/opensearch/search/internal/ShardSearchRequest.java b/server/src/main/java/org/opensearch/search/internal/ShardSearchRequest.java
index 45a7eef736193..3a0cf564422c0 100644
--- a/server/src/main/java/org/opensearch/search/internal/ShardSearchRequest.java
+++ b/server/src/main/java/org/opensearch/search/internal/ShardSearchRequest.java
@@ -43,12 +43,12 @@
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.common.CheckedFunction;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.index.Index;
 import org.opensearch.index.query.BoolQueryBuilder;
diff --git a/server/src/main/java/org/opensearch/search/query/QuerySearchRequest.java b/server/src/main/java/org/opensearch/search/query/QuerySearchRequest.java
index 9f58b24c25704..650a9930f2db0 100644
--- a/server/src/main/java/org/opensearch/search/query/QuerySearchRequest.java
+++ b/server/src/main/java/org/opensearch/search/query/QuerySearchRequest.java
@@ -37,9 +37,9 @@
 import org.opensearch.action.search.SearchShardTask;
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 import org.opensearch.search.dfs.AggregatedDfs;
 import org.opensearch.search.internal.ShardSearchContextId;
 import org.opensearch.search.internal.ShardSearchRequest;
diff --git a/server/src/main/java/org/opensearch/search/slice/SliceBuilder.java b/server/src/main/java/org/opensearch/search/slice/SliceBuilder.java
index 44d8d1fdfd618..9ff69a174ee95 100644
--- a/server/src/main/java/org/opensearch/search/slice/SliceBuilder.java
+++ b/server/src/main/java/org/opensearch/search/slice/SliceBuilder.java
@@ -132,7 +132,7 @@ public void writeTo(StreamOutput out) throws IOException {
     }
 
     private SliceBuilder setField(String field) {
-        if (Strings.isEmpty(field)) {
+        if (org.opensearch.core.common.Strings.isEmpty(field)) {
             throw new IllegalArgumentException("field name is null or empty");
         }
         this.field = field;
diff --git a/server/src/main/java/org/opensearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java b/server/src/main/java/org/opensearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java
index afd46f1a8164c..dc75088d4c85b 100644
--- a/server/src/main/java/org/opensearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java
+++ b/server/src/main/java/org/opensearch/search/suggest/phrase/DirectCandidateGeneratorBuilder.java
@@ -40,7 +40,7 @@
 import org.apache.lucene.search.spell.StringDistance;
 import org.apache.lucene.search.spell.SuggestMode;
 import org.apache.lucene.util.automaton.LevenshteinAutomata;
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.core.ParseField;
 import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
@@ -510,7 +510,7 @@ public String toString() {
             toXContent(builder, EMPTY_PARAMS);
             return Strings.toString(builder);
         } catch (Exception e) {
-            return "{ \"error\" : \"" + ExceptionsHelper.detailedMessage(e) + "\"}";
+            return "{ \"error\" : \"" + BaseExceptionsHelper.detailedMessage(e) + "\"}";
         }
     }
 
diff --git a/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java b/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java
index 51ca07adddd5a..8a5cc0bf9517a 100644
--- a/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java
+++ b/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java
@@ -467,7 +467,7 @@ public ClusterState execute(ClusterState currentState) {
                         "No indices in the source snapshot ["
                             + sourceSnapshotId
                             + "] matched requested pattern ["
-                            + Strings.arrayToCommaDelimitedString(request.indices())
+                            + org.opensearch.core.common.Strings.arrayToCommaDelimitedString(request.indices())
                             + "]"
                     );
                 }
@@ -756,7 +756,7 @@ private static void validate(String repositoryName, String snapshotName, Cluster
     }
 
     private static void validate(final String repositoryName, final String snapshotName) {
-        if (Strings.hasLength(snapshotName) == false) {
+        if (org.opensearch.core.common.Strings.hasLength(snapshotName) == false) {
             throw new InvalidSnapshotNameException(repositoryName, snapshotName, "cannot be empty");
         }
         if (snapshotName.contains(" ")) {
@@ -1738,7 +1738,7 @@ public void deleteSnapshots(final DeleteSnapshotRequest request, final ActionLis
         logger.info(
             () -> new ParameterizedMessage(
                 "deleting snapshots [{}] from repository [{}]",
-                Strings.arrayToCommaDelimitedString(snapshotNames),
+                org.opensearch.core.common.Strings.arrayToCommaDelimitedString(snapshotNames),
                 repoName
             )
         );
diff --git a/server/src/main/java/org/opensearch/tasks/TaskCancellationService.java b/server/src/main/java/org/opensearch/tasks/TaskCancellationService.java
index ebce26c4bbfbc..4368b5fe0ba3a 100644
--- a/server/src/main/java/org/opensearch/tasks/TaskCancellationService.java
+++ b/server/src/main/java/org/opensearch/tasks/TaskCancellationService.java
@@ -34,7 +34,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.OpenSearchSecurityException;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.StepListener;
@@ -156,7 +156,7 @@ public void handleResponse(TransportResponse.Empty response) {
 
                     @Override
                     public void handleException(TransportException exp) {
-                        assert ExceptionsHelper.unwrapCause(exp) instanceof OpenSearchSecurityException == false;
+                        assert BaseExceptionsHelper.unwrapCause(exp) instanceof OpenSearchSecurityException == false;
                         logger.warn("Cannot send ban for tasks with the parent [{}] to the node [{}]", taskId, node);
                         groupedListener.onFailure(exp);
                     }
@@ -172,7 +172,7 @@ private void removeBanOnNodes(CancellableTask task, Collection<DiscoveryNode> ch
             transportService.sendRequest(node, BAN_PARENT_ACTION_NAME, request, new EmptyTransportResponseHandler(ThreadPool.Names.SAME) {
                 @Override
                 public void handleException(TransportException exp) {
-                    assert ExceptionsHelper.unwrapCause(exp) instanceof OpenSearchSecurityException == false;
+                    assert BaseExceptionsHelper.unwrapCause(exp) instanceof OpenSearchSecurityException == false;
                     logger.info("failed to remove the parent ban for task {} on node {}", request.parentTaskId, node);
                 }
             });
diff --git a/server/src/main/java/org/opensearch/tasks/TaskId.java b/server/src/main/java/org/opensearch/tasks/TaskId.java
index 6e51f73659053..e1f198dba14ad 100644
--- a/server/src/main/java/org/opensearch/tasks/TaskId.java
+++ b/server/src/main/java/org/opensearch/tasks/TaskId.java
@@ -71,7 +71,7 @@ private TaskId() {
     }
 
     public TaskId(String taskId) {
-        if (Strings.hasLength(taskId) && "unset".equals(taskId) == false) {
+        if (org.opensearch.core.common.Strings.hasLength(taskId) && "unset".equals(taskId) == false) {
             String[] s = Strings.split(taskId, ":");
             if (s == null || s.length != 2) {
                 throw new IllegalArgumentException("malformed task id " + taskId);
diff --git a/server/src/main/java/org/opensearch/tasks/TaskManager.java b/server/src/main/java/org/opensearch/tasks/TaskManager.java
index ab08f04352e7a..816ed391b9c7d 100644
--- a/server/src/main/java/org/opensearch/tasks/TaskManager.java
+++ b/server/src/main/java/org/opensearch/tasks/TaskManager.java
@@ -37,6 +37,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.core.Assertions;
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.OpenSearchException;
@@ -335,7 +336,7 @@ public <Response extends ActionResponse> void storeResult(Task task, Exception e
         try {
             taskResult = task.result(localNode, error);
         } catch (IOException ex) {
-            logger.warn(() -> new ParameterizedMessage("couldn't store error {}", ExceptionsHelper.detailedMessage(error)), ex);
+            logger.warn(() -> new ParameterizedMessage("couldn't store error {}", BaseExceptionsHelper.detailedMessage(error)), ex);
             listener.onFailure(ex);
             return;
         }
@@ -347,7 +348,7 @@ public void onResponse(Void aVoid) {
 
             @Override
             public void onFailure(Exception e) {
-                logger.warn(() -> new ParameterizedMessage("couldn't store error {}", ExceptionsHelper.detailedMessage(error)), e);
+                logger.warn(() -> new ParameterizedMessage("couldn't store error {}", BaseExceptionsHelper.detailedMessage(error)), e);
                 listener.onFailure(e);
             }
         });
diff --git a/server/src/main/java/org/opensearch/tasks/TaskResult.java b/server/src/main/java/org/opensearch/tasks/TaskResult.java
index 2387de173c924..5823a87b6e41a 100644
--- a/server/src/main/java/org/opensearch/tasks/TaskResult.java
+++ b/server/src/main/java/org/opensearch/tasks/TaskResult.java
@@ -31,7 +31,7 @@
 
 package org.opensearch.tasks;
 
-import org.opensearch.OpenSearchException;
+import org.opensearch.BaseOpenSearchException;
 import org.opensearch.client.Requests;
 import org.opensearch.common.Nullable;
 import org.opensearch.core.ParseField;
@@ -240,7 +240,7 @@ public int hashCode() {
     private static BytesReference toXContent(Exception error) throws IOException {
         try (XContentBuilder builder = XContentFactory.contentBuilder(Requests.INDEX_CONTENT_TYPE)) {
             builder.startObject();
-            OpenSearchException.generateThrowableXContent(builder, ToXContent.EMPTY_PARAMS, error);
+            BaseOpenSearchException.generateThrowableXContent(builder, ToXContent.EMPTY_PARAMS, error);
             builder.endObject();
             return BytesReference.bytes(builder);
         }
diff --git a/server/src/main/java/org/opensearch/tasks/TaskResultsService.java b/server/src/main/java/org/opensearch/tasks/TaskResultsService.java
index 1feb115cb585a..329fc55431bc8 100644
--- a/server/src/main/java/org/opensearch/tasks/TaskResultsService.java
+++ b/server/src/main/java/org/opensearch/tasks/TaskResultsService.java
@@ -34,7 +34,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.OpenSearchException;
 import org.opensearch.ResourceAlreadyExistsException;
 import org.opensearch.action.ActionListener;
@@ -126,7 +126,7 @@ public void onResponse(CreateIndexResponse result) {
 
                 @Override
                 public void onFailure(Exception e) {
-                    if (ExceptionsHelper.unwrapCause(e) instanceof ResourceAlreadyExistsException) {
+                    if (BaseExceptionsHelper.unwrapCause(e) instanceof ResourceAlreadyExistsException) {
                         // we have the index, do it
                         try {
                             doStoreResult(taskResult, listener);
diff --git a/server/src/main/java/org/opensearch/transport/ProxyConnectionStrategy.java b/server/src/main/java/org/opensearch/transport/ProxyConnectionStrategy.java
index 8a95ff520f4a7..ecef36435480c 100644
--- a/server/src/main/java/org/opensearch/transport/ProxyConnectionStrategy.java
+++ b/server/src/main/java/org/opensearch/transport/ProxyConnectionStrategy.java
@@ -73,7 +73,7 @@ public class ProxyConnectionStrategy extends RemoteConnectionStrategy {
         "cluster.remote.",
         "proxy_address",
         (ns, key) -> Setting.simpleString(key, new StrategyValidator<>(ns, key, ConnectionStrategy.PROXY, s -> {
-            if (Strings.hasLength(s)) {
+            if (org.opensearch.core.common.Strings.hasLength(s)) {
                 parsePort(s);
             }
         }), Setting.Property.Dynamic, Setting.Property.NodeScope)
@@ -192,7 +192,8 @@ public class ProxyConnectionStrategy extends RemoteConnectionStrategy {
         this.maxNumConnections = maxNumConnections;
         this.configuredAddress = configuredAddress;
         this.configuredServerName = configuredServerName;
-        assert Strings.isEmpty(configuredAddress) == false : "Cannot use proxy connection strategy with no configured addresses";
+        assert org.opensearch.core.common.Strings.isEmpty(configuredAddress) == false
+            : "Cannot use proxy connection strategy with no configured addresses";
         this.address = address;
         this.clusterNameValidator = (newConnection, actualProfile, listener) -> transportService.handshake(
             newConnection,
diff --git a/server/src/main/java/org/opensearch/transport/RemoteConnectionStrategy.java b/server/src/main/java/org/opensearch/transport/RemoteConnectionStrategy.java
index 15aebd5f71123..818694e88342a 100644
--- a/server/src/main/java/org/opensearch/transport/RemoteConnectionStrategy.java
+++ b/server/src/main/java/org/opensearch/transport/RemoteConnectionStrategy.java
@@ -39,12 +39,12 @@
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.support.ContextPreservingActionListener;
 import org.opensearch.cluster.node.DiscoveryNode;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.Writeable;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.concurrent.AbstractRunnable;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.concurrency.OpenSearchRejectedExecutionException;
 import org.opensearch.threadpool.ThreadPool;
 
@@ -217,7 +217,7 @@ public static boolean isConnectionEnabled(String clusterAlias, Settings settings
             return seeds.isEmpty() == false;
         } else {
             String address = ProxyConnectionStrategy.PROXY_ADDRESS.getConcreteSettingForNamespace(clusterAlias).get(settings);
-            return Strings.isEmpty(address) == false;
+            return org.opensearch.core.common.Strings.isEmpty(address) == false;
         }
     }
 
diff --git a/server/src/main/java/org/opensearch/transport/SniffConnectionStrategy.java b/server/src/main/java/org/opensearch/transport/SniffConnectionStrategy.java
index a9bba4fe44874..981df456e9394 100644
--- a/server/src/main/java/org/opensearch/transport/SniffConnectionStrategy.java
+++ b/server/src/main/java/org/opensearch/transport/SniffConnectionStrategy.java
@@ -44,7 +44,6 @@
 import org.opensearch.cluster.node.DiscoveryNodeRole;
 import org.opensearch.common.Booleans;
 import org.opensearch.common.SetOnce;
-import org.opensearch.common.Strings;
 import org.opensearch.common.UUIDs;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
@@ -53,6 +52,7 @@
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.common.util.concurrent.ThreadContext;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.util.io.IOUtils;
 import org.opensearch.threadpool.ThreadPool;
diff --git a/server/src/main/java/org/opensearch/transport/TcpTransport.java b/server/src/main/java/org/opensearch/transport/TcpTransport.java
index 7aedebb946e58..07bf9162d9355 100644
--- a/server/src/main/java/org/opensearch/transport/TcpTransport.java
+++ b/server/src/main/java/org/opensearch/transport/TcpTransport.java
@@ -42,7 +42,6 @@
 import org.opensearch.action.support.ThreadedActionListener;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.Booleans;
-import org.opensearch.common.Strings;
 import org.opensearch.common.breaker.CircuitBreaker;
 import org.opensearch.common.bytes.BytesArray;
 import org.opensearch.common.bytes.BytesReference;
@@ -66,6 +65,7 @@
 import org.opensearch.common.util.PageCacheRecycler;
 import org.opensearch.common.util.concurrent.ConcurrentCollections;
 import org.opensearch.common.util.concurrent.CountDown;
+import org.opensearch.core.common.Strings;
 import org.opensearch.indices.breaker.CircuitBreakerService;
 import org.opensearch.monitor.jvm.JvmInfo;
 import org.opensearch.node.Node;
diff --git a/server/src/main/java/org/opensearch/transport/TransportService.java b/server/src/main/java/org/opensearch/transport/TransportService.java
index e96f1d11c89d0..5a8be0e85ee13 100644
--- a/server/src/main/java/org/opensearch/transport/TransportService.java
+++ b/server/src/main/java/org/opensearch/transport/TransportService.java
@@ -42,7 +42,6 @@
 import org.opensearch.cluster.ClusterName;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.component.AbstractLifecycleComponent;
 import org.opensearch.common.geo.GeoPoint;
 import org.opensearch.common.io.stream.StreamInput;
@@ -57,9 +56,10 @@
 import org.opensearch.common.transport.TransportAddress;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.concurrent.AbstractRunnable;
-import org.opensearch.core.concurrency.OpenSearchRejectedExecutionException;
 import org.opensearch.common.util.concurrent.ThreadContext;
 import org.opensearch.common.util.io.IOUtils;
+import org.opensearch.core.common.Strings;
+import org.opensearch.core.concurrency.OpenSearchRejectedExecutionException;
 import org.opensearch.node.NodeClosedException;
 import org.opensearch.node.ReportingService;
 import org.opensearch.script.JodaCompatibleZonedDateTime;
diff --git a/server/src/test/java/org/opensearch/ExceptionsHelperTests.java b/server/src/test/java/org/opensearch/ExceptionsHelperTests.java
index 4c65eadf46e89..395c5ec14c8a3 100644
--- a/server/src/test/java/org/opensearch/ExceptionsHelperTests.java
+++ b/server/src/test/java/org/opensearch/ExceptionsHelperTests.java
@@ -114,9 +114,9 @@ public void testStatus() {
     }
 
     public void testSummaryMessage() {
-        assertThat(ExceptionsHelper.summaryMessage(new IllegalArgumentException("illegal")), equalTo("Invalid argument"));
-        assertThat(ExceptionsHelper.summaryMessage(new JsonParseException(null, "illegal")), equalTo("Failed to parse JSON"));
-        assertThat(ExceptionsHelper.summaryMessage(new OpenSearchRejectedExecutionException("rejected")), equalTo("Too many requests"));
+        assertThat(BaseExceptionsHelper.summaryMessage(new IllegalArgumentException("illegal")), equalTo("Invalid argument"));
+        assertThat(BaseExceptionsHelper.summaryMessage(new JsonParseException(null, "illegal")), equalTo("Failed to parse JSON"));
+        assertThat(BaseExceptionsHelper.summaryMessage(new OpenSearchRejectedExecutionException("rejected")), equalTo("Too many requests"));
     }
 
     public void testGroupBy() {
diff --git a/server/src/test/java/org/opensearch/OpenSearchExceptionTests.java b/server/src/test/java/org/opensearch/OpenSearchExceptionTests.java
index a0bd8202abbbe..adc75f917c751 100644
--- a/server/src/test/java/org/opensearch/OpenSearchExceptionTests.java
+++ b/server/src/test/java/org/opensearch/OpenSearchExceptionTests.java
@@ -127,9 +127,9 @@ public void testGuessRootCause() {
                 "foo",
                 new OpenSearchException("bar", new IndexNotFoundException("foo", new RuntimeException("foobar")))
             );
-            OpenSearchException[] rootCauses = exception.guessRootCauses();
+            BaseOpenSearchException[] rootCauses = exception.guessRootCauses();
             assertEquals(rootCauses.length, 1);
-            assertEquals(OpenSearchException.getExceptionName(rootCauses[0]), "index_not_found_exception");
+            assertEquals(BaseOpenSearchException.getExceptionName(rootCauses[0]), "index_not_found_exception");
             assertEquals("no such index [foo]", rootCauses[0].getMessage());
             ShardSearchFailure failure = new ShardSearchFailure(
                 new ParsingException(1, 2, "foobar", null),
@@ -147,14 +147,14 @@ public void testGuessRootCause() {
             if (randomBoolean()) {
                 rootCauses = (randomBoolean() ? new RemoteTransportException("remoteboom", ex) : ex).guessRootCauses();
             } else {
-                rootCauses = OpenSearchException.guessRootCauses(randomBoolean() ? new RemoteTransportException("remoteboom", ex) : ex);
+                rootCauses = BaseOpenSearchException.guessRootCauses(randomBoolean() ? new RemoteTransportException("remoteboom", ex) : ex);
             }
-            assertEquals("parsing_exception", OpenSearchException.getExceptionName(rootCauses[0]));
+            assertEquals("parsing_exception", BaseOpenSearchException.getExceptionName(rootCauses[0]));
             assertEquals("foobar", rootCauses[0].getMessage());
 
             OpenSearchException oneLevel = new OpenSearchException("foo", new RuntimeException("foobar"));
             rootCauses = oneLevel.guessRootCauses();
-            assertEquals("exception", OpenSearchException.getExceptionName(rootCauses[0]));
+            assertEquals("exception", BaseOpenSearchException.getExceptionName(rootCauses[0]));
             assertEquals("foo", rootCauses[0].getMessage());
         }
         {
@@ -175,32 +175,32 @@ public void testGuessRootCause() {
                 "all shards failed",
                 new ShardSearchFailure[] { failure, failure1, failure2 }
             );
-            final OpenSearchException[] rootCauses = ex.guessRootCauses();
+            final BaseOpenSearchException[] rootCauses = ex.guessRootCauses();
             assertEquals(rootCauses.length, 2);
-            assertEquals(OpenSearchException.getExceptionName(rootCauses[0]), "parsing_exception");
+            assertEquals(BaseOpenSearchException.getExceptionName(rootCauses[0]), "parsing_exception");
             assertEquals(rootCauses[0].getMessage(), "foobar");
             assertEquals(1, ((ParsingException) rootCauses[0]).getLineNumber());
             assertEquals(2, ((ParsingException) rootCauses[0]).getColumnNumber());
-            assertEquals("query_shard_exception", OpenSearchException.getExceptionName(rootCauses[1]));
-            assertEquals("foo1", rootCauses[1].getIndex().getName());
+            assertEquals("query_shard_exception", BaseOpenSearchException.getExceptionName(rootCauses[1]));
+            assertEquals("foo1", rootCauses[1].getIndexName());
             assertEquals("foobar", rootCauses[1].getMessage());
         }
 
         {
-            final OpenSearchException[] foobars = OpenSearchException.guessRootCauses(new IllegalArgumentException("foobar"));
+            final BaseOpenSearchException[] foobars = BaseOpenSearchException.guessRootCauses(new IllegalArgumentException("foobar"));
             assertEquals(foobars.length, 1);
-            assertThat(foobars[0], instanceOf(OpenSearchException.class));
+            assertThat(foobars[0], instanceOf(BaseOpenSearchException.class));
             assertEquals("foobar", foobars[0].getMessage());
             assertEquals(IllegalArgumentException.class, foobars[0].getCause().getClass());
             assertEquals("illegal_argument_exception", foobars[0].getExceptionName());
         }
 
         {
-            final OpenSearchException[] foobars = OpenSearchException.guessRootCauses(
+            final BaseOpenSearchException[] foobars = BaseOpenSearchException.guessRootCauses(
                 new RemoteTransportException("abc", new IllegalArgumentException("foobar"))
             );
             assertEquals(foobars.length, 1);
-            assertThat(foobars[0], instanceOf(OpenSearchException.class));
+            assertThat(foobars[0], instanceOf(BaseOpenSearchException.class));
             assertEquals("foobar", foobars[0].getMessage());
             assertEquals(IllegalArgumentException.class, foobars[0].getCause().getClass());
             assertEquals("illegal_argument_exception", foobars[0].getExceptionName());
@@ -209,9 +209,9 @@ public void testGuessRootCause() {
         {
             XContentParseException inner = new XContentParseException(null, "inner");
             XContentParseException outer = new XContentParseException(null, "outer", inner);
-            final OpenSearchException[] causes = OpenSearchException.guessRootCauses(outer);
+            final BaseOpenSearchException[] causes = BaseOpenSearchException.guessRootCauses(outer);
             assertEquals(causes.length, 1);
-            assertThat(causes[0], instanceOf(OpenSearchException.class));
+            assertThat(causes[0], instanceOf(BaseOpenSearchException.class));
             assertEquals("inner", causes[0].getMessage());
             assertEquals("x_content_parse_exception", causes[0].getExceptionName());
         }
@@ -219,9 +219,9 @@ public void testGuessRootCause() {
         {
             OpenSearchException inner = new OpenSearchException("inner");
             XContentParseException outer = new XContentParseException(null, "outer", inner);
-            final OpenSearchException[] causes = OpenSearchException.guessRootCauses(outer);
+            final BaseOpenSearchException[] causes = BaseOpenSearchException.guessRootCauses(outer);
             assertEquals(causes.length, 1);
-            assertThat(causes[0], instanceOf(OpenSearchException.class));
+            assertThat(causes[0], instanceOf(BaseOpenSearchException.class));
             assertEquals("inner", causes[0].getMessage());
             assertEquals("exception", causes[0].getExceptionName());
         }
@@ -409,7 +409,7 @@ public void testToXContent() throws IOException {
             // Test the same exception but with the "rest.exception.stacktrace.skip" parameter disabled: the stack_trace must be present
             // in the JSON. Since the stack can be large, it only checks the beginning of the JSON.
             ToXContent.Params params = new ToXContent.MapParams(
-                Collections.singletonMap(OpenSearchException.REST_EXCEPTION_SKIP_STACK_TRACE, "false")
+                Collections.singletonMap(BaseOpenSearchException.REST_EXCEPTION_SKIP_STACK_TRACE, "false")
             );
             String actual;
             try (XContentBuilder builder = XContentBuilder.builder(XContentType.JSON.xContent())) {
@@ -451,7 +451,7 @@ public void testGenerateThrowableToXContent() throws IOException {
             OpenSearchException ex = new RemoteTransportException("foobar", new FileNotFoundException("foo not found"));
             String toXContentString = Strings.toString(XContentType.JSON, ex);
             String throwableString = Strings.toString(XContentType.JSON, (builder, params) -> {
-                OpenSearchException.generateThrowableXContent(builder, params, ex);
+                BaseOpenSearchException.generateThrowableXContent(builder, params, ex);
                 return builder;
             });
 
@@ -740,7 +740,7 @@ public void testThrowableToAndFromXContent() throws IOException {
         }
 
         BytesReference throwableBytes = toShuffledXContent((builder, params) -> {
-            OpenSearchException.generateThrowableXContent(builder, params, throwable);
+            BaseOpenSearchException.generateThrowableXContent(builder, params, throwable);
             return builder;
         }, xContent.mediaType(), ToXContent.EMPTY_PARAMS, randomBoolean());
 
@@ -756,7 +756,7 @@ public void testThrowableToAndFromXContent() throws IOException {
         if (suppressedCount > 0) {
             XContentBuilder builder = XContentBuilder.builder(xContent);
             builder.startObject();
-            OpenSearchException.generateThrowableXContent(builder, ToXContent.EMPTY_PARAMS, throwable);
+            BaseOpenSearchException.generateThrowableXContent(builder, ToXContent.EMPTY_PARAMS, throwable);
             builder.endObject();
             throwableBytes = BytesReference.bytes(builder);
             try (XContentParser parser = createParser(xContent, throwableBytes)) {
@@ -772,7 +772,7 @@ public void testUnknownFailureToAndFromXContent() throws IOException {
 
         BytesReference failureBytes = toShuffledXContent((builder, params) -> {
             // Prints a null failure using generateFailureXContent()
-            OpenSearchException.generateFailureXContent(builder, params, null, randomBoolean());
+            BaseOpenSearchException.generateFailureXContent(builder, params, null, randomBoolean());
             return builder;
         }, xContent.mediaType(), ToXContent.EMPTY_PARAMS, randomBoolean());
 
@@ -796,7 +796,7 @@ public void testFailureToAndFromXContentWithNoDetails() throws IOException {
 
         final Exception failure = (Exception) randomExceptions().v1();
         BytesReference failureBytes = toShuffledXContent((builder, params) -> {
-            OpenSearchException.generateFailureXContent(builder, params, failure, false);
+            BaseOpenSearchException.generateFailureXContent(builder, params, failure, false);
             return builder;
         }, xContent.mediaType(), ToXContent.EMPTY_PARAMS, randomBoolean());
 
@@ -814,8 +814,8 @@ public void testFailureToAndFromXContentWithNoDetails() throws IOException {
         }
         assertNotNull(parsedFailure);
 
-        String reason = ExceptionsHelper.summaryMessage(failure);
-        assertEquals(OpenSearchException.buildMessage("exception", reason, null), parsedFailure.getMessage());
+        String reason = BaseExceptionsHelper.summaryMessage(failure);
+        assertEquals(BaseOpenSearchException.buildMessage("exception", reason, null), parsedFailure.getMessage());
         assertEquals(0, parsedFailure.getHeaders().size());
         assertEquals(0, parsedFailure.getMetadata().size());
         assertNull(parsedFailure.getCause());
@@ -950,7 +950,7 @@ public void testFailureToAndFromXContentWithDetails() throws IOException {
 
         Exception finalFailure = failure;
         BytesReference failureBytes = toShuffledXContent((builder, params) -> {
-            OpenSearchException.generateFailureXContent(builder, params, finalFailure, true);
+            BaseOpenSearchException.generateFailureXContent(builder, params, finalFailure, true);
             return builder;
         }, xContent.mediaType(), ToXContent.EMPTY_PARAMS, randomBoolean());
 
@@ -983,7 +983,7 @@ private static void assertToXContentAsJson(ToXContent e, String expectedJson) th
 
     private static void assertExceptionAsJson(Exception e, String expectedJson) throws IOException {
         assertToXContentAsJson((builder, params) -> {
-            OpenSearchException.generateThrowableXContent(builder, params, e);
+            BaseOpenSearchException.generateThrowableXContent(builder, params, e);
             return builder;
         }, expectedJson);
     }
diff --git a/server/src/test/java/org/opensearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequestTests.java b/server/src/test/java/org/opensearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequestTests.java
index 54b51944999d4..529ed8c1b62cc 100644
--- a/server/src/test/java/org/opensearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequestTests.java
+++ b/server/src/test/java/org/opensearch/action/admin/cluster/configuration/AddVotingConfigExclusionsRequestTests.java
@@ -40,8 +40,8 @@
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.node.DiscoveryNodeRole;
 import org.opensearch.cluster.node.DiscoveryNodes.Builder;
-import org.opensearch.common.Strings;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/action/admin/cluster/configuration/TransportAddVotingConfigExclusionsActionTests.java b/server/src/test/java/org/opensearch/action/admin/cluster/configuration/TransportAddVotingConfigExclusionsActionTests.java
index 40a041e9b94e3..56c9f70dc5575 100644
--- a/server/src/test/java/org/opensearch/action/admin/cluster/configuration/TransportAddVotingConfigExclusionsActionTests.java
+++ b/server/src/test/java/org/opensearch/action/admin/cluster/configuration/TransportAddVotingConfigExclusionsActionTests.java
@@ -49,12 +49,12 @@
 import org.opensearch.cluster.node.DiscoveryNodes.Builder;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.SetOnce;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.concurrent.ThreadContext;
+import org.opensearch.core.common.Strings;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.test.transport.MockTransport;
 import org.opensearch.threadpool.TestThreadPool;
diff --git a/server/src/test/java/org/opensearch/action/admin/cluster/configuration/VotingConfigExclusionsHelperTests.java b/server/src/test/java/org/opensearch/action/admin/cluster/configuration/VotingConfigExclusionsHelperTests.java
index f33781064345d..55528cfb71a6a 100644
--- a/server/src/test/java/org/opensearch/action/admin/cluster/configuration/VotingConfigExclusionsHelperTests.java
+++ b/server/src/test/java/org/opensearch/action/admin/cluster/configuration/VotingConfigExclusionsHelperTests.java
@@ -17,8 +17,8 @@
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.node.DiscoveryNodeRole;
 import org.opensearch.cluster.node.DiscoveryNodes;
-import org.opensearch.common.Strings;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.util.Set;
diff --git a/server/src/test/java/org/opensearch/action/admin/cluster/health/ClusterHealthRequestTests.java b/server/src/test/java/org/opensearch/action/admin/cluster/health/ClusterHealthRequestTests.java
index 284e8f1ac5cd1..1dbefd17b200b 100644
--- a/server/src/test/java/org/opensearch/action/admin/cluster/health/ClusterHealthRequestTests.java
+++ b/server/src/test/java/org/opensearch/action/admin/cluster/health/ClusterHealthRequestTests.java
@@ -36,9 +36,9 @@
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.cluster.health.ClusterHealthStatus;
 import org.opensearch.common.Priority;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.io.stream.StreamInput;
+import org.opensearch.core.common.Strings;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.util.Locale;
diff --git a/server/src/test/java/org/opensearch/action/admin/cluster/shards/ClusterSearchShardsResponseTests.java b/server/src/test/java/org/opensearch/action/admin/cluster/shards/ClusterSearchShardsResponseTests.java
index 6c54303802407..4207dca9e3750 100644
--- a/server/src/test/java/org/opensearch/action/admin/cluster/shards/ClusterSearchShardsResponseTests.java
+++ b/server/src/test/java/org/opensearch/action/admin/cluster/shards/ClusterSearchShardsResponseTests.java
@@ -37,13 +37,13 @@
 import org.opensearch.cluster.routing.ShardRouting;
 import org.opensearch.cluster.routing.ShardRoutingState;
 import org.opensearch.cluster.routing.TestShardRouting;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput;
 import org.opensearch.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.transport.TransportAddress;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.query.RandomQueryBuilder;
 import org.opensearch.index.shard.ShardId;
 import org.opensearch.search.SearchModule;
diff --git a/server/src/test/java/org/opensearch/action/admin/indices/datastream/DeleteDataStreamRequestTests.java b/server/src/test/java/org/opensearch/action/admin/indices/datastream/DeleteDataStreamRequestTests.java
index c4fd5c553f069..6cf490843affa 100644
--- a/server/src/test/java/org/opensearch/action/admin/indices/datastream/DeleteDataStreamRequestTests.java
+++ b/server/src/test/java/org/opensearch/action/admin/indices/datastream/DeleteDataStreamRequestTests.java
@@ -41,10 +41,10 @@
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.metadata.Metadata;
 import org.opensearch.cluster.metadata.MetadataDeleteIndexService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.io.stream.Writeable;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.Index;
 import org.opensearch.snapshots.Snapshot;
 import org.opensearch.snapshots.SnapshotId;
diff --git a/server/src/test/java/org/opensearch/action/admin/indices/resolve/ResolveIndexResponseTests.java b/server/src/test/java/org/opensearch/action/admin/indices/resolve/ResolveIndexResponseTests.java
index a9b99df5c4ce3..c792ed0e0439f 100644
--- a/server/src/test/java/org/opensearch/action/admin/indices/resolve/ResolveIndexResponseTests.java
+++ b/server/src/test/java/org/opensearch/action/admin/indices/resolve/ResolveIndexResponseTests.java
@@ -36,8 +36,8 @@
 import org.opensearch.action.admin.indices.resolve.ResolveIndexAction.ResolvedDataStream;
 import org.opensearch.action.admin.indices.resolve.ResolveIndexAction.ResolvedIndex;
 import org.opensearch.action.admin.indices.resolve.ResolveIndexAction.Response;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.Writeable;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ConstructingObjectParser;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.test.AbstractSerializingTestCase;
diff --git a/server/src/test/java/org/opensearch/action/admin/indices/resolve/ResolveIndexTests.java b/server/src/test/java/org/opensearch/action/admin/indices/resolve/ResolveIndexTests.java
index 0ad31fec57472..8fbe46be856ba 100644
--- a/server/src/test/java/org/opensearch/action/admin/indices/resolve/ResolveIndexTests.java
+++ b/server/src/test/java/org/opensearch/action/admin/indices/resolve/ResolveIndexTests.java
@@ -45,10 +45,10 @@
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.metadata.Metadata;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.time.DateFormatter;
 import org.opensearch.common.util.concurrent.ThreadContext;
+import org.opensearch.core.common.Strings;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.time.Clock;
diff --git a/server/src/test/java/org/opensearch/action/bulk/TransportBulkActionTookTests.java b/server/src/test/java/org/opensearch/action/bulk/TransportBulkActionTookTests.java
index 713b506f14299..2361b69e9b82c 100644
--- a/server/src/test/java/org/opensearch/action/bulk/TransportBulkActionTookTests.java
+++ b/server/src/test/java/org/opensearch/action/bulk/TransportBulkActionTookTests.java
@@ -48,11 +48,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.util.concurrent.AtomicArray;
 import org.opensearch.common.util.concurrent.ThreadContext;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.index.IndexingPressureService;
 import org.opensearch.indices.SystemIndices;
diff --git a/server/src/test/java/org/opensearch/action/search/CanMatchPreFilterSearchPhaseTests.java b/server/src/test/java/org/opensearch/action/search/CanMatchPreFilterSearchPhaseTests.java
index cb2ac328002c5..2e3ff166a6a53 100644
--- a/server/src/test/java/org/opensearch/action/search/CanMatchPreFilterSearchPhaseTests.java
+++ b/server/src/test/java/org/opensearch/action/search/CanMatchPreFilterSearchPhaseTests.java
@@ -38,8 +38,8 @@
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.routing.GroupShardsIterator;
-import org.opensearch.common.Strings;
 import org.opensearch.common.util.concurrent.OpenSearchExecutors;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.shard.ShardId;
 import org.opensearch.search.SearchPhaseResult;
 import org.opensearch.search.SearchService;
diff --git a/server/src/test/java/org/opensearch/action/search/MultiSearchResponseTests.java b/server/src/test/java/org/opensearch/action/search/MultiSearchResponseTests.java
index 4a0857244021b..e26a3cb4731da 100644
--- a/server/src/test/java/org/opensearch/action/search/MultiSearchResponseTests.java
+++ b/server/src/test/java/org/opensearch/action/search/MultiSearchResponseTests.java
@@ -32,7 +32,7 @@
 package org.opensearch.action.search;
 
 import org.opensearch.OpenSearchException;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.search.internal.InternalSearchResponse;
diff --git a/server/src/test/java/org/opensearch/action/search/SearchAsyncActionTests.java b/server/src/test/java/org/opensearch/action/search/SearchAsyncActionTests.java
index 277f2f1dee0bf..cf838682aa717 100644
--- a/server/src/test/java/org/opensearch/action/search/SearchAsyncActionTests.java
+++ b/server/src/test/java/org/opensearch/action/search/SearchAsyncActionTests.java
@@ -40,9 +40,9 @@
 import org.opensearch.cluster.routing.RecoverySource;
 import org.opensearch.cluster.routing.ShardRouting;
 import org.opensearch.cluster.routing.UnassignedInfo;
-import org.opensearch.common.Strings;
 import org.opensearch.common.UUIDs;
 import org.opensearch.common.io.stream.StreamOutput;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.Index;
 import org.opensearch.index.shard.ShardId;
 import org.opensearch.search.SearchPhaseResult;
diff --git a/server/src/test/java/org/opensearch/action/search/SearchPhaseControllerTests.java b/server/src/test/java/org/opensearch/action/search/SearchPhaseControllerTests.java
index abcf1efe56122..a007fe0fb44f8 100644
--- a/server/src/test/java/org/opensearch/action/search/SearchPhaseControllerTests.java
+++ b/server/src/test/java/org/opensearch/action/search/SearchPhaseControllerTests.java
@@ -45,7 +45,6 @@
 import org.apache.lucene.search.grouping.CollapseTopFieldDocs;
 import org.apache.lucene.util.BytesRef;
 import org.opensearch.action.OriginalIndices;
-import org.opensearch.common.Strings;
 import org.opensearch.common.UUIDs;
 import org.opensearch.common.breaker.CircuitBreaker;
 import org.opensearch.common.breaker.CircuitBreakingException;
@@ -59,6 +58,7 @@
 import org.opensearch.common.util.concurrent.AtomicArray;
 import org.opensearch.common.util.concurrent.OpenSearchExecutors;
 import org.opensearch.common.util.concurrent.OpenSearchThreadPoolExecutor;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.shard.ShardId;
 import org.opensearch.search.DocValueFormat;
 import org.opensearch.search.SearchHit;
diff --git a/server/src/test/java/org/opensearch/action/search/SearchQueryThenFetchAsyncActionTests.java b/server/src/test/java/org/opensearch/action/search/SearchQueryThenFetchAsyncActionTests.java
index 4a23c4ec18951..4e351e1424cd0 100644
--- a/server/src/test/java/org/opensearch/action/search/SearchQueryThenFetchAsyncActionTests.java
+++ b/server/src/test/java/org/opensearch/action/search/SearchQueryThenFetchAsyncActionTests.java
@@ -41,12 +41,12 @@
 import org.opensearch.action.OriginalIndices;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.routing.GroupShardsIterator;
-import org.opensearch.common.Strings;
 import org.opensearch.common.breaker.CircuitBreaker;
 import org.opensearch.common.breaker.NoopCircuitBreaker;
 import org.opensearch.common.lucene.search.TopDocsAndMaxScore;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.concurrent.OpenSearchExecutors;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.shard.ShardId;
 import org.opensearch.search.DocValueFormat;
 import org.opensearch.search.SearchPhaseResult;
diff --git a/server/src/test/java/org/opensearch/action/search/SearchRequestTests.java b/server/src/test/java/org/opensearch/action/search/SearchRequestTests.java
index 1779644790c2e..ddce6d9772b05 100644
--- a/server/src/test/java/org/opensearch/action/search/SearchRequestTests.java
+++ b/server/src/test/java/org/opensearch/action/search/SearchRequestTests.java
@@ -35,9 +35,9 @@
 import org.opensearch.Version;
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.support.IndicesOptions;
-import org.opensearch.common.Strings;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.ArrayUtils;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.search.AbstractSearchTestCase;
 import org.opensearch.search.Scroll;
diff --git a/server/src/test/java/org/opensearch/action/search/TransportSearchActionTests.java b/server/src/test/java/org/opensearch/action/search/TransportSearchActionTests.java
index 136e1879881f8..51d9a06c9ac43 100644
--- a/server/src/test/java/org/opensearch/action/search/TransportSearchActionTests.java
+++ b/server/src/test/java/org/opensearch/action/search/TransportSearchActionTests.java
@@ -52,10 +52,10 @@
 import org.opensearch.cluster.routing.ShardRoutingState;
 import org.opensearch.cluster.routing.TestShardRouting;
 import org.opensearch.common.SetOnce;
-import org.opensearch.common.Strings;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.transport.TransportAddress;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.Index;
 import org.opensearch.index.query.InnerHitBuilder;
 import org.opensearch.index.query.MatchAllQueryBuilder;
diff --git a/server/src/test/java/org/opensearch/client/AbstractClientHeadersTestCase.java b/server/src/test/java/org/opensearch/client/AbstractClientHeadersTestCase.java
index 92a88aa7940ee..f40227beb59b7 100644
--- a/server/src/test/java/org/opensearch/client/AbstractClientHeadersTestCase.java
+++ b/server/src/test/java/org/opensearch/client/AbstractClientHeadersTestCase.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.client;
 
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.action.ActionType;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.admin.cluster.reroute.ClusterRerouteAction;
@@ -244,7 +244,7 @@ public Throwable unwrap(Throwable t, Class<? extends Throwable> exceptionType) {
                 }
                 if (counter++ > 10) {
                     // dear god, if we got more than 10 levels down, WTF? just bail
-                    fail("Exception cause unwrapping ran for 10 levels: " + ExceptionsHelper.stackTrace(t));
+                    fail("Exception cause unwrapping ran for 10 levels: " + BaseExceptionsHelper.stackTrace(t));
                     return null;
                 }
                 result = result.getCause();
diff --git a/server/src/test/java/org/opensearch/cluster/metadata/IndexNameExpressionResolverTests.java b/server/src/test/java/org/opensearch/cluster/metadata/IndexNameExpressionResolverTests.java
index 52a2663f173a7..e79839de7a292 100644
--- a/server/src/test/java/org/opensearch/cluster/metadata/IndexNameExpressionResolverTests.java
+++ b/server/src/test/java/org/opensearch/cluster/metadata/IndexNameExpressionResolverTests.java
@@ -45,9 +45,9 @@
 import org.opensearch.cluster.ClusterName;
 import org.opensearch.cluster.ClusterState;
 import org.opensearch.cluster.metadata.IndexMetadata.State;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.util.concurrent.ThreadContext;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.Index;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.index.IndexSettings;
diff --git a/server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexStateServiceTests.java b/server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexStateServiceTests.java
index ffda58adcd019..0e2f06ba59d89 100644
--- a/server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexStateServiceTests.java
+++ b/server/src/test/java/org/opensearch/cluster/metadata/MetadataIndexStateServiceTests.java
@@ -51,9 +51,9 @@
 import org.opensearch.cluster.routing.UnassignedInfo;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.Index;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.index.shard.ShardId;
diff --git a/server/src/test/java/org/opensearch/common/geo/GeoJsonParserTests.java b/server/src/test/java/org/opensearch/common/geo/GeoJsonParserTests.java
index 05ad2b41fe5b5..9ab0f41f33762 100644
--- a/server/src/test/java/org/opensearch/common/geo/GeoJsonParserTests.java
+++ b/server/src/test/java/org/opensearch/common/geo/GeoJsonParserTests.java
@@ -33,11 +33,11 @@
 package org.opensearch.common.geo;
 
 import org.opensearch.common.Strings;
-import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.common.xcontent.json.JsonXContent;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParseException;
 import org.opensearch.core.xcontent.XContentParser;
-import org.opensearch.common.xcontent.json.JsonXContent;
 import org.opensearch.geometry.Circle;
 import org.opensearch.geometry.Geometry;
 import org.opensearch.geometry.GeometryCollection;
diff --git a/server/src/test/java/org/opensearch/http/CorsHandlerTests.java b/server/src/test/java/org/opensearch/http/CorsHandlerTests.java
index 08464db73fd78..d5f4e9acd6951 100644
--- a/server/src/test/java/org/opensearch/http/CorsHandlerTests.java
+++ b/server/src/test/java/org/opensearch/http/CorsHandlerTests.java
@@ -50,7 +50,7 @@
 import java.util.regex.PatternSyntaxException;
 import java.util.stream.Collectors;
 
-import static org.opensearch.common.Strings.collectionToDelimitedString;
+import static org.opensearch.core.common.Strings.collectionToDelimitedString;
 import static org.opensearch.http.HttpTransportSettings.SETTING_CORS_ALLOW_CREDENTIALS;
 import static org.opensearch.http.HttpTransportSettings.SETTING_CORS_ALLOW_HEADERS;
 import static org.opensearch.http.HttpTransportSettings.SETTING_CORS_ALLOW_METHODS;
diff --git a/server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java
index a1e1937f78c32..808ea29865855 100644
--- a/server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java
+++ b/server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java
@@ -2563,7 +2563,7 @@ class OpAndVersion {
                                 "1",
                                 null,
                                 testDocument(),
-                                bytesArray(Strings.collectionToCommaDelimitedString(values)),
+                                bytesArray(org.opensearch.core.common.Strings.collectionToCommaDelimitedString(values)),
                                 null
                             ),
                             UNASSIGNED_SEQ_NO,
diff --git a/server/src/test/java/org/opensearch/index/fielddata/AbstractFieldDataImplTestCase.java b/server/src/test/java/org/opensearch/index/fielddata/AbstractFieldDataImplTestCase.java
index 9be0a738441e5..1ffacf98a6836 100644
--- a/server/src/test/java/org/opensearch/index/fielddata/AbstractFieldDataImplTestCase.java
+++ b/server/src/test/java/org/opensearch/index/fielddata/AbstractFieldDataImplTestCase.java
@@ -41,7 +41,7 @@
 import org.apache.lucene.search.SortField;
 import org.apache.lucene.search.TopFieldDocs;
 import org.apache.lucene.util.BytesRef;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.search.MultiValueMode;
 
 import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/mapper/DynamicMappingTests.java b/server/src/test/java/org/opensearch/index/mapper/DynamicMappingTests.java
index 6759ed05e9735..222cdf9f7684c 100644
--- a/server/src/test/java/org/opensearch/index/mapper/DynamicMappingTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/DynamicMappingTests.java
@@ -37,7 +37,6 @@
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.common.xcontent.XContentType;
 
 import java.io.IOException;
 import java.time.Instant;
diff --git a/server/src/test/java/org/opensearch/index/query/InnerHitBuilderTests.java b/server/src/test/java/org/opensearch/index/query/InnerHitBuilderTests.java
index bdfc03838dcea..d252d76fa19b2 100644
--- a/server/src/test/java/org/opensearch/index/query/InnerHitBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/InnerHitBuilderTests.java
@@ -31,16 +31,16 @@
 
 package org.opensearch.index.query;
 
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
-import org.opensearch.common.xcontent.XContentFactory;
 import org.opensearch.core.xcontent.XContentParser;
-import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.script.Script;
 import org.opensearch.script.ScriptType;
 import org.opensearch.search.SearchModule;
diff --git a/server/src/test/java/org/opensearch/index/reindex/BulkByScrollTaskStatusOrExceptionTests.java b/server/src/test/java/org/opensearch/index/reindex/BulkByScrollTaskStatusOrExceptionTests.java
index 53c1824e849d0..8e28580fc9296 100644
--- a/server/src/test/java/org/opensearch/index/reindex/BulkByScrollTaskStatusOrExceptionTests.java
+++ b/server/src/test/java/org/opensearch/index/reindex/BulkByScrollTaskStatusOrExceptionTests.java
@@ -33,7 +33,7 @@
 package org.opensearch.index.reindex;
 
 import org.opensearch.OpenSearchException;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.test.AbstractXContentTestCase;
diff --git a/server/src/test/java/org/opensearch/index/reindex/BulkByScrollTaskStatusTests.java b/server/src/test/java/org/opensearch/index/reindex/BulkByScrollTaskStatusTests.java
index 465307c11be5e..8d2c24ff5320d 100644
--- a/server/src/test/java/org/opensearch/index/reindex/BulkByScrollTaskStatusTests.java
+++ b/server/src/test/java/org/opensearch/index/reindex/BulkByScrollTaskStatusTests.java
@@ -36,9 +36,9 @@
 import org.opensearch.OpenSearchException;
 import org.opensearch.Version;
 import org.opensearch.common.Randomness;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.BytesStreamOutput;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.test.AbstractXContentTestCase;
diff --git a/server/src/test/java/org/opensearch/index/shard/RemoteStoreRefreshListenerTests.java b/server/src/test/java/org/opensearch/index/shard/RemoteStoreRefreshListenerTests.java
index 7ae18771ee0fa..bcc3268658ab8 100644
--- a/server/src/test/java/org/opensearch/index/shard/RemoteStoreRefreshListenerTests.java
+++ b/server/src/test/java/org/opensearch/index/shard/RemoteStoreRefreshListenerTests.java
@@ -326,7 +326,7 @@ private static class TestFilterDirectory extends FilterDirectory {
         /**
          * Sole constructor, typically called from sub-classes.
          *
-         * @param in
+         * @param in input directory
          */
         protected TestFilterDirectory(Directory in) {
             super(in);
diff --git a/server/src/test/java/org/opensearch/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java b/server/src/test/java/org/opensearch/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java
index ba4d16c87bed1..ac1c67eda0d91 100644
--- a/server/src/test/java/org/opensearch/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java
+++ b/server/src/test/java/org/opensearch/lucene/search/uhighlight/CustomUnifiedHighlighterTests.java
@@ -63,8 +63,8 @@
 import org.apache.lucene.search.uhighlight.UnifiedHighlighter;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.tests.index.RandomIndexWriter;
-import org.opensearch.common.Strings;
 import org.opensearch.common.lucene.search.MultiPhrasePrefixQuery;
+import org.opensearch.core.common.Strings;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.text.BreakIterator;
diff --git a/server/src/test/java/org/opensearch/monitor/jvm/JvmStatsTests.java b/server/src/test/java/org/opensearch/monitor/jvm/JvmStatsTests.java
index 41a0891b73aa8..23261680dd70a 100644
--- a/server/src/test/java/org/opensearch/monitor/jvm/JvmStatsTests.java
+++ b/server/src/test/java/org/opensearch/monitor/jvm/JvmStatsTests.java
@@ -32,8 +32,8 @@
 
 package org.opensearch.monitor.jvm;
 
-import org.opensearch.common.Strings;
 import org.opensearch.common.unit.ByteSizeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.io.IOException;
@@ -77,7 +77,7 @@ public void testJvmStats() throws IOException {
         assertNotNull(collectors);
         assertThat(collectors.length, greaterThan(0));
         for (JvmStats.GarbageCollector collector : collectors) {
-            assertTrue(Strings.hasText(collector.getName()));
+            assertTrue(org.opensearch.core.common.Strings.hasText(collector.getName()));
             assertNotNull(collector.getCollectionTime());
             assertThat(collector.getCollectionTime().millis(), anyOf(equalTo(-1L), greaterThanOrEqualTo(0L)));
             assertThat(collector.getCollectionCount(), anyOf(equalTo(-1L), greaterThanOrEqualTo(0L)));
diff --git a/server/src/test/java/org/opensearch/rest/BytesRestResponseTests.java b/server/src/test/java/org/opensearch/rest/BytesRestResponseTests.java
index ddca4288353ff..0e58e8ce719f6 100644
--- a/server/src/test/java/org/opensearch/rest/BytesRestResponseTests.java
+++ b/server/src/test/java/org/opensearch/rest/BytesRestResponseTests.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.rest;
 
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.OpenSearchStatusException;
 import org.opensearch.OpenSearchException;
 import org.opensearch.ResourceAlreadyExistsException;
@@ -183,7 +183,7 @@ public void testConvert() throws IOException {
             + "\"failed_shards\":[{\"shard\":1,\"index\":\"foo\",\"node\":\"node_1\",\"reason\":{\"type\":\"parsing_exception\","
             + "\"reason\":\"foobar\",\"line\":1,\"col\":2}}]},\"status\":400}";
         assertEquals(expected.trim(), text.trim());
-        String stackTrace = ExceptionsHelper.stackTrace(ex);
+        String stackTrace = BaseExceptionsHelper.stackTrace(ex);
         assertTrue(stackTrace.contains("Caused by: ParsingException[foobar]"));
     }
 
diff --git a/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestAddVotingConfigExclusionActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestAddVotingConfigExclusionActionTests.java
index 629bb3ca5f358..750519ab006d4 100644
--- a/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestAddVotingConfigExclusionActionTests.java
+++ b/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestAddVotingConfigExclusionActionTests.java
@@ -33,7 +33,7 @@
 package org.opensearch.rest.action.admin.cluster;
 
 import org.opensearch.action.admin.cluster.configuration.AddVotingConfigExclusionsRequest;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.test.rest.FakeRestRequest;
 import org.opensearch.test.rest.RestActionTestCase;
diff --git a/server/src/test/java/org/opensearch/search/SearchServiceTests.java b/server/src/test/java/org/opensearch/search/SearchServiceTests.java
index 4540e860b23ef..a09e05915b779 100644
--- a/server/src/test/java/org/opensearch/search/SearchServiceTests.java
+++ b/server/src/test/java/org/opensearch/search/SearchServiceTests.java
@@ -54,13 +54,13 @@
 import org.opensearch.action.support.IndicesOptions;
 import org.opensearch.action.support.PlainActionFuture;
 import org.opensearch.action.support.WriteRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.UUIDs;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.settings.SettingsException;
 import org.opensearch.common.unit.TimeValue;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.concurrency.OpenSearchRejectedExecutionException;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.index.Index;
diff --git a/server/src/test/java/org/opensearch/search/aggregations/AggregatorFactoriesTests.java b/server/src/test/java/org/opensearch/search/aggregations/AggregatorFactoriesTests.java
index 4a67ae838764a..6e83739ac8771 100644
--- a/server/src/test/java/org/opensearch/search/aggregations/AggregatorFactoriesTests.java
+++ b/server/src/test/java/org/opensearch/search/aggregations/AggregatorFactoriesTests.java
@@ -34,16 +34,16 @@
 import org.opensearch.action.ActionListener;
 import org.opensearch.common.ParsingException;
 import org.opensearch.common.SetOnce;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.core.xcontent.NamedXContentRegistry;
-import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.common.xcontent.json.JsonXContent;
+import org.opensearch.core.common.Strings;
+import org.opensearch.core.xcontent.NamedXContentRegistry;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.env.Environment;
 import org.opensearch.index.query.MatchAllQueryBuilder;
 import org.opensearch.index.query.QueryBuilder;
diff --git a/server/src/test/java/org/opensearch/search/aggregations/pipeline/DerivativeAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/pipeline/DerivativeAggregatorTests.java
index 88628cd44c721..801f057d8888d 100644
--- a/server/src/test/java/org/opensearch/search/aggregations/pipeline/DerivativeAggregatorTests.java
+++ b/server/src/test/java/org/opensearch/search/aggregations/pipeline/DerivativeAggregatorTests.java
@@ -41,7 +41,7 @@
 import org.apache.lucene.search.MatchAllDocsQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.store.Directory;
-import org.opensearch.ExceptionsHelper;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.action.search.SearchPhaseExecutionException;
 import org.opensearch.common.CheckedConsumer;
 import org.opensearch.index.mapper.DateFieldMapper;
@@ -635,7 +635,7 @@ public void testSingleValueAggDerivative_invalidPath() throws IOException {
             executeTestCase(query, aggBuilder, history -> {});
             fail("Expected an Exception but didn't get one");
         } catch (Exception e) {
-            Throwable cause = ExceptionsHelper.unwrapCause(e);
+            Throwable cause = BaseExceptionsHelper.unwrapCause(e);
             if (cause == null) {
                 throw e;
             } else if (cause instanceof SearchPhaseExecutionException) {
diff --git a/server/src/test/java/org/opensearch/search/fetch/subphase/FetchSourcePhaseTests.java b/server/src/test/java/org/opensearch/search/fetch/subphase/FetchSourcePhaseTests.java
index 2da4b12587dbd..f2b9d44c81a90 100644
--- a/server/src/test/java/org/opensearch/search/fetch/subphase/FetchSourcePhaseTests.java
+++ b/server/src/test/java/org/opensearch/search/fetch/subphase/FetchSourcePhaseTests.java
@@ -34,10 +34,10 @@
 
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.memory.MemoryIndex;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesReference;
-import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
+import org.opensearch.core.common.Strings;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.fetch.FetchContext;
 import org.opensearch.search.fetch.FetchSubPhase.HitContext;
@@ -167,7 +167,7 @@ private HitContext hitExecute(
         return hitExecuteMultiple(
             source,
             fetchSource,
-            include == null ? Strings.EMPTY_ARRAY : new String[] { include },
+            include == null ? org.opensearch.common.Strings.EMPTY_ARRAY : new String[] { include },
             exclude == null ? Strings.EMPTY_ARRAY : new String[] { exclude },
             nestedIdentity
         );
diff --git a/server/src/test/java/org/opensearch/search/query/QuerySearchResultTests.java b/server/src/test/java/org/opensearch/search/query/QuerySearchResultTests.java
index 1cdc2f166224f..6347d5e722581 100644
--- a/server/src/test/java/org/opensearch/search/query/QuerySearchResultTests.java
+++ b/server/src/test/java/org/opensearch/search/query/QuerySearchResultTests.java
@@ -39,11 +39,11 @@
 import org.opensearch.action.OriginalIndices;
 import org.opensearch.action.OriginalIndicesTests;
 import org.opensearch.action.search.SearchRequest;
-import org.opensearch.common.Strings;
 import org.opensearch.common.UUIDs;
 import org.opensearch.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.common.lucene.search.TopDocsAndMaxScore;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.index.shard.ShardId;
 import org.opensearch.search.DocValueFormat;
 import org.opensearch.search.SearchModule;
diff --git a/server/src/test/java/org/opensearch/search/slice/SliceBuilderTests.java b/server/src/test/java/org/opensearch/search/slice/SliceBuilderTests.java
index 5a3031ba34a2b..c14569f044b5b 100644
--- a/server/src/test/java/org/opensearch/search/slice/SliceBuilderTests.java
+++ b/server/src/test/java/org/opensearch/search/slice/SliceBuilderTests.java
@@ -54,13 +54,13 @@
 import org.opensearch.cluster.routing.ShardIterator;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.common.xcontent.XContentFactory;
-import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.core.common.Strings;
+import org.opensearch.core.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.index.IndexSettings;
 import org.opensearch.index.fielddata.IndexNumericFieldData;
 import org.opensearch.index.mapper.MappedFieldType;
@@ -127,7 +127,7 @@ private IndexSettings createIndexSettings(Version indexVersionCreated, int numSh
     }
 
     private ShardSearchRequest createRequest(int shardId) {
-        return createRequest(shardId, Strings.EMPTY_ARRAY, null);
+        return createRequest(shardId, org.opensearch.common.Strings.EMPTY_ARRAY, null);
     }
 
     private ShardSearchRequest createRequest(int shardId, String[] routings, String preference) {
diff --git a/server/src/test/java/org/opensearch/tasks/CancelTasksResponseTests.java b/server/src/test/java/org/opensearch/tasks/CancelTasksResponseTests.java
index 44b3274d04f97..546ee937e3754 100644
--- a/server/src/test/java/org/opensearch/tasks/CancelTasksResponseTests.java
+++ b/server/src/test/java/org/opensearch/tasks/CancelTasksResponseTests.java
@@ -36,7 +36,7 @@
 import org.opensearch.action.TaskOperationFailure;
 import org.opensearch.action.admin.cluster.node.tasks.cancel.CancelTasksResponse;
 import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.test.AbstractXContentTestCase;
diff --git a/server/src/test/java/org/opensearch/tasks/ListTasksResponseTests.java b/server/src/test/java/org/opensearch/tasks/ListTasksResponseTests.java
index 3890c555df2f9..d0002eb04914a 100644
--- a/server/src/test/java/org/opensearch/tasks/ListTasksResponseTests.java
+++ b/server/src/test/java/org/opensearch/tasks/ListTasksResponseTests.java
@@ -36,7 +36,7 @@
 import org.opensearch.action.FailedNodeException;
 import org.opensearch.action.TaskOperationFailure;
 import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.test.AbstractXContentTestCase;
diff --git a/server/src/test/java/org/opensearch/transport/RemoteClusterConnectionTests.java b/server/src/test/java/org/opensearch/transport/RemoteClusterConnectionTests.java
index 86b40b3f84536..74084757e3dd7 100644
--- a/server/src/test/java/org/opensearch/transport/RemoteClusterConnectionTests.java
+++ b/server/src/test/java/org/opensearch/transport/RemoteClusterConnectionTests.java
@@ -694,7 +694,7 @@ private static Settings buildSniffSettings(String clusterAlias, List<String> see
         builder.put(RemoteConnectionStrategy.REMOTE_CONNECTION_MODE.getConcreteSettingForNamespace(clusterAlias).getKey(), "sniff");
         builder.put(
             SniffConnectionStrategy.REMOTE_CLUSTER_SEEDS.getConcreteSettingForNamespace(clusterAlias).getKey(),
-            Strings.collectionToCommaDelimitedString(seedNodes)
+            org.opensearch.core.common.Strings.collectionToCommaDelimitedString(seedNodes)
         );
         return builder.build();
     }
diff --git a/server/src/test/java/org/opensearch/transport/RemoteClusterServiceTests.java b/server/src/test/java/org/opensearch/transport/RemoteClusterServiceTests.java
index dea42684d2e21..b969334295ef2 100644
--- a/server/src/test/java/org/opensearch/transport/RemoteClusterServiceTests.java
+++ b/server/src/test/java/org/opensearch/transport/RemoteClusterServiceTests.java
@@ -38,12 +38,12 @@
 import org.opensearch.action.support.PlainActionFuture;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.node.DiscoveryNodeRole;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.AbstractScopedSettings;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.io.IOUtils;
+import org.opensearch.core.common.Strings;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.test.transport.MockTransportService;
 import org.opensearch.threadpool.TestThreadPool;
@@ -283,11 +283,14 @@ public void testGroupIndices() throws IOException {
                     {
                         Map<String, OriginalIndices> perClusterIndices = service.groupIndices(
                             IndicesOptions.LENIENT_EXPAND_OPEN,
-                            Strings.EMPTY_ARRAY,
+                            org.opensearch.common.Strings.EMPTY_ARRAY,
                             i -> false
                         );
                         assertEquals(1, perClusterIndices.size());
-                        assertArrayEquals(Strings.EMPTY_ARRAY, perClusterIndices.get(RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY).indices());
+                        assertArrayEquals(
+                            org.opensearch.common.Strings.EMPTY_ARRAY,
+                            perClusterIndices.get(RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY).indices()
+                        );
                     }
                 }
             }
diff --git a/server/src/test/java/org/opensearch/transport/SniffConnectionStrategyTests.java b/server/src/test/java/org/opensearch/transport/SniffConnectionStrategyTests.java
index 409bc327cb095..6ee176bcfddeb 100644
--- a/server/src/test/java/org/opensearch/transport/SniffConnectionStrategyTests.java
+++ b/server/src/test/java/org/opensearch/transport/SniffConnectionStrategyTests.java
@@ -42,13 +42,13 @@
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.node.DiscoveryNodeRole;
 import org.opensearch.cluster.node.DiscoveryNodes;
-import org.opensearch.common.Strings;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.settings.AbstractScopedSettings;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.transport.TransportAddress;
+import org.opensearch.core.common.Strings;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.test.VersionUtils;
 import org.opensearch.test.transport.MockTransportService;
@@ -712,16 +712,25 @@ public void testSniffStrategyWillNeedToBeRebuiltIfNumOfConnectionsOrSeedsOrProxy
                     );
 
                     Settings noChange = Settings.builder()
-                        .put(seedSetting.getKey(), Strings.arrayToCommaDelimitedString(seedNodes(seedNode).toArray()))
+                        .put(
+                            seedSetting.getKey(),
+                            org.opensearch.core.common.Strings.arrayToCommaDelimitedString(seedNodes(seedNode).toArray())
+                        )
                         .put(numConnections.getKey(), 3)
                         .build();
                     assertFalse(strategy.shouldRebuildConnection(noChange));
                     Settings seedsChanged = Settings.builder()
-                        .put(seedSetting.getKey(), Strings.arrayToCommaDelimitedString(seedNodes(discoverableNode).toArray()))
+                        .put(
+                            seedSetting.getKey(),
+                            org.opensearch.core.common.Strings.arrayToCommaDelimitedString(seedNodes(discoverableNode).toArray())
+                        )
                         .build();
                     assertTrue(strategy.shouldRebuildConnection(seedsChanged));
                     Settings proxyChanged = Settings.builder()
-                        .put(seedSetting.getKey(), Strings.arrayToCommaDelimitedString(seedNodes(seedNode).toArray()))
+                        .put(
+                            seedSetting.getKey(),
+                            org.opensearch.core.common.Strings.arrayToCommaDelimitedString(seedNodes(seedNode).toArray())
+                        )
                         .put(proxySetting.getKey(), "proxy_address:9300")
                         .build();
                     assertTrue(strategy.shouldRebuildConnection(proxyChanged));
diff --git a/server/src/test/java/org/opensearch/transport/TransportActionProxyTests.java b/server/src/test/java/org/opensearch/transport/TransportActionProxyTests.java
index 2bbbab1b2ccbd..64125863c3c5f 100644
--- a/server/src/test/java/org/opensearch/transport/TransportActionProxyTests.java
+++ b/server/src/test/java/org/opensearch/transport/TransportActionProxyTests.java
@@ -31,8 +31,8 @@
 
 package org.opensearch.transport;
 
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.OpenSearchException;
-import org.opensearch.ExceptionsHelper;
 import org.opensearch.Version;
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.common.io.stream.StreamInput;
@@ -196,7 +196,7 @@ public void handleResponse(SimpleTestResponse response) {
                 @Override
                 public void handleException(TransportException exp) {
                     try {
-                        Throwable cause = ExceptionsHelper.unwrapCause(exp);
+                        Throwable cause = BaseExceptionsHelper.unwrapCause(exp);
                         assertEquals("greetings from TS_C", cause.getMessage());
                     } finally {
                         latch.countDown();
diff --git a/test/fixtures/gcs-fixture/src/main/java/fixture/gcs/GoogleCloudStorageHttpHandler.java b/test/fixtures/gcs-fixture/src/main/java/fixture/gcs/GoogleCloudStorageHttpHandler.java
index af3faa46e2169..a3741668465fa 100644
--- a/test/fixtures/gcs-fixture/src/main/java/fixture/gcs/GoogleCloudStorageHttpHandler.java
+++ b/test/fixtures/gcs-fixture/src/main/java/fixture/gcs/GoogleCloudStorageHttpHandler.java
@@ -36,7 +36,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.opensearch.common.Strings;
 import org.opensearch.common.SuppressForbidden;
 import org.opensearch.common.UUIDs;
 import org.opensearch.common.bytes.BytesArray;
@@ -45,6 +44,7 @@
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.io.Streams;
 import org.opensearch.common.regex.Regex;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.RestStatus;
 import org.opensearch.rest.RestUtils;
 
diff --git a/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java b/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java
index 428b0988d4cce..d46fcb224e8c2 100644
--- a/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java
+++ b/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java
@@ -37,8 +37,8 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.lucene.tests.util.LuceneTestCase;
 import org.opensearch.common.Booleans;
-import org.opensearch.common.Strings;
 import org.opensearch.common.SuppressForbidden;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.util.FileSystemUtils;
 import org.opensearch.common.io.PathUtils;
 import org.opensearch.common.network.IfConfig;
diff --git a/test/framework/src/main/java/org/opensearch/repositories/AbstractThirdPartyRepositoryTestCase.java b/test/framework/src/main/java/org/opensearch/repositories/AbstractThirdPartyRepositoryTestCase.java
index 8ddaba8067b2d..5c28d9f83a4ee 100644
--- a/test/framework/src/main/java/org/opensearch/repositories/AbstractThirdPartyRepositoryTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/repositories/AbstractThirdPartyRepositoryTestCase.java
@@ -36,13 +36,13 @@
 import org.opensearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse;
 import org.opensearch.action.admin.cluster.snapshots.delete.DeleteSnapshotRequest;
 import org.opensearch.action.support.PlainActionFuture;
-import org.opensearch.common.Strings;
 import org.opensearch.common.blobstore.BlobMetadata;
 import org.opensearch.common.blobstore.BlobPath;
 import org.opensearch.common.blobstore.BlobStore;
 import org.opensearch.common.blobstore.support.PlainBlobMetadata;
 import org.opensearch.common.settings.SecureSettings;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.repositories.blobstore.BlobStoreRepository;
 import org.opensearch.repositories.blobstore.BlobStoreTestUtil;
 import org.opensearch.snapshots.SnapshotState;
diff --git a/test/framework/src/main/java/org/opensearch/repositories/blobstore/BlobStoreTestUtil.java b/test/framework/src/main/java/org/opensearch/repositories/blobstore/BlobStoreTestUtil.java
index b89656b1d2c77..df1af3fde3b14 100644
--- a/test/framework/src/main/java/org/opensearch/repositories/blobstore/BlobStoreTestUtil.java
+++ b/test/framework/src/main/java/org/opensearch/repositories/blobstore/BlobStoreTestUtil.java
@@ -47,13 +47,13 @@
 import org.opensearch.cluster.node.DiscoveryNodes;
 import org.opensearch.cluster.service.ClusterApplierService;
 import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.common.Strings;
 import org.opensearch.common.blobstore.BlobContainer;
 import org.opensearch.common.blobstore.BlobMetadata;
 import org.opensearch.common.blobstore.BlobPath;
 import org.opensearch.common.blobstore.BlobStore;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.xcontent.LoggingDeprecationHandler;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.common.xcontent.XContentType;
@@ -216,7 +216,7 @@ private static void assertIndexUUIDs(BlobStoreRepository repository, RepositoryD
                 .filter(s -> s.startsWith("extra") == false)
                 .collect(Collectors.toList());
         }
-        assertThat(foundIndexUUIDs, containsInAnyOrder(expectedIndexUUIDs.toArray(Strings.EMPTY_ARRAY)));
+        assertThat(foundIndexUUIDs, containsInAnyOrder(expectedIndexUUIDs.toArray(org.opensearch.common.Strings.EMPTY_ARRAY)));
         for (String indexId : foundIndexUUIDs) {
             final Set<String> indexMetaGenerationsFound = indicesContainer.children()
                 .get(indexId)
@@ -247,7 +247,7 @@ private static void assertSnapshotUUIDs(BlobStoreRepository repository, Reposito
                 .filter(p -> p.startsWith(prefix))
                 .map(p -> p.replace(prefix, "").replace(".dat", ""))
                 .collect(Collectors.toSet());
-            assertThat(foundSnapshotUUIDs, containsInAnyOrder(expectedSnapshotUUIDs.toArray(Strings.EMPTY_ARRAY)));
+            assertThat(foundSnapshotUUIDs, containsInAnyOrder(expectedSnapshotUUIDs.toArray(org.opensearch.common.Strings.EMPTY_ARRAY)));
         }
 
         final BlobContainer indicesContainer = repository.getBlobContainer().children().get("indices");
diff --git a/test/framework/src/main/java/org/opensearch/repositories/blobstore/OpenSearchMockAPIBasedRepositoryIntegTestCase.java b/test/framework/src/main/java/org/opensearch/repositories/blobstore/OpenSearchMockAPIBasedRepositoryIntegTestCase.java
index 28153e0ecce9d..31ba7bb89c60e 100644
--- a/test/framework/src/main/java/org/opensearch/repositories/blobstore/OpenSearchMockAPIBasedRepositoryIntegTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/repositories/blobstore/OpenSearchMockAPIBasedRepositoryIntegTestCase.java
@@ -43,11 +43,11 @@
 import org.apache.lucene.tests.util.LuceneTestCase;
 import org.opensearch.action.admin.indices.forcemerge.ForceMergeResponse;
 import org.opensearch.cluster.metadata.IndexMetadata;
-import org.opensearch.common.Strings;
 import org.opensearch.common.SuppressForbidden;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.network.InetAddresses;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.repositories.RepositoriesService;
 import org.opensearch.repositories.Repository;
 import org.opensearch.repositories.RepositoryMissingException;
diff --git a/test/framework/src/main/java/org/opensearch/test/AbstractSerializingTestCase.java b/test/framework/src/main/java/org/opensearch/test/AbstractSerializingTestCase.java
index aa6187cba5327..152691bdb38a3 100644
--- a/test/framework/src/main/java/org/opensearch/test/AbstractSerializingTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/test/AbstractSerializingTestCase.java
@@ -32,8 +32,8 @@
 
 package org.opensearch.test;
 
-import org.opensearch.common.Strings;
 import org.opensearch.common.io.stream.Writeable;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.core.xcontent.XContentParser;
diff --git a/test/framework/src/main/java/org/opensearch/test/AbstractXContentTestCase.java b/test/framework/src/main/java/org/opensearch/test/AbstractXContentTestCase.java
index b0abe854d3ce7..d2dfa4ef628e5 100644
--- a/test/framework/src/main/java/org/opensearch/test/AbstractXContentTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/test/AbstractXContentTestCase.java
@@ -35,8 +35,8 @@
 import org.opensearch.common.CheckedBiConsumer;
 import org.opensearch.common.CheckedBiFunction;
 import org.opensearch.common.CheckedFunction;
-import org.opensearch.common.Strings;
 import org.opensearch.common.bytes.BytesReference;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContent;
 import org.opensearch.core.xcontent.XContent;
 import org.opensearch.core.xcontent.XContentBuilder;
diff --git a/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java b/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java
index 8743c78e28bef..c5241766bd808 100644
--- a/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java
+++ b/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java
@@ -68,10 +68,8 @@
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.Nullable;
 import org.opensearch.common.Randomness;
-import org.opensearch.common.Strings;
 import org.opensearch.common.breaker.CircuitBreaker;
 import org.opensearch.common.component.LifecycleListener;
-import org.opensearch.core.util.FileSystemUtils;
 import org.opensearch.common.io.stream.NamedWriteableRegistry;
 import org.opensearch.common.lease.Releasables;
 import org.opensearch.common.settings.MockSecureSettings;
@@ -87,6 +85,8 @@
 import org.opensearch.common.util.concurrent.ThreadContext;
 import org.opensearch.common.util.set.Sets;
 import org.opensearch.common.util.io.IOUtils;
+import org.opensearch.core.common.Strings;
+import org.opensearch.core.util.FileSystemUtils;
 import org.opensearch.env.Environment;
 import org.opensearch.env.NodeEnvironment;
 import org.opensearch.env.ShardLockObtainFailedException;
diff --git a/test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java b/test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java
index 5af7be76b7b86..95df6d7b7860d 100644
--- a/test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java
@@ -41,8 +41,8 @@
 import org.apache.lucene.search.Sort;
 import org.apache.lucene.search.TotalHits;
 import org.apache.lucene.tests.util.LuceneTestCase;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.OpenSearchException;
-import org.opensearch.ExceptionsHelper;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.DocWriteResponse;
 import org.opensearch.action.admin.cluster.health.ClusterHealthRequest;
@@ -1594,7 +1594,7 @@ public void indexRandom(boolean forceRefresh, boolean dummyDocuments, boolean ma
         }
         final List<Exception> actualErrors = new ArrayList<>();
         for (Tuple<IndexRequestBuilder, Exception> tuple : errors) {
-            Throwable t = ExceptionsHelper.unwrapCause(tuple.v2());
+            Throwable t = BaseExceptionsHelper.unwrapCause(tuple.v2());
             if (t instanceof OpenSearchRejectedExecutionException) {
                 logger.debug("Error indexing doc: " + t.getMessage() + ", reindexing.");
                 tuple.v1().execute().actionGet(); // re-index if rejected
@@ -1928,7 +1928,7 @@ protected boolean ignoreExternalCluster() {
 
     protected TestCluster buildTestCluster(Scope scope, long seed) throws IOException {
         String clusterAddresses = System.getProperty(TESTS_CLUSTER);
-        if (Strings.hasLength(clusterAddresses) && ignoreExternalCluster() == false) {
+        if (org.opensearch.core.common.Strings.hasLength(clusterAddresses) && ignoreExternalCluster() == false) {
             if (scope == Scope.TEST) {
                 throw new IllegalArgumentException("Cannot run TEST scope test with " + TESTS_CLUSTER);
             }
diff --git a/test/framework/src/main/java/org/opensearch/test/OpenSearchSingleNodeTestCase.java b/test/framework/src/main/java/org/opensearch/test/OpenSearchSingleNodeTestCase.java
index 3d03c3d4b04c9..bf797ef6b310b 100644
--- a/test/framework/src/main/java/org/opensearch/test/OpenSearchSingleNodeTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/test/OpenSearchSingleNodeTestCase.java
@@ -45,14 +45,14 @@
 import org.opensearch.cluster.metadata.Metadata;
 import org.opensearch.cluster.routing.allocation.DiskThresholdSettings;
 import org.opensearch.common.Priority;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.unit.TimeValue;
 import org.opensearch.common.util.BigArrays;
 import org.opensearch.common.util.concurrent.OpenSearchExecutors;
+import org.opensearch.common.util.io.IOUtils;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.XContentBuilder;
-import org.opensearch.common.util.io.IOUtils;
 import org.opensearch.env.Environment;
 import org.opensearch.env.NodeEnvironment;
 import org.opensearch.index.Index;
diff --git a/test/framework/src/main/java/org/opensearch/test/junit/listeners/ReproduceInfoPrinter.java b/test/framework/src/main/java/org/opensearch/test/junit/listeners/ReproduceInfoPrinter.java
index b2d0705b937e2..4b2bf4ff609af 100644
--- a/test/framework/src/main/java/org/opensearch/test/junit/listeners/ReproduceInfoPrinter.java
+++ b/test/framework/src/main/java/org/opensearch/test/junit/listeners/ReproduceInfoPrinter.java
@@ -35,8 +35,8 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.lucene.util.Constants;
-import org.opensearch.common.Strings;
 import org.opensearch.common.SuppressForbidden;
+import org.opensearch.core.common.Strings;
 import org.opensearch.test.OpenSearchIntegTestCase;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase;
@@ -163,7 +163,7 @@ public ReproduceErrorMessageBuilder appendOpt(String sysPropName, String value)
                 // we always use the default prefix
                 return this;
             }
-            if (Strings.hasLength(value)) {
+            if (org.opensearch.core.common.Strings.hasLength(value)) {
                 return super.appendOpt(sysPropName, value);
             }
             return this;
diff --git a/test/framework/src/main/java/org/opensearch/test/rest/OpenSearchRestTestCase.java b/test/framework/src/main/java/org/opensearch/test/rest/OpenSearchRestTestCase.java
index a5d2e6793f397..6f9315ee02a1e 100644
--- a/test/framework/src/main/java/org/opensearch/test/rest/OpenSearchRestTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/test/rest/OpenSearchRestTestCase.java
@@ -1058,10 +1058,10 @@ protected static boolean aliasExists(String index, String alias) throws IOExcept
     @SuppressWarnings("unchecked")
     protected static Map<String, Object> getAlias(final String index, final String alias) throws IOException {
         String endpoint = "/_alias";
-        if (false == Strings.isEmpty(index)) {
+        if (false == org.opensearch.core.common.Strings.isEmpty(index)) {
             endpoint = index + endpoint;
         }
-        if (false == Strings.isEmpty(alias)) {
+        if (false == org.opensearch.core.common.Strings.isEmpty(alias)) {
             endpoint = endpoint + "/" + alias;
         }
         Map<String, Object> getAliasResponse = getAsMap(endpoint);
diff --git a/test/framework/src/main/java/org/opensearch/test/rest/yaml/OpenSearchClientYamlSuiteTestCase.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/OpenSearchClientYamlSuiteTestCase.java
index 43482cf0f6656..a051e716e165f 100644
--- a/test/framework/src/main/java/org/opensearch/test/rest/yaml/OpenSearchClientYamlSuiteTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/OpenSearchClientYamlSuiteTestCase.java
@@ -300,7 +300,7 @@ private static void addSuite(Path root, Path file, Map<String, Set<Path>> files)
 
     private static String[] resolvePathsProperty(String propertyName, String defaultValue) {
         String property = System.getProperty(propertyName);
-        if (!Strings.hasLength(property)) {
+        if (!org.opensearch.core.common.Strings.hasLength(property)) {
             return defaultValue == null ? Strings.EMPTY_ARRAY : new String[] { defaultValue };
         } else {
             return property.split(PATHS_SEPARATOR);
diff --git a/test/framework/src/main/java/org/opensearch/test/rest/yaml/Stash.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/Stash.java
index 8a064f42269b8..4f5dd35602256 100644
--- a/test/framework/src/main/java/org/opensearch/test/rest/yaml/Stash.java
+++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/Stash.java
@@ -34,7 +34,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContentFragment;
 import org.opensearch.core.xcontent.XContentBuilder;
 
diff --git a/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/DoSection.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/DoSection.java
index cad5adba24953..35296de61079f 100644
--- a/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/DoSection.java
+++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/DoSection.java
@@ -39,9 +39,9 @@
 import org.opensearch.client.Node;
 import org.opensearch.client.NodeSelector;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.logging.HeaderWarning;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.DeprecationHandler;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.XContentLocation;
@@ -309,7 +309,7 @@ public void execute(ClientYamlTestExecutionContext executionContext) throws IOEx
                 apiCallSection.getHeaders(),
                 apiCallSection.getNodeSelector()
             );
-            if (Strings.hasLength(catchParam)) {
+            if (org.opensearch.core.common.Strings.hasLength(catchParam)) {
                 String catchStatusCode;
                 if (catches.containsKey(catchParam)) {
                     catchStatusCode = catches.get(catchParam).v1();
diff --git a/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/SkipSection.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/SkipSection.java
index f96dcfa3e0246..0e3dec78e3bdf 100644
--- a/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/SkipSection.java
+++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/SkipSection.java
@@ -33,7 +33,7 @@
 
 import org.opensearch.Version;
 import org.opensearch.common.ParsingException;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.test.VersionUtils;
 import org.opensearch.test.rest.yaml.Features;
@@ -117,10 +117,10 @@ public static SkipSection parse(XContentParser parser) throws IOException {
 
         parser.nextToken();
 
-        if (!Strings.hasLength(version) && features.isEmpty()) {
+        if (!org.opensearch.core.common.Strings.hasLength(version) && features.isEmpty()) {
             throw new ParsingException(parser.getTokenLocation(), "version or features is mandatory within skip section");
         }
-        if (Strings.hasLength(version) && !Strings.hasLength(reason)) {
+        if (org.opensearch.core.common.Strings.hasLength(version) && !Strings.hasLength(reason)) {
             throw new ParsingException(parser.getTokenLocation(), "reason is mandatory within skip version section");
         }
         return new SkipSection(version, features, reason);
diff --git a/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java b/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java
index fed14d6bbc1ba..94e66a34d6cea 100644
--- a/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java
@@ -39,6 +39,7 @@
 import org.apache.logging.log4j.util.Supplier;
 import org.apache.lucene.util.CollectionUtil;
 import org.apache.lucene.util.Constants;
+import org.opensearch.BaseExceptionsHelper;
 import org.opensearch.LegacyESVersion;
 import org.opensearch.OpenSearchException;
 import org.opensearch.ExceptionsHelper;
@@ -557,7 +558,7 @@ public void onRequestSent(
             serviceA.submitRequest(nodeB, ACTION, TransportRequest.Empty.INSTANCE, EmptyTransportResponseHandler.INSTANCE_SAME).get();
         } catch (ExecutionException e) {
             assertThat(e.getCause(), instanceOf(OpenSearchException.class));
-            assertThat(ExceptionsHelper.unwrapCause(e.getCause()).getMessage(), equalTo("simulated"));
+            assertThat(BaseExceptionsHelper.unwrapCause(e.getCause()).getMessage(), equalTo("simulated"));
         }
 
         // use assert busy as callbacks are called on a different thread
@@ -576,7 +577,7 @@ public void onRequestSent(
             serviceB.submitRequest(nodeA, ACTION, TransportRequest.Empty.INSTANCE, EmptyTransportResponseHandler.INSTANCE_SAME).get();
         } catch (ExecutionException e) {
             assertThat(e.getCause(), instanceOf(OpenSearchException.class));
-            assertThat(ExceptionsHelper.unwrapCause(e.getCause()).getMessage(), equalTo("simulated"));
+            assertThat(BaseExceptionsHelper.unwrapCause(e.getCause()).getMessage(), equalTo("simulated"));
         }
 
         // use assert busy as callbacks are called on a different thread
@@ -596,7 +597,7 @@ public void onRequestSent(
             serviceA.submitRequest(nodeA, ACTION, TransportRequest.Empty.INSTANCE, EmptyTransportResponseHandler.INSTANCE_SAME).get();
         } catch (ExecutionException e) {
             assertThat(e.getCause(), instanceOf(OpenSearchException.class));
-            assertThat(ExceptionsHelper.unwrapCause(e.getCause()).getMessage(), equalTo("simulated"));
+            assertThat(BaseExceptionsHelper.unwrapCause(e.getCause()).getMessage(), equalTo("simulated"));
         }
 
         // use assert busy as callbacks are called on a different thread
@@ -1650,7 +1651,7 @@ public void handleResponse(StringMessageResponse response) {
 
                 @Override
                 public void handleException(TransportException exp) {
-                    Throwable cause = ExceptionsHelper.unwrapCause(exp);
+                    Throwable cause = BaseExceptionsHelper.unwrapCause(exp);
                     assertThat(cause, instanceOf(ConnectTransportException.class));
                     assertThat(((ConnectTransportException) cause).node(), equalTo(nodeA));
                 }
@@ -1661,7 +1662,7 @@ public void handleException(TransportException exp) {
             res.txGet();
             fail("exception should be thrown");
         } catch (Exception e) {
-            Throwable cause = ExceptionsHelper.unwrapCause(e);
+            Throwable cause = BaseExceptionsHelper.unwrapCause(e);
             assertThat(cause, instanceOf(ConnectTransportException.class));
             assertThat(((ConnectTransportException) cause).node(), equalTo(nodeA));
         }