Merge remote-tracking branch 'upstream/main' into 7424

Signed-off-by: Ashish Singh <[email protected]>
opensearch-project · May 18, 2023 · 5ae6109 · 5ae6109
2 parents 0d87c8c + 6d9c82f
commit 5ae6109
Show file tree

Hide file tree

Showing 466 changed files with 2,283 additions and 1,680 deletions.
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
@@ -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
@@ -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
@@ -72,14 +72,14 @@
 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;
 import org.opensearch.common.unit.TimeValue;
 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;

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
@@ -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
@@ -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/AnalyzeRequest.java b/client/rest-high-level/src/main/java/org/opensearch/client/indices/AnalyzeRequest.java
@@ -33,8 +33,8 @@
 package org.opensearch.client.indices;
 
 import org.opensearch.client.Validatable;
-import org.opensearch.common.Strings;
 import org.opensearch.common.settings.Settings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContentFragment;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;

diff --git a/...igh-level/src/main/java/org/opensearch/client/indices/ComponentTemplatesExistRequest.java b/...igh-level/src/main/java/org/opensearch/client/indices/ComponentTemplatesExistRequest.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.client.indices;
 
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 
 /**
  * A request to check for the existence of component templates

diff --git a/...evel/src/main/java/org/opensearch/client/indices/ComposableIndexTemplateExistRequest.java b/...evel/src/main/java/org/opensearch/client/indices/ComposableIndexTemplateExistRequest.java
@@ -32,7 +32,7 @@
 
 package org.opensearch.client.indices;
 
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 
 /**
  * A request to check for the existence of index templates

diff --git a/...nt/rest-high-level/src/main/java/org/opensearch/client/indices/DetailAnalyzeResponse.java b/...nt/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/.../rest-high-level/src/main/java/org/opensearch/client/indices/GetFieldMappingsRequest.java b/.../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/...rest-high-level/src/main/java/org/opensearch/client/indices/GetIndexTemplatesRequest.java b/...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
@@ -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/...t-high-level/src/main/java/org/opensearch/client/indices/PutComponentTemplateRequest.java b/...t-high-level/src/main/java/org/opensearch/client/indices/PutComponentTemplateRequest.java
@@ -33,7 +33,7 @@
 
 import org.opensearch.client.TimedRequest;
 import org.opensearch.cluster.metadata.ComponentTemplate;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
 

diff --git a/...-level/src/main/java/org/opensearch/client/indices/PutComposableIndexTemplateRequest.java b/...-level/src/main/java/org/opensearch/client/indices/PutComposableIndexTemplateRequest.java
@@ -33,7 +33,7 @@
 
 import org.opensearch.client.TimedRequest;
 import org.opensearch.cluster.metadata.ComposableIndexTemplate;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.core.xcontent.ToXContentObject;
 import org.opensearch.core.xcontent.XContentBuilder;
 

diff --git a/...-high-level/src/main/java/org/opensearch/client/indices/SimulateIndexTemplateRequest.java b/...-high-level/src/main/java/org/opensearch/client/indices/SimulateIndexTemplateRequest.java
@@ -34,7 +34,7 @@
 
 import org.opensearch.client.TimedRequest;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 
 /**
  * A request to simulate matching a provided index name and an optional new index template against the existing index templates.

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
@@ -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
@@ -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
@@ -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/...nt/rest-high-level/src/test/java/org/opensearch/client/IndicesRequestConvertersTests.java b/...nt/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
@@ -65,20 +65,20 @@
 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;
 import org.opensearch.common.io.Streams;
 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;

diff --git a/...t/rest-high-level/src/test/java/org/opensearch/client/indices/CloseIndexRequestTests.java b/...t/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
@@ -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;