diff --git a/client/benchmark/src/main/java/org/opensearch/client/benchmark/AbstractBenchmark.java b/client/benchmark/src/main/java/org/opensearch/client/benchmark/AbstractBenchmark.java index 69f622c1deac9..e399da409c48a 100644 --- a/client/benchmark/src/main/java/org/opensearch/client/benchmark/AbstractBenchmark.java +++ b/client/benchmark/src/main/java/org/opensearch/client/benchmark/AbstractBenchmark.java @@ -22,7 +22,7 @@ import org.opensearch.client.benchmark.ops.bulk.BulkRequestExecutor; import org.opensearch.client.benchmark.ops.search.SearchBenchmarkTask; import org.opensearch.client.benchmark.ops.search.SearchRequestExecutor; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import java.io.Closeable; import java.lang.management.GarbageCollectorMXBean; diff --git a/client/benchmark/src/main/java/org/opensearch/client/benchmark/BenchmarkMain.java b/client/benchmark/src/main/java/org/opensearch/client/benchmark/BenchmarkMain.java index 466a3fcc8560d..cdd98e47a0873 100644 --- a/client/benchmark/src/main/java/org/opensearch/client/benchmark/BenchmarkMain.java +++ b/client/benchmark/src/main/java/org/opensearch/client/benchmark/BenchmarkMain.java @@ -20,7 +20,7 @@ import org.opensearch.client.benchmark.rest.RestClientBenchmark; import org.opensearch.client.benchmark.transport.TransportClientBenchmark; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import java.util.Arrays; diff --git a/client/benchmark/src/main/java/org/opensearch/client/benchmark/BenchmarkRunner.java b/client/benchmark/src/main/java/org/opensearch/client/benchmark/BenchmarkRunner.java index b32c0876bdd5b..6b3c61918122b 100644 --- a/client/benchmark/src/main/java/org/opensearch/client/benchmark/BenchmarkRunner.java +++ b/client/benchmark/src/main/java/org/opensearch/client/benchmark/BenchmarkRunner.java @@ -22,7 +22,7 @@ import org.opensearch.client.benchmark.metrics.MetricsCalculator; import org.opensearch.client.benchmark.metrics.Sample; import org.opensearch.client.benchmark.metrics.SampleRecorder; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import java.util.Arrays; import java.util.List; diff --git a/client/benchmark/src/main/java/org/opensearch/client/benchmark/ops/bulk/BulkBenchmarkTask.java b/client/benchmark/src/main/java/org/opensearch/client/benchmark/ops/bulk/BulkBenchmarkTask.java index 19fa63aa2adc0..d09de28fe13f2 100644 --- a/client/benchmark/src/main/java/org/opensearch/client/benchmark/ops/bulk/BulkBenchmarkTask.java +++ b/client/benchmark/src/main/java/org/opensearch/client/benchmark/ops/bulk/BulkBenchmarkTask.java @@ -24,8 +24,8 @@ import org.opensearch.client.benchmark.BenchmarkTask; import org.opensearch.client.benchmark.metrics.Sample; import org.opensearch.client.benchmark.metrics.SampleRecorder; -import org.elasticsearch.common.SuppressForbidden; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.SuppressForbidden; +import org.opensearch.common.io.PathUtils; import java.io.BufferedReader; import java.io.IOException; diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/NodesResponseHeader.java b/client/rest-high-level/src/main/java/org/opensearch/client/NodesResponseHeader.java index 9bf43da14d131..0147d45f1c66d 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/NodesResponseHeader.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/NodesResponseHeader.java @@ -20,7 +20,7 @@ import org.opensearch.OpenSearchException; import org.opensearch.action.support.nodes.BaseNodesResponse; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.ToXContent; 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 0d9f09e6b55f4..d4880a5b3792e 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 @@ -28,7 +28,6 @@ import org.apache.http.entity.ContentType; import org.apache.http.nio.entity.NByteArrayEntity; import org.apache.lucene.util.BytesRef; -import org.opensearch.client.Request; import org.opensearch.action.DocWriteRequest; import org.opensearch.action.admin.cluster.health.ClusterHealthRequest; import org.opensearch.action.admin.cluster.storedscripts.DeleteStoredScriptRequest; @@ -56,13 +55,13 @@ import org.opensearch.client.indices.AnalyzeRequest; import org.opensearch.client.tasks.TaskId; import org.opensearch.cluster.health.ClusterHealthStatus; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Priority; import org.opensearch.common.Strings; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.lucene.uid.Versions; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.CollectionUtils; import org.elasticsearch.common.xcontent.DeprecationHandler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/RestHighLevelClient.java b/client/rest-high-level/src/main/java/org/opensearch/client/RestHighLevelClient.java index 15ea64a53f615..b5e67f5af43b1 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/RestHighLevelClient.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/RestHighLevelClient.java @@ -73,8 +73,8 @@ import org.opensearch.client.core.TermVectorsRequest; import org.opensearch.client.core.TermVectorsResponse; import org.opensearch.client.tasks.TaskSubmissionResponse; -import org.elasticsearch.common.CheckedConsumer; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedConsumer; +import org.opensearch.common.CheckedFunction; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ContextParser; import org.elasticsearch.common.xcontent.DeprecationHandler; diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/TimedRequest.java b/client/rest-high-level/src/main/java/org/opensearch/client/TimedRequest.java index 40f0db0babf05..234fba390dc79 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/TimedRequest.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/TimedRequest.java @@ -18,9 +18,9 @@ */ package org.opensearch.client; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; -import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds; +import static org.opensearch.common.unit.TimeValue.timeValueSeconds; /** * A base request for any requests that supply timeouts. diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/ValidationException.java b/client/rest-high-level/src/main/java/org/opensearch/client/ValidationException.java index d9153a1ea1c3f..cb20c53670d0b 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/ValidationException.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/ValidationException.java @@ -18,7 +18,7 @@ */ package org.opensearch.client; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import java.util.ArrayList; import java.util.Arrays; diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/core/PageParams.java b/client/rest-high-level/src/main/java/org/opensearch/client/core/PageParams.java index d2ecf741b2477..9d239a0febaaa 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/core/PageParams.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/core/PageParams.java @@ -18,7 +18,7 @@ */ package org.opensearch.client.core; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.ToXContentObject; diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/core/TermVectorsRequest.java b/client/rest-high-level/src/main/java/org/opensearch/client/core/TermVectorsRequest.java index 0ad2214417f8b..8b1672d23ac04 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/core/TermVectorsRequest.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/core/TermVectorsRequest.java @@ -20,7 +20,7 @@ package org.opensearch.client.core; import org.opensearch.client.Validatable; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/core/TermVectorsResponse.java b/client/rest-high-level/src/main/java/org/opensearch/client/core/TermVectorsResponse.java index 8174af691da48..bb4ce43faf249 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/core/TermVectorsResponse.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/core/TermVectorsResponse.java @@ -19,7 +19,7 @@ package org.opensearch.client.core; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/indices/CloseIndexResponse.java b/client/rest-high-level/src/main/java/org/opensearch/client/indices/CloseIndexResponse.java index ccccc57689514..e287dece0d766 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/indices/CloseIndexResponse.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/indices/CloseIndexResponse.java @@ -21,7 +21,7 @@ import org.opensearch.OpenSearchException; import org.opensearch.action.support.DefaultShardOperationFailedException; import org.opensearch.action.support.master.ShardsAcknowledgedResponse; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/indices/DataStream.java b/client/rest-high-level/src/main/java/org/opensearch/client/indices/DataStream.java index 9a1056a759c0f..8ecb1027f2e53 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/indices/DataStream.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/indices/DataStream.java @@ -19,7 +19,7 @@ package org.opensearch.client.indices; import org.opensearch.cluster.health.ClusterHealthStatus; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetComponentTemplatesRequest.java b/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetComponentTemplatesRequest.java index 33e6a561fc43e..ac13c77a85452 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetComponentTemplatesRequest.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetComponentTemplatesRequest.java @@ -21,8 +21,8 @@ import org.opensearch.client.TimedRequest; import org.opensearch.client.Validatable; -import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.Nullable; +import org.opensearch.common.unit.TimeValue; /** * A request to read the content of component templates diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetComposableIndexTemplateRequest.java b/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetComposableIndexTemplateRequest.java index ffa0e9f71637c..9629e5a13f994 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetComposableIndexTemplateRequest.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/indices/GetComposableIndexTemplateRequest.java @@ -21,8 +21,8 @@ import org.opensearch.client.TimedRequest; import org.opensearch.client.Validatable; -import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.Nullable; +import org.opensearch.common.unit.TimeValue; /** * A request to read the content of index templates 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 37e9c1c1b334b..09d99a9dbaae6 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 @@ -21,9 +21,9 @@ import org.opensearch.client.TimedRequest; import org.opensearch.client.Validatable; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.Arrays; import java.util.List; diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/indices/IndexTemplateMetadata.java b/client/rest-high-level/src/main/java/org/opensearch/client/indices/IndexTemplateMetadata.java index c9d710f13b5a1..858298e97cbd9 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/indices/IndexTemplateMetadata.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/indices/IndexTemplateMetadata.java @@ -21,7 +21,7 @@ import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.MappingMetadata; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.settings.Settings; diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/indices/PutIndexTemplateRequest.java b/client/rest-high-level/src/main/java/org/opensearch/client/indices/PutIndexTemplateRequest.java index 29c6f78e05934..f83ef8363d1ff 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/indices/PutIndexTemplateRequest.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/indices/PutIndexTemplateRequest.java @@ -25,7 +25,7 @@ import org.opensearch.action.admin.indices.alias.Alias; import org.opensearch.action.support.IndicesOptions; import org.opensearch.action.support.master.MasterNodeRequest; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.settings.Settings; diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/indices/SimulateIndexTemplateRequest.java b/client/rest-high-level/src/main/java/org/opensearch/client/indices/SimulateIndexTemplateRequest.java index 28170a1e9f345..5bec8eca454fd 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/indices/SimulateIndexTemplateRequest.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/indices/SimulateIndexTemplateRequest.java @@ -20,7 +20,7 @@ package org.opensearch.client.indices; import org.opensearch.client.TimedRequest; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; /** diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/indices/SimulateIndexTemplateResponse.java b/client/rest-high-level/src/main/java/org/opensearch/client/indices/SimulateIndexTemplateResponse.java index 9fa89db972f1a..8f218cafc17d6 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/indices/SimulateIndexTemplateResponse.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/indices/SimulateIndexTemplateResponse.java @@ -19,7 +19,7 @@ package org.opensearch.client.indices; import org.opensearch.cluster.metadata.Template; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/indices/rollover/RolloverRequest.java b/client/rest-high-level/src/main/java/org/opensearch/client/indices/rollover/RolloverRequest.java index ae92e948f09f6..55d4c8ddce377 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/indices/rollover/RolloverRequest.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/indices/rollover/RolloverRequest.java @@ -25,7 +25,7 @@ import org.opensearch.client.TimedRequest; import org.opensearch.client.indices.CreateIndexRequest; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotLifecyclePolicy.java b/client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotLifecyclePolicy.java index d5d9008527cda..6352628b61eef 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotLifecyclePolicy.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotLifecyclePolicy.java @@ -19,7 +19,7 @@ package org.opensearch.client.slm; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.Strings; import org.elasticsearch.common.xcontent.ConstructingObjectParser; diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotLifecyclePolicyMetadata.java b/client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotLifecyclePolicyMetadata.java index 9b77d22d68032..eed48a8eb736a 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotLifecyclePolicyMetadata.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotLifecyclePolicyMetadata.java @@ -19,7 +19,7 @@ package org.opensearch.client.slm; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.Strings; import org.elasticsearch.common.xcontent.ConstructingObjectParser; diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotLifecycleStats.java b/client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotLifecycleStats.java index fd717275d6cf8..75376532809d1 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotLifecycleStats.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotLifecycleStats.java @@ -21,7 +21,7 @@ import org.elasticsearch.common.ParseField; import org.opensearch.common.Strings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.ToXContentFragment; import org.elasticsearch.common.xcontent.ToXContentObject; diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotRetentionConfiguration.java b/client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotRetentionConfiguration.java index 6b5aa23742b83..63c36014e49fc 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotRetentionConfiguration.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotRetentionConfiguration.java @@ -19,10 +19,10 @@ package org.opensearch.client.slm; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.Strings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/tasks/CancelTasksRequest.java b/client/rest-high-level/src/main/java/org/opensearch/client/tasks/CancelTasksRequest.java index 2799084a209a4..b18d020279b66 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/tasks/CancelTasksRequest.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/tasks/CancelTasksRequest.java @@ -19,7 +19,7 @@ package org.opensearch.client.tasks; import org.opensearch.client.Validatable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.ArrayList; import java.util.List; diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/tasks/GetTaskRequest.java b/client/rest-high-level/src/main/java/org/opensearch/client/tasks/GetTaskRequest.java index 8758145fea372..c367eaa3c571e 100644 --- a/client/rest-high-level/src/main/java/org/opensearch/client/tasks/GetTaskRequest.java +++ b/client/rest-high-level/src/main/java/org/opensearch/client/tasks/GetTaskRequest.java @@ -20,7 +20,7 @@ import org.opensearch.client.Validatable; import org.opensearch.client.ValidationException; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.Objects; import java.util.Optional; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/BulkProcessorIT.java b/client/rest-high-level/src/test/java/org/opensearch/client/BulkProcessorIT.java index db511c5b9a537..7effe56e046a3 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/BulkProcessorIT.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/BulkProcessorIT.java @@ -36,7 +36,7 @@ import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.index.mapper.MapperService; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/BulkProcessorRetryIT.java b/client/rest-high-level/src/test/java/org/opensearch/client/BulkProcessorRetryIT.java index 66ba3dfa9c2c0..f7f40bb90f65b 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/BulkProcessorRetryIT.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/BulkProcessorRetryIT.java @@ -27,7 +27,7 @@ import org.opensearch.action.bulk.BulkResponse; import org.opensearch.action.get.MultiGetRequest; import org.opensearch.action.index.IndexRequest; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.rest.RestStatus; import org.opensearch.transport.RemoteTransportException; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/ClusterClientIT.java b/client/rest-high-level/src/test/java/org/opensearch/client/ClusterClientIT.java index b3fcc8df9f8c7..2ca217c977701 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/ClusterClientIT.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/ClusterClientIT.java @@ -50,7 +50,7 @@ import org.opensearch.common.compress.CompressedXContent; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeUnit; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.support.XContentMapValues; import org.elasticsearch.indices.recovery.RecoverySettings; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/CustomRestHighLevelClientTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/CustomRestHighLevelClientTests.java index 839bbed5e6af6..4550142dd05a1 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/CustomRestHighLevelClientTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/CustomRestHighLevelClientTests.java @@ -41,7 +41,7 @@ import org.opensearch.action.main.MainResponse; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.cluster.ClusterName; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.test.ESTestCase; 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 f9e4659e9cd75..54e0cea652b87 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,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; @@ -2138,8 +2138,8 @@ public void testSimulateIndexTemplate() throws Exception { Settings settings = Settings.builder().put("index.number_of_shards", 1).build(); CompressedXContent mappings = new CompressedXContent("{\"properties\":{\"host_name\":{\"type\":\"keyword\"}}}"); AliasMetadata alias = AliasMetadata.builder("alias").writeIndex(true).build(); - Template template = new Template(settings, mappings, org.elasticsearch.common.collect.Map.of("alias", alias)); - List pattern = org.elasticsearch.common.collect.List.of("pattern"); + Template template = new Template(settings, mappings, org.opensearch.common.collect.Map.of("alias", alias)); + List pattern = org.opensearch.common.collect.List.of("pattern"); ComposableIndexTemplate indexTemplate = new ComposableIndexTemplate(pattern, template, Collections.emptyList(), 1L, 1L, new HashMap<>(), null); PutComposableIndexTemplateRequest putComposableIndexTemplateRequest = @@ -2152,7 +2152,7 @@ public void testSimulateIndexTemplate() throws Exception { SimulateIndexTemplateRequest simulateIndexTemplateRequest = new SimulateIndexTemplateRequest("pattern"); AliasMetadata simulationAlias = AliasMetadata.builder("simulation-alias").writeIndex(true).build(); ComposableIndexTemplate simulationTemplate = new ComposableIndexTemplate(pattern, new Template(null, null, - org.elasticsearch.common.collect.Map.of("simulation-alias", simulationAlias)), Collections.emptyList(), 2L, 1L, + org.opensearch.common.collect.Map.of("simulation-alias", simulationAlias)), Collections.emptyList(), 2L, 1L, new HashMap<>(), null); PutComposableIndexTemplateRequest newIndexTemplateReq = new PutComposableIndexTemplateRequest().name("used-for-simulation").create(true).indexTemplate(indexTemplate); 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 be43112f08200..b2ade50040258 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 @@ -60,10 +60,10 @@ import org.opensearch.client.indices.RandomCreateIndexGenerator; import org.opensearch.client.indices.ResizeRequest; import org.opensearch.client.indices.rollover.RolloverRequest; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.Strings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.CollectionUtils; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.test.ESTestCase; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/OpenSearchRestHighLevelClientTestCase.java b/client/rest-high-level/src/test/java/org/opensearch/client/OpenSearchRestHighLevelClientTestCase.java index 59808dadbae19..ba423cd2ed1eb 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/OpenSearchRestHighLevelClientTestCase.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/OpenSearchRestHighLevelClientTestCase.java @@ -33,8 +33,8 @@ import org.opensearch.client.cluster.RemoteInfoRequest; import org.opensearch.client.cluster.RemoteInfoResponse; import org.opensearch.client.indices.CreateIndexRequest; -import org.elasticsearch.common.Booleans; -import org.elasticsearch.common.CheckedRunnable; +import org.opensearch.common.Booleans; +import org.opensearch.common.CheckedRunnable; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; @@ -42,7 +42,7 @@ import org.opensearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.ingest.Pipeline; import org.opensearch.search.SearchHit; import org.opensearch.search.SearchModule; 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 6f7eeb32601b9..a6e70b4a2af11 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 @@ -62,11 +62,11 @@ import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +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.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentHelper; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/RestHighLevelClientTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/RestHighLevelClientTests.java index cdb5249e1e471..7c85f6afcc3d6 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/RestHighLevelClientTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/RestHighLevelClientTests.java @@ -52,9 +52,9 @@ import org.opensearch.action.search.ShardSearchFailure; import org.opensearch.client.core.MainRequest; import org.opensearch.client.core.MainResponse; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.util.set.Sets; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/SearchIT.java b/client/rest-high-level/src/test/java/org/opensearch/client/SearchIT.java index 69747f36fb8f0..3c1a383da14b8 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/SearchIT.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/SearchIT.java @@ -40,7 +40,7 @@ import org.opensearch.client.core.CountResponse; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/SnapshotRequestConvertersTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/SnapshotRequestConvertersTests.java index 75bb6fc98705a..b6794860152f6 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/SnapshotRequestConvertersTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/SnapshotRequestConvertersTests.java @@ -34,7 +34,7 @@ import org.opensearch.action.admin.cluster.snapshots.restore.RestoreSnapshotRequest; import org.opensearch.action.admin.cluster.snapshots.status.SnapshotsStatusRequest; import org.opensearch.action.support.master.AcknowledgedRequest; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.io.PathUtils; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.repositories.fs.FsRepository; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/TimedRequestTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/TimedRequestTests.java index 5099815f52dbc..f7ccf644908b2 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/TimedRequestTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/TimedRequestTests.java @@ -19,7 +19,7 @@ package org.opensearch.client; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; public class TimedRequestTests extends ESTestCase { diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/cluster/RemoteInfoResponseTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/cluster/RemoteInfoResponseTests.java index 89aaeb1c8e5a3..fa55d804c139e 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/cluster/RemoteInfoResponseTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/cluster/RemoteInfoResponseTests.java @@ -20,7 +20,7 @@ package org.opensearch.client.cluster; import org.opensearch.client.AbstractResponseTestCase; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.transport.ProxyConnectionStrategy; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/documentation/CRUDDocumentationIT.java b/client/rest-high-level/src/test/java/org/opensearch/client/documentation/CRUDDocumentationIT.java index 50d83d141ed2a..0036bd3949e7e 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/documentation/CRUDDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/documentation/CRUDDocumentationIT.java @@ -66,7 +66,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/documentation/ClusterClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/opensearch/client/documentation/ClusterClientDocumentationIT.java index a12190db97c9b..67e116d5df858 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/documentation/ClusterClientDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/documentation/ClusterClientDocumentationIT.java @@ -51,7 +51,7 @@ import org.opensearch.common.compress.CompressedXContent; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeUnit; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.indices.recovery.RecoverySettings; import org.opensearch.rest.RestStatus; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/documentation/IndicesClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/opensearch/client/documentation/IndicesClientDocumentationIT.java index ba38cd837b046..3ea7abcad7149 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/documentation/IndicesClientDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/documentation/IndicesClientDocumentationIT.java @@ -95,7 +95,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/documentation/IngestClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/opensearch/client/documentation/IngestClientDocumentationIT.java index 34d0e0932e603..c0e6657248b15 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/documentation/IngestClientDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/documentation/IngestClientDocumentationIT.java @@ -36,7 +36,7 @@ import org.opensearch.client.RequestOptions; import org.opensearch.client.RestHighLevelClient; import org.opensearch.common.bytes.BytesArray; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.ingest.PipelineConfiguration; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/documentation/SearchDocumentationIT.java b/client/rest-high-level/src/test/java/org/opensearch/client/documentation/SearchDocumentationIT.java index 7a379813d90e0..6d177c9e45881 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/documentation/SearchDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/documentation/SearchDocumentationIT.java @@ -56,7 +56,7 @@ import org.opensearch.common.document.DocumentField; import org.opensearch.common.text.Text; import org.opensearch.common.unit.Fuzziness; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.index.get.GetResult; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/documentation/SnapshotClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/opensearch/client/documentation/SnapshotClientDocumentationIT.java index c854e3530b24e..e9f5e9975cee9 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/documentation/SnapshotClientDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/documentation/SnapshotClientDocumentationIT.java @@ -48,9 +48,9 @@ import org.opensearch.client.indices.CreateIndexRequest; import org.opensearch.cluster.SnapshotsInProgress; import org.opensearch.cluster.metadata.RepositoryMetadata; -import org.elasticsearch.common.Booleans; +import org.opensearch.common.Booleans; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.repositories.fs.FsRepository; import org.opensearch.rest.RestStatus; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/documentation/StoredScriptsDocumentationIT.java b/client/rest-high-level/src/test/java/org/opensearch/client/documentation/StoredScriptsDocumentationIT.java index 45b8b0f702c56..40bb0ccc4f7b6 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/documentation/StoredScriptsDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/documentation/StoredScriptsDocumentationIT.java @@ -31,7 +31,7 @@ import org.opensearch.client.RestHighLevelClient; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/documentation/TasksClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/opensearch/client/documentation/TasksClientDocumentationIT.java index f95ae49a7b20e..31fc71f654450 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/documentation/TasksClientDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/documentation/TasksClientDocumentationIT.java @@ -31,7 +31,7 @@ import org.opensearch.client.RestHighLevelClient; import org.opensearch.client.tasks.CancelTasksRequest; import org.opensearch.client.tasks.CancelTasksResponse; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.tasks.TaskId; import org.opensearch.tasks.TaskInfo; 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 a5b86fa6b1d33..a799af42ebfa6 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 @@ -23,7 +23,7 @@ import org.opensearch.client.TimedRequest; import org.opensearch.client.ValidationException; import org.opensearch.common.Strings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import java.util.Optional; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/indices/rollover/RolloverRequestTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/indices/rollover/RolloverRequestTests.java index 0cea932da6c22..007a1a6f97a01 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/indices/rollover/RolloverRequestTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/indices/rollover/RolloverRequestTests.java @@ -24,7 +24,7 @@ import org.opensearch.action.admin.indices.rollover.MaxDocsCondition; import org.opensearch.action.admin.indices.rollover.MaxSizeCondition; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import java.util.ArrayList; diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/indices/rollover/RolloverResponseTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/indices/rollover/RolloverResponseTests.java index d0e8f4fdc9827..14d89ffc3768e 100644 --- a/client/rest-high-level/src/test/java/org/opensearch/client/indices/rollover/RolloverResponseTests.java +++ b/client/rest-high-level/src/test/java/org/opensearch/client/indices/rollover/RolloverResponseTests.java @@ -24,7 +24,7 @@ import org.opensearch.action.admin.indices.rollover.MaxDocsCondition; import org.opensearch.action.admin.indices.rollover.MaxSizeCondition; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.test.ESTestCase; diff --git a/client/transport/src/main/java/org/opensearch/transport/client/PreBuiltTransportClient.java b/client/transport/src/main/java/org/opensearch/transport/client/PreBuiltTransportClient.java index 297cf34ec9aad..91f6427b0af34 100644 --- a/client/transport/src/main/java/org/opensearch/transport/client/PreBuiltTransportClient.java +++ b/client/transport/src/main/java/org/opensearch/transport/client/PreBuiltTransportClient.java @@ -23,7 +23,7 @@ import io.netty.util.concurrent.GlobalEventExecutor; import org.opensearch.client.transport.TransportClient; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.network.NetworkModule; import org.opensearch.common.settings.Settings; import org.opensearch.index.reindex.ReindexPlugin; diff --git a/distribution/docker/src/test/java/org/elasticsearch/docker/test/DockerYmlTestSuiteIT.java b/distribution/docker/src/test/java/org/elasticsearch/docker/test/DockerYmlTestSuiteIT.java index 6b15df831f985..e5dc890ae282d 100644 --- a/distribution/docker/src/test/java/org/elasticsearch/docker/test/DockerYmlTestSuiteIT.java +++ b/distribution/docker/src/test/java/org/elasticsearch/docker/test/DockerYmlTestSuiteIT.java @@ -21,7 +21,7 @@ import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; import org.opensearch.OpenSearchException; import org.opensearch.client.Request; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.io.PathUtils; import org.opensearch.common.settings.Settings; import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate; import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; diff --git a/distribution/tools/keystore-cli/src/main/java/org/opensearch/common/settings/AddFileKeyStoreCommand.java b/distribution/tools/keystore-cli/src/main/java/org/opensearch/common/settings/AddFileKeyStoreCommand.java index 74c9436ba1e46..9766259b4e341 100644 --- a/distribution/tools/keystore-cli/src/main/java/org/opensearch/common/settings/AddFileKeyStoreCommand.java +++ b/distribution/tools/keystore-cli/src/main/java/org/opensearch/common/settings/AddFileKeyStoreCommand.java @@ -24,8 +24,8 @@ import org.opensearch.cli.ExitCodes; import org.opensearch.cli.Terminal; import org.opensearch.cli.UserException; -import org.elasticsearch.common.SuppressForbidden; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.SuppressForbidden; +import org.opensearch.common.io.PathUtils; import org.elasticsearch.env.Environment; import java.nio.file.Files; diff --git a/distribution/tools/keystore-cli/src/main/java/org/opensearch/common/settings/AddStringKeyStoreCommand.java b/distribution/tools/keystore-cli/src/main/java/org/opensearch/common/settings/AddStringKeyStoreCommand.java index 9fa2d912cf98b..d40217d48a07e 100644 --- a/distribution/tools/keystore-cli/src/main/java/org/opensearch/common/settings/AddStringKeyStoreCommand.java +++ b/distribution/tools/keystore-cli/src/main/java/org/opensearch/common/settings/AddStringKeyStoreCommand.java @@ -24,7 +24,7 @@ import org.opensearch.cli.ExitCodes; import org.opensearch.cli.Terminal; import org.opensearch.cli.UserException; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.elasticsearch.env.Environment; import java.io.BufferedReader; diff --git a/distribution/tools/keystore-cli/src/test/java/org/opensearch/bootstrap/BootstrapTests.java b/distribution/tools/keystore-cli/src/test/java/org/opensearch/bootstrap/BootstrapTests.java index d6eb13aca7020..c3fcb59726d94 100644 --- a/distribution/tools/keystore-cli/src/test/java/org/opensearch/bootstrap/BootstrapTests.java +++ b/distribution/tools/keystore-cli/src/test/java/org/opensearch/bootstrap/BootstrapTests.java @@ -18,7 +18,7 @@ */ package org.opensearch.bootstrap; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.common.settings.KeyStoreCommandTestCase; import org.opensearch.common.settings.KeyStoreWrapper; import org.opensearch.common.settings.SecureSettings; diff --git a/distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/AddFileKeyStoreCommandTests.java b/distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/AddFileKeyStoreCommandTests.java index 73151937fc656..d6b6980498f0d 100644 --- a/distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/AddFileKeyStoreCommandTests.java +++ b/distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/AddFileKeyStoreCommandTests.java @@ -22,7 +22,7 @@ import org.opensearch.cli.Command; import org.opensearch.cli.ExitCodes; import org.opensearch.cli.UserException; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.env.Environment; import java.io.IOException; diff --git a/distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreCommandTestCase.java b/distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreCommandTestCase.java index 692cdcc60deb4..3c5ba2c547597 100644 --- a/distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreCommandTestCase.java +++ b/distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreCommandTestCase.java @@ -29,7 +29,7 @@ import com.google.common.jimfs.Configuration; import com.google.common.jimfs.Jimfs; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.cli.CommandTestCase; import org.elasticsearch.common.io.PathUtilsForTesting; diff --git a/distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreWrapperTests.java b/distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreWrapperTests.java index 0c21720db3d2d..0672458867845 100644 --- a/distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreWrapperTests.java +++ b/distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreWrapperTests.java @@ -24,7 +24,7 @@ import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.SimpleFSDirectory; import org.opensearch.common.Randomness; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.env.Environment; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; diff --git a/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/InstallPluginCommand.java b/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/InstallPluginCommand.java index c306cb50bc2bb..812b80f0d1d49 100644 --- a/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/InstallPluginCommand.java +++ b/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/InstallPluginCommand.java @@ -37,15 +37,15 @@ import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; import org.elasticsearch.Build; import org.opensearch.Version; -import org.elasticsearch.bootstrap.JarHell; +import org.opensearch.bootstrap.JarHell; import org.opensearch.cli.EnvironmentAwareCommand; import org.opensearch.cli.ExitCodes; import org.opensearch.cli.Terminal; import org.opensearch.cli.UserException; -import org.elasticsearch.common.SuppressForbidden; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.SuppressForbidden; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.hash.MessageDigests; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.env.Environment; import java.io.BufferedReader; diff --git a/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/PluginCli.java b/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/PluginCli.java index 84fce140e07ab..40ea8cedde033 100644 --- a/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/PluginCli.java +++ b/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/PluginCli.java @@ -19,7 +19,7 @@ package org.opensearch.plugins; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.cli.Command; import org.opensearch.cli.LoggingAwareMultiCommand; import org.opensearch.cli.Terminal; diff --git a/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/RemovePluginCommand.java b/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/RemovePluginCommand.java index 32a2bdd7c9fae..43863f837fdc2 100644 --- a/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/RemovePluginCommand.java +++ b/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/RemovePluginCommand.java @@ -25,7 +25,7 @@ import org.opensearch.cli.ExitCodes; import org.opensearch.cli.Terminal; import org.opensearch.cli.UserException; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.env.Environment; import java.io.IOException; diff --git a/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java b/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java index d950167776207..af8706e0533e4 100644 --- a/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java +++ b/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java @@ -47,11 +47,11 @@ import org.elasticsearch.cli.MockTerminal; import org.opensearch.cli.Terminal; import org.opensearch.cli.UserException; -import org.elasticsearch.common.SuppressForbidden; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.SuppressForbidden; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.hash.MessageDigests; import org.opensearch.common.io.FileSystemUtils; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.io.PathUtils; import org.elasticsearch.common.io.PathUtilsForTesting; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; diff --git a/libs/cli/src/main/java/org/opensearch/cli/MultiCommand.java b/libs/cli/src/main/java/org/opensearch/cli/MultiCommand.java index d04b916e79a63..27de4912f96db 100644 --- a/libs/cli/src/main/java/org/opensearch/cli/MultiCommand.java +++ b/libs/cli/src/main/java/org/opensearch/cli/MultiCommand.java @@ -23,7 +23,7 @@ import joptsimple.OptionSet; import joptsimple.OptionSpec; import joptsimple.util.KeyValuePair; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import java.io.IOException; import java.util.ArrayList; diff --git a/libs/cli/src/main/java/org/opensearch/cli/UserException.java b/libs/cli/src/main/java/org/opensearch/cli/UserException.java index c414cbeb982d2..8015891a06b66 100644 --- a/libs/cli/src/main/java/org/opensearch/cli/UserException.java +++ b/libs/cli/src/main/java/org/opensearch/cli/UserException.java @@ -19,7 +19,7 @@ package org.opensearch.cli; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; /** * An exception representing a user fixable problem in {@link Command} usage. diff --git a/libs/core/.classpath1 b/libs/core/.classpath1 index 348ab88da6757..3a20aa700e9e9 100644 --- a/libs/core/.classpath1 +++ b/libs/core/.classpath1 @@ -49,7 +49,7 @@ - + @@ -59,22 +59,22 @@ - + - + - + - + @@ -121,13 +121,13 @@ - + - + @@ -301,7 +301,7 @@ - + diff --git a/libs/core/build.gradle b/libs/core/build.gradle index fabeda9b7fb41..f411422f879ca 100644 --- a/libs/core/build.gradle +++ b/libs/core/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.opensearch.gradle.info.BuildParams /* * Licensed to Elasticsearch under one or more contributor @@ -20,9 +20,9 @@ import org.elasticsearch.gradle.info.BuildParams */ apply plugin: 'nebula.optional-base' -apply plugin: 'elasticsearch.publish' +apply plugin: 'opensearch.publish' -archivesBaseName = 'elasticsearch-core' +archivesBaseName = 'opensearch-core' // we want to keep the JDKs in our IDEs set to JDK 8 until minimum JDK is bumped to 11 so we do not include this source set in our IDEs if (!isEclipse) { @@ -72,12 +72,12 @@ dependencies { testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}" testImplementation(project(":test:framework")) { - exclude group: 'org.elasticsearch', module: 'elasticsearch-core' + exclude group: 'org.opensearch', module: 'opensearch-core' } } tasks.named('forbiddenApisMain').configure { - // :libs:elasticsearch-core does not depend on server + // :libs:opensearch-core does not depend on server // TODO: Need to decide how we want to handle for forbidden signatures with the changes to server replaceSignatureFiles 'jdk-signatures' } diff --git a/libs/core/src/main/java/org/elasticsearch/bootstrap/JarHell.java b/libs/core/src/main/java/org/opensearch/bootstrap/JarHell.java similarity index 98% rename from libs/core/src/main/java/org/elasticsearch/bootstrap/JarHell.java rename to libs/core/src/main/java/org/opensearch/bootstrap/JarHell.java index 91edbbc3c1f60..ac3b0f111995a 100644 --- a/libs/core/src/main/java/org/elasticsearch/bootstrap/JarHell.java +++ b/libs/core/src/main/java/org/opensearch/bootstrap/JarHell.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.bootstrap; +package org.opensearch.bootstrap; -import org.elasticsearch.common.SuppressForbidden; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.SuppressForbidden; +import org.opensearch.common.io.PathUtils; import java.io.IOException; import java.net.MalformedURLException; @@ -138,7 +138,7 @@ static Set parseClassPath(String classPath) { // Eclipse adds this to the classpath when running unit tests... continue; } - URL url = PathUtils.get(element).toUri().toURL(); + URL url = PathUtils.get(element).toUri().toURL(); // junit4.childvm.count if (urlElements.add(url) == false && element.endsWith(".jar")) { throw new IllegalStateException("jar hell!" + System.lineSeparator() + diff --git a/libs/core/src/main/java/org/elasticsearch/bootstrap/JavaVersion.java b/libs/core/src/main/java/org/opensearch/bootstrap/JavaVersion.java similarity index 99% rename from libs/core/src/main/java/org/elasticsearch/bootstrap/JavaVersion.java rename to libs/core/src/main/java/org/opensearch/bootstrap/JavaVersion.java index 1330a365d3dbd..9ee047abf489e 100644 --- a/libs/core/src/main/java/org/elasticsearch/bootstrap/JavaVersion.java +++ b/libs/core/src/main/java/org/opensearch/bootstrap/JavaVersion.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.bootstrap; +package org.opensearch.bootstrap; import java.math.BigInteger; import java.util.ArrayList; diff --git a/libs/core/src/main/java/org/elasticsearch/bootstrap/JdkJarHellCheck.java b/libs/core/src/main/java/org/opensearch/bootstrap/JdkJarHellCheck.java similarity index 97% rename from libs/core/src/main/java/org/elasticsearch/bootstrap/JdkJarHellCheck.java rename to libs/core/src/main/java/org/opensearch/bootstrap/JdkJarHellCheck.java index 9708fc54b3098..72045c07670c8 100644 --- a/libs/core/src/main/java/org/elasticsearch/bootstrap/JdkJarHellCheck.java +++ b/libs/core/src/main/java/org/opensearch/bootstrap/JdkJarHellCheck.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.bootstrap; +package org.opensearch.bootstrap; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import java.io.IOException; import java.nio.file.FileVisitResult; diff --git a/libs/core/src/main/java/org/elasticsearch/common/Booleans.java b/libs/core/src/main/java/org/opensearch/common/Booleans.java similarity index 99% rename from libs/core/src/main/java/org/elasticsearch/common/Booleans.java rename to libs/core/src/main/java/org/opensearch/common/Booleans.java index 8687785796508..ad9f39ba5e579 100644 --- a/libs/core/src/main/java/org/elasticsearch/common/Booleans.java +++ b/libs/core/src/main/java/org/opensearch/common/Booleans.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common; +package org.opensearch.common; public final class Booleans { private Booleans() { diff --git a/libs/core/src/main/java/org/elasticsearch/common/CharArrays.java b/libs/core/src/main/java/org/opensearch/common/CharArrays.java similarity index 99% rename from libs/core/src/main/java/org/elasticsearch/common/CharArrays.java rename to libs/core/src/main/java/org/opensearch/common/CharArrays.java index 907874ca5735b..99cb119bbb4ba 100644 --- a/libs/core/src/main/java/org/elasticsearch/common/CharArrays.java +++ b/libs/core/src/main/java/org/opensearch/common/CharArrays.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common; +package org.opensearch.common; import java.nio.ByteBuffer; import java.nio.CharBuffer; diff --git a/libs/core/src/main/java/org/elasticsearch/common/CheckedConsumer.java b/libs/core/src/main/java/org/opensearch/common/CheckedConsumer.java similarity index 96% rename from libs/core/src/main/java/org/elasticsearch/common/CheckedConsumer.java rename to libs/core/src/main/java/org/opensearch/common/CheckedConsumer.java index 0e4a723726ec9..f96a77d402a37 100644 --- a/libs/core/src/main/java/org/elasticsearch/common/CheckedConsumer.java +++ b/libs/core/src/main/java/org/opensearch/common/CheckedConsumer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common; +package org.opensearch.common; import java.util.function.Consumer; diff --git a/libs/core/src/main/java/org/elasticsearch/common/CheckedFunction.java b/libs/core/src/main/java/org/opensearch/common/CheckedFunction.java similarity index 96% rename from libs/core/src/main/java/org/elasticsearch/common/CheckedFunction.java rename to libs/core/src/main/java/org/opensearch/common/CheckedFunction.java index 4a2d222db0b7a..813756a9d0b66 100644 --- a/libs/core/src/main/java/org/elasticsearch/common/CheckedFunction.java +++ b/libs/core/src/main/java/org/opensearch/common/CheckedFunction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common; +package org.opensearch.common; import java.util.function.Function; diff --git a/libs/core/src/main/java/org/elasticsearch/common/CheckedRunnable.java b/libs/core/src/main/java/org/opensearch/common/CheckedRunnable.java similarity index 96% rename from libs/core/src/main/java/org/elasticsearch/common/CheckedRunnable.java rename to libs/core/src/main/java/org/opensearch/common/CheckedRunnable.java index 721d7be14b4aa..82cf32035d557 100644 --- a/libs/core/src/main/java/org/elasticsearch/common/CheckedRunnable.java +++ b/libs/core/src/main/java/org/opensearch/common/CheckedRunnable.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common; +package org.opensearch.common; /** * A {@link Runnable}-like interface which allows throwing checked exceptions. diff --git a/libs/core/src/main/java/org/elasticsearch/common/Glob.java b/libs/core/src/main/java/org/opensearch/common/Glob.java similarity index 98% rename from libs/core/src/main/java/org/elasticsearch/common/Glob.java rename to libs/core/src/main/java/org/opensearch/common/Glob.java index f0baf75bd4db1..8769d529b2f94 100644 --- a/libs/core/src/main/java/org/elasticsearch/common/Glob.java +++ b/libs/core/src/main/java/org/opensearch/common/Glob.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common; +package org.opensearch.common; /** * Utility class for glob-like matching diff --git a/libs/core/src/main/java/org/elasticsearch/common/MemoizedSupplier.java b/libs/core/src/main/java/org/opensearch/common/MemoizedSupplier.java similarity index 97% rename from libs/core/src/main/java/org/elasticsearch/common/MemoizedSupplier.java rename to libs/core/src/main/java/org/opensearch/common/MemoizedSupplier.java index d010eac52051e..a7cef08a82044 100644 --- a/libs/core/src/main/java/org/elasticsearch/common/MemoizedSupplier.java +++ b/libs/core/src/main/java/org/opensearch/common/MemoizedSupplier.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common; +package org.opensearch.common; import java.util.function.Supplier; diff --git a/libs/core/src/main/java/org/elasticsearch/common/Nullable.java b/libs/core/src/main/java/org/opensearch/common/Nullable.java similarity index 97% rename from libs/core/src/main/java/org/elasticsearch/common/Nullable.java rename to libs/core/src/main/java/org/opensearch/common/Nullable.java index 497020b3ef270..21b519982d92f 100644 --- a/libs/core/src/main/java/org/elasticsearch/common/Nullable.java +++ b/libs/core/src/main/java/org/opensearch/common/Nullable.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common; +package org.opensearch.common; import javax.annotation.CheckForNull; import javax.annotation.meta.TypeQualifierNickname; diff --git a/libs/core/src/main/java/org/elasticsearch/common/SuppressForbidden.java b/libs/core/src/main/java/org/opensearch/common/SuppressForbidden.java similarity index 97% rename from libs/core/src/main/java/org/elasticsearch/common/SuppressForbidden.java rename to libs/core/src/main/java/org/opensearch/common/SuppressForbidden.java index d5d56f415d0f0..9d77bf1c2e627 100644 --- a/libs/core/src/main/java/org/elasticsearch/common/SuppressForbidden.java +++ b/libs/core/src/main/java/org/opensearch/common/SuppressForbidden.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.common; +package org.opensearch.common; import java.lang.annotation.ElementType; diff --git a/libs/core/src/main/java/org/elasticsearch/common/collect/List.java b/libs/core/src/main/java/org/opensearch/common/collect/List.java similarity index 98% rename from libs/core/src/main/java/org/elasticsearch/common/collect/List.java rename to libs/core/src/main/java/org/opensearch/common/collect/List.java index e9a2a20bb1a90..81239cb8bda62 100644 --- a/libs/core/src/main/java/org/elasticsearch/common/collect/List.java +++ b/libs/core/src/main/java/org/opensearch/common/collect/List.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.collect; +package org.opensearch.common.collect; import java.util.Arrays; import java.util.Collection; diff --git a/libs/core/src/main/java/org/elasticsearch/common/collect/Map.java b/libs/core/src/main/java/org/opensearch/common/collect/Map.java similarity index 99% rename from libs/core/src/main/java/org/elasticsearch/common/collect/Map.java rename to libs/core/src/main/java/org/opensearch/common/collect/Map.java index 3697f01abea33..b504eb5b9c305 100644 --- a/libs/core/src/main/java/org/elasticsearch/common/collect/Map.java +++ b/libs/core/src/main/java/org/opensearch/common/collect/Map.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.collect; +package org.opensearch.common.collect; import java.util.AbstractMap; import java.util.Collections; diff --git a/libs/core/src/main/java/org/elasticsearch/common/collect/Set.java b/libs/core/src/main/java/org/opensearch/common/collect/Set.java similarity index 98% rename from libs/core/src/main/java/org/elasticsearch/common/collect/Set.java rename to libs/core/src/main/java/org/opensearch/common/collect/Set.java index b6d9df65423e9..a46c843e4b41a 100644 --- a/libs/core/src/main/java/org/elasticsearch/common/collect/Set.java +++ b/libs/core/src/main/java/org/opensearch/common/collect/Set.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.collect; +package org.opensearch.common.collect; import java.util.Arrays; import java.util.Collection; diff --git a/libs/core/src/main/java/org/elasticsearch/common/collect/Tuple.java b/libs/core/src/main/java/org/opensearch/common/collect/Tuple.java similarity index 97% rename from libs/core/src/main/java/org/elasticsearch/common/collect/Tuple.java rename to libs/core/src/main/java/org/opensearch/common/collect/Tuple.java index 70c7bcbc045b6..3be9e270a51a5 100644 --- a/libs/core/src/main/java/org/elasticsearch/common/collect/Tuple.java +++ b/libs/core/src/main/java/org/opensearch/common/collect/Tuple.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.collect; +package org.opensearch.common.collect; public class Tuple { diff --git a/libs/core/src/main/java/org/elasticsearch/common/concurrent/CompletableContext.java b/libs/core/src/main/java/org/opensearch/common/concurrent/CompletableContext.java similarity index 97% rename from libs/core/src/main/java/org/elasticsearch/common/concurrent/CompletableContext.java rename to libs/core/src/main/java/org/opensearch/common/concurrent/CompletableContext.java index e838842931837..f943bbeda7bd4 100644 --- a/libs/core/src/main/java/org/elasticsearch/common/concurrent/CompletableContext.java +++ b/libs/core/src/main/java/org/opensearch/common/concurrent/CompletableContext.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.concurrent; +package org.opensearch.common.concurrent; import java.util.concurrent.CompletableFuture; import java.util.function.BiConsumer; diff --git a/libs/core/src/main/java/org/elasticsearch/common/io/PathUtils.java b/libs/core/src/main/java/org/opensearch/common/io/PathUtils.java similarity index 96% rename from libs/core/src/main/java/org/elasticsearch/common/io/PathUtils.java rename to libs/core/src/main/java/org/opensearch/common/io/PathUtils.java index 0002c1e5b5f21..7e0ebf64b5700 100644 --- a/libs/core/src/main/java/org/elasticsearch/common/io/PathUtils.java +++ b/libs/core/src/main/java/org/opensearch/common/io/PathUtils.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.common.io; +package org.opensearch.common.io; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import java.net.URI; import java.nio.file.FileSystem; @@ -27,7 +27,7 @@ import java.nio.file.Path; import java.nio.file.Paths; -/** +/** * Utilities for creating a Path from names, * or accessing the default FileSystem. *

@@ -39,14 +39,14 @@ public final class PathUtils { /** no instantiation */ private PathUtils() {} - + /** the actual JDK default */ static final FileSystem ACTUAL_DEFAULT = FileSystems.getDefault(); - + /** can be changed by tests */ static volatile FileSystem DEFAULT = ACTUAL_DEFAULT; - - /** + + /** * Returns a {@code Path} from name components. *

* This works just like {@code Paths.get()}. @@ -59,8 +59,8 @@ private PathUtils() {} public static Path get(String first, String... more) { return DEFAULT.getPath(first, more); } - - /** + + /** * Returns a {@code Path} from a URI *

* This works just like {@code Paths.get()}. diff --git a/libs/core/src/main/java/org/elasticsearch/common/unit/TimeValue.java b/libs/core/src/main/java/org/opensearch/common/unit/TimeValue.java similarity index 99% rename from libs/core/src/main/java/org/elasticsearch/common/unit/TimeValue.java rename to libs/core/src/main/java/org/opensearch/common/unit/TimeValue.java index bbca172dc421d..235eb55e05268 100644 --- a/libs/core/src/main/java/org/elasticsearch/common/unit/TimeValue.java +++ b/libs/core/src/main/java/org/opensearch/common/unit/TimeValue.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.unit; +package org.opensearch.common.unit; import java.util.Locale; import java.util.Objects; diff --git a/libs/core/src/main/java/org/elasticsearch/common/util/FastMath.java b/libs/core/src/main/java/org/opensearch/common/util/FastMath.java similarity index 99% rename from libs/core/src/main/java/org/elasticsearch/common/util/FastMath.java rename to libs/core/src/main/java/org/opensearch/common/util/FastMath.java index 8978a85a58f00..ada9dfe6af77d 100644 --- a/libs/core/src/main/java/org/elasticsearch/common/util/FastMath.java +++ b/libs/core/src/main/java/org/opensearch/common/util/FastMath.java @@ -30,7 +30,7 @@ * https://github.com/yannrichet/jmathplot/blob/f25426e0ab0e68647ad2b75f577c7be050ecac86/src/main/java/org/math/plot/utils/FastMath.java */ -package org.elasticsearch.common.util; +package org.opensearch.common.util; /** * Additions or modifications to this class should only come from the original org.math.plot.utils.FastMath source diff --git a/libs/core/src/main/java/org/elasticsearch/common/util/ESSloppyMath.java b/libs/core/src/main/java/org/opensearch/common/util/OpenSearchSloppyMath.java similarity index 90% rename from libs/core/src/main/java/org/elasticsearch/common/util/ESSloppyMath.java rename to libs/core/src/main/java/org/opensearch/common/util/OpenSearchSloppyMath.java index d123b89e8c7b8..8033941e5a2d5 100644 --- a/libs/core/src/main/java/org/elasticsearch/common/util/ESSloppyMath.java +++ b/libs/core/src/main/java/org/opensearch/common/util/OpenSearchSloppyMath.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.common.util; +package org.opensearch.common.util; /** * Similar to Lucene's SloppyMath, but for additional math functions. */ -public class ESSloppyMath { +public class OpenSearchSloppyMath { - private ESSloppyMath() {} + private OpenSearchSloppyMath() {} public static double sinh(double value) { return FastMath.sinh(value); diff --git a/libs/core/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRefCounted.java b/libs/core/src/main/java/org/opensearch/common/util/concurrent/AbstractRefCounted.java similarity index 97% rename from libs/core/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRefCounted.java rename to libs/core/src/main/java/org/opensearch/common/util/concurrent/AbstractRefCounted.java index 7483f7a858014..8ea0d4ecf341e 100644 --- a/libs/core/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRefCounted.java +++ b/libs/core/src/main/java/org/opensearch/common/util/concurrent/AbstractRefCounted.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.util.concurrent; +package org.opensearch.common.util.concurrent; import java.util.concurrent.atomic.AtomicInteger; diff --git a/libs/core/src/main/java/org/elasticsearch/common/util/concurrent/RefCounted.java b/libs/core/src/main/java/org/opensearch/common/util/concurrent/RefCounted.java similarity index 97% rename from libs/core/src/main/java/org/elasticsearch/common/util/concurrent/RefCounted.java rename to libs/core/src/main/java/org/opensearch/common/util/concurrent/RefCounted.java index e573ba5402675..379579c787e91 100644 --- a/libs/core/src/main/java/org/elasticsearch/common/util/concurrent/RefCounted.java +++ b/libs/core/src/main/java/org/opensearch/common/util/concurrent/RefCounted.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.util.concurrent; +package org.opensearch.common.util.concurrent; /** * An interface for objects that need to be notified when all reference diff --git a/libs/core/src/main/java/org/elasticsearch/core/internal/io/IOUtils.java b/libs/core/src/main/java/org/opensearch/core/internal/io/IOUtils.java similarity index 99% rename from libs/core/src/main/java/org/elasticsearch/core/internal/io/IOUtils.java rename to libs/core/src/main/java/org/opensearch/core/internal/io/IOUtils.java index 022d8c90301ed..8b55066e7673d 100644 --- a/libs/core/src/main/java/org/elasticsearch/core/internal/io/IOUtils.java +++ b/libs/core/src/main/java/org/opensearch/core/internal/io/IOUtils.java @@ -17,9 +17,9 @@ * Modifications copyright (C) 2020 Elasticsearch B.V. */ -package org.elasticsearch.core.internal.io; +package org.opensearch.core.internal.io; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import java.io.Closeable; import java.io.IOException; diff --git a/libs/core/src/main/java/org/elasticsearch/core/internal/io/Streams.java b/libs/core/src/main/java/org/opensearch/core/internal/io/Streams.java similarity index 98% rename from libs/core/src/main/java/org/elasticsearch/core/internal/io/Streams.java rename to libs/core/src/main/java/org/opensearch/core/internal/io/Streams.java index eb6114ffdb979..aa594fedb4857 100644 --- a/libs/core/src/main/java/org/elasticsearch/core/internal/io/Streams.java +++ b/libs/core/src/main/java/org/opensearch/core/internal/io/Streams.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.core.internal.io; +package org.opensearch.core.internal.io; import java.io.IOException; import java.io.InputStream; diff --git a/libs/core/src/main/java/org/elasticsearch/core/internal/net/NetUtils.java b/libs/core/src/main/java/org/opensearch/core/internal/net/NetUtils.java similarity index 99% rename from libs/core/src/main/java/org/elasticsearch/core/internal/net/NetUtils.java rename to libs/core/src/main/java/org/opensearch/core/internal/net/NetUtils.java index 9185e39fdab20..fdd4f9812d35b 100644 --- a/libs/core/src/main/java/org/elasticsearch/core/internal/net/NetUtils.java +++ b/libs/core/src/main/java/org/opensearch/core/internal/net/NetUtils.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.core.internal.net; +package org.opensearch.core.internal.net; import java.io.IOException; import java.lang.reflect.Field; diff --git a/libs/core/src/main/java11/org/elasticsearch/common/collect/List.java b/libs/core/src/main/java11/org/opensearch/common/collect/List.java similarity index 98% rename from libs/core/src/main/java11/org/elasticsearch/common/collect/List.java rename to libs/core/src/main/java11/org/opensearch/common/collect/List.java index 40534f11c05d0..2ec27a8a294b1 100644 --- a/libs/core/src/main/java11/org/elasticsearch/common/collect/List.java +++ b/libs/core/src/main/java11/org/opensearch/common/collect/List.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.collect; +package org.opensearch.common.collect; import java.util.Collection; diff --git a/libs/core/src/main/java11/org/elasticsearch/common/collect/Map.java b/libs/core/src/main/java11/org/opensearch/common/collect/Map.java similarity index 99% rename from libs/core/src/main/java11/org/elasticsearch/common/collect/Map.java rename to libs/core/src/main/java11/org/opensearch/common/collect/Map.java index c213518ab2eb7..a2042d71ae99a 100644 --- a/libs/core/src/main/java11/org/elasticsearch/common/collect/Map.java +++ b/libs/core/src/main/java11/org/opensearch/common/collect/Map.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.collect; +package org.opensearch.common.collect; public class Map { diff --git a/libs/core/src/main/java11/org/elasticsearch/common/collect/Set.java b/libs/core/src/main/java11/org/opensearch/common/collect/Set.java similarity index 98% rename from libs/core/src/main/java11/org/elasticsearch/common/collect/Set.java rename to libs/core/src/main/java11/org/opensearch/common/collect/Set.java index 9594f22fb3924..a70c5db78fc46 100644 --- a/libs/core/src/main/java11/org/elasticsearch/common/collect/Set.java +++ b/libs/core/src/main/java11/org/opensearch/common/collect/Set.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.collect; +package org.opensearch.common.collect; import java.util.Collection; diff --git a/libs/core/src/main/java11/org/elasticsearch/core/internal/io/Streams.java b/libs/core/src/main/java11/org/opensearch/core/internal/io/Streams.java similarity index 98% rename from libs/core/src/main/java11/org/elasticsearch/core/internal/io/Streams.java rename to libs/core/src/main/java11/org/opensearch/core/internal/io/Streams.java index 1fc8392609d82..ecbd9b6baeec5 100644 --- a/libs/core/src/main/java11/org/elasticsearch/core/internal/io/Streams.java +++ b/libs/core/src/main/java11/org/opensearch/core/internal/io/Streams.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.core.internal.io; +package org.opensearch.core.internal.io; import java.io.IOException; import java.io.InputStream; diff --git a/libs/core/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java b/libs/core/src/test/java/org/opensearch/bootstrap/JarHellTests.java similarity index 99% rename from libs/core/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java rename to libs/core/src/test/java/org/opensearch/bootstrap/JarHellTests.java index d664947380a09..b8d0d51e410fa 100644 --- a/libs/core/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java +++ b/libs/core/src/test/java/org/opensearch/bootstrap/JarHellTests.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.bootstrap; +package org.opensearch.bootstrap; import org.opensearch.common.Strings; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.io.PathUtils; import org.elasticsearch.test.ESTestCase; import java.io.IOException; diff --git a/libs/core/src/test/java/org/elasticsearch/common/CharArraysTests.java b/libs/core/src/test/java/org/opensearch/common/CharArraysTests.java similarity index 99% rename from libs/core/src/test/java/org/elasticsearch/common/CharArraysTests.java rename to libs/core/src/test/java/org/opensearch/common/CharArraysTests.java index 9cedac763e29c..1cd46f4548299 100644 --- a/libs/core/src/test/java/org/elasticsearch/common/CharArraysTests.java +++ b/libs/core/src/test/java/org/opensearch/common/CharArraysTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common; +package org.opensearch.common; import org.elasticsearch.test.ESTestCase; diff --git a/libs/core/src/test/java/org/elasticsearch/common/collect/ListTests.java b/libs/core/src/test/java/org/opensearch/common/collect/ListTests.java similarity index 98% rename from libs/core/src/test/java/org/elasticsearch/common/collect/ListTests.java rename to libs/core/src/test/java/org/opensearch/common/collect/ListTests.java index 719aa73c250b9..ba138dff4f7a5 100644 --- a/libs/core/src/test/java/org/elasticsearch/common/collect/ListTests.java +++ b/libs/core/src/test/java/org/opensearch/common/collect/ListTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.collect; +package org.opensearch.common.collect; import org.elasticsearch.test.ESTestCase; diff --git a/libs/core/src/test/java/org/elasticsearch/common/collect/MapTests.java b/libs/core/src/test/java/org/opensearch/common/collect/MapTests.java similarity index 99% rename from libs/core/src/test/java/org/elasticsearch/common/collect/MapTests.java rename to libs/core/src/test/java/org/opensearch/common/collect/MapTests.java index 49e92008988c4..306154ecf138e 100644 --- a/libs/core/src/test/java/org/elasticsearch/common/collect/MapTests.java +++ b/libs/core/src/test/java/org/opensearch/common/collect/MapTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.collect; +package org.opensearch.common.collect; import org.elasticsearch.test.ESTestCase; diff --git a/libs/core/src/test/java/org/elasticsearch/common/collect/SetTests.java b/libs/core/src/test/java/org/opensearch/common/collect/SetTests.java similarity index 98% rename from libs/core/src/test/java/org/elasticsearch/common/collect/SetTests.java rename to libs/core/src/test/java/org/opensearch/common/collect/SetTests.java index 89f5ee23a0ca9..2ae33ba13a0b4 100644 --- a/libs/core/src/test/java/org/elasticsearch/common/collect/SetTests.java +++ b/libs/core/src/test/java/org/opensearch/common/collect/SetTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.collect; +package org.opensearch.common.collect; import org.elasticsearch.test.ESTestCase; diff --git a/libs/core/src/test/java/org/elasticsearch/common/collect/TupleTests.java b/libs/core/src/test/java/org/opensearch/common/collect/TupleTests.java similarity index 97% rename from libs/core/src/test/java/org/elasticsearch/common/collect/TupleTests.java rename to libs/core/src/test/java/org/opensearch/common/collect/TupleTests.java index 79a9969ad0510..1fb1e5fa6f737 100644 --- a/libs/core/src/test/java/org/elasticsearch/common/collect/TupleTests.java +++ b/libs/core/src/test/java/org/opensearch/common/collect/TupleTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.collect; +package org.opensearch.common.collect; import org.elasticsearch.test.ESTestCase; diff --git a/libs/core/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java b/libs/core/src/test/java/org/opensearch/common/unit/TimeValueTests.java similarity index 99% rename from libs/core/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java rename to libs/core/src/test/java/org/opensearch/common/unit/TimeValueTests.java index ff58b88a704f8..a4c409bbbc2c5 100644 --- a/libs/core/src/test/java/org/elasticsearch/common/unit/TimeValueTests.java +++ b/libs/core/src/test/java/org/opensearch/common/unit/TimeValueTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.unit; +package org.opensearch.common.unit; import org.elasticsearch.test.ESTestCase; diff --git a/libs/core/src/test/java/org/elasticsearch/common/util/ESSloppyMathTests.java b/libs/core/src/test/java/org/opensearch/common/util/OpenSearchSloppyMathTests.java similarity index 89% rename from libs/core/src/test/java/org/elasticsearch/common/util/ESSloppyMathTests.java rename to libs/core/src/test/java/org/opensearch/common/util/OpenSearchSloppyMathTests.java index 24ac1e0176392..d4da1885b4524 100644 --- a/libs/core/src/test/java/org/elasticsearch/common/util/ESSloppyMathTests.java +++ b/libs/core/src/test/java/org/opensearch/common/util/OpenSearchSloppyMathTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.common.util; +package org.opensearch.common.util; import org.elasticsearch.test.ESTestCase; -import static org.elasticsearch.common.util.ESSloppyMath.atan; -import static org.elasticsearch.common.util.ESSloppyMath.sinh; +import static org.opensearch.common.util.OpenSearchSloppyMath.atan; +import static org.opensearch.common.util.OpenSearchSloppyMath.sinh; -public class ESSloppyMathTests extends ESTestCase { +public class OpenSearchSloppyMathTests extends ESTestCase { // accuracy for atan(x) static double ATAN_DELTA = 1E-15; diff --git a/libs/core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTests.java b/libs/core/src/test/java/org/opensearch/common/util/concurrent/RefCountedTests.java similarity index 98% rename from libs/core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTests.java rename to libs/core/src/test/java/org/opensearch/common/util/concurrent/RefCountedTests.java index ebcf12482dfa7..6d8b04b9c486a 100644 --- a/libs/core/src/test/java/org/elasticsearch/common/util/concurrent/RefCountedTests.java +++ b/libs/core/src/test/java/org/opensearch/common/util/concurrent/RefCountedTests.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.common.util.concurrent; +package org.opensearch.common.util.concurrent; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; diff --git a/libs/core/src/test/java/org/elasticsearch/core/internal/io/IOUtilsTests.java b/libs/core/src/test/java/org/opensearch/core/internal/io/IOUtilsTests.java similarity index 98% rename from libs/core/src/test/java/org/elasticsearch/core/internal/io/IOUtilsTests.java rename to libs/core/src/test/java/org/opensearch/core/internal/io/IOUtilsTests.java index 882d19cd2c333..0b90c6cc56045 100644 --- a/libs/core/src/test/java/org/elasticsearch/core/internal/io/IOUtilsTests.java +++ b/libs/core/src/test/java/org/opensearch/core/internal/io/IOUtilsTests.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.elasticsearch.core.internal.io; +package org.opensearch.core.internal.io; import org.apache.lucene.mockfile.FilterFileSystemProvider; import org.apache.lucene.mockfile.FilterPath; import org.apache.lucene.util.Constants; -import org.elasticsearch.common.CheckedConsumer; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.CheckedConsumer; +import org.opensearch.common.io.PathUtils; import org.elasticsearch.test.ESTestCase; import java.io.Closeable; diff --git a/libs/core/src/test/java/org/elasticsearch/core/internal/io/StreamsTests.java b/libs/core/src/test/java/org/opensearch/core/internal/io/StreamsTests.java similarity index 97% rename from libs/core/src/test/java/org/elasticsearch/core/internal/io/StreamsTests.java rename to libs/core/src/test/java/org/opensearch/core/internal/io/StreamsTests.java index 3908ef83500c4..43f18784c86f2 100644 --- a/libs/core/src/test/java/org/elasticsearch/core/internal/io/StreamsTests.java +++ b/libs/core/src/test/java/org/opensearch/core/internal/io/StreamsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.core.internal.io; +package org.opensearch.core.internal.io; import org.elasticsearch.test.ESTestCase; diff --git a/libs/core/src/test/java/org/elasticsearch/core/internal/net/NetUtilsTests.java b/libs/core/src/test/java/org/opensearch/core/internal/net/NetUtilsTests.java similarity index 91% rename from libs/core/src/test/java/org/elasticsearch/core/internal/net/NetUtilsTests.java rename to libs/core/src/test/java/org/opensearch/core/internal/net/NetUtilsTests.java index 6f327c178a0e5..17c0d3497dcc4 100644 --- a/libs/core/src/test/java/org/elasticsearch/core/internal/net/NetUtilsTests.java +++ b/libs/core/src/test/java/org/opensearch/core/internal/net/NetUtilsTests.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.core.internal.net; +package org.opensearch.core.internal.net; import org.apache.lucene.util.Constants; -import org.elasticsearch.bootstrap.JavaVersion; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.bootstrap.JavaVersion; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.test.ESTestCase; public class NetUtilsTests extends ESTestCase { diff --git a/libs/core/src/test/resources/org/elasticsearch/bootstrap/duplicate-classes.jar b/libs/core/src/test/resources/org/opensearch/bootstrap/duplicate-classes.jar similarity index 100% rename from libs/core/src/test/resources/org/elasticsearch/bootstrap/duplicate-classes.jar rename to libs/core/src/test/resources/org/opensearch/bootstrap/duplicate-classes.jar diff --git a/libs/core/src/test/resources/org/elasticsearch/bootstrap/duplicate-xmlbeans-classes.jar b/libs/core/src/test/resources/org/opensearch/bootstrap/duplicate-xmlbeans-classes.jar similarity index 100% rename from libs/core/src/test/resources/org/elasticsearch/bootstrap/duplicate-xmlbeans-classes.jar rename to libs/core/src/test/resources/org/opensearch/bootstrap/duplicate-xmlbeans-classes.jar diff --git a/libs/nio/src/main/java/org/opensearch/nio/ChannelContext.java b/libs/nio/src/main/java/org/opensearch/nio/ChannelContext.java index 768fa627ae3d4..ca7e3c87167aa 100644 --- a/libs/nio/src/main/java/org/opensearch/nio/ChannelContext.java +++ b/libs/nio/src/main/java/org/opensearch/nio/ChannelContext.java @@ -19,7 +19,7 @@ package org.opensearch.nio; -import org.elasticsearch.common.concurrent.CompletableContext; +import org.opensearch.common.concurrent.CompletableContext; import java.io.IOException; import java.nio.channels.NetworkChannel; diff --git a/libs/nio/src/main/java/org/opensearch/nio/Page.java b/libs/nio/src/main/java/org/opensearch/nio/Page.java index cb384dd33bba0..a256f9e50d420 100644 --- a/libs/nio/src/main/java/org/opensearch/nio/Page.java +++ b/libs/nio/src/main/java/org/opensearch/nio/Page.java @@ -19,7 +19,7 @@ package org.opensearch.nio; -import org.elasticsearch.common.util.concurrent.AbstractRefCounted; +import org.opensearch.common.util.concurrent.AbstractRefCounted; import java.io.Closeable; import java.nio.ByteBuffer; diff --git a/libs/nio/src/main/java/org/opensearch/nio/ServerChannelContext.java b/libs/nio/src/main/java/org/opensearch/nio/ServerChannelContext.java index 004c832422019..7561da8093b8d 100644 --- a/libs/nio/src/main/java/org/opensearch/nio/ServerChannelContext.java +++ b/libs/nio/src/main/java/org/opensearch/nio/ServerChannelContext.java @@ -19,7 +19,7 @@ package org.opensearch.nio; -import org.elasticsearch.common.concurrent.CompletableContext; +import org.opensearch.common.concurrent.CompletableContext; import java.io.IOException; import java.net.BindException; diff --git a/libs/nio/src/main/java/org/opensearch/nio/SocketChannelContext.java b/libs/nio/src/main/java/org/opensearch/nio/SocketChannelContext.java index 78202420c359a..4918045baa275 100644 --- a/libs/nio/src/main/java/org/opensearch/nio/SocketChannelContext.java +++ b/libs/nio/src/main/java/org/opensearch/nio/SocketChannelContext.java @@ -19,8 +19,8 @@ package org.opensearch.nio; -import org.elasticsearch.common.concurrent.CompletableContext; -import org.elasticsearch.core.internal.net.NetUtils; +import org.opensearch.common.concurrent.CompletableContext; +import org.opensearch.core.internal.net.NetUtils; import org.opensearch.nio.utils.ByteBufferUtils; import org.opensearch.nio.utils.ExceptionsHelper; diff --git a/libs/nio/src/test/java/org/opensearch/nio/BytesChannelContextTests.java b/libs/nio/src/test/java/org/opensearch/nio/BytesChannelContextTests.java index e6729214da5f4..1ad4d9266b5ce 100644 --- a/libs/nio/src/test/java/org/opensearch/nio/BytesChannelContextTests.java +++ b/libs/nio/src/test/java/org/opensearch/nio/BytesChannelContextTests.java @@ -19,7 +19,7 @@ package org.opensearch.nio; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.util.PageCacheRecycler; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/libs/nio/src/test/java/org/opensearch/nio/ChannelFactoryTests.java b/libs/nio/src/test/java/org/opensearch/nio/ChannelFactoryTests.java index 07be339c8c3fc..bccf2ff71daee 100644 --- a/libs/nio/src/test/java/org/opensearch/nio/ChannelFactoryTests.java +++ b/libs/nio/src/test/java/org/opensearch/nio/ChannelFactoryTests.java @@ -19,7 +19,7 @@ package org.opensearch.nio; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.test.ESTestCase; import org.junit.After; import org.junit.Before; diff --git a/libs/nio/src/test/java/org/opensearch/nio/NioSelectorGroupTests.java b/libs/nio/src/test/java/org/opensearch/nio/NioSelectorGroupTests.java index a9d689de8e718..86a974e7496b4 100644 --- a/libs/nio/src/test/java/org/opensearch/nio/NioSelectorGroupTests.java +++ b/libs/nio/src/test/java/org/opensearch/nio/NioSelectorGroupTests.java @@ -19,7 +19,7 @@ package org.opensearch.nio; -import org.elasticsearch.common.CheckedRunnable; +import org.opensearch.common.CheckedRunnable; import org.opensearch.common.settings.Settings; import org.elasticsearch.test.ESTestCase; diff --git a/libs/nio/src/test/java/org/opensearch/nio/NioSelectorTests.java b/libs/nio/src/test/java/org/opensearch/nio/NioSelectorTests.java index 57570187cb8e9..9776f003a2728 100644 --- a/libs/nio/src/test/java/org/opensearch/nio/NioSelectorTests.java +++ b/libs/nio/src/test/java/org/opensearch/nio/NioSelectorTests.java @@ -19,8 +19,8 @@ package org.opensearch.nio; -import org.elasticsearch.common.CheckedRunnable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.CheckedRunnable; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.AbstractRunnable; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/libs/nio/src/test/java/org/opensearch/nio/SocketChannelContextTests.java b/libs/nio/src/test/java/org/opensearch/nio/SocketChannelContextTests.java index 22d4d9f113e5d..34af9c692f15a 100644 --- a/libs/nio/src/test/java/org/opensearch/nio/SocketChannelContextTests.java +++ b/libs/nio/src/test/java/org/opensearch/nio/SocketChannelContextTests.java @@ -19,7 +19,7 @@ package org.opensearch.nio; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.elasticsearch.test.ESTestCase; import org.junit.Before; import org.mockito.ArgumentCaptor; diff --git a/libs/ssl-config/src/main/java/org/opensearch/common/ssl/DefaultJdkTrustConfig.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/DefaultJdkTrustConfig.java index f6b6240d105c8..9a68107808a29 100644 --- a/libs/ssl-config/src/main/java/org/opensearch/common/ssl/DefaultJdkTrustConfig.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/DefaultJdkTrustConfig.java @@ -19,7 +19,7 @@ package org.opensearch.common.ssl; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509ExtendedTrustManager; diff --git a/libs/ssl-config/src/main/java/org/opensearch/common/ssl/KeyStoreUtil.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/KeyStoreUtil.java index e44cffaec8d03..b7cd02340a54a 100644 --- a/libs/ssl-config/src/main/java/org/opensearch/common/ssl/KeyStoreUtil.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/KeyStoreUtil.java @@ -19,7 +19,7 @@ package org.opensearch.common.ssl; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import javax.net.ssl.KeyManager; import javax.net.ssl.KeyManagerFactory; diff --git a/libs/ssl-config/src/main/java/org/opensearch/common/ssl/PemUtils.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/PemUtils.java index 728d378bd7512..51966ce7c7239 100644 --- a/libs/ssl-config/src/main/java/org/opensearch/common/ssl/PemUtils.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/PemUtils.java @@ -19,7 +19,7 @@ package org.opensearch.common.ssl; -import org.elasticsearch.common.CharArrays; +import org.opensearch.common.CharArrays; import javax.crypto.Cipher; import javax.crypto.EncryptedPrivateKeyInfo; diff --git a/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslConfigurationLoader.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslConfigurationLoader.java index fa275959357b0..daec1bed8fd6d 100644 --- a/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslConfigurationLoader.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslConfigurationLoader.java @@ -19,7 +19,7 @@ package org.opensearch.common.ssl; -import org.elasticsearch.bootstrap.JavaVersion; +import org.opensearch.bootstrap.JavaVersion; import javax.crypto.Cipher; import javax.net.ssl.KeyManagerFactory; diff --git a/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslDiagnostics.java b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslDiagnostics.java index 0d8f6cd809137..78b709ac81048 100644 --- a/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslDiagnostics.java +++ b/libs/ssl-config/src/main/java/org/opensearch/common/ssl/SslDiagnostics.java @@ -19,7 +19,7 @@ package org.opensearch.common.ssl; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import javax.net.ssl.SSLSession; import java.security.cert.CertificateEncodingException; diff --git a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslDiagnosticsTests.java b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslDiagnosticsTests.java index ca0b095a4bd66..63676329d1ebd 100644 --- a/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslDiagnosticsTests.java +++ b/libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslDiagnosticsTests.java @@ -19,7 +19,7 @@ package org.opensearch.common.ssl; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; import org.mockito.Mockito; diff --git a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/AbstractObjectParser.java b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/AbstractObjectParser.java index b9a5164e1942d..19ac1c11cb51b 100644 --- a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/AbstractObjectParser.java +++ b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/AbstractObjectParser.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.xcontent; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ObjectParser.NamedObjectParser; import org.elasticsearch.common.xcontent.ObjectParser.ValueType; diff --git a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/NamedXContentRegistry.java b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/NamedXContentRegistry.java index 9efe568955f39..d0ded2ab7ef8d 100644 --- a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/NamedXContentRegistry.java +++ b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/NamedXContentRegistry.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.xcontent; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.elasticsearch.common.ParseField; import java.io.IOException; diff --git a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/ObjectParser.java b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/ObjectParser.java index 26b77551909c0..b487af6736466 100644 --- a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/ObjectParser.java +++ b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/ObjectParser.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.common.xcontent; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import java.io.IOException; diff --git a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java index 74542bb809f71..2079f3780fb35 100644 --- a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java +++ b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/ToXContent.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.xcontent; -import org.elasticsearch.common.Booleans; +import org.opensearch.common.Booleans; import java.io.IOException; import java.util.Map; diff --git a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/XContentParseException.java b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/XContentParseException.java index 8a7a10d6ebb90..6aec8c2daa1fc 100644 --- a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/XContentParseException.java +++ b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/XContentParseException.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.xcontent; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import java.util.Optional; diff --git a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/XContentParser.java b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/XContentParser.java index 82a663bd9dc5d..8691511d50ba9 100644 --- a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/XContentParser.java +++ b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/XContentParser.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.xcontent; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import java.io.Closeable; import java.io.IOException; diff --git a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/XContentSubParser.java b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/XContentSubParser.java index 9a8686001e2dc..e737dac44c538 100644 --- a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/XContentSubParser.java +++ b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/XContentSubParser.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.xcontent; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import java.io.IOException; import java.nio.CharBuffer; diff --git a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java index 65dc4136b9c2f..bdeee03b67df5 100644 --- a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java +++ b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentGenerator.java @@ -36,7 +36,7 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.support.filtering.FilterPathBasedFilter; -import org.elasticsearch.core.internal.io.Streams; +import org.opensearch.core.internal.io.Streams; import java.io.BufferedInputStream; import java.io.IOException; diff --git a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java index 7489222df2e76..99fcd79dcc93c 100644 --- a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java +++ b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/json/JsonXContentParser.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.xcontent.XContentLocation; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.support.AbstractXContentParser; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import java.io.IOException; import java.nio.CharBuffer; diff --git a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java index e1f2baf66ca70..95b01e7c1d36b 100644 --- a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java +++ b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/support/AbstractXContentParser.java @@ -19,8 +19,8 @@ package org.elasticsearch.common.xcontent.support; -import org.elasticsearch.common.Booleans; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.Booleans; +import org.opensearch.common.CheckedFunction; import org.elasticsearch.common.xcontent.DeprecationHandler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentParseException; diff --git a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPath.java b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPath.java index cd62280badbab..f848e2e98153f 100644 --- a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPath.java +++ b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/support/filtering/FilterPath.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.xcontent.support.filtering; -import org.elasticsearch.common.Glob; +import org.opensearch.common.Glob; import java.util.ArrayList; import java.util.List; diff --git a/libs/x-content/src/test/java/org/elasticsearch/common/xcontent/ConstructingObjectParserTests.java b/libs/x-content/src/test/java/org/elasticsearch/common/xcontent/ConstructingObjectParserTests.java index d0b6f72400b39..7821bd39ecbe6 100644 --- a/libs/x-content/src/test/java/org/elasticsearch/common/xcontent/ConstructingObjectParserTests.java +++ b/libs/x-content/src/test/java/org/elasticsearch/common/xcontent/ConstructingObjectParserTests.java @@ -19,8 +19,8 @@ package org.elasticsearch.common.xcontent; -import org.elasticsearch.common.CheckedFunction; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.CheckedFunction; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ObjectParserTests.NamedObject; import org.elasticsearch.common.xcontent.json.JsonXContent; diff --git a/libs/x-content/src/test/java/org/elasticsearch/common/xcontent/MapXContentParserTests.java b/libs/x-content/src/test/java/org/elasticsearch/common/xcontent/MapXContentParserTests.java index 472780f79d516..ea9ebff27f6d5 100644 --- a/libs/x-content/src/test/java/org/elasticsearch/common/xcontent/MapXContentParserTests.java +++ b/libs/x-content/src/test/java/org/elasticsearch/common/xcontent/MapXContentParserTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.xcontent; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.support.MapXContentParser; import org.elasticsearch.test.ESTestCase; diff --git a/libs/x-content/src/test/java/org/elasticsearch/common/xcontent/ObjectParserTests.java b/libs/x-content/src/test/java/org/elasticsearch/common/xcontent/ObjectParserTests.java index 03e509f00e008..b1dc332ddefd3 100644 --- a/libs/x-content/src/test/java/org/elasticsearch/common/xcontent/ObjectParserTests.java +++ b/libs/x-content/src/test/java/org/elasticsearch/common/xcontent/ObjectParserTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.common.xcontent; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.elasticsearch.common.ParseField; import org.opensearch.common.Strings; import org.elasticsearch.common.xcontent.ObjectParser.NamedObjectParser; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateProcessor.java index 2c6ac78b411ed..dd7754dff1037 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateProcessor.java @@ -20,7 +20,7 @@ package org.opensearch.ingest.common; import org.elasticsearch.ExceptionsHelper; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.time.DateFormatter; import org.opensearch.common.util.LocaleUtils; import org.elasticsearch.ingest.AbstractProcessor; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/IngestCommonPlugin.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/IngestCommonPlugin.java index d47b660c6288d..1099131b6d992 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/IngestCommonPlugin.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/IngestCommonPlugin.java @@ -28,7 +28,7 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.SettingsFilter; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.grok.Grok; import org.opensearch.grok.MatcherWatchdog; import org.elasticsearch.ingest.DropProcessor; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ScriptProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ScriptProcessor.java index 94d73cf2ec38e..e67411103f400 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ScriptProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ScriptProcessor.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.common; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.logging.DeprecationLogger; import org.opensearch.common.util.CollectionUtils; @@ -53,7 +53,7 @@ public final class ScriptProcessor extends AbstractProcessor { private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(DynamicMap.class); - private static final Map> PARAMS_FUNCTIONS = org.elasticsearch.common.collect.Map.of( + private static final Map> PARAMS_FUNCTIONS = org.opensearch.common.collect.Map.of( "_type", value -> { deprecationLogger.deprecate("script_processor", "[types removal] Looking up doc types [_type] in scripts is deprecated."); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateFormatTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateFormatTests.java index c769dfd94d17e..0d629edbbd653 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateFormatTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateFormatTests.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.common; -import org.elasticsearch.bootstrap.JavaVersion; +import org.opensearch.bootstrap.JavaVersion; import org.opensearch.common.time.DateFormatter; import org.opensearch.common.time.DateUtils; import org.elasticsearch.test.ESTestCase; diff --git a/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/DatabaseReaderLazyLoader.java b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/DatabaseReaderLazyLoader.java index 890d8dc1a1376..39c59cb9f272d 100644 --- a/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/DatabaseReaderLazyLoader.java +++ b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/DatabaseReaderLazyLoader.java @@ -24,7 +24,7 @@ import org.apache.logging.log4j.Logger; import org.apache.lucene.util.SetOnce; import org.opensearch.common.CheckedSupplier; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import java.io.Closeable; import java.io.IOException; diff --git a/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/IngestGeoIpPlugin.java b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/IngestGeoIpPlugin.java index fd68c5e57ec0b..78327f6d20f4a 100644 --- a/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/IngestGeoIpPlugin.java +++ b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/IngestGeoIpPlugin.java @@ -24,13 +24,13 @@ import com.maxmind.db.Reader; import com.maxmind.geoip2.DatabaseReader; import com.maxmind.geoip2.model.AbstractResponse; -import org.elasticsearch.common.Booleans; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.Booleans; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.cache.Cache; import org.opensearch.common.cache.CacheBuilder; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.io.PathUtils; import org.opensearch.common.settings.Setting; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.ingest.Processor; import org.opensearch.plugins.IngestPlugin; import org.elasticsearch.plugins.Plugin; diff --git a/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java index b504e9e985335..0445efd7a0042 100644 --- a/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java +++ b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java @@ -21,7 +21,7 @@ import com.maxmind.geoip2.DatabaseReader; import org.opensearch.common.CheckedSupplier; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.io.PathUtils; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.RandomDocumentPicks; import org.opensearch.ingest.geoip.IngestGeoIpPlugin.GeoIpCache; diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionScriptEngine.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionScriptEngine.java index c6d4216aa8cde..3511d9a91cc39 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionScriptEngine.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionScriptEngine.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.DoubleValuesSource; import org.apache.lucene.search.SortField; import org.elasticsearch.SpecialPermission; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.IndexNumericFieldData; import org.elasticsearch.index.mapper.DateFieldMapper; 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 d150e8bfe533a..13cfc46c058b3 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 @@ -23,12 +23,12 @@ import org.opensearch.Version; import org.opensearch.action.ActionResponse; import org.opensearch.action.search.MultiSearchResponse; -import org.elasticsearch.common.Nullable; +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.io.stream.Writeable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/modules/lang-painless/src/doc/java/org/opensearch/painless/ContextDocGenerator.java b/modules/lang-painless/src/doc/java/org/opensearch/painless/ContextDocGenerator.java index 05ecea20df09c..26f99a4936dcc 100644 --- a/modules/lang-painless/src/doc/java/org/opensearch/painless/ContextDocGenerator.java +++ b/modules/lang-painless/src/doc/java/org/opensearch/painless/ContextDocGenerator.java @@ -19,11 +19,11 @@ package org.opensearch.painless; -import org.elasticsearch.common.SuppressForbidden; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.SuppressForbidden; +import org.opensearch.common.io.PathUtils; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.painless.action.PainlessContextClassBindingInfo; import org.opensearch.painless.action.PainlessContextClassInfo; import org.opensearch.painless.action.PainlessContextConstructorInfo; diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/DefBootstrap.java b/modules/lang-painless/src/main/java/org/opensearch/painless/DefBootstrap.java index 578e7c95a745d..41d3fd92ff3fc 100644 --- a/modules/lang-painless/src/main/java/org/opensearch/painless/DefBootstrap.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/DefBootstrap.java @@ -19,7 +19,7 @@ package org.opensearch.painless; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.painless.lookup.PainlessLookup; import org.opensearch.painless.symbol.FunctionTable; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/ArrayLikeObjectTestCase.java b/modules/lang-painless/src/test/java/org/opensearch/painless/ArrayLikeObjectTestCase.java index a11a06e18360a..8161a1a988597 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/ArrayLikeObjectTestCase.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/ArrayLikeObjectTestCase.java @@ -19,7 +19,7 @@ package org.opensearch.painless; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.hamcrest.Matcher; import static java.util.Collections.singletonMap; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/ArrayTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/ArrayTests.java index 1866684380785..fc65e2220538f 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/ArrayTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/ArrayTests.java @@ -20,7 +20,7 @@ package org.opensearch.painless; import org.apache.lucene.util.Constants; -import org.elasticsearch.bootstrap.JavaVersion; +import org.opensearch.bootstrap.JavaVersion; import org.hamcrest.Matcher; import java.lang.invoke.MethodHandle; diff --git a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureFieldMapperTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureFieldMapperTests.java index 63f4e6816fb87..df903cdb9ee0c 100644 --- a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureFieldMapperTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureFieldMapperTests.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.opensearch.common.Strings; -import org.elasticsearch.common.collect.List; +import org.opensearch.common.collect.List; import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.plugins.Plugin; diff --git a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/ScaledFloatFieldTypeTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/ScaledFloatFieldTypeTests.java index b7975a58605ee..941544e15b9b3 100644 --- a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/ScaledFloatFieldTypeTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/ScaledFloatFieldTypeTests.java @@ -32,7 +32,7 @@ import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.index.fielddata.IndexNumericFieldData; import org.opensearch.index.fielddata.LeafNumericFieldData; import org.opensearch.index.fielddata.SortedNumericDoubleValues; diff --git a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ChildQuerySearchIT.java b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ChildQuerySearchIT.java index 27e520e44b30c..f7aa115b978ba 100644 --- a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ChildQuerySearchIT.java +++ b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ChildQuerySearchIT.java @@ -28,7 +28,7 @@ import org.opensearch.common.lucene.search.function.CombineFunction; import org.opensearch.common.lucene.search.function.FunctionScoreQuery; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.index.query.BoolQueryBuilder; import org.opensearch.index.query.IdsQueryBuilder; import org.opensearch.index.query.InnerHitBuilder; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenToParentAggregatorTests.java b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenToParentAggregatorTests.java index b69af6f1a6575..252ed0cd5a14f 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenToParentAggregatorTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenToParentAggregatorTests.java @@ -34,7 +34,7 @@ import org.apache.lucene.util.BytesRef; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.lucene.index.OpenSearchDirectoryReader; import org.opensearch.common.settings.Settings; import org.opensearch.index.Index; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentToChildrenAggregatorTests.java b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentToChildrenAggregatorTests.java index 246f7c0271c27..42210c6f28260 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentToChildrenAggregatorTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentToChildrenAggregatorTests.java @@ -35,7 +35,7 @@ import org.apache.lucene.util.BytesRef; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.lucene.index.OpenSearchDirectoryReader; import org.opensearch.common.settings.Settings; import org.opensearch.index.Index; diff --git a/modules/percolator/src/main/java/org/opensearch/percolator/PercolateQuery.java b/modules/percolator/src/main/java/org/opensearch/percolator/PercolateQuery.java index 334ac33d88fe0..31d0314cd4588 100644 --- a/modules/percolator/src/main/java/org/opensearch/percolator/PercolateQuery.java +++ b/modules/percolator/src/main/java/org/opensearch/percolator/PercolateQuery.java @@ -36,7 +36,7 @@ import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.util.Accountable; import org.apache.lucene.util.Bits; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.lucene.Lucene; diff --git a/modules/percolator/src/main/java/org/opensearch/percolator/PercolatorFieldMapper.java b/modules/percolator/src/main/java/org/opensearch/percolator/PercolatorFieldMapper.java index b41d31659af49..e54246597095f 100644 --- a/modules/percolator/src/main/java/org/opensearch/percolator/PercolatorFieldMapper.java +++ b/modules/percolator/src/main/java/org/opensearch/percolator/PercolatorFieldMapper.java @@ -46,7 +46,7 @@ import org.opensearch.action.support.PlainActionFuture; import org.opensearch.common.ParsingException; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.hash.MurmurHash3; import org.opensearch.common.io.stream.OutputStreamStreamOutput; import org.opensearch.common.lucene.search.Queries; diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/CandidateQueryTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/CandidateQueryTests.java index 892b60e6aa9fd..e846b66910627 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/CandidateQueryTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/CandidateQueryTests.java @@ -79,7 +79,7 @@ import org.apache.lucene.util.BytesRef; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java index 8eb5038d0f321..d17556e88ed4a 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java @@ -46,7 +46,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.compress.CompressedXContent; import org.opensearch.common.hash.MurmurHash3; import org.opensearch.common.io.stream.InputStreamStreamInput; diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/QueryBuilderStoreTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/QueryBuilderStoreTests.java index e2d9657b03444..b703315e7446f 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/QueryBuilderStoreTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/QueryBuilderStoreTests.java @@ -30,7 +30,7 @@ import org.apache.lucene.store.Directory; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; diff --git a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/ExpectedReciprocalRank.java b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/ExpectedReciprocalRank.java index 432f925935596..77dd238701f52 100644 --- a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/ExpectedReciprocalRank.java +++ b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/ExpectedReciprocalRank.java @@ -19,7 +19,7 @@ package org.opensearch.index.rankeval; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; 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 4baaf8691de0d..3731183dd961b 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 @@ -23,7 +23,7 @@ import org.opensearch.action.ActionResponse; import org.elasticsearch.common.ParseField; import org.opensearch.common.Strings; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.ConstructingObjectParser; diff --git a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RatedRequest.java b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RatedRequest.java index cda0cf0967cb2..5690efd3705d0 100644 --- a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RatedRequest.java +++ b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RatedRequest.java @@ -19,7 +19,7 @@ package org.opensearch.index.rankeval; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; diff --git a/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/remote/ReindexFromOldRemoteIT.java b/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/remote/ReindexFromOldRemoteIT.java index 744f46c85d61c..4708b709367ec 100644 --- a/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/remote/ReindexFromOldRemoteIT.java +++ b/modules/reindex/src/javaRestTest/java/org/opensearch/index/reindex/remote/ReindexFromOldRemoteIT.java @@ -25,7 +25,7 @@ import org.opensearch.client.Request; import org.opensearch.client.Response; import org.opensearch.client.RestClient; -import org.elasticsearch.common.Booleans; +import org.opensearch.common.Booleans; import org.elasticsearch.test.rest.ESRestTestCase; import java.io.IOException; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java index eea255c9522f0..fd904e70e2946 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java @@ -36,9 +36,9 @@ import org.opensearch.action.index.IndexRequest; import org.opensearch.action.support.TransportAction; import org.opensearch.client.ParentTaskAssigningClient; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.AbstractRunnable; import org.elasticsearch.index.VersionType; import org.elasticsearch.index.mapper.IdFieldMapper; @@ -81,7 +81,7 @@ import static java.util.Collections.emptyList; import static java.util.Collections.unmodifiableList; import static org.opensearch.action.bulk.BackoffPolicy.exponentialBackoff; -import static org.elasticsearch.common.unit.TimeValue.timeValueNanos; +import static org.opensearch.common.unit.TimeValue.timeValueNanos; import static org.elasticsearch.index.reindex.AbstractBulkByScrollRequest.MAX_DOCS_ALL_MATCHES; import static org.opensearch.rest.RestStatus.CONFLICT; import static org.opensearch.search.sort.SortBuilders.fieldSort; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/RestReindexAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/RestReindexAction.java index 16c673b721ae6..09b21cf277dab 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/RestReindexAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/RestReindexAction.java @@ -32,7 +32,7 @@ import java.util.Set; import static java.util.Collections.singletonList; -import static org.elasticsearch.common.unit.TimeValue.parseTimeValue; +import static org.opensearch.common.unit.TimeValue.parseTimeValue; import static org.opensearch.rest.RestRequest.Method.POST; /** diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteRequestBuilders.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteRequestBuilders.java index d337523041473..cb4d386193d3d 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteRequestBuilders.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteRequestBuilders.java @@ -28,7 +28,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.logging.DeprecationLogger; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.xcontent.LoggingDeprecationHandler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -44,7 +44,7 @@ import java.util.Arrays; import java.util.stream.Collectors; -import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; +import static org.opensearch.common.unit.TimeValue.timeValueMillis; /** * Builds requests for remote version of OpenSearch. Note that unlike most of the diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java index 989a8919b15a3..186c369699053 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.ParseField; import org.opensearch.common.ParsingException; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.util.concurrent.EsRejectedExecutionException; import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.ObjectParser; 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 d27bf21c15f74..f5c31300b7b6d 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 @@ -35,10 +35,10 @@ import org.opensearch.client.ResponseException; import org.opensearch.client.ResponseListener; import org.opensearch.client.RestClient; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.common.xcontent.LoggingDeprecationHandler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; @@ -55,8 +55,8 @@ import java.util.function.BiFunction; import java.util.function.Consumer; -import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; -import static org.elasticsearch.common.unit.TimeValue.timeValueNanos; +import static org.opensearch.common.unit.TimeValue.timeValueMillis; +import static org.opensearch.common.unit.TimeValue.timeValueNanos; import static org.opensearch.index.reindex.remote.RemoteResponseParsers.MAIN_ACTION_PARSER; import static org.opensearch.index.reindex.remote.RemoteResponseParsers.RESPONSE_PARSER; 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 7a33057308229..c05ad06955487 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 @@ -57,11 +57,11 @@ import org.opensearch.client.FilterClient; import org.opensearch.client.ParentTaskAssigningClient; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.settings.Settings; import org.opensearch.common.text.Text; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.AbstractRunnable; import org.opensearch.common.util.concurrent.EsRejectedExecutionException; import org.elasticsearch.common.xcontent.XContentType; @@ -117,8 +117,8 @@ import static java.util.Collections.synchronizedSet; import static org.apache.lucene.util.TestUtil.randomSimpleString; import static org.opensearch.action.bulk.BackoffPolicy.constantBackoff; -import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; -import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds; +import static org.opensearch.common.unit.TimeValue.timeValueMillis; +import static org.opensearch.common.unit.TimeValue.timeValueSeconds; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.either; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkIndexByScrollResponseTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkIndexByScrollResponseTests.java index 3fe6ada7fef91..47a843db59c48 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkIndexByScrollResponseTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkIndexByScrollResponseTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.index.reindex.BulkByScrollTask; import org.elasticsearch.index.reindex.ScrollableHitSource.SearchFailure; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import java.util.ArrayList; @@ -32,7 +32,7 @@ import java.util.stream.IntStream; import static java.util.Collections.emptyList; -import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; +import static org.opensearch.common.unit.TimeValue.timeValueMillis; public class BulkIndexByScrollResponseTests extends ESTestCase { public void testMergeConstructor() { diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ClientScrollableHitSourceTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ClientScrollableHitSourceTests.java index bc6c621e5571c..d357204eec7c9 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ClientScrollableHitSourceTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ClientScrollableHitSourceTests.java @@ -35,7 +35,7 @@ import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.settings.Settings; import org.opensearch.common.text.Text; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.EsRejectedExecutionException; import org.elasticsearch.index.reindex.ClientScrollableHitSource; import org.elasticsearch.index.reindex.ScrollableHitSource; @@ -60,7 +60,7 @@ import static java.util.Collections.emptyMap; import static org.apache.lucene.util.TestUtil.randomSimpleString; -import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds; +import static org.opensearch.common.unit.TimeValue.timeValueSeconds; import static org.hamcrest.Matchers.instanceOf; public class ClientScrollableHitSourceTests extends ESTestCase { diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryBasicTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryBasicTests.java index dc8316449f125..2277d2b7475ba 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryBasicTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryBasicTests.java @@ -25,7 +25,7 @@ import org.opensearch.cluster.InternalClusterInfoService; import org.opensearch.cluster.routing.allocation.DiskThresholdSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.index.IndexNotFoundException; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java index fcdb976c10075..3a9a309352266 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java @@ -26,9 +26,9 @@ import org.opensearch.client.Request; import org.opensearch.client.Response; import org.opensearch.client.RestClient; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.bytes.BytesArray; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.io.PathUtils; import org.opensearch.common.settings.Settings; import org.opensearch.common.ssl.PemKeyConfig; import org.opensearch.common.ssl.PemTrustConfig; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSourceTargetValidationTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSourceTargetValidationTests.java index d4d8161f30176..b3078a38902c3 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSourceTargetValidationTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSourceTargetValidationTests.java @@ -30,7 +30,7 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.metadata.Metadata; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.settings.ClusterSettings; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/RoundTripTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/RoundTripTests.java index 7ff5d668f787c..71aeaba7ca44b 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/RoundTripTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/RoundTripTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.lucene.uid.Versions; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; import org.elasticsearch.index.reindex.AbstractBulkIndexByScrollRequest; import org.elasticsearch.index.reindex.DeleteByQueryRequest; @@ -46,7 +46,7 @@ import java.util.Map; import static org.apache.lucene.util.TestUtil.randomSimpleString; -import static org.elasticsearch.common.unit.TimeValue.parseTimeValue; +import static org.opensearch.common.unit.TimeValue.parseTimeValue; /** * Round trip tests for all {@link Writeable} things declared in this plugin. diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/TransportRethrottleActionTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/TransportRethrottleActionTests.java index 823da00f56bf8..8d36f845621c0 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/TransportRethrottleActionTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/TransportRethrottleActionTests.java @@ -40,7 +40,7 @@ import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; -import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; +import static org.opensearch.common.unit.TimeValue.timeValueMillis; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.hasToString; import static org.hamcrest.Matchers.theInstance; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteRequestBuildersTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteRequestBuildersTests.java index 56729474ae967..dc9bd0de14b72 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteRequestBuildersTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteRequestBuildersTests.java @@ -27,7 +27,7 @@ import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.io.Streams; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.ESTestCase; @@ -36,7 +36,7 @@ import java.nio.charset.StandardCharsets; import java.util.Map; -import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; +import static org.opensearch.common.unit.TimeValue.timeValueMillis; import static org.opensearch.index.reindex.remote.RemoteRequestBuilders.DEPRECATED_URL_ENCODED_INDEX_WARNING; import static org.opensearch.index.reindex.remote.RemoteRequestBuilders.clearScroll; import static org.opensearch.index.reindex.remote.RemoteRequestBuilders.initialSearch; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java index a658f39d8ab66..2e9b83f136e25 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java @@ -49,7 +49,7 @@ import org.opensearch.common.io.Streams; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.EsExecutors; import org.opensearch.common.util.concurrent.EsRejectedExecutionException; import org.elasticsearch.index.reindex.RejectAwareActionListener; @@ -78,8 +78,8 @@ import java.util.function.Consumer; import java.util.stream.Stream; -import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; -import static org.elasticsearch.common.unit.TimeValue.timeValueMinutes; +import static org.opensearch.common.unit.TimeValue.timeValueMillis; +import static org.opensearch.common.unit.TimeValue.timeValueMinutes; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.hasSize; diff --git a/modules/repository-url/src/main/java/org/opensearch/common/blobstore/url/URLBlobContainer.java b/modules/repository-url/src/main/java/org/opensearch/common/blobstore/url/URLBlobContainer.java index 5c54459d0bc20..a70a8ecbcf233 100644 --- a/modules/repository-url/src/main/java/org/opensearch/common/blobstore/url/URLBlobContainer.java +++ b/modules/repository-url/src/main/java/org/opensearch/common/blobstore/url/URLBlobContainer.java @@ -19,7 +19,7 @@ package org.opensearch.common.blobstore.url; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.blobstore.BlobContainer; import org.opensearch.common.blobstore.BlobMetadata; import org.opensearch.common.blobstore.BlobPath; diff --git a/modules/repository-url/src/test/java/org/opensearch/common/blobstore/url/URLBlobStoreTests.java b/modules/repository-url/src/test/java/org/opensearch/common/blobstore/url/URLBlobStoreTests.java index 834aec26f788b..ceb86b81c88bc 100644 --- a/modules/repository-url/src/test/java/org/opensearch/common/blobstore/url/URLBlobStoreTests.java +++ b/modules/repository-url/src/test/java/org/opensearch/common/blobstore/url/URLBlobStoreTests.java @@ -20,7 +20,7 @@ package org.opensearch.common.blobstore.url; import com.sun.net.httpserver.HttpServer; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.blobstore.BlobContainer; import org.opensearch.common.blobstore.BlobPath; import org.opensearch.common.settings.Settings; diff --git a/modules/repository-url/src/test/java/org/opensearch/repositories/url/URLFixture.java b/modules/repository-url/src/test/java/org/opensearch/repositories/url/URLFixture.java index 7ced3a44cbcef..f364034c1c735 100644 --- a/modules/repository-url/src/test/java/org/opensearch/repositories/url/URLFixture.java +++ b/modules/repository-url/src/test/java/org/opensearch/repositories/url/URLFixture.java @@ -19,7 +19,7 @@ package org.opensearch.repositories.url; import org.elasticsearch.test.fixture.AbstractHttpFixture; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.rest.RestStatus; import java.io.IOException; diff --git a/modules/repository-url/src/yamlRestTest/java/org/opensearch/repositories/url/RepositoryURLClientYamlTestSuiteIT.java b/modules/repository-url/src/yamlRestTest/java/org/opensearch/repositories/url/RepositoryURLClientYamlTestSuiteIT.java index 60c0b465e431c..b7802b7693bc7 100644 --- a/modules/repository-url/src/yamlRestTest/java/org/opensearch/repositories/url/RepositoryURLClientYamlTestSuiteIT.java +++ b/modules/repository-url/src/yamlRestTest/java/org/opensearch/repositories/url/RepositoryURLClientYamlTestSuiteIT.java @@ -27,7 +27,7 @@ import org.opensearch.client.Request; import org.opensearch.client.Response; import org.opensearch.common.Strings; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.io.PathUtils; import org.opensearch.common.settings.Settings; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java b/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java index e5a57f78cd16a..e49f7c463b168 100644 --- a/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java +++ b/modules/systemd/src/main/java/org/opensearch/systemd/SystemdPlugin.java @@ -27,7 +27,7 @@ import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.io.stream.NamedWriteableRegistry; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.env.Environment; import org.elasticsearch.env.NodeEnvironment; diff --git a/modules/systemd/src/test/java/org/opensearch/systemd/SystemdPluginTests.java b/modules/systemd/src/test/java/org/opensearch/systemd/SystemdPluginTests.java index 8e2c57ff82165..1830b528571c0 100644 --- a/modules/systemd/src/test/java/org/opensearch/systemd/SystemdPluginTests.java +++ b/modules/systemd/src/test/java/org/opensearch/systemd/SystemdPluginTests.java @@ -20,8 +20,8 @@ package org.opensearch.systemd; import org.elasticsearch.Build; -import org.elasticsearch.common.CheckedConsumer; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.CheckedConsumer; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.hamcrest.OptionalMatchers; import org.opensearch.threadpool.Scheduler; diff --git a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4HttpRequestSizeLimitIT.java b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4HttpRequestSizeLimitIT.java index 5a088778cee70..6f6bc6000e151 100644 --- a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4HttpRequestSizeLimitIT.java +++ b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4HttpRequestSizeLimitIT.java @@ -23,7 +23,7 @@ import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.util.ReferenceCounted; import org.opensearch.OpenSearchNetty4IntegTestCase; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; import org.opensearch.common.unit.ByteSizeUnit; diff --git a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/rest/discovery/Zen2RestApiIT.java b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/rest/discovery/Zen2RestApiIT.java index 44573465c57a8..6ba662da87972 100644 --- a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/rest/discovery/Zen2RestApiIT.java +++ b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/rest/discovery/Zen2RestApiIT.java @@ -32,7 +32,7 @@ import org.opensearch.cluster.routing.UnassignedInfo; import org.opensearch.common.Priority; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.http.HttpServerTransport; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.InternalTestCluster; diff --git a/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpChannel.java b/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpChannel.java index b4c4a73682c42..be2ac444e0535 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpChannel.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpChannel.java @@ -21,7 +21,7 @@ import io.netty.channel.Channel; import org.opensearch.action.ActionListener; -import org.elasticsearch.common.concurrent.CompletableContext; +import org.opensearch.common.concurrent.CompletableContext; import org.opensearch.http.HttpChannel; import org.opensearch.http.HttpResponse; import org.opensearch.transport.netty4.Netty4TcpChannel; diff --git a/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpPipeliningHandler.java b/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpPipeliningHandler.java index 16ecec272c239..e0578deca7f1b 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpPipeliningHandler.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpPipeliningHandler.java @@ -23,7 +23,7 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPromise; import org.apache.logging.log4j.Logger; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.http.HttpPipelinedRequest; import org.opensearch.http.HttpPipelinedResponse; import org.opensearch.http.HttpPipeliningAggregator; diff --git a/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpResponseCreator.java b/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpResponseCreator.java index 98ee1a6b48fd8..c494c515a7fd1 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpResponseCreator.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpResponseCreator.java @@ -28,7 +28,7 @@ import io.netty.handler.codec.http.DefaultHttpResponse; import io.netty.handler.codec.http.DefaultLastHttpContent; import io.netty.handler.codec.http.HttpResponse; -import org.elasticsearch.common.Booleans; +import org.opensearch.common.Booleans; import org.opensearch.transport.NettyAllocator; import java.util.List; diff --git a/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpServerChannel.java b/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpServerChannel.java index a060b969a45e3..bdcd4334ff3bc 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpServerChannel.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpServerChannel.java @@ -21,7 +21,7 @@ import io.netty.channel.Channel; import org.opensearch.action.ActionListener; -import org.elasticsearch.common.concurrent.CompletableContext; +import org.opensearch.common.concurrent.CompletableContext; import org.opensearch.http.HttpServerChannel; import org.opensearch.transport.netty4.Netty4TcpChannel; diff --git a/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpServerTransport.java b/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpServerTransport.java index db85e96e4ca9a..1d298d45e7586 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpServerTransport.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/http/netty4/Netty4HttpServerTransport.java @@ -52,8 +52,8 @@ import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.concurrent.EsExecutors; import org.elasticsearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.core.internal.io.IOUtils; -import org.elasticsearch.core.internal.net.NetUtils; +import org.opensearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.net.NetUtils; import org.opensearch.http.AbstractHttpServerTransport; import org.opensearch.http.HttpChannel; import org.opensearch.http.HttpHandlingSettings; diff --git a/modules/transport-netty4/src/main/java/org/opensearch/transport/CopyBytesSocketChannel.java b/modules/transport-netty4/src/main/java/org/opensearch/transport/CopyBytesSocketChannel.java index 1c295756de255..3b37eb2d3a27a 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/transport/CopyBytesSocketChannel.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/transport/CopyBytesSocketChannel.java @@ -38,7 +38,7 @@ import io.netty.channel.ChannelOutboundBuffer; import io.netty.channel.RecvByteBufAllocator; import io.netty.channel.socket.nio.NioSocketChannel; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.unit.ByteSizeValue; import java.io.IOException; diff --git a/modules/transport-netty4/src/main/java/org/opensearch/transport/NettyAllocator.java b/modules/transport-netty4/src/main/java/org/opensearch/transport/NettyAllocator.java index b51a2ae79bec4..82ec7abf44215 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/transport/NettyAllocator.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/transport/NettyAllocator.java @@ -29,7 +29,7 @@ import io.netty.channel.socket.nio.NioServerSocketChannel; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.common.Booleans; +import org.opensearch.common.Booleans; import org.opensearch.common.unit.ByteSizeValue; import org.elasticsearch.monitor.jvm.JvmInfo; diff --git a/modules/transport-netty4/src/main/java/org/opensearch/transport/SharedGroupFactory.java b/modules/transport-netty4/src/main/java/org/opensearch/transport/SharedGroupFactory.java index bd78e6f772fa7..b0ea495d60722 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/transport/SharedGroupFactory.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/transport/SharedGroupFactory.java @@ -25,7 +25,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.util.concurrent.AbstractRefCounted; +import org.opensearch.common.util.concurrent.AbstractRefCounted; import org.opensearch.http.HttpServerTransport; import org.opensearch.http.netty4.Netty4HttpServerTransport; import org.opensearch.transport.netty4.Netty4Transport; diff --git a/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4TcpChannel.java b/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4TcpChannel.java index c388e06137556..0562cd0ed0da1 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4TcpChannel.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4TcpChannel.java @@ -24,9 +24,9 @@ import io.netty.channel.ChannelPromise; import org.elasticsearch.ExceptionsHelper; import org.opensearch.action.ActionListener; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.concurrent.CompletableContext; +import org.opensearch.common.concurrent.CompletableContext; import org.opensearch.transport.TcpChannel; import org.opensearch.transport.TransportException; diff --git a/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4TcpServerChannel.java b/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4TcpServerChannel.java index a6a80bad3910d..1a2b136c9f68e 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4TcpServerChannel.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4TcpServerChannel.java @@ -21,7 +21,7 @@ import io.netty.channel.Channel; import org.opensearch.action.ActionListener; -import org.elasticsearch.common.concurrent.CompletableContext; +import org.opensearch.common.concurrent.CompletableContext; import org.opensearch.transport.TcpServerChannel; import java.net.InetSocketAddress; diff --git a/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4Transport.java b/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4Transport.java index e4d5719798ad1..d1495adfcc4a4 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4Transport.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4Transport.java @@ -38,7 +38,7 @@ import org.elasticsearch.ExceptionsHelper; import org.opensearch.Version; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.lease.Releasables; import org.opensearch.common.network.NetworkService; @@ -48,8 +48,8 @@ import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.util.PageCacheRecycler; -import org.elasticsearch.common.util.concurrent.EsExecutors; -import org.elasticsearch.core.internal.net.NetUtils; +import org.opensearch.common.util.concurrent.EsExecutors; +import org.opensearch.core.internal.net.NetUtils; import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.Netty4NioSocketChannel; diff --git a/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4Utils.java b/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4Utils.java index 8c4bb17100688..844623441575d 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4Utils.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/transport/netty4/Netty4Utils.java @@ -25,7 +25,7 @@ import io.netty.util.NettyRuntime; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefIterator; -import org.elasticsearch.common.Booleans; +import org.opensearch.common.Booleans; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; diff --git a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpClient.java b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpClient.java index 136541712b300..b14f9cd72f2e5 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpClient.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpClient.java @@ -42,7 +42,7 @@ import io.netty.handler.codec.http.HttpResponse; import io.netty.handler.codec.http.HttpResponseDecoder; import io.netty.handler.codec.http.HttpVersion; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.tasks.Task; diff --git a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerTransportTests.java b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerTransportTests.java index 0345086aa15d5..51f9489600341 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerTransportTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerTransportTests.java @@ -53,7 +53,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.MockBigArrays; import org.elasticsearch.common.util.MockPageCacheRecycler; import org.opensearch.common.util.concurrent.ThreadContext; diff --git a/modules/transport-netty4/src/test/java/org/opensearch/transport/CopyBytesSocketChannelTests.java b/modules/transport-netty4/src/test/java/org/opensearch/transport/CopyBytesSocketChannelTests.java index 5577c6357e098..54120439da487 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/transport/CopyBytesSocketChannelTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/transport/CopyBytesSocketChannelTests.java @@ -30,7 +30,7 @@ import io.netty.channel.ChannelOption; import io.netty.channel.SimpleChannelInboundHandler; import io.netty.channel.nio.NioEventLoopGroup; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.elasticsearch.test.ESTestCase; import java.io.IOException; diff --git a/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/SimpleNetty4TransportTests.java b/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/SimpleNetty4TransportTests.java index 7ed0f7bd37057..00b8cf3565d72 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/SimpleNetty4TransportTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/SimpleNetty4TransportTests.java @@ -21,7 +21,7 @@ import org.opensearch.Version; import org.opensearch.action.ActionListener; -import org.elasticsearch.bootstrap.JavaVersion; +import org.opensearch.bootstrap.JavaVersion; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.network.NetworkService; @@ -29,8 +29,8 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; import org.opensearch.common.util.PageCacheRecycler; -import org.elasticsearch.core.internal.io.IOUtils; -import org.elasticsearch.core.internal.net.NetUtils; +import org.opensearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.net.NetUtils; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.elasticsearch.test.transport.MockTransportService; import org.elasticsearch.test.transport.StubbableTransport; diff --git a/server/src/main/java/org/elasticsearch/Build.java b/server/src/main/java/org/elasticsearch/Build.java index 5eb5e7c1392e0..479a141823176 100644 --- a/server/src/main/java/org/elasticsearch/Build.java +++ b/server/src/main/java/org/elasticsearch/Build.java @@ -19,7 +19,7 @@ package org.elasticsearch; -import org.elasticsearch.common.Booleans; +import org.opensearch.common.Booleans; import org.opensearch.common.io.FileSystemUtils; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/elasticsearch/ExceptionsHelper.java b/server/src/main/java/org/elasticsearch/ExceptionsHelper.java index aff1188b8ecbd..352a697999091 100644 --- a/server/src/main/java/org/elasticsearch/ExceptionsHelper.java +++ b/server/src/main/java/org/elasticsearch/ExceptionsHelper.java @@ -26,7 +26,7 @@ import org.apache.lucene.index.IndexFormatTooNewException; import org.apache.lucene.index.IndexFormatTooOldException; import org.opensearch.action.ShardOperationFailedException; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.util.concurrent.EsRejectedExecutionException; import org.elasticsearch.index.Index; import org.opensearch.rest.RestStatus; diff --git a/server/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java b/server/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java index 7c3c7d6dbf714..b495e5e05cd6f 100644 --- a/server/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java +++ b/server/src/main/java/org/elasticsearch/watcher/ResourceWatcherService.java @@ -23,7 +23,7 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.threadpool.ThreadPool; import org.opensearch.threadpool.Scheduler.Cancellable; import org.opensearch.threadpool.ThreadPool.Names; diff --git a/server/src/main/java/org/opensearch/OpenSearchException.java b/server/src/main/java/org/opensearch/OpenSearchException.java index 40da2ead20a11..68157984da29d 100644 --- a/server/src/main/java/org/opensearch/OpenSearchException.java +++ b/server/src/main/java/org/opensearch/OpenSearchException.java @@ -19,14 +19,12 @@ package org.opensearch; -import org.opensearch.action.search.ReduceSearchPhaseException; -import org.opensearch.action.search.SearchPhaseExecutionException; import org.opensearch.action.support.replication.ReplicationOperation; import org.opensearch.cluster.action.shard.ShardStateAction; -import org.elasticsearch.common.CheckedFunction; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.CheckedFunction; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.collect.Tuple; +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; diff --git a/server/src/main/java/org/opensearch/Version.java b/server/src/main/java/org/opensearch/Version.java index 03b5d7b286248..3361a942ec8d8 100644 --- a/server/src/main/java/org/opensearch/Version.java +++ b/server/src/main/java/org/opensearch/Version.java @@ -23,7 +23,7 @@ import org.elasticsearch.Build; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.Strings; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.collect.ImmutableOpenIntMap; import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/opensearch/action/ActionFuture.java b/server/src/main/java/org/opensearch/action/ActionFuture.java index 43ed541beb184..78565680e9f50 100644 --- a/server/src/main/java/org/opensearch/action/ActionFuture.java +++ b/server/src/main/java/org/opensearch/action/ActionFuture.java @@ -19,7 +19,7 @@ package org.opensearch.action; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; diff --git a/server/src/main/java/org/opensearch/action/ActionListener.java b/server/src/main/java/org/opensearch/action/ActionListener.java index d40bd35ac7875..3eaf1671b5bb0 100644 --- a/server/src/main/java/org/opensearch/action/ActionListener.java +++ b/server/src/main/java/org/opensearch/action/ActionListener.java @@ -20,9 +20,9 @@ package org.opensearch.action; import org.elasticsearch.ExceptionsHelper; -import org.elasticsearch.common.CheckedConsumer; -import org.elasticsearch.common.CheckedFunction; -import org.elasticsearch.common.CheckedRunnable; +import org.opensearch.common.CheckedConsumer; +import org.opensearch.common.CheckedFunction; +import org.opensearch.common.CheckedRunnable; import org.opensearch.common.CheckedSupplier; import java.util.ArrayList; diff --git a/server/src/main/java/org/opensearch/action/ActionRequestBuilder.java b/server/src/main/java/org/opensearch/action/ActionRequestBuilder.java index f557beb1242f5..9f319f7f8235e 100644 --- a/server/src/main/java/org/opensearch/action/ActionRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/ActionRequestBuilder.java @@ -20,7 +20,7 @@ package org.opensearch.action; import org.opensearch.client.OpenSearchClient; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.Objects; diff --git a/server/src/main/java/org/opensearch/action/ActionRunnable.java b/server/src/main/java/org/opensearch/action/ActionRunnable.java index db7a520f7213f..20d1faec6a526 100644 --- a/server/src/main/java/org/opensearch/action/ActionRunnable.java +++ b/server/src/main/java/org/opensearch/action/ActionRunnable.java @@ -19,8 +19,8 @@ package org.opensearch.action; -import org.elasticsearch.common.CheckedConsumer; -import org.elasticsearch.common.CheckedRunnable; +import org.opensearch.common.CheckedConsumer; +import org.opensearch.common.CheckedRunnable; import org.opensearch.common.CheckedSupplier; import org.opensearch.common.util.concurrent.AbstractRunnable; diff --git a/server/src/main/java/org/opensearch/action/DocWriteRequest.java b/server/src/main/java/org/opensearch/action/DocWriteRequest.java index f1547cbb5d0fd..870da78556f13 100644 --- a/server/src/main/java/org/opensearch/action/DocWriteRequest.java +++ b/server/src/main/java/org/opensearch/action/DocWriteRequest.java @@ -23,7 +23,7 @@ import org.opensearch.action.index.IndexRequest; import org.opensearch.action.support.IndicesOptions; import org.opensearch.action.update.UpdateRequest; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.lucene.uid.Versions; diff --git a/server/src/main/java/org/opensearch/action/DocWriteResponse.java b/server/src/main/java/org/opensearch/action/DocWriteResponse.java index 607ab18ce1044..d961ef3ad2e71 100644 --- a/server/src/main/java/org/opensearch/action/DocWriteResponse.java +++ b/server/src/main/java/org/opensearch/action/DocWriteResponse.java @@ -24,7 +24,7 @@ import org.opensearch.action.support.WriteResponse; import org.opensearch.action.support.replication.ReplicationResponse; import org.opensearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; diff --git a/server/src/main/java/org/opensearch/action/ShardOperationFailedException.java b/server/src/main/java/org/opensearch/action/ShardOperationFailedException.java index b77f1ce0888c8..130573b1060b5 100644 --- a/server/src/main/java/org/opensearch/action/ShardOperationFailedException.java +++ b/server/src/main/java/org/opensearch/action/ShardOperationFailedException.java @@ -19,7 +19,7 @@ package org.opensearch.action; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.rest.RestStatus; diff --git a/server/src/main/java/org/opensearch/action/StepListener.java b/server/src/main/java/org/opensearch/action/StepListener.java index 5a3311ffcf21f..cc7e5ceda4c3c 100644 --- a/server/src/main/java/org/opensearch/action/StepListener.java +++ b/server/src/main/java/org/opensearch/action/StepListener.java @@ -19,7 +19,7 @@ package org.opensearch.action; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.util.concurrent.EsExecutors; import org.opensearch.common.util.concurrent.FutureUtils; import org.opensearch.common.util.concurrent.ListenableFuture; diff --git a/server/src/main/java/org/opensearch/action/UnavailableShardsException.java b/server/src/main/java/org/opensearch/action/UnavailableShardsException.java index 1883adb67d4c0..4bf773e2efe09 100644 --- a/server/src/main/java/org/opensearch/action/UnavailableShardsException.java +++ b/server/src/main/java/org/opensearch/action/UnavailableShardsException.java @@ -20,7 +20,7 @@ package org.opensearch.action; import org.opensearch.OpenSearchException; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.elasticsearch.index.shard.ShardId; import org.opensearch.rest.RestStatus; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/allocation/ClusterAllocationExplainRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/allocation/ClusterAllocationExplainRequest.java index cdbf698fadd72..89ff338d4eb5a 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/allocation/ClusterAllocationExplainRequest.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/allocation/ClusterAllocationExplainRequest.java @@ -21,7 +21,7 @@ import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.support.master.MasterNodeRequest; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java b/server/src/main/java/org/opensearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java index d982b7201a4a4..a93a07a205eb3 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java @@ -26,7 +26,7 @@ import org.opensearch.cluster.routing.UnassignedInfo; import org.opensearch.cluster.routing.allocation.AllocationDecision; import org.opensearch.cluster.routing.allocation.ShardAllocationDecision; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; 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 43eb477e168d4..682161d005905 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 @@ -29,7 +29,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.logging.DeprecationLogger; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.io.IOException; import java.util.Arrays; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/configuration/ClearVotingConfigExclusionsRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/configuration/ClearVotingConfigExclusionsRequest.java index 69f55033de5e3..6f75306b22345 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/configuration/ClearVotingConfigExclusionsRequest.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/configuration/ClearVotingConfigExclusionsRequest.java @@ -22,7 +22,7 @@ import org.opensearch.action.support.master.MasterNodeRequest; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/configuration/TransportAddVotingConfigExclusionsAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/configuration/TransportAddVotingConfigExclusionsAction.java index 5bdf25b56ca6c..feb88b5bdde14 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/configuration/TransportAddVotingConfigExclusionsAction.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/configuration/TransportAddVotingConfigExclusionsAction.java @@ -43,7 +43,7 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.threadpool.ThreadPool; import org.opensearch.threadpool.ThreadPool.Names; import org.opensearch.transport.TransportService; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/configuration/TransportClearVotingConfigExclusionsAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/configuration/TransportClearVotingConfigExclusionsAction.java index 184e890acda81..26d582b4052da 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/configuration/TransportClearVotingConfigExclusionsAction.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/configuration/TransportClearVotingConfigExclusionsAction.java @@ -39,7 +39,7 @@ import org.opensearch.common.Priority; import org.opensearch.common.inject.Inject; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.threadpool.ThreadPool; import org.opensearch.threadpool.ThreadPool.Names; import org.opensearch.transport.TransportService; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthRequest.java index ec25a47573fe7..e6a849a51dd3d 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthRequest.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthRequest.java @@ -29,7 +29,7 @@ import org.opensearch.common.Priority; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.io.IOException; import java.util.Objects; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java index 58b940860d8d9..8e3494af5a44f 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthRequestBuilder.java @@ -25,7 +25,7 @@ import org.opensearch.client.OpenSearchClient; import org.opensearch.cluster.health.ClusterHealthStatus; import org.opensearch.common.Priority; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; public class ClusterHealthRequestBuilder extends MasterNodeReadOperationRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthResponse.java b/server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthResponse.java index e7d5961b28646..e3385a80064f8 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthResponse.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/health/ClusterHealthResponse.java @@ -28,7 +28,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.ObjectParser; import org.opensearch.common.xcontent.StatusToXContentObject; 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 29b9fee654666..09d5195d125ad 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 @@ -42,7 +42,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.inject.Inject; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.CollectionUtils; import org.opensearch.index.IndexNotFoundException; import org.opensearch.node.NodeClosedException; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java index 14e2321771865..61375be0a112a 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java @@ -22,7 +22,7 @@ import org.opensearch.action.support.nodes.BaseNodesRequest; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.io.IOException; import java.util.concurrent.TimeUnit; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequestBuilder.java index 3c6310f786f5c..a708c73a4d93c 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequestBuilder.java @@ -21,7 +21,7 @@ import org.opensearch.action.support.nodes.NodesOperationRequestBuilder; import org.opensearch.client.OpenSearchClient; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; public class NodesHotThreadsRequestBuilder extends NodesOperationRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/info/NodeInfo.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/info/NodeInfo.java index 21bb7feca4e8e..1b478c9671e71 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/info/NodeInfo.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/info/NodeInfo.java @@ -23,7 +23,7 @@ import org.opensearch.Version; import org.opensearch.action.support.nodes.BaseNodeResponse; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.settings.Settings; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsRequest.java index d9a1354e525b3..3b6cb8ee38c4d 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsRequest.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/reload/NodesReloadSecureSettingsRequest.java @@ -25,8 +25,8 @@ import java.io.IOException; -import org.elasticsearch.common.CharArrays; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.CharArrays; +import org.opensearch.common.Nullable; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodeStats.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodeStats.java index 55685801f7f61..e6c49e56d2f74 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodeStats.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/stats/NodeStats.java @@ -23,7 +23,7 @@ import org.opensearch.action.support.nodes.BaseNodeResponse; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodeRole; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.ToXContentFragment; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/get/GetTaskRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/get/GetTaskRequest.java index 140d60ddd4f47..d32b947b48b81 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/get/GetTaskRequest.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/get/GetTaskRequest.java @@ -23,7 +23,7 @@ import org.opensearch.action.ActionRequestValidationException; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.tasks.TaskId; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/get/GetTaskRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/get/GetTaskRequestBuilder.java index eac71d0586623..9587e8349554c 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/get/GetTaskRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/get/GetTaskRequestBuilder.java @@ -21,7 +21,7 @@ import org.opensearch.action.ActionRequestBuilder; import org.opensearch.client.OpenSearchClient; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.tasks.TaskId; /** diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/list/TransportListTasksAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/list/TransportListTasksAction.java index f082ea1533c12..4b48bf91adc55 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/list/TransportListTasksAction.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/node/tasks/list/TransportListTasksAction.java @@ -26,7 +26,7 @@ import org.opensearch.action.support.tasks.TransportTasksAction; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.tasks.Task; import org.opensearch.tasks.TaskInfo; import org.opensearch.threadpool.ThreadPool; @@ -35,7 +35,7 @@ import java.util.List; import java.util.function.Consumer; -import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds; +import static org.opensearch.common.unit.TimeValue.timeValueSeconds; public class TransportListTasksAction extends TransportTasksAction { public static long waitForCompletionTimeout(TimeValue timeout) { diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/repositories/cleanup/TransportCleanupRepositoryAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/repositories/cleanup/TransportCleanupRepositoryAction.java index 63f77178c9cc6..94b4b90cb58b3 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/repositories/cleanup/TransportCleanupRepositoryAction.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/repositories/cleanup/TransportCleanupRepositoryAction.java @@ -37,7 +37,7 @@ import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.inject.Inject; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.repositories.RepositoriesService; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/settings/SettingsUpdater.java b/server/src/main/java/org/opensearch/action/admin/cluster/settings/SettingsUpdater.java index 098b995da2f33..d7de3cc8f98b4 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/settings/SettingsUpdater.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/settings/SettingsUpdater.java @@ -25,7 +25,7 @@ import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.block.ClusterBlocks; import org.opensearch.cluster.metadata.Metadata; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java index e5c27db1e926c..4161ff2342391 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java @@ -35,7 +35,7 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Priority; import org.opensearch.common.inject.Inject; import org.opensearch.common.io.stream.StreamInput; 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 a12616de50dee..ae89f52ed2a46 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 @@ -23,7 +23,7 @@ import org.opensearch.action.IndicesRequest; import org.opensearch.action.support.IndicesOptions; import org.opensearch.action.support.master.MasterNodeReadRequest; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/create/CreateSnapshotResponse.java b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/create/CreateSnapshotResponse.java index e71149be5a2c5..8013e6a6864af 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/create/CreateSnapshotResponse.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/create/CreateSnapshotResponse.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.cluster.snapshots.create; import org.opensearch.action.ActionResponse; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java index 377489dc5c139..eb33add8cb61d 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java @@ -33,7 +33,7 @@ import org.opensearch.cluster.block.ClusterBlockLevel; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.inject.Inject; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.regex.Regex; 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 5096cbd285179..b9df3a4827d40 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 @@ -23,7 +23,7 @@ import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.support.IndicesOptions; import org.opensearch.action.support.master.MasterNodeRequest; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/restore/RestoreSnapshotResponse.java b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/restore/RestoreSnapshotResponse.java index 973eb35fae0ff..8a7c30a07c652 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/restore/RestoreSnapshotResponse.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/restore/RestoreSnapshotResponse.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.cluster.snapshots.restore; import org.opensearch.action.ActionResponse; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/SnapshotStats.java b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/SnapshotStats.java index fdffbafc42396..1ad60a41c60a8 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/SnapshotStats.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/SnapshotStats.java @@ -25,7 +25,7 @@ import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/SnapshotStatus.java b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/SnapshotStatus.java index f273a1d08094e..6e56dc810b156 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/SnapshotStatus.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/snapshots/status/SnapshotStatus.java @@ -22,7 +22,7 @@ import org.opensearch.Version; import org.opensearch.cluster.SnapshotsInProgress; import org.opensearch.cluster.SnapshotsInProgress.State; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; 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 410e1c6a5ff2f..5b0db85fa805a 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 @@ -27,7 +27,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/state/ClusterStateRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/cluster/state/ClusterStateRequestBuilder.java index 7bae31efb71bc..778897086c063 100644 --- a/server/src/main/java/org/opensearch/action/admin/cluster/state/ClusterStateRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/cluster/state/ClusterStateRequestBuilder.java @@ -21,7 +21,7 @@ import org.opensearch.action.support.master.MasterNodeReadOperationRequestBuilder; import org.opensearch.client.OpenSearchClient; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.action.support.IndicesOptions; public class ClusterStateRequestBuilder extends MasterNodeReadOperationRequestBuilder VALID_ROLLOVER_TARGETS = org.elasticsearch.common.collect.List.of(ALIAS, DATA_STREAM); + private static final List VALID_ROLLOVER_TARGETS = org.opensearch.common.collect.List.of(ALIAS, DATA_STREAM); private final ThreadPool threadPool; private final MetadataCreateIndexService createIndexService; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/rollover/RolloverRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/rollover/RolloverRequest.java index c10eac8ef8f27..1da7578179fe1 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/rollover/RolloverRequest.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/rollover/RolloverRequest.java @@ -28,7 +28,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/rollover/RolloverRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/rollover/RolloverRequestBuilder.java index 4d2634000e005..0437d3737cb94 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/rollover/RolloverRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/rollover/RolloverRequestBuilder.java @@ -24,7 +24,7 @@ import org.opensearch.client.OpenSearchClient; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentType; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/rollover/TransportRolloverAction.java b/server/src/main/java/org/opensearch/action/admin/indices/rollover/TransportRolloverAction.java index f2fdd05932b6e..9a3843de2026f 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/rollover/TransportRolloverAction.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/rollover/TransportRolloverAction.java @@ -37,7 +37,7 @@ import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.metadata.Metadata; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.inject.Inject; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.unit.ByteSizeValue; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java b/server/src/main/java/org/opensearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java index 606fca0d0001d..27dfedccb381f 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/shards/TransportIndicesShardStoresAction.java @@ -42,7 +42,7 @@ import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.collect.ImmutableOpenIntMap; import org.opensearch.common.collect.ImmutableOpenMap; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.inject.Inject; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.util.concurrent.CountDown; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/stats/CommonStats.java b/server/src/main/java/org/opensearch/action/admin/indices/stats/CommonStats.java index d57e576b70a5c..78e06665f0775 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/stats/CommonStats.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/stats/CommonStats.java @@ -20,7 +20,7 @@ package org.opensearch.action.admin.indices.stats; import org.apache.lucene.store.AlreadyClosedException; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/stats/ShardStats.java b/server/src/main/java/org/opensearch/action/admin/indices/stats/ShardStats.java index 7a7a67516fd1a..138f17dd4b3ef 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/stats/ShardStats.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/stats/ShardStats.java @@ -21,7 +21,7 @@ import org.opensearch.Version; import org.opensearch.cluster.routing.ShardRouting; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/template/get/GetComponentTemplateAction.java b/server/src/main/java/org/opensearch/action/admin/indices/template/get/GetComponentTemplateAction.java index 568de3a1f1d6a..2e50a7d128144 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/template/get/GetComponentTemplateAction.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/template/get/GetComponentTemplateAction.java @@ -24,7 +24,7 @@ import org.opensearch.action.ActionType; import org.opensearch.action.support.master.MasterNodeReadRequest; import org.opensearch.cluster.metadata.ComponentTemplate; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/template/get/GetComposableIndexTemplateAction.java b/server/src/main/java/org/opensearch/action/admin/indices/template/get/GetComposableIndexTemplateAction.java index 9c78cf2789e9d..e47926025eb87 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/template/get/GetComposableIndexTemplateAction.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/template/get/GetComposableIndexTemplateAction.java @@ -24,7 +24,7 @@ import org.opensearch.action.ActionType; import org.opensearch.action.support.master.MasterNodeReadRequest; import org.opensearch.cluster.metadata.ComposableIndexTemplate; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/template/post/SimulateIndexTemplateRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/template/post/SimulateIndexTemplateRequest.java index d314e65c2c837..27a42a30cb141 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/template/post/SimulateIndexTemplateRequest.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/template/post/SimulateIndexTemplateRequest.java @@ -22,7 +22,7 @@ import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.admin.indices.template.put.PutComposableIndexTemplateAction; import org.opensearch.action.support.master.MasterNodeReadRequest; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/template/post/SimulateIndexTemplateResponse.java b/server/src/main/java/org/opensearch/action/admin/indices/template/post/SimulateIndexTemplateResponse.java index cbe817d7b2670..d5577e98e2e15 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/template/post/SimulateIndexTemplateResponse.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/template/post/SimulateIndexTemplateResponse.java @@ -21,7 +21,7 @@ import org.opensearch.action.ActionResponse; import org.opensearch.cluster.metadata.Template; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/template/post/SimulateTemplateAction.java b/server/src/main/java/org/opensearch/action/admin/indices/template/post/SimulateTemplateAction.java index d6cbe203ec532..90af5607c3134 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/template/post/SimulateTemplateAction.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/template/post/SimulateTemplateAction.java @@ -24,7 +24,7 @@ import org.opensearch.action.ValidateActions; import org.opensearch.action.admin.indices.template.put.PutComposableIndexTemplateAction; import org.opensearch.action.support.master.MasterNodeReadRequest; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; 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 d2d31c55d6c1e..8c40c33b82b89 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 @@ -24,7 +24,7 @@ import org.opensearch.action.support.master.AcknowledgedResponse; import org.opensearch.action.support.master.MasterNodeRequest; import org.opensearch.cluster.metadata.ComponentTemplate; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; 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 923117d3411ca..13f40352e0d0e 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 @@ -27,7 +27,7 @@ import org.opensearch.action.support.master.MasterNodeRequest; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.ComposableIndexTemplate; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java b/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java index 7cdb608041ac9..739b6d5ebde26 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/TransportUpgradeAction.java @@ -36,7 +36,7 @@ import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.ShardsIterator; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.inject.Inject; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.index.shard.IndexShard; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeResponse.java b/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeResponse.java index 06e79054743fe..2d07423cf1e42 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeResponse.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeResponse.java @@ -22,7 +22,7 @@ import org.opensearch.Version; import org.elasticsearch.action.support.DefaultShardOperationFailedException; import org.opensearch.action.support.broadcast.BroadcastResponse; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeSettingsClusterStateUpdateRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeSettingsClusterStateUpdateRequest.java index 2e62b2011f33b..785a77523d8a9 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeSettingsClusterStateUpdateRequest.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeSettingsClusterStateUpdateRequest.java @@ -21,7 +21,7 @@ import org.opensearch.Version; import org.opensearch.cluster.ack.ClusterStateUpdateRequest; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import java.util.Map; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java b/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java index 93ff08d999538..3a48b6175f831 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeSettingsRequest.java @@ -22,7 +22,7 @@ import org.opensearch.Version; import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.support.master.AcknowledgedRequest; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java b/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java index 7f52d79a229c1..5d2af14e35282 100644 --- a/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/admin/indices/upgrade/post/UpgradeSettingsRequestBuilder.java @@ -23,7 +23,7 @@ import org.opensearch.action.support.master.AcknowledgedRequestBuilder; import org.opensearch.action.support.master.AcknowledgedResponse; import org.opensearch.client.OpenSearchClient; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import java.util.Map; diff --git a/server/src/main/java/org/opensearch/action/bulk/BackoffPolicy.java b/server/src/main/java/org/opensearch/action/bulk/BackoffPolicy.java index 6cfdbc2e49916..cfdcd3e47dd2a 100644 --- a/server/src/main/java/org/opensearch/action/bulk/BackoffPolicy.java +++ b/server/src/main/java/org/opensearch/action/bulk/BackoffPolicy.java @@ -18,7 +18,7 @@ */ package org.opensearch.action.bulk; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/server/src/main/java/org/opensearch/action/bulk/BulkItemRequest.java b/server/src/main/java/org/opensearch/action/bulk/BulkItemRequest.java index de443d4cdbbac..4eb7e2ace4f9a 100644 --- a/server/src/main/java/org/opensearch/action/bulk/BulkItemRequest.java +++ b/server/src/main/java/org/opensearch/action/bulk/BulkItemRequest.java @@ -22,7 +22,7 @@ import org.apache.lucene.util.Accountable; import org.apache.lucene.util.RamUsageEstimator; import org.opensearch.action.DocWriteRequest; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; 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 708e90baea4ea..a7d870e30c298 100644 --- a/server/src/main/java/org/opensearch/action/bulk/BulkItemResponse.java +++ b/server/src/main/java/org/opensearch/action/bulk/BulkItemResponse.java @@ -27,7 +27,7 @@ import org.opensearch.action.delete.DeleteResponse; import org.opensearch.action.index.IndexResponse; import org.opensearch.action.update.UpdateResponse; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.elasticsearch.common.ParseField; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/opensearch/action/bulk/BulkProcessor.java b/server/src/main/java/org/opensearch/action/bulk/BulkProcessor.java index 6254ff5f1266c..451a593480f9d 100644 --- a/server/src/main/java/org/opensearch/action/bulk/BulkProcessor.java +++ b/server/src/main/java/org/opensearch/action/bulk/BulkProcessor.java @@ -24,13 +24,13 @@ import org.elasticsearch.action.delete.DeleteRequest; import org.opensearch.action.index.IndexRequest; import org.opensearch.client.Client; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.threadpool.Scheduler; import org.opensearch.threadpool.ThreadPool; 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 c0f118834b9d8..0f634a513a8a3 100644 --- a/server/src/main/java/org/opensearch/action/bulk/BulkRequest.java +++ b/server/src/main/java/org/opensearch/action/bulk/BulkRequest.java @@ -31,13 +31,13 @@ import org.opensearch.action.support.WriteRequest; import org.elasticsearch.action.support.replication.ReplicationRequest; import org.opensearch.action.update.UpdateRequest; -import org.elasticsearch.common.Nullable; +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.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.mapper.MapperService; import org.opensearch.search.fetch.subphase.FetchSourceContext; diff --git a/server/src/main/java/org/opensearch/action/bulk/BulkRequestBuilder.java b/server/src/main/java/org/opensearch/action/bulk/BulkRequestBuilder.java index 2d23f8d33c153..5fd652a6fac8a 100644 --- a/server/src/main/java/org/opensearch/action/bulk/BulkRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/bulk/BulkRequestBuilder.java @@ -30,8 +30,8 @@ import org.opensearch.action.update.UpdateRequest; import org.opensearch.action.update.UpdateRequestBuilder; import org.opensearch.client.OpenSearchClient; -import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.Nullable; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.mapper.MapperService; diff --git a/server/src/main/java/org/opensearch/action/bulk/BulkRequestParser.java b/server/src/main/java/org/opensearch/action/bulk/BulkRequestParser.java index bd3e1389cb316..1e1ef1ed6ecc0 100644 --- a/server/src/main/java/org/opensearch/action/bulk/BulkRequestParser.java +++ b/server/src/main/java/org/opensearch/action/bulk/BulkRequestParser.java @@ -23,7 +23,7 @@ import org.opensearch.action.delete.DeleteRequest; import org.opensearch.action.index.IndexRequest; import org.opensearch.action.update.UpdateRequest; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; diff --git a/server/src/main/java/org/opensearch/action/bulk/BulkResponse.java b/server/src/main/java/org/opensearch/action/bulk/BulkResponse.java index ebc87e005d023..03628778da69f 100644 --- a/server/src/main/java/org/opensearch/action/bulk/BulkResponse.java +++ b/server/src/main/java/org/opensearch/action/bulk/BulkResponse.java @@ -22,7 +22,7 @@ import org.opensearch.action.ActionResponse; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.xcontent.StatusToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/server/src/main/java/org/opensearch/action/bulk/Retry.java b/server/src/main/java/org/opensearch/action/bulk/Retry.java index 39ea7d131c8ee..e45c29bd1efef 100644 --- a/server/src/main/java/org/opensearch/action/bulk/Retry.java +++ b/server/src/main/java/org/opensearch/action/bulk/Retry.java @@ -22,7 +22,7 @@ import org.apache.logging.log4j.LogManager; import org.opensearch.action.ActionListener; import org.opensearch.action.support.PlainActionFuture; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.rest.RestStatus; import org.opensearch.threadpool.Scheduler; import org.opensearch.threadpool.ThreadPool; 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 b814a749cc96a..91242c1035a27 100644 --- a/server/src/main/java/org/opensearch/action/bulk/TransportBulkAction.java +++ b/server/src/main/java/org/opensearch/action/bulk/TransportBulkAction.java @@ -57,7 +57,7 @@ import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.lease.Releasable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.AtomicArray; import org.opensearch.index.Index; import org.opensearch.index.IndexNotFoundException; 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 5203d81a5eddd..16e8360199572 100644 --- a/server/src/main/java/org/opensearch/action/bulk/TransportShardBulkAction.java +++ b/server/src/main/java/org/opensearch/action/bulk/TransportShardBulkAction.java @@ -46,12 +46,12 @@ import org.opensearch.cluster.metadata.MappingMetadata; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.compress.CompressedXContent; import org.opensearch.common.inject.Inject; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentType; 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 20faedadc34c3..ec87771b8f392 100644 --- a/server/src/main/java/org/opensearch/action/delete/DeleteRequest.java +++ b/server/src/main/java/org/opensearch/action/delete/DeleteRequest.java @@ -25,7 +25,7 @@ import org.opensearch.action.CompositeIndicesRequest; import org.opensearch.action.DocWriteRequest; import org.opensearch.action.support.replication.ReplicatedWriteRequest; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/action/delete/DeleteRequestBuilder.java b/server/src/main/java/org/opensearch/action/delete/DeleteRequestBuilder.java index 8293a5c4e6f3e..10739392f73e7 100644 --- a/server/src/main/java/org/opensearch/action/delete/DeleteRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/delete/DeleteRequestBuilder.java @@ -22,7 +22,7 @@ import org.opensearch.action.support.WriteRequestBuilder; import org.opensearch.action.support.replication.ReplicationRequestBuilder; import org.opensearch.client.OpenSearchClient; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.index.VersionType; /** 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 3ce468c2ec7f0..ba36d952d39c6 100644 --- a/server/src/main/java/org/opensearch/action/explain/ExplainRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/explain/ExplainRequestBuilder.java @@ -21,7 +21,7 @@ import org.opensearch.action.support.single.shard.SingleShardOperationRequestBuilder; import org.opensearch.client.OpenSearchClient; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.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/FieldCapabilitiesResponse.java b/server/src/main/java/org/opensearch/action/fieldcaps/FieldCapabilitiesResponse.java index 8051c0d63a678..e856ff6d7d179 100644 --- a/server/src/main/java/org/opensearch/action/fieldcaps/FieldCapabilitiesResponse.java +++ b/server/src/main/java/org/opensearch/action/fieldcaps/FieldCapabilitiesResponse.java @@ -23,7 +23,7 @@ import org.opensearch.action.ActionResponse; import org.elasticsearch.common.ParseField; import org.opensearch.common.Strings; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.ConstructingObjectParser; 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 d454acad07ca2..8363bfe5a309b 100644 --- a/server/src/main/java/org/opensearch/action/fieldcaps/TransportFieldCapabilitiesIndexAction.java +++ b/server/src/main/java/org/opensearch/action/fieldcaps/TransportFieldCapabilitiesIndexAction.java @@ -39,7 +39,7 @@ import org.opensearch.cluster.routing.ShardIterator; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.inject.Inject; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.logging.LoggerMessageFormat; 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 b09757bfda7ad..35ca2ef960555 100644 --- a/server/src/main/java/org/opensearch/action/get/GetRequest.java +++ b/server/src/main/java/org/opensearch/action/get/GetRequest.java @@ -24,7 +24,7 @@ import org.opensearch.action.RealtimeRequest; import org.opensearch.action.ValidateActions; import org.opensearch.action.support.single.shard.SingleShardRequest; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; 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 db88f1c59c6a3..cebc2b77076db 100644 --- a/server/src/main/java/org/opensearch/action/get/GetRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/get/GetRequestBuilder.java @@ -21,7 +21,7 @@ import org.opensearch.action.support.single.shard.SingleShardOperationRequestBuilder; import org.opensearch.client.OpenSearchClient; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.index.VersionType; import org.opensearch.search.fetch.subphase.FetchSourceContext; diff --git a/server/src/main/java/org/opensearch/action/get/MultiGetRequest.java b/server/src/main/java/org/opensearch/action/get/MultiGetRequest.java index 50a2b45cefc57..e1a1fe71c685b 100644 --- a/server/src/main/java/org/opensearch/action/get/MultiGetRequest.java +++ b/server/src/main/java/org/opensearch/action/get/MultiGetRequest.java @@ -28,7 +28,7 @@ import org.opensearch.action.RealtimeRequest; import org.opensearch.action.ValidateActions; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.ParsingException; import org.opensearch.common.Strings; diff --git a/server/src/main/java/org/opensearch/action/get/MultiGetRequestBuilder.java b/server/src/main/java/org/opensearch/action/get/MultiGetRequestBuilder.java index 5e17fdbd70278..8cd76576573de 100644 --- a/server/src/main/java/org/opensearch/action/get/MultiGetRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/get/MultiGetRequestBuilder.java @@ -21,7 +21,7 @@ import org.opensearch.action.ActionRequestBuilder; import org.opensearch.client.OpenSearchClient; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; /** * A multi get document action request 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 5cdf0995a88c5..aa2655b2e60d4 100644 --- a/server/src/main/java/org/opensearch/action/index/IndexRequest.java +++ b/server/src/main/java/org/opensearch/action/index/IndexRequest.java @@ -32,7 +32,7 @@ import org.opensearch.client.Requests; import org.opensearch.cluster.metadata.MappingMetadata; import org.opensearch.cluster.metadata.Metadata; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.UUIDs; import org.opensearch.common.bytes.BytesArray; diff --git a/server/src/main/java/org/opensearch/action/index/IndexRequestBuilder.java b/server/src/main/java/org/opensearch/action/index/IndexRequestBuilder.java index 02a048382c90a..ccae9de96b282 100644 --- a/server/src/main/java/org/opensearch/action/index/IndexRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/index/IndexRequestBuilder.java @@ -23,7 +23,7 @@ import org.opensearch.action.support.WriteRequestBuilder; import org.opensearch.action.support.replication.ReplicationRequestBuilder; import org.opensearch.client.OpenSearchClient; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentType; 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 2979789dec576..ee759c1f247cd 100644 --- a/server/src/main/java/org/opensearch/action/ingest/SimulateProcessorResult.java +++ b/server/src/main/java/org/opensearch/action/ingest/SimulateProcessorResult.java @@ -21,7 +21,7 @@ import org.opensearch.OpenSearchException; import org.opensearch.Version; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.collect.Tuple; +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; 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 82b753f858950..405685006cb1b 100644 --- a/server/src/main/java/org/opensearch/action/search/AbstractSearchAsyncAction.java +++ b/server/src/main/java/org/opensearch/action/search/AbstractSearchAsyncAction.java @@ -31,7 +31,7 @@ import org.opensearch.action.support.TransportActions; import org.opensearch.cluster.ClusterState; import org.elasticsearch.cluster.routing.GroupShardsIterator; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.lease.Releasable; import org.opensearch.common.lease.Releasables; import org.opensearch.common.util.concurrent.AbstractRunnable; diff --git a/server/src/main/java/org/opensearch/action/search/CountedCollector.java b/server/src/main/java/org/opensearch/action/search/CountedCollector.java index 077cca3271133..ca02c7e17035d 100644 --- a/server/src/main/java/org/opensearch/action/search/CountedCollector.java +++ b/server/src/main/java/org/opensearch/action/search/CountedCollector.java @@ -18,7 +18,7 @@ */ package org.opensearch.action.search; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.util.concurrent.CountDown; import org.opensearch.search.SearchPhaseResult; import org.opensearch.search.SearchShardTarget; 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 da70ac654496e..92bb79c57d577 100644 --- a/server/src/main/java/org/opensearch/action/search/MultiSearchResponse.java +++ b/server/src/main/java/org/opensearch/action/search/MultiSearchResponse.java @@ -23,13 +23,13 @@ import org.elasticsearch.ExceptionsHelper; import org.opensearch.Version; import org.opensearch.action.ActionResponse; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; 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.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/action/search/SearchContextIdForNode.java b/server/src/main/java/org/opensearch/action/search/SearchContextIdForNode.java index d0c24c3ffc602..39a09104f9269 100644 --- a/server/src/main/java/org/opensearch/action/search/SearchContextIdForNode.java +++ b/server/src/main/java/org/opensearch/action/search/SearchContextIdForNode.java @@ -19,7 +19,7 @@ package org.opensearch.action.search; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; diff --git a/server/src/main/java/org/opensearch/action/search/SearchPhase.java b/server/src/main/java/org/opensearch/action/search/SearchPhase.java index e1a844d88da9a..14ea118b46256 100644 --- a/server/src/main/java/org/opensearch/action/search/SearchPhase.java +++ b/server/src/main/java/org/opensearch/action/search/SearchPhase.java @@ -18,7 +18,7 @@ */ package org.opensearch.action.search; -import org.elasticsearch.common.CheckedRunnable; +import org.opensearch.common.CheckedRunnable; import java.io.IOException; import java.util.Objects; diff --git a/server/src/main/java/org/opensearch/action/search/SearchPhaseContext.java b/server/src/main/java/org/opensearch/action/search/SearchPhaseContext.java index 475aa7fb4fd20..37d75184b07eb 100644 --- a/server/src/main/java/org/opensearch/action/search/SearchPhaseContext.java +++ b/server/src/main/java/org/opensearch/action/search/SearchPhaseContext.java @@ -20,7 +20,7 @@ import org.apache.logging.log4j.Logger; import org.opensearch.action.OriginalIndices; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.lease.Releasable; import org.opensearch.common.util.concurrent.AtomicArray; import org.opensearch.search.SearchPhaseResult; 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 84a7f413d3528..b96479364273f 100644 --- a/server/src/main/java/org/opensearch/action/search/SearchRequest.java +++ b/server/src/main/java/org/opensearch/action/search/SearchRequest.java @@ -24,11 +24,11 @@ import org.opensearch.action.ActionRequestValidationException; import org.opensearch.action.IndicesRequest; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.common.Nullable; +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.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; import org.opensearch.search.Scroll; import org.opensearch.search.builder.PointInTimeBuilder; diff --git a/server/src/main/java/org/opensearch/action/search/SearchRequestBuilder.java b/server/src/main/java/org/opensearch/action/search/SearchRequestBuilder.java index 55f2b2ed4754b..4fe8d8b54119e 100644 --- a/server/src/main/java/org/opensearch/action/search/SearchRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/search/SearchRequestBuilder.java @@ -22,8 +22,8 @@ import org.opensearch.action.ActionRequestBuilder; import org.opensearch.action.support.IndicesOptions; import org.opensearch.client.OpenSearchClient; -import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.Nullable; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.index.query.QueryBuilder; import org.opensearch.script.Script; import org.opensearch.search.Scroll; diff --git a/server/src/main/java/org/opensearch/action/search/SearchResponse.java b/server/src/main/java/org/opensearch/action/search/SearchResponse.java index 2dbbece268c9a..fcf41f3ef88df 100644 --- a/server/src/main/java/org/opensearch/action/search/SearchResponse.java +++ b/server/src/main/java/org/opensearch/action/search/SearchResponse.java @@ -22,13 +22,13 @@ import org.apache.lucene.search.TotalHits; import org.opensearch.Version; import org.opensearch.action.ActionResponse; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; 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.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.xcontent.StatusToXContentObject; import org.elasticsearch.common.xcontent.ToXContentFragment; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/action/search/SearchScrollAsyncAction.java b/server/src/main/java/org/opensearch/action/search/SearchScrollAsyncAction.java index 8b114f0731630..c4a50bdaa9eea 100644 --- a/server/src/main/java/org/opensearch/action/search/SearchScrollAsyncAction.java +++ b/server/src/main/java/org/opensearch/action/search/SearchScrollAsyncAction.java @@ -24,7 +24,7 @@ import org.opensearch.action.ActionListener; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.util.concurrent.AtomicArray; import org.opensearch.common.util.concurrent.CountDown; import org.opensearch.search.SearchPhaseResult; diff --git a/server/src/main/java/org/opensearch/action/search/SearchScrollRequest.java b/server/src/main/java/org/opensearch/action/search/SearchScrollRequest.java index aff2383397a87..72c5cc48d9df2 100644 --- a/server/src/main/java/org/opensearch/action/search/SearchScrollRequest.java +++ b/server/src/main/java/org/opensearch/action/search/SearchScrollRequest.java @@ -23,7 +23,7 @@ import org.opensearch.action.ActionRequestValidationException; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/server/src/main/java/org/opensearch/action/search/SearchScrollRequestBuilder.java b/server/src/main/java/org/opensearch/action/search/SearchScrollRequestBuilder.java index 6cd1ec0ae25ec..b3d89508e5f86 100644 --- a/server/src/main/java/org/opensearch/action/search/SearchScrollRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/search/SearchScrollRequestBuilder.java @@ -21,7 +21,7 @@ import org.opensearch.action.ActionRequestBuilder; import org.opensearch.client.OpenSearchClient; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.search.Scroll; /** diff --git a/server/src/main/java/org/opensearch/action/search/SearchShard.java b/server/src/main/java/org/opensearch/action/search/SearchShard.java index 211fde0306737..8a252bdf59c1e 100644 --- a/server/src/main/java/org/opensearch/action/search/SearchShard.java +++ b/server/src/main/java/org/opensearch/action/search/SearchShard.java @@ -19,7 +19,7 @@ package org.opensearch.action.search; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.index.shard.ShardId; import java.util.Comparator; diff --git a/server/src/main/java/org/opensearch/action/search/SearchShardIterator.java b/server/src/main/java/org/opensearch/action/search/SearchShardIterator.java index 70d0b1e40cd28..3d09680b83f28 100644 --- a/server/src/main/java/org/opensearch/action/search/SearchShardIterator.java +++ b/server/src/main/java/org/opensearch/action/search/SearchShardIterator.java @@ -22,8 +22,8 @@ import org.opensearch.action.OriginalIndices; import org.opensearch.cluster.routing.PlainShardIterator; import org.opensearch.cluster.routing.ShardRouting; -import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.Nullable; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.Countable; import org.opensearch.common.util.PlainIterator; import org.elasticsearch.index.shard.ShardId; diff --git a/server/src/main/java/org/opensearch/action/search/SearchTransportService.java b/server/src/main/java/org/opensearch/action/search/SearchTransportService.java index 1e4f74091697c..9e4a484323f10 100644 --- a/server/src/main/java/org/opensearch/action/search/SearchTransportService.java +++ b/server/src/main/java/org/opensearch/action/search/SearchTransportService.java @@ -27,7 +27,7 @@ import org.opensearch.action.support.ChannelActionListener; import org.opensearch.action.support.IndicesOptions; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; 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 fa66b0c056af2..e663a8a11d467 100644 --- a/server/src/main/java/org/opensearch/action/search/ShardSearchFailure.java +++ b/server/src/main/java/org/opensearch/action/search/ShardSearchFailure.java @@ -24,7 +24,7 @@ import org.opensearch.action.OriginalIndices; import org.opensearch.action.ShardOperationFailedException; import org.opensearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; 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 5dc0fecaa4796..4d25d810987f3 100644 --- a/server/src/main/java/org/opensearch/action/search/TransportSearchAction.java +++ b/server/src/main/java/org/opensearch/action/search/TransportSearchAction.java @@ -42,7 +42,7 @@ import org.elasticsearch.cluster.routing.OperationRouting; import org.opensearch.cluster.routing.ShardIterator; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.breaker.CircuitBreaker; import org.opensearch.common.Strings; import org.opensearch.common.inject.Inject; @@ -50,7 +50,7 @@ import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.AtomicArray; import org.elasticsearch.common.util.concurrent.CountDown; import org.opensearch.index.Index; diff --git a/server/src/main/java/org/opensearch/action/support/ActiveShardsObserver.java b/server/src/main/java/org/opensearch/action/support/ActiveShardsObserver.java index 1754018c5d2a8..1d3bc67e58b66 100644 --- a/server/src/main/java/org/opensearch/action/support/ActiveShardsObserver.java +++ b/server/src/main/java/org/opensearch/action/support/ActiveShardsObserver.java @@ -25,7 +25,7 @@ import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.ClusterStateObserver; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.node.NodeClosedException; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/opensearch/action/support/AdapterActionFuture.java b/server/src/main/java/org/opensearch/action/support/AdapterActionFuture.java index c9c5a8f1c6e7c..2137a52087ae7 100644 --- a/server/src/main/java/org/opensearch/action/support/AdapterActionFuture.java +++ b/server/src/main/java/org/opensearch/action/support/AdapterActionFuture.java @@ -22,7 +22,7 @@ import org.opensearch.OpenSearchException; import org.opensearch.action.ActionFuture; import org.opensearch.action.ActionListener; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.BaseFuture; import org.opensearch.common.util.concurrent.FutureUtils; import org.opensearch.common.util.concurrent.UncategorizedExecutionException; diff --git a/server/src/main/java/org/opensearch/action/support/AutoCreateIndex.java b/server/src/main/java/org/opensearch/action/support/AutoCreateIndex.java index 9d24195eb40b1..d89c98dd9d819 100644 --- a/server/src/main/java/org/opensearch/action/support/AutoCreateIndex.java +++ b/server/src/main/java/org/opensearch/action/support/AutoCreateIndex.java @@ -21,9 +21,9 @@ import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; -import org.elasticsearch.common.Booleans; +import org.opensearch.common.Booleans; import org.opensearch.common.Strings; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.regex.Regex; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Setting; diff --git a/server/src/main/java/org/opensearch/action/support/ListenerTimeouts.java b/server/src/main/java/org/opensearch/action/support/ListenerTimeouts.java index f30a9fe5c00da..9a8755c284468 100644 --- a/server/src/main/java/org/opensearch/action/support/ListenerTimeouts.java +++ b/server/src/main/java/org/opensearch/action/support/ListenerTimeouts.java @@ -21,7 +21,7 @@ import org.elasticsearch.OpenSearchTimeoutException; import org.opensearch.action.ActionListener; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.threadpool.Scheduler; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/opensearch/action/support/PlainActionFuture.java b/server/src/main/java/org/opensearch/action/support/PlainActionFuture.java index 559a809e95cd4..ecdddad69b2de 100644 --- a/server/src/main/java/org/opensearch/action/support/PlainActionFuture.java +++ b/server/src/main/java/org/opensearch/action/support/PlainActionFuture.java @@ -19,7 +19,7 @@ package org.opensearch.action.support; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; public class PlainActionFuture extends AdapterActionFuture { diff --git a/server/src/main/java/org/opensearch/action/support/RetryableAction.java b/server/src/main/java/org/opensearch/action/support/RetryableAction.java index c80c1be45be39..4d36eaed3276a 100644 --- a/server/src/main/java/org/opensearch/action/support/RetryableAction.java +++ b/server/src/main/java/org/opensearch/action/support/RetryableAction.java @@ -24,7 +24,7 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRunnable; import org.opensearch.common.Randomness; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.threadpool.Scheduler; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/opensearch/action/support/broadcast/TransportBroadcastAction.java b/server/src/main/java/org/opensearch/action/support/broadcast/TransportBroadcastAction.java index 8d6e9acf5872e..f192e90bef23c 100644 --- a/server/src/main/java/org/opensearch/action/support/broadcast/TransportBroadcastAction.java +++ b/server/src/main/java/org/opensearch/action/support/broadcast/TransportBroadcastAction.java @@ -35,7 +35,7 @@ import org.opensearch.cluster.routing.ShardIterator; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.Writeable; import org.opensearch.tasks.Task; diff --git a/server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequest.java b/server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequest.java index 6ccb1b3218197..4d3d6d86a7d71 100644 --- a/server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequest.java +++ b/server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequest.java @@ -21,11 +21,11 @@ import org.opensearch.cluster.ack.AckedRequest; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.io.IOException; -import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds; +import static org.opensearch.common.unit.TimeValue.timeValueSeconds; /** * Abstract class that allows to mark action requests that support acknowledgements. diff --git a/server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequestBuilder.java b/server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequestBuilder.java index 4aa34137b6eaa..747aede901f70 100644 --- a/server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/support/master/AcknowledgedRequestBuilder.java @@ -20,7 +20,7 @@ import org.opensearch.action.ActionType; import org.opensearch.client.OpenSearchClient; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; /** * Base request builder for master node operations that support acknowledgements diff --git a/server/src/main/java/org/opensearch/action/support/master/MasterNodeOperationRequestBuilder.java b/server/src/main/java/org/opensearch/action/support/master/MasterNodeOperationRequestBuilder.java index fdf895f208afb..77737f81eb3dc 100644 --- a/server/src/main/java/org/opensearch/action/support/master/MasterNodeOperationRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/support/master/MasterNodeOperationRequestBuilder.java @@ -23,7 +23,7 @@ import org.opensearch.action.ActionRequestBuilder; import org.opensearch.action.ActionResponse; import org.opensearch.client.OpenSearchClient; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; /** * Base request builder for master node operations diff --git a/server/src/main/java/org/opensearch/action/support/master/MasterNodeRequest.java b/server/src/main/java/org/opensearch/action/support/master/MasterNodeRequest.java index f637ffcf5dea8..90364cb87a4dc 100644 --- a/server/src/main/java/org/opensearch/action/support/master/MasterNodeRequest.java +++ b/server/src/main/java/org/opensearch/action/support/master/MasterNodeRequest.java @@ -22,7 +22,7 @@ import org.opensearch.action.ActionRequest; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeAction.java b/server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeAction.java index 78c89c62aba30..0c4a18887f213 100644 --- a/server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeAction.java +++ b/server/src/main/java/org/opensearch/action/support/master/TransportMasterNodeAction.java @@ -40,7 +40,7 @@ import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.Writeable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.discovery.MasterNotDiscoveredException; import org.elasticsearch.node.NodeClosedException; import org.opensearch.tasks.Task; diff --git a/server/src/main/java/org/opensearch/action/support/nodes/BaseNodesRequest.java b/server/src/main/java/org/opensearch/action/support/nodes/BaseNodesRequest.java index 9f0c2f07c2f53..dacdc4e82ea8b 100644 --- a/server/src/main/java/org/opensearch/action/support/nodes/BaseNodesRequest.java +++ b/server/src/main/java/org/opensearch/action/support/nodes/BaseNodesRequest.java @@ -25,7 +25,7 @@ import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/action/support/nodes/NodesOperationRequestBuilder.java b/server/src/main/java/org/opensearch/action/support/nodes/NodesOperationRequestBuilder.java index 85eec9c44512b..a73dfb2568cb2 100644 --- a/server/src/main/java/org/opensearch/action/support/nodes/NodesOperationRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/support/nodes/NodesOperationRequestBuilder.java @@ -22,7 +22,7 @@ import org.opensearch.action.ActionType; import org.opensearch.action.ActionRequestBuilder; import org.opensearch.client.OpenSearchClient; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; public abstract class NodesOperationRequestBuilder, Response extends BaseNodesResponse, RequestBuilder extends NodesOperationRequestBuilder> diff --git a/server/src/main/java/org/opensearch/action/support/replication/ReplicatedWriteRequest.java b/server/src/main/java/org/opensearch/action/support/replication/ReplicatedWriteRequest.java index 5582b49220690..9fac56d5c5c2d 100644 --- a/server/src/main/java/org/opensearch/action/support/replication/ReplicatedWriteRequest.java +++ b/server/src/main/java/org/opensearch/action/support/replication/ReplicatedWriteRequest.java @@ -23,7 +23,7 @@ import org.opensearch.action.delete.DeleteRequest; import org.opensearch.action.index.IndexRequest; import org.opensearch.action.support.WriteRequest; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.index.shard.ShardId; 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 0f5799dccbad3..4a851d380750a 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 @@ -32,10 +32,10 @@ import org.opensearch.cluster.action.shard.ShardStateAction; import org.opensearch.cluster.routing.IndexShardRoutingTable; import org.opensearch.cluster.routing.ShardRouting; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.breaker.CircuitBreakingException; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.EsRejectedExecutionException; import org.elasticsearch.index.seqno.SequenceNumbers; import org.elasticsearch.index.shard.ReplicationGroup; diff --git a/server/src/main/java/org/opensearch/action/support/replication/ReplicationRequest.java b/server/src/main/java/org/opensearch/action/support/replication/ReplicationRequest.java index b123a347b3f5b..710ecc6bb3434 100644 --- a/server/src/main/java/org/opensearch/action/support/replication/ReplicationRequest.java +++ b/server/src/main/java/org/opensearch/action/support/replication/ReplicationRequest.java @@ -26,10 +26,10 @@ import org.opensearch.action.index.IndexRequest; import org.opensearch.action.support.ActiveShardCount; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.index.shard.ShardId; import org.opensearch.tasks.Task; import org.opensearch.tasks.TaskId; diff --git a/server/src/main/java/org/opensearch/action/support/replication/ReplicationRequestBuilder.java b/server/src/main/java/org/opensearch/action/support/replication/ReplicationRequestBuilder.java index ce277d7f36b89..d78379a9de862 100644 --- a/server/src/main/java/org/opensearch/action/support/replication/ReplicationRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/support/replication/ReplicationRequestBuilder.java @@ -24,7 +24,7 @@ import org.opensearch.action.ActionResponse; import org.opensearch.action.support.ActiveShardCount; import org.opensearch.client.OpenSearchClient; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; public abstract class ReplicationRequestBuilder, Response extends ActionResponse, RequestBuilder extends ReplicationRequestBuilder> 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 a80a14780e2f7..273b0f34a6322 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 @@ -24,7 +24,7 @@ import org.opensearch.action.ActionResponse; import org.opensearch.action.ShardOperationFailedException; import org.opensearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; diff --git a/server/src/main/java/org/opensearch/action/support/replication/TransportReplicationAction.java b/server/src/main/java/org/opensearch/action/support/replication/TransportReplicationAction.java index 75a423040604e..aec1996f35b8b 100644 --- a/server/src/main/java/org/opensearch/action/support/replication/TransportReplicationAction.java +++ b/server/src/main/java/org/opensearch/action/support/replication/TransportReplicationAction.java @@ -45,7 +45,7 @@ import org.opensearch.cluster.routing.AllocationId; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; @@ -54,7 +54,7 @@ import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.elasticsearch.index.IndexNotFoundException; import org.elasticsearch.index.IndexService; diff --git a/server/src/main/java/org/opensearch/action/support/replication/TransportWriteAction.java b/server/src/main/java/org/opensearch/action/support/replication/TransportWriteAction.java index 1d428f5500bb0..924f186b9f54c 100644 --- a/server/src/main/java/org/opensearch/action/support/replication/TransportWriteAction.java +++ b/server/src/main/java/org/opensearch/action/support/replication/TransportWriteAction.java @@ -32,7 +32,7 @@ import org.opensearch.cluster.metadata.IndexAbstraction; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.lease.Releasable; import org.opensearch.common.settings.Settings; diff --git a/server/src/main/java/org/opensearch/action/support/single/instance/InstanceShardOperationRequest.java b/server/src/main/java/org/opensearch/action/support/single/instance/InstanceShardOperationRequest.java index 86c016a016436..7c5dc8e10b558 100644 --- a/server/src/main/java/org/opensearch/action/support/single/instance/InstanceShardOperationRequest.java +++ b/server/src/main/java/org/opensearch/action/support/single/instance/InstanceShardOperationRequest.java @@ -24,10 +24,10 @@ import org.opensearch.action.IndicesRequest; import org.opensearch.action.ValidateActions; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.index.shard.ShardId; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/action/support/single/instance/InstanceShardOperationRequestBuilder.java b/server/src/main/java/org/opensearch/action/support/single/instance/InstanceShardOperationRequestBuilder.java index 36943463a4462..6412b721e86d8 100644 --- a/server/src/main/java/org/opensearch/action/support/single/instance/InstanceShardOperationRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/support/single/instance/InstanceShardOperationRequestBuilder.java @@ -23,7 +23,7 @@ import org.opensearch.action.ActionRequestBuilder; import org.opensearch.action.ActionResponse; import org.opensearch.client.OpenSearchClient; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; public abstract class InstanceShardOperationRequestBuilder, Response extends ActionResponse, RequestBuilder extends InstanceShardOperationRequestBuilder> diff --git a/server/src/main/java/org/opensearch/action/support/single/instance/TransportInstanceSingleOperationAction.java b/server/src/main/java/org/opensearch/action/support/single/instance/TransportInstanceSingleOperationAction.java index ecfbbb24bde4c..0a01f0bb2a1de 100644 --- a/server/src/main/java/org/opensearch/action/support/single/instance/TransportInstanceSingleOperationAction.java +++ b/server/src/main/java/org/opensearch/action/support/single/instance/TransportInstanceSingleOperationAction.java @@ -33,10 +33,10 @@ import org.opensearch.cluster.routing.ShardIterator; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.Writeable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.AbstractRunnable; import org.elasticsearch.index.IndexNotFoundException; import org.elasticsearch.index.shard.ShardId; diff --git a/server/src/main/java/org/opensearch/action/support/single/shard/SingleShardRequest.java b/server/src/main/java/org/opensearch/action/support/single/shard/SingleShardRequest.java index ca6aa23c37f46..0c98a56ed2926 100644 --- a/server/src/main/java/org/opensearch/action/support/single/shard/SingleShardRequest.java +++ b/server/src/main/java/org/opensearch/action/support/single/shard/SingleShardRequest.java @@ -24,7 +24,7 @@ import org.opensearch.action.IndicesRequest; import org.opensearch.action.ValidateActions; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.elasticsearch.index.shard.ShardId; 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 a488583d37543..77d89a309bf91 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 @@ -37,7 +37,7 @@ import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.ShardsIterator; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +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; 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 2e0cad3b111be..faac365da652b 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 @@ -25,7 +25,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.regex.Regex; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.CollectionUtils; import org.opensearch.tasks.Task; import org.opensearch.tasks.TaskId; diff --git a/server/src/main/java/org/opensearch/action/support/tasks/TasksRequestBuilder.java b/server/src/main/java/org/opensearch/action/support/tasks/TasksRequestBuilder.java index 8f3832b8a8c5a..b0913ff5a4221 100644 --- a/server/src/main/java/org/opensearch/action/support/tasks/TasksRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/support/tasks/TasksRequestBuilder.java @@ -21,7 +21,7 @@ import org.opensearch.action.ActionType; import org.opensearch.action.ActionRequestBuilder; import org.opensearch.client.OpenSearchClient; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.tasks.TaskId; /** diff --git a/server/src/main/java/org/opensearch/action/support/tasks/TransportTasksAction.java b/server/src/main/java/org/opensearch/action/support/tasks/TransportTasksAction.java index 5d54119f2bacb..142547ae1aa86 100644 --- a/server/src/main/java/org/opensearch/action/support/tasks/TransportTasksAction.java +++ b/server/src/main/java/org/opensearch/action/support/tasks/TransportTasksAction.java @@ -32,7 +32,7 @@ import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.collect.ImmutableOpenMap; -import org.elasticsearch.common.collect.Tuple; +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; diff --git a/server/src/main/java/org/opensearch/action/termvectors/MultiTermVectorsRequest.java b/server/src/main/java/org/opensearch/action/termvectors/MultiTermVectorsRequest.java index 9ce965c675713..64b4c1f6b1749 100644 --- a/server/src/main/java/org/opensearch/action/termvectors/MultiTermVectorsRequest.java +++ b/server/src/main/java/org/opensearch/action/termvectors/MultiTermVectorsRequest.java @@ -25,7 +25,7 @@ import org.opensearch.action.CompositeIndicesRequest; import org.opensearch.action.RealtimeRequest; import org.opensearch.action.ValidateActions; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/server/src/main/java/org/opensearch/action/termvectors/MultiTermVectorsRequestBuilder.java b/server/src/main/java/org/opensearch/action/termvectors/MultiTermVectorsRequestBuilder.java index 12bbc1df3fae5..6048f552820b8 100644 --- a/server/src/main/java/org/opensearch/action/termvectors/MultiTermVectorsRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/termvectors/MultiTermVectorsRequestBuilder.java @@ -21,7 +21,7 @@ import org.opensearch.action.ActionRequestBuilder; import org.opensearch.client.OpenSearchClient; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; public class MultiTermVectorsRequestBuilder extends ActionRequestBuilder { diff --git a/server/src/main/java/org/opensearch/action/termvectors/TermVectorsRequest.java b/server/src/main/java/org/opensearch/action/termvectors/TermVectorsRequest.java index 9d5ffadafe030..716cfc3320dd5 100644 --- a/server/src/main/java/org/opensearch/action/termvectors/TermVectorsRequest.java +++ b/server/src/main/java/org/opensearch/action/termvectors/TermVectorsRequest.java @@ -26,7 +26,7 @@ import org.opensearch.action.ValidateActions; import org.opensearch.action.get.MultiGetRequest; import org.opensearch.action.support.single.shard.SingleShardRequest; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; diff --git a/server/src/main/java/org/opensearch/action/termvectors/TermVectorsResponse.java b/server/src/main/java/org/opensearch/action/termvectors/TermVectorsResponse.java index efa426df37f1b..993a139fb7fb3 100644 --- a/server/src/main/java/org/opensearch/action/termvectors/TermVectorsResponse.java +++ b/server/src/main/java/org/opensearch/action/termvectors/TermVectorsResponse.java @@ -33,7 +33,7 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/action/termvectors/TermVectorsWriter.java b/server/src/main/java/org/opensearch/action/termvectors/TermVectorsWriter.java index c169947432d43..1f340188faf71 100644 --- a/server/src/main/java/org/opensearch/action/termvectors/TermVectorsWriter.java +++ b/server/src/main/java/org/opensearch/action/termvectors/TermVectorsWriter.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.util.BytesRef; import org.opensearch.action.termvectors.TermVectorsRequest.Flag; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.io.stream.BytesStreamOutput; diff --git a/server/src/main/java/org/opensearch/action/update/TransportUpdateAction.java b/server/src/main/java/org/opensearch/action/update/TransportUpdateAction.java index 3a6264088a5af..bf8f621240e82 100644 --- a/server/src/main/java/org/opensearch/action/update/TransportUpdateAction.java +++ b/server/src/main/java/org/opensearch/action/update/TransportUpdateAction.java @@ -43,7 +43,7 @@ import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.inject.Inject; import org.opensearch.common.io.stream.NotSerializableExceptionWrapper; import org.opensearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/opensearch/action/update/UpdateHelper.java b/server/src/main/java/org/opensearch/action/update/UpdateHelper.java index 0da636670c1c4..d8994ac1f14f9 100644 --- a/server/src/main/java/org/opensearch/action/update/UpdateHelper.java +++ b/server/src/main/java/org/opensearch/action/update/UpdateHelper.java @@ -26,9 +26,9 @@ import org.opensearch.action.delete.DeleteRequest; import org.opensearch.action.index.IndexRequest; import org.opensearch.client.Requests; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.XContentBuilder; 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 e4bee4fe6c2db..2be044dfd311d 100644 --- a/server/src/main/java/org/opensearch/action/update/UpdateRequest.java +++ b/server/src/main/java/org/opensearch/action/update/UpdateRequest.java @@ -28,7 +28,7 @@ import org.opensearch.action.support.WriteRequest; import org.elasticsearch.action.support.replication.ReplicationRequest; import org.opensearch.action.support.single.instance.InstanceShardOperationRequest; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/opensearch/action/update/UpdateRequestBuilder.java b/server/src/main/java/org/opensearch/action/update/UpdateRequestBuilder.java index 066febe5b8cb8..f9e348ccbe13c 100644 --- a/server/src/main/java/org/opensearch/action/update/UpdateRequestBuilder.java +++ b/server/src/main/java/org/opensearch/action/update/UpdateRequestBuilder.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.support.replication.ReplicationRequest; import org.elasticsearch.action.support.single.instance.InstanceShardOperationRequestBuilder; import org.opensearch.client.OpenSearchClient; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.VersionType; diff --git a/server/src/main/java/org/opensearch/bootstrap/Bootstrap.java b/server/src/main/java/org/opensearch/bootstrap/Bootstrap.java index e234bfd167d08..493e76dda8a18 100644 --- a/server/src/main/java/org/opensearch/bootstrap/Bootstrap.java +++ b/server/src/main/java/org/opensearch/bootstrap/Bootstrap.java @@ -29,13 +29,11 @@ import org.apache.lucene.util.StringHelper; import org.opensearch.OpenSearchException; import org.elasticsearch.Version; -import org.elasticsearch.bootstrap.JarHell; -import org.elasticsearch.bootstrap.JavaVersion; import org.opensearch.cli.KeyStoreAwareCommand; import org.opensearch.cli.Terminal; import org.opensearch.cli.UserException; import org.opensearch.common.PidFile; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.inject.CreationException; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.logging.LogConfigurator; @@ -46,7 +44,7 @@ import org.opensearch.common.settings.SecureString; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.BoundTransportAddress; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.env.Environment; import org.elasticsearch.monitor.jvm.JvmInfo; import org.elasticsearch.monitor.os.OsProbe; diff --git a/server/src/main/java/org/opensearch/bootstrap/BootstrapChecks.java b/server/src/main/java/org/opensearch/bootstrap/BootstrapChecks.java index c899c2b426a69..fa054171ccdbe 100644 --- a/server/src/main/java/org/opensearch/bootstrap/BootstrapChecks.java +++ b/server/src/main/java/org/opensearch/bootstrap/BootstrapChecks.java @@ -23,10 +23,9 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.lucene.util.Constants; -import org.elasticsearch.bootstrap.JavaVersion; import org.opensearch.cluster.coordination.ClusterBootstrapService; -import org.elasticsearch.common.SuppressForbidden; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.SuppressForbidden; +import org.opensearch.common.io.PathUtils; import org.opensearch.common.settings.Setting; import org.opensearch.common.transport.BoundTransportAddress; import org.opensearch.common.transport.TransportAddress; diff --git a/server/src/main/java/org/opensearch/bootstrap/BootstrapInfo.java b/server/src/main/java/org/opensearch/bootstrap/BootstrapInfo.java index 67a023f95a4a3..9fba71117b63d 100644 --- a/server/src/main/java/org/opensearch/bootstrap/BootstrapInfo.java +++ b/server/src/main/java/org/opensearch/bootstrap/BootstrapInfo.java @@ -19,7 +19,7 @@ package org.opensearch.bootstrap; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import java.util.Dictionary; import java.util.Enumeration; diff --git a/server/src/main/java/org/opensearch/bootstrap/FilePermissionUtils.java b/server/src/main/java/org/opensearch/bootstrap/FilePermissionUtils.java index b8e1c4ebd79ba..4c0a7406db409 100644 --- a/server/src/main/java/org/opensearch/bootstrap/FilePermissionUtils.java +++ b/server/src/main/java/org/opensearch/bootstrap/FilePermissionUtils.java @@ -19,7 +19,7 @@ package org.opensearch.bootstrap; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import java.io.FilePermission; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/bootstrap/OpenSearchPolicy.java b/server/src/main/java/org/opensearch/bootstrap/OpenSearchPolicy.java index bf28c3fdf74ad..a8148a3534b3c 100644 --- a/server/src/main/java/org/opensearch/bootstrap/OpenSearchPolicy.java +++ b/server/src/main/java/org/opensearch/bootstrap/OpenSearchPolicy.java @@ -19,7 +19,7 @@ package org.opensearch.bootstrap; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import java.io.FilePermission; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/bootstrap/OpenSearchUncaughtExceptionHandler.java b/server/src/main/java/org/opensearch/bootstrap/OpenSearchUncaughtExceptionHandler.java index de449a60bae5d..f454ca91d1937 100644 --- a/server/src/main/java/org/opensearch/bootstrap/OpenSearchUncaughtExceptionHandler.java +++ b/server/src/main/java/org/opensearch/bootstrap/OpenSearchUncaughtExceptionHandler.java @@ -22,7 +22,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.cli.Terminal; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import java.io.IOError; import java.security.AccessController; diff --git a/server/src/main/java/org/opensearch/bootstrap/Security.java b/server/src/main/java/org/opensearch/bootstrap/Security.java index 68adb1772ba6e..34a2cf983b52d 100644 --- a/server/src/main/java/org/opensearch/bootstrap/Security.java +++ b/server/src/main/java/org/opensearch/bootstrap/Security.java @@ -19,10 +19,9 @@ package org.opensearch.bootstrap; -import org.elasticsearch.bootstrap.JarHell; import org.opensearch.cli.Command; -import org.elasticsearch.common.SuppressForbidden; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.SuppressForbidden; +import org.opensearch.common.io.PathUtils; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.opensearch.http.HttpTransportSettings; diff --git a/server/src/main/java/org/opensearch/bootstrap/Spawner.java b/server/src/main/java/org/opensearch/bootstrap/Spawner.java index 50c7ece4d540d..c4a84dc57e8b6 100644 --- a/server/src/main/java/org/opensearch/bootstrap/Spawner.java +++ b/server/src/main/java/org/opensearch/bootstrap/Spawner.java @@ -20,7 +20,7 @@ package org.opensearch.bootstrap; import org.apache.lucene.util.Constants; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.env.Environment; import org.elasticsearch.plugins.Platforms; import org.elasticsearch.plugins.PluginInfo; diff --git a/server/src/main/java/org/opensearch/bootstrap/SystemCallFilter.java b/server/src/main/java/org/opensearch/bootstrap/SystemCallFilter.java index 3c1958a05050b..f6a29c24f80cf 100644 --- a/server/src/main/java/org/opensearch/bootstrap/SystemCallFilter.java +++ b/server/src/main/java/org/opensearch/bootstrap/SystemCallFilter.java @@ -30,7 +30,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.util.Constants; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/server/src/main/java/org/opensearch/cli/EnvironmentAwareCommand.java b/server/src/main/java/org/opensearch/cli/EnvironmentAwareCommand.java index 58e8e5d11865a..4e501ab9a2be4 100644 --- a/server/src/main/java/org/opensearch/cli/EnvironmentAwareCommand.java +++ b/server/src/main/java/org/opensearch/cli/EnvironmentAwareCommand.java @@ -22,7 +22,7 @@ import joptsimple.OptionSet; import joptsimple.OptionSpec; import joptsimple.util.KeyValuePair; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.node.InternalSettingsPreparer; diff --git a/server/src/main/java/org/opensearch/client/Client.java b/server/src/main/java/org/opensearch/client/Client.java index 6871cb05e025a..1bb10e0d27ac3 100644 --- a/server/src/main/java/org/opensearch/client/Client.java +++ b/server/src/main/java/org/opensearch/client/Client.java @@ -62,7 +62,7 @@ import org.opensearch.action.update.UpdateRequest; import org.opensearch.action.update.UpdateRequestBuilder; import org.opensearch.action.update.UpdateResponse; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.lease.Releasable; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; diff --git a/server/src/main/java/org/opensearch/client/IndicesAdminClient.java b/server/src/main/java/org/opensearch/client/IndicesAdminClient.java index db144dd32228e..0831dd614797c 100644 --- a/server/src/main/java/org/opensearch/client/IndicesAdminClient.java +++ b/server/src/main/java/org/opensearch/client/IndicesAdminClient.java @@ -121,7 +121,7 @@ import org.opensearch.action.admin.indices.validate.query.ValidateQueryResponse; import org.opensearch.action.support.master.AcknowledgedResponse; import org.opensearch.cluster.metadata.IndexMetadata.APIBlock; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; /** * Administrative actions/operations against indices. diff --git a/server/src/main/java/org/opensearch/client/support/AbstractClient.java b/server/src/main/java/org/opensearch/client/support/AbstractClient.java index 337ddce784062..bcac0f5fa1c3f 100644 --- a/server/src/main/java/org/opensearch/client/support/AbstractClient.java +++ b/server/src/main/java/org/opensearch/client/support/AbstractClient.java @@ -369,7 +369,7 @@ import org.opensearch.client.FilterClient; import org.opensearch.client.IndicesAdminClient; import org.opensearch.cluster.metadata.IndexMetadata.APIBlock; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.ThreadContext; diff --git a/server/src/main/java/org/opensearch/client/transport/TransportClient.java b/server/src/main/java/org/opensearch/client/transport/TransportClient.java index 56a766118eca6..ea5d26d2aa8d1 100644 --- a/server/src/main/java/org/opensearch/client/transport/TransportClient.java +++ b/server/src/main/java/org/opensearch/client/transport/TransportClient.java @@ -41,11 +41,11 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.SettingsModule; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.util.PageCacheRecycler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.indices.IndicesModule; import org.opensearch.indices.SystemIndices; import org.opensearch.indices.breaker.CircuitBreakerService; @@ -78,7 +78,7 @@ import static java.util.Collections.emptySet; import static java.util.Collections.unmodifiableList; import static java.util.stream.Collectors.toList; -import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds; +import static org.opensearch.common.unit.TimeValue.timeValueSeconds; /** * The transport client allows to create a client that is not part of the cluster, but simply connects to one diff --git a/server/src/main/java/org/opensearch/client/transport/TransportClientNodesService.java b/server/src/main/java/org/opensearch/client/transport/TransportClientNodesService.java index a60af2ee9a69f..f109dffb3a3e1 100644 --- a/server/src/main/java/org/opensearch/client/transport/TransportClientNodesService.java +++ b/server/src/main/java/org/opensearch/client/transport/TransportClientNodesService.java @@ -24,7 +24,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.Version; import org.opensearch.action.ActionListener; @@ -39,7 +39,7 @@ import org.opensearch.common.Randomness; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.elasticsearch.common.util.concurrent.ConcurrentCollections; import org.opensearch.threadpool.Scheduler; diff --git a/server/src/main/java/org/opensearch/cluster/AbstractDiffable.java b/server/src/main/java/org/opensearch/cluster/AbstractDiffable.java index ff10cc8278533..268a309940467 100644 --- a/server/src/main/java/org/opensearch/cluster/AbstractDiffable.java +++ b/server/src/main/java/org/opensearch/cluster/AbstractDiffable.java @@ -19,7 +19,7 @@ package org.opensearch.cluster; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/cluster/AbstractNamedDiffable.java b/server/src/main/java/org/opensearch/cluster/AbstractNamedDiffable.java index 34a985c1edaa6..6e7eb3dad93da 100644 --- a/server/src/main/java/org/opensearch/cluster/AbstractNamedDiffable.java +++ b/server/src/main/java/org/opensearch/cluster/AbstractNamedDiffable.java @@ -20,7 +20,7 @@ package org.opensearch.cluster; import org.opensearch.Version; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.NamedWriteable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/cluster/AckedClusterStateTaskListener.java b/server/src/main/java/org/opensearch/cluster/AckedClusterStateTaskListener.java index 4c831d41d2b93..5c96e29fb7482 100644 --- a/server/src/main/java/org/opensearch/cluster/AckedClusterStateTaskListener.java +++ b/server/src/main/java/org/opensearch/cluster/AckedClusterStateTaskListener.java @@ -19,8 +19,8 @@ package org.opensearch.cluster; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.Nullable; +import org.opensearch.common.unit.TimeValue; public interface AckedClusterStateTaskListener extends ClusterStateTaskListener { diff --git a/server/src/main/java/org/opensearch/cluster/AckedClusterStateUpdateTask.java b/server/src/main/java/org/opensearch/cluster/AckedClusterStateUpdateTask.java index c1663ac82ccb9..57dc674a2174c 100644 --- a/server/src/main/java/org/opensearch/cluster/AckedClusterStateUpdateTask.java +++ b/server/src/main/java/org/opensearch/cluster/AckedClusterStateUpdateTask.java @@ -21,9 +21,9 @@ import org.opensearch.action.ActionListener; import org.opensearch.cluster.ack.AckedRequest; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Priority; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; /** * An extension interface to {@link ClusterStateUpdateTask} that allows to be notified when diff --git a/server/src/main/java/org/opensearch/cluster/ClusterStateObserver.java b/server/src/main/java/org/opensearch/cluster/ClusterStateObserver.java index 1e8631f8e9ce0..ec2c30dd752fe 100644 --- a/server/src/main/java/org/opensearch/cluster/ClusterStateObserver.java +++ b/server/src/main/java/org/opensearch/cluster/ClusterStateObserver.java @@ -23,8 +23,8 @@ import org.opensearch.OpenSearchException; import org.opensearch.cluster.service.ClusterApplierService; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.Nullable; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/opensearch/cluster/ClusterStateTaskConfig.java b/server/src/main/java/org/opensearch/cluster/ClusterStateTaskConfig.java index 42424d8f9fbb6..b48a96a86db08 100644 --- a/server/src/main/java/org/opensearch/cluster/ClusterStateTaskConfig.java +++ b/server/src/main/java/org/opensearch/cluster/ClusterStateTaskConfig.java @@ -18,9 +18,9 @@ */ package org.opensearch.cluster; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Priority; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; /** * Cluster state update task configuration for timeout and priority diff --git a/server/src/main/java/org/opensearch/cluster/ClusterStateTaskExecutor.java b/server/src/main/java/org/opensearch/cluster/ClusterStateTaskExecutor.java index 940ea79935280..cc7965df1106d 100644 --- a/server/src/main/java/org/opensearch/cluster/ClusterStateTaskExecutor.java +++ b/server/src/main/java/org/opensearch/cluster/ClusterStateTaskExecutor.java @@ -18,7 +18,7 @@ */ package org.opensearch.cluster; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import java.util.IdentityHashMap; import java.util.List; diff --git a/server/src/main/java/org/opensearch/cluster/ClusterStateUpdateTask.java b/server/src/main/java/org/opensearch/cluster/ClusterStateUpdateTask.java index c246529431dcd..1e7314b81a87d 100644 --- a/server/src/main/java/org/opensearch/cluster/ClusterStateUpdateTask.java +++ b/server/src/main/java/org/opensearch/cluster/ClusterStateUpdateTask.java @@ -19,9 +19,9 @@ package org.opensearch.cluster; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Priority; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.List; diff --git a/server/src/main/java/org/opensearch/cluster/InternalClusterInfoService.java b/server/src/main/java/org/opensearch/cluster/InternalClusterInfoService.java index ff006ac114022..f9a4d69ad91f7 100644 --- a/server/src/main/java/org/opensearch/cluster/InternalClusterInfoService.java +++ b/server/src/main/java/org/opensearch/cluster/InternalClusterInfoService.java @@ -43,7 +43,7 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.elasticsearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.elasticsearch.index.store.StoreStats; diff --git a/server/src/main/java/org/opensearch/cluster/LocalClusterUpdateTask.java b/server/src/main/java/org/opensearch/cluster/LocalClusterUpdateTask.java index 9791d7350fd07..454e0ad4d6b09 100644 --- a/server/src/main/java/org/opensearch/cluster/LocalClusterUpdateTask.java +++ b/server/src/main/java/org/opensearch/cluster/LocalClusterUpdateTask.java @@ -18,9 +18,9 @@ */ package org.opensearch.cluster; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Priority; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.List; diff --git a/server/src/main/java/org/opensearch/cluster/NodeConnectionsService.java b/server/src/main/java/org/opensearch/cluster/NodeConnectionsService.java index 6d857507f3d9a..5184521907bf8 100644 --- a/server/src/main/java/org/opensearch/cluster/NodeConnectionsService.java +++ b/server/src/main/java/org/opensearch/cluster/NodeConnectionsService.java @@ -30,12 +30,12 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.service.ClusterApplier; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.component.AbstractLifecycleComponent; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; diff --git a/server/src/main/java/org/opensearch/cluster/SnapshotDeletionsInProgress.java b/server/src/main/java/org/opensearch/cluster/SnapshotDeletionsInProgress.java index 8413ffee2f118..b7500f9b357f0 100644 --- a/server/src/main/java/org/opensearch/cluster/SnapshotDeletionsInProgress.java +++ b/server/src/main/java/org/opensearch/cluster/SnapshotDeletionsInProgress.java @@ -26,7 +26,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.repositories.RepositoryOperation; import org.opensearch.snapshots.Snapshot; diff --git a/server/src/main/java/org/opensearch/cluster/SnapshotsInProgress.java b/server/src/main/java/org/opensearch/cluster/SnapshotsInProgress.java index e431ffcbbf279..ed6541fd949cb 100644 --- a/server/src/main/java/org/opensearch/cluster/SnapshotsInProgress.java +++ b/server/src/main/java/org/opensearch/cluster/SnapshotsInProgress.java @@ -24,13 +24,13 @@ import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import org.opensearch.Version; import org.opensearch.cluster.ClusterState.Custom; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.shard.ShardId; diff --git a/server/src/main/java/org/opensearch/cluster/TimeoutClusterStateListener.java b/server/src/main/java/org/opensearch/cluster/TimeoutClusterStateListener.java index a1f23038c4784..addb671c43b6a 100644 --- a/server/src/main/java/org/opensearch/cluster/TimeoutClusterStateListener.java +++ b/server/src/main/java/org/opensearch/cluster/TimeoutClusterStateListener.java @@ -19,7 +19,7 @@ package org.opensearch.cluster; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; /** * An exception to cluster state listener that allows for timeouts and for post added notifications. diff --git a/server/src/main/java/org/opensearch/cluster/ack/AckedRequest.java b/server/src/main/java/org/opensearch/cluster/ack/AckedRequest.java index c47ebef2be152..8a1a2c77214b1 100644 --- a/server/src/main/java/org/opensearch/cluster/ack/AckedRequest.java +++ b/server/src/main/java/org/opensearch/cluster/ack/AckedRequest.java @@ -19,7 +19,7 @@ package org.opensearch.cluster.ack; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; /** * Identifies a cluster state update request with acknowledgement support diff --git a/server/src/main/java/org/opensearch/cluster/ack/ClusterStateUpdateRequest.java b/server/src/main/java/org/opensearch/cluster/ack/ClusterStateUpdateRequest.java index 0cc31ca040f72..88b5ddeccaf2b 100644 --- a/server/src/main/java/org/opensearch/cluster/ack/ClusterStateUpdateRequest.java +++ b/server/src/main/java/org/opensearch/cluster/ack/ClusterStateUpdateRequest.java @@ -19,7 +19,7 @@ package org.opensearch.cluster.ack; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; /** * Base class to be used when needing to update the cluster state diff --git a/server/src/main/java/org/opensearch/cluster/action/index/MappingUpdatedAction.java b/server/src/main/java/org/opensearch/cluster/action/index/MappingUpdatedAction.java index e8bd8cd54a378..36ecb26f796a3 100644 --- a/server/src/main/java/org/opensearch/cluster/action/index/MappingUpdatedAction.java +++ b/server/src/main/java/org/opensearch/cluster/action/index/MappingUpdatedAction.java @@ -33,7 +33,7 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.UncategorizedExecutionException; import org.elasticsearch.common.util.concurrent.RunOnce; import org.elasticsearch.common.xcontent.XContentType; 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 ad1317be4fa02..c8bde35302c8e 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 @@ -43,13 +43,13 @@ import org.opensearch.cluster.routing.allocation.FailedShard; import org.opensearch.cluster.routing.allocation.StaleShard; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Priority; import org.opensearch.common.inject.Inject; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.settings.Setting; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.index.shard.ShardId; import org.opensearch.node.NodeClosedException; import org.opensearch.tasks.Task; diff --git a/server/src/main/java/org/opensearch/cluster/block/ClusterBlock.java b/server/src/main/java/org/opensearch/cluster/block/ClusterBlock.java index c56a171c4bee2..61303e7ba9f25 100644 --- a/server/src/main/java/org/opensearch/cluster/block/ClusterBlock.java +++ b/server/src/main/java/org/opensearch/cluster/block/ClusterBlock.java @@ -20,7 +20,7 @@ package org.opensearch.cluster.block; import org.opensearch.Version; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; diff --git a/server/src/main/java/org/opensearch/cluster/block/ClusterBlocks.java b/server/src/main/java/org/opensearch/cluster/block/ClusterBlocks.java index e7bfec0b86a31..a77c8502c4692 100644 --- a/server/src/main/java/org/opensearch/cluster/block/ClusterBlocks.java +++ b/server/src/main/java/org/opensearch/cluster/block/ClusterBlocks.java @@ -23,7 +23,7 @@ import org.opensearch.cluster.Diff; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.MetadataIndexStateService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/ClusterBootstrapService.java b/server/src/main/java/org/opensearch/cluster/coordination/ClusterBootstrapService.java index 14175f3d672d3..771b08b00ae88 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/ClusterBootstrapService.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/ClusterBootstrapService.java @@ -23,12 +23,12 @@ import org.apache.logging.log4j.message.ParameterizedMessage; import org.opensearch.cluster.coordination.CoordinationMetadata.VotingConfiguration; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.Nullable; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.discovery.DiscoveryModule; import org.opensearch.node.Node; import org.opensearch.threadpool.ThreadPool.Names; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/ClusterFormationFailureHelper.java b/server/src/main/java/org/opensearch/cluster/coordination/ClusterFormationFailureHelper.java index ad8caaa0512d1..2fa727a113beb 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/ClusterFormationFailureHelper.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/ClusterFormationFailureHelper.java @@ -25,11 +25,11 @@ import org.opensearch.cluster.coordination.CoordinationMetadata.VotingConfiguration; import org.opensearch.cluster.coordination.CoordinationState.VoteCollection; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.opensearch.gateway.GatewayMetaState; import org.opensearch.monitor.StatusInfo; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/ClusterStatePublisher.java b/server/src/main/java/org/opensearch/cluster/coordination/ClusterStatePublisher.java index 8eb52a59bafdc..de24dd5ee1843 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/ClusterStatePublisher.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/ClusterStatePublisher.java @@ -21,8 +21,8 @@ import org.opensearch.action.ActionListener; import org.opensearch.cluster.ClusterChangedEvent; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.Nullable; +import org.opensearch.common.unit.TimeValue; public interface ClusterStatePublisher { /** diff --git a/server/src/main/java/org/opensearch/cluster/coordination/Coordinator.java b/server/src/main/java/org/opensearch/cluster/coordination/Coordinator.java index 186705c00a0fe..f3cebbe86eeb3 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/Coordinator.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/Coordinator.java @@ -46,8 +46,8 @@ import org.elasticsearch.cluster.service.ClusterApplier; import org.elasticsearch.cluster.service.ClusterApplier.ClusterApplyListener; import org.elasticsearch.cluster.service.MasterService; -import org.elasticsearch.common.Booleans; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Booleans; +import org.opensearch.common.Nullable; import org.opensearch.common.Priority; import org.opensearch.common.Strings; import org.opensearch.common.component.AbstractLifecycleComponent; @@ -57,7 +57,7 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.EsExecutors; import org.elasticsearch.common.util.concurrent.ListenableFuture; import org.opensearch.common.xcontent.XContentHelper; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/DiscoveryUpgradeService.java b/server/src/main/java/org/opensearch/cluster/coordination/DiscoveryUpgradeService.java index 2f8a7d6b4c8a2..155af42abdfac 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/DiscoveryUpgradeService.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/DiscoveryUpgradeService.java @@ -27,11 +27,11 @@ import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.coordination.CoordinationMetadata.VotingConfiguration; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.CountDown; import org.opensearch.discovery.zen.ElectMasterService; import org.opensearch.discovery.zen.ElectMasterService.MasterCandidate; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/ElectionSchedulerFactory.java b/server/src/main/java/org/opensearch/cluster/coordination/ElectionSchedulerFactory.java index cb1c2a644f41b..0ad196406c06e 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/ElectionSchedulerFactory.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/ElectionSchedulerFactory.java @@ -22,12 +22,12 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.lease.Releasable; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.opensearch.threadpool.ThreadPool; import org.opensearch.threadpool.ThreadPool.Names; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/FollowersChecker.java b/server/src/main/java/org/opensearch/cluster/coordination/FollowersChecker.java index a8baaf784f3eb..f540c063c17e0 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/FollowersChecker.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/FollowersChecker.java @@ -31,8 +31,8 @@ import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.common.util.concurrent.AbstractRunnable; +import org.opensearch.common.unit.TimeValue; +import org.opensearch.common.util.concurrent.AbstractRunnable; import org.opensearch.discovery.zen.NodesFaultDetection; import org.elasticsearch.monitor.NodeHealthService; import org.elasticsearch.monitor.StatusInfo; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/JoinHelper.java b/server/src/main/java/org/opensearch/cluster/coordination/JoinHelper.java index 5ee8ff87020f2..bb26a69e82e51 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/JoinHelper.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/JoinHelper.java @@ -35,11 +35,11 @@ import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.cluster.service.MasterService; import org.opensearch.common.Priority; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.discovery.zen.MembershipAction; import org.opensearch.discovery.zen.ZenDiscovery; import org.elasticsearch.monitor.NodeHealthService; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/LagDetector.java b/server/src/main/java/org/opensearch/cluster/coordination/LagDetector.java index cacb053754ac4..e924d7c4702ed 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/LagDetector.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/LagDetector.java @@ -23,7 +23,7 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.threadpool.ThreadPool; import org.opensearch.threadpool.ThreadPool.Names; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/LeaderChecker.java b/server/src/main/java/org/opensearch/cluster/coordination/LeaderChecker.java index eeed86d340621..e373a09fbef45 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/LeaderChecker.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/LeaderChecker.java @@ -26,13 +26,13 @@ import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.lease.Releasable; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.discovery.zen.MasterFaultDetection; import org.elasticsearch.monitor.NodeHealthService; import org.elasticsearch.monitor.StatusInfo; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/OpenSearchNodeCommand.java b/server/src/main/java/org/opensearch/cluster/coordination/OpenSearchNodeCommand.java index cc3b6ab992f4c..df45acefa5be5 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/OpenSearchNodeCommand.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/OpenSearchNodeCommand.java @@ -36,7 +36,7 @@ import org.opensearch.cluster.Diff; import org.opensearch.cluster.metadata.DataStreamMetadata; import org.opensearch.cluster.metadata.Metadata; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/PreVoteCollector.java b/server/src/main/java/org/opensearch/cluster/coordination/PreVoteCollector.java index 091e5aded5707..dda22ede9d59c 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/PreVoteCollector.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/PreVoteCollector.java @@ -25,8 +25,8 @@ import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.coordination.CoordinationState.VoteCollection; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.Nullable; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.lease.Releasable; import org.opensearch.monitor.NodeHealthService; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/Publication.java b/server/src/main/java/org/opensearch/cluster/coordination/Publication.java index c2007ffcb82df..d0b2d16a0ad40 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/Publication.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/Publication.java @@ -28,7 +28,7 @@ import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.coordination.ClusterStatePublisher.AckListener; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.transport.TransportException; import org.opensearch.transport.TransportResponse; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/PublicationTransportHandler.java b/server/src/main/java/org/opensearch/cluster/coordination/PublicationTransportHandler.java index 26d2f89d875e2..bdc599f1e501f 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/PublicationTransportHandler.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/PublicationTransportHandler.java @@ -40,7 +40,7 @@ import org.opensearch.common.io.stream.OutputStreamStreamOutput; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.discovery.zen.PublishClusterStateAction; import org.opensearch.discovery.zen.PublishClusterStateStats; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/RemoveCustomsCommand.java b/server/src/main/java/org/opensearch/cluster/coordination/RemoveCustomsCommand.java index cff5a5db684bc..fb4fb4e803052 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/RemoveCustomsCommand.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/RemoveCustomsCommand.java @@ -26,7 +26,7 @@ import org.opensearch.cli.UserException; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.Metadata; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.regex.Regex; import org.elasticsearch.env.Environment; import org.opensearch.gateway.PersistedClusterStateService; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/RemoveSettingsCommand.java b/server/src/main/java/org/opensearch/cluster/coordination/RemoveSettingsCommand.java index 2a54b136c85ce..b4949cc14a474 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/RemoveSettingsCommand.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/RemoveSettingsCommand.java @@ -25,7 +25,7 @@ import org.opensearch.cli.UserException; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.Metadata; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.regex.Regex; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; diff --git a/server/src/main/java/org/opensearch/cluster/coordination/UnsafeBootstrapMasterCommand.java b/server/src/main/java/org/opensearch/cluster/coordination/UnsafeBootstrapMasterCommand.java index 472300b3c6bda..9215d893a7045 100644 --- a/server/src/main/java/org/opensearch/cluster/coordination/UnsafeBootstrapMasterCommand.java +++ b/server/src/main/java/org/opensearch/cluster/coordination/UnsafeBootstrapMasterCommand.java @@ -28,7 +28,7 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.UUIDs; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; 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 6d6e8884f827b..827e25307244d 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/AliasAction.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/AliasAction.java @@ -20,7 +20,7 @@ package org.opensearch.cluster.metadata; import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; /** 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 5e13f8692501e..bbc3cd799511c 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/AliasMetadata.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/AliasMetadata.java @@ -23,7 +23,7 @@ import org.opensearch.Version; import org.opensearch.cluster.AbstractDiffable; import org.opensearch.cluster.Diff; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.compress.CompressedXContent; 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 7de0f3d047a8d..b5f66c21b4cea 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/AliasValidator.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/AliasValidator.java @@ -20,7 +20,7 @@ package org.opensearch.cluster.metadata; import org.opensearch.action.admin.indices.alias.Alias; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.xcontent.LoggingDeprecationHandler; diff --git a/server/src/main/java/org/opensearch/cluster/metadata/AutoExpandReplicas.java b/server/src/main/java/org/opensearch/cluster/metadata/AutoExpandReplicas.java index 10587a99b44a9..820c1d75191f7 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/AutoExpandReplicas.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/AutoExpandReplicas.java @@ -23,7 +23,7 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.routing.allocation.RoutingAllocation; import org.elasticsearch.cluster.routing.allocation.decider.Decision; -import org.elasticsearch.common.Booleans; +import org.opensearch.common.Booleans; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; diff --git a/server/src/main/java/org/opensearch/cluster/metadata/ComponentTemplate.java b/server/src/main/java/org/opensearch/cluster/metadata/ComponentTemplate.java index df58a8b83d9e4..a2d2e882150b3 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/ComponentTemplate.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/ComponentTemplate.java @@ -21,7 +21,7 @@ import org.opensearch.cluster.AbstractDiffable; import org.opensearch.cluster.Diff; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/opensearch/cluster/metadata/ComposableIndexTemplate.java b/server/src/main/java/org/opensearch/cluster/metadata/ComposableIndexTemplate.java index a9a5442be5a1b..4938533df9252 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/ComposableIndexTemplate.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/ComposableIndexTemplate.java @@ -22,7 +22,7 @@ import org.opensearch.Version; import org.opensearch.cluster.AbstractDiffable; import org.opensearch.cluster.Diff; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; 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 5cf578ae822a1..fa2fb4db69061 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/IndexAbstraction.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/IndexAbstraction.java @@ -19,9 +19,9 @@ package org.opensearch.cluster.metadata; import org.apache.lucene.util.SetOnce; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import java.util.ArrayList; import java.util.Collections; @@ -33,7 +33,7 @@ import static org.opensearch.cluster.metadata.DataStream.getDefaultBackingIndexName; import static org.opensearch.cluster.metadata.IndexMetadata.INDEX_HIDDEN_SETTING; -import static org.elasticsearch.common.collect.List.copyOf; +import static org.opensearch.common.collect.List.copyOf; /** * An index abstraction is a reference to one or more concrete indices. 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 c4a1883d065db..07fb5fd1cc9b4 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/IndexMetadata.java @@ -34,7 +34,7 @@ import org.opensearch.cluster.block.ClusterBlockLevel; import org.opensearch.cluster.node.DiscoveryNodeFilters; import org.opensearch.cluster.routing.allocation.IndexMetadataUpdater; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.collect.ImmutableOpenIntMap; import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.collect.MapBuilder; 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 ec1d7e14e80e4..bdc08c4fcd33b 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/IndexNameExpressionResolver.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/IndexNameExpressionResolver.java @@ -24,11 +24,11 @@ import org.opensearch.action.IndicesRequest; import org.opensearch.action.support.IndicesOptions; import org.opensearch.cluster.ClusterState; -import org.elasticsearch.common.Booleans; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Booleans; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.collect.ImmutableOpenMap; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.logging.DeprecationLogger; import org.opensearch.common.regex.Regex; import org.opensearch.common.time.DateFormatter; @@ -72,7 +72,7 @@ public class IndexNameExpressionResolver { private final DateMathExpressionResolver dateMathExpressionResolver = new DateMathExpressionResolver(); private final WildcardExpressionResolver wildcardExpressionResolver = new WildcardExpressionResolver(); private final List expressionResolvers = - org.elasticsearch.common.collect.List.of(dateMathExpressionResolver, wildcardExpressionResolver); + org.opensearch.common.collect.List.of(dateMathExpressionResolver, wildcardExpressionResolver); private final ThreadContext threadContext; @@ -144,7 +144,7 @@ public List dataStreamNames(ClusterState state, IndicesOptions options, } List dataStreams = wildcardExpressionResolver.resolve(context, Arrays.asList(indexExpressions)); - return ((dataStreams == null) ? org.elasticsearch.common.collect.List.of() : dataStreams).stream() + return ((dataStreams == null) ? org.opensearch.common.collect.List.of() : dataStreams).stream() .map(x -> state.metadata().getIndicesLookup().get(x)) .filter(Objects::nonNull) .filter(ia -> ia.getType() == IndexAbstraction.Type.DATA_STREAM) diff --git a/server/src/main/java/org/opensearch/cluster/metadata/IndexTemplateMetadata.java b/server/src/main/java/org/opensearch/cluster/metadata/IndexTemplateMetadata.java index 8d6c3920de1cd..560a797bb449d 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/IndexTemplateMetadata.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/IndexTemplateMetadata.java @@ -24,7 +24,7 @@ import org.opensearch.Version; import org.opensearch.cluster.AbstractDiffable; import org.opensearch.cluster.Diff; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.collect.MapBuilder; 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 9c064c26c4604..aff1d33d7f6d6 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/Metadata.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/Metadata.java @@ -38,7 +38,7 @@ import org.opensearch.cluster.block.ClusterBlock; import org.opensearch.cluster.block.ClusterBlockLevel; import org.opensearch.cluster.coordination.CoordinationMetadata; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.UUIDs; import org.opensearch.common.collect.HppcMaps; diff --git a/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateDataStreamService.java b/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateDataStreamService.java index a88930008b86b..9e7b5e2e79c46 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateDataStreamService.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateDataStreamService.java @@ -35,7 +35,7 @@ import org.elasticsearch.cluster.service.ClusterService; import org.opensearch.common.Priority; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.ObjectPath; import org.elasticsearch.index.mapper.MapperService; 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 4d29dc1b1bea0..2c4cbf542c3f7 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java @@ -47,13 +47,13 @@ import org.opensearch.cluster.routing.ShardRoutingState; import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Priority; import org.opensearch.common.Strings; import org.opensearch.common.UUIDs; import org.opensearch.common.ValidationException; import org.opensearch.common.compress.CompressedXContent; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.io.PathUtils; import org.opensearch.common.logging.DeprecationLogger; import org.opensearch.common.settings.IndexScopedSettings; import org.opensearch.common.settings.Setting; @@ -581,7 +581,7 @@ private ClusterState applyCreateIndexRequestWithExistingMetadata(final ClusterSt // the context is only used for validation so it's fine to pass fake values for the // shard id and the current timestamp indexService.newQueryShardContext(0, null, () -> 0L, null)), - org.elasticsearch.common.collect.List.of(), metadataTransformer); + org.opensearch.common.collect.List.of(), metadataTransformer); } /** 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 9384499f8be62..c73ca42dc669a 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/MetadataIndexStateService.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/MetadataIndexStateService.java @@ -59,11 +59,11 @@ import org.opensearch.common.Strings; import org.opensearch.common.UUIDs; import org.opensearch.common.collect.ImmutableOpenIntMap; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.AtomicArray; import org.elasticsearch.common.util.concurrent.ConcurrentCollections; import org.elasticsearch.common.util.concurrent.CountDown; 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 51900a3928a07..60cae18778fe0 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/MetadataIndexTemplateService.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/MetadataIndexTemplateService.java @@ -33,7 +33,7 @@ import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.ClusterStateUpdateTask; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Priority; import org.opensearch.common.Strings; import org.opensearch.common.UUIDs; @@ -45,7 +45,7 @@ import org.opensearch.common.regex.Regex; import org.opensearch.common.settings.IndexScopedSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.set.Sets; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentBuilder; 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 69ecf458d4602..6923f6f912a03 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/MetadataMappingService.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/MetadataMappingService.java @@ -31,13 +31,13 @@ import org.opensearch.cluster.ack.ClusterStateUpdateResponse; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +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.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.common.unit.TimeValue; +import org.opensearch.core.internal.io.IOUtils; 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/metadata/MetadataUpdateSettingsService.java b/server/src/main/java/org/opensearch/cluster/metadata/MetadataUpdateSettingsService.java index 5c2a3667caea0..b1705c943d7be 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/MetadataUpdateSettingsService.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/MetadataUpdateSettingsService.java @@ -36,7 +36,7 @@ import org.elasticsearch.cluster.service.ClusterService; import org.opensearch.common.Priority; import org.opensearch.common.ValidationException; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.inject.Inject; import org.opensearch.common.regex.Regex; import org.opensearch.common.settings.IndexScopedSettings; diff --git a/server/src/main/java/org/opensearch/cluster/metadata/ProcessClusterEventTimeoutException.java b/server/src/main/java/org/opensearch/cluster/metadata/ProcessClusterEventTimeoutException.java index 0796652686cb0..9b600f6328e1d 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/ProcessClusterEventTimeoutException.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/ProcessClusterEventTimeoutException.java @@ -21,7 +21,7 @@ import org.opensearch.OpenSearchException; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.rest.RestStatus; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/cluster/metadata/RepositoriesMetadata.java b/server/src/main/java/org/opensearch/cluster/metadata/RepositoriesMetadata.java index c50ae810b7e03..75e4ba999f913 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/RepositoriesMetadata.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/RepositoriesMetadata.java @@ -24,7 +24,7 @@ import org.opensearch.cluster.AbstractNamedDiffable; import org.opensearch.cluster.NamedDiff; import org.opensearch.cluster.metadata.Metadata.Custom; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/cluster/metadata/Template.java b/server/src/main/java/org/opensearch/cluster/metadata/Template.java index f91ea98e74da1..a4414e948e957 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/Template.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/Template.java @@ -20,7 +20,7 @@ package org.opensearch.cluster.metadata; import org.opensearch.cluster.AbstractDiffable; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.Strings; import org.opensearch.common.compress.CompressedXContent; diff --git a/server/src/main/java/org/opensearch/cluster/metadata/TemplateUpgradeService.java b/server/src/main/java/org/opensearch/cluster/metadata/TemplateUpgradeService.java index 60ebfb6b0cec5..c839f0d4ae849 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/TemplateUpgradeService.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/TemplateUpgradeService.java @@ -36,8 +36,8 @@ import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.collect.ImmutableOpenMap; -import org.elasticsearch.common.collect.Tuple; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.collect.Tuple; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentType; diff --git a/server/src/main/java/org/opensearch/cluster/node/DiscoveryNodeFilters.java b/server/src/main/java/org/opensearch/cluster/node/DiscoveryNodeFilters.java index c20b5d500233a..e9ba31166df80 100644 --- a/server/src/main/java/org/opensearch/cluster/node/DiscoveryNodeFilters.java +++ b/server/src/main/java/org/opensearch/cluster/node/DiscoveryNodeFilters.java @@ -19,7 +19,7 @@ package org.opensearch.cluster.node; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.network.InetAddresses; import org.opensearch.common.network.NetworkAddress; 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 b8968d6139e00..20ba879c3ed5a 100644 --- a/server/src/main/java/org/opensearch/cluster/node/DiscoveryNodes.java +++ b/server/src/main/java/org/opensearch/cluster/node/DiscoveryNodes.java @@ -25,8 +25,8 @@ import org.opensearch.Version; import org.opensearch.cluster.AbstractDiffable; import org.opensearch.cluster.Diff; -import org.elasticsearch.common.Booleans; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Booleans; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/opensearch/cluster/routing/AllocationId.java b/server/src/main/java/org/opensearch/cluster/routing/AllocationId.java index 255e95175b5c6..3a1cfab6c7d6a 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/AllocationId.java +++ b/server/src/main/java/org/opensearch/cluster/routing/AllocationId.java @@ -19,7 +19,7 @@ package org.opensearch.cluster.routing; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.UUIDs; import org.opensearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/opensearch/cluster/routing/BatchedRerouteService.java b/server/src/main/java/org/opensearch/cluster/routing/BatchedRerouteService.java index 96fe3e938c94c..110ec17948b26 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/BatchedRerouteService.java +++ b/server/src/main/java/org/opensearch/cluster/routing/BatchedRerouteService.java @@ -28,7 +28,7 @@ import org.opensearch.cluster.ClusterStateUpdateTask; import org.opensearch.cluster.NotMasterException; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Priority; import java.util.ArrayList; diff --git a/server/src/main/java/org/opensearch/cluster/routing/DelayedAllocationService.java b/server/src/main/java/org/opensearch/cluster/routing/DelayedAllocationService.java index c532a5523b86d..c4500c2282558 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/DelayedAllocationService.java +++ b/server/src/main/java/org/opensearch/cluster/routing/DelayedAllocationService.java @@ -31,7 +31,7 @@ import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.component.AbstractLifecycleComponent; import org.opensearch.common.inject.Inject; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.AbstractRunnable; import org.opensearch.threadpool.Scheduler; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/opensearch/cluster/routing/IndexShardRoutingTable.java b/server/src/main/java/org/opensearch/cluster/routing/IndexShardRoutingTable.java index 42099723fb9bd..ec5d7b87e126f 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/IndexShardRoutingTable.java +++ b/server/src/main/java/org/opensearch/cluster/routing/IndexShardRoutingTable.java @@ -21,7 +21,7 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Randomness; import org.opensearch.common.collect.MapBuilder; import org.opensearch.common.io.stream.StreamInput; 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 d6855740d0bb8..6a390fcafa925 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/OperationRouting.java +++ b/server/src/main/java/org/opensearch/cluster/routing/OperationRouting.java @@ -24,7 +24,7 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.routing.allocation.decider.AwarenessAllocationDecider; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.logging.DeprecationLogger; import org.opensearch.common.settings.ClusterSettings; @@ -43,7 +43,7 @@ import java.util.Set; import java.util.stream.Collectors; -import static org.elasticsearch.common.Booleans.parseBoolean; +import static org.opensearch.common.Booleans.parseBoolean; public class OperationRouting { diff --git a/server/src/main/java/org/opensearch/cluster/routing/RoutingNode.java b/server/src/main/java/org/opensearch/cluster/routing/RoutingNode.java index d4c2ec7e28091..edf7ee846701e 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/RoutingNode.java +++ b/server/src/main/java/org/opensearch/cluster/routing/RoutingNode.java @@ -20,7 +20,7 @@ package org.opensearch.cluster.routing; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.index.Index; import org.elasticsearch.index.shard.ShardId; diff --git a/server/src/main/java/org/opensearch/cluster/routing/RoutingNodes.java b/server/src/main/java/org/opensearch/cluster/routing/RoutingNodes.java index e4adbb6c421f7..afbdcf51a6d2c 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/RoutingNodes.java +++ b/server/src/main/java/org/opensearch/cluster/routing/RoutingNodes.java @@ -30,9 +30,9 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.routing.UnassignedInfo.AllocationStatus; import org.opensearch.cluster.routing.allocation.ExistingShardsAllocator; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Randomness; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.index.Index; import org.opensearch.index.shard.ShardId; diff --git a/server/src/main/java/org/opensearch/cluster/routing/RoutingTable.java b/server/src/main/java/org/opensearch/cluster/routing/RoutingTable.java index 84a7731c42a35..0be04f304f197 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/RoutingTable.java +++ b/server/src/main/java/org/opensearch/cluster/routing/RoutingTable.java @@ -28,7 +28,7 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.Metadata; import org.opensearch.cluster.routing.RecoverySource.SnapshotRecoverySource; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/cluster/routing/ShardRouting.java b/server/src/main/java/org/opensearch/cluster/routing/ShardRouting.java index 584c0561c77a8..28248597bfb5f 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/ShardRouting.java +++ b/server/src/main/java/org/opensearch/cluster/routing/ShardRouting.java @@ -22,7 +22,7 @@ import org.opensearch.cluster.routing.RecoverySource.ExistingStoreRecoverySource; import org.opensearch.cluster.routing.RecoverySource.PeerRecoverySource; import org.opensearch.cluster.routing.allocation.allocator.BalancedShardsAllocator; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; 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 9683f85a57fa3..f20a5656b19ea 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/UnassignedInfo.java +++ b/server/src/main/java/org/opensearch/cluster/routing/UnassignedInfo.java @@ -25,7 +25,7 @@ import org.opensearch.cluster.metadata.Metadata; import org.opensearch.cluster.routing.allocation.RoutingAllocation; import org.opensearch.cluster.routing.allocation.decider.Decision; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; @@ -33,7 +33,7 @@ import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.settings.Settings; import org.opensearch.common.time.DateFormatter; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContentFragment; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/AbstractAllocationDecision.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/AbstractAllocationDecision.java index 3efe52dad2c10..9cd72f3284e50 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/allocation/AbstractAllocationDecision.java +++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/AbstractAllocationDecision.java @@ -21,7 +21,7 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.routing.allocation.decider.Decision.Type; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/AllocateUnassignedDecision.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/AllocateUnassignedDecision.java index ffe2580f3ffad..12ff7ba711dd6 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/allocation/AllocateUnassignedDecision.java +++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/AllocateUnassignedDecision.java @@ -23,10 +23,10 @@ import org.opensearch.cluster.routing.UnassignedInfo.AllocationStatus; import org.opensearch.cluster.routing.allocation.decider.Decision; import org.opensearch.cluster.routing.allocation.decider.Decision.Type; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/DiskThresholdSettings.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/DiskThresholdSettings.java index c7afaa6ea3391..c807e5b010fce 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/allocation/DiskThresholdSettings.java +++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/DiskThresholdSettings.java @@ -26,7 +26,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.RatioValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.Arrays; import java.util.Iterator; diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/ExistingShardsAllocator.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/ExistingShardsAllocator.java index 33866b882a18b..3433c755817fa 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/allocation/ExistingShardsAllocator.java +++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/ExistingShardsAllocator.java @@ -23,7 +23,7 @@ import org.opensearch.cluster.routing.RoutingNodes; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.UnassignedInfo; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.settings.Setting; import org.opensearch.gateway.GatewayAllocator; 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 7ad642e720174..55baee06408ed 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 @@ -21,7 +21,7 @@ import org.elasticsearch.ExceptionsHelper; import org.opensearch.cluster.routing.ShardRouting; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; /** * A class representing a failed shard. diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/MoveDecision.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/MoveDecision.java index f7e6f8555cbf7..99169ccef5299 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/allocation/MoveDecision.java +++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/MoveDecision.java @@ -22,7 +22,7 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.routing.allocation.decider.Decision; import org.opensearch.cluster.routing.allocation.decider.Decision.Type; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; 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 bdccc78db355d..7169fa92c953a 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 @@ -22,7 +22,7 @@ import org.opensearch.OpenSearchException; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.routing.allocation.decider.Decision; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java index 7e158657b5ebc..27c9856545d61 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java +++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java @@ -41,7 +41,7 @@ import org.opensearch.cluster.routing.allocation.decider.Decision; import org.opensearch.cluster.routing.allocation.decider.Decision.Type; import org.opensearch.cluster.routing.allocation.decider.DiskThresholdDecider; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Setting; diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/command/AbstractAllocateAllocationCommand.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/command/AbstractAllocateAllocationCommand.java index 39bff4e8cdf85..a0077dedfc324 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/allocation/command/AbstractAllocateAllocationCommand.java +++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/command/AbstractAllocateAllocationCommand.java @@ -28,7 +28,7 @@ import org.opensearch.cluster.routing.allocation.RerouteExplanation; import org.opensearch.cluster.routing.allocation.RoutingAllocation; import org.opensearch.cluster.routing.allocation.decider.Decision; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/Decision.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/Decision.java index 73a41dad056af..9df70b2571617 100644 --- a/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/Decision.java +++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/decider/Decision.java @@ -19,7 +19,7 @@ package org.opensearch.cluster.routing.allocation.decider; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; diff --git a/server/src/main/java/org/opensearch/cluster/service/ClusterApplierService.java b/server/src/main/java/org/opensearch/cluster/service/ClusterApplierService.java index 33009f6b0af17..16ad5c4e0a482 100644 --- a/server/src/main/java/org/opensearch/cluster/service/ClusterApplierService.java +++ b/server/src/main/java/org/opensearch/cluster/service/ClusterApplierService.java @@ -33,7 +33,7 @@ import org.opensearch.cluster.TimeoutClusterStateListener; import org.opensearch.cluster.metadata.ProcessClusterEventTimeoutException; import org.opensearch.cluster.node.DiscoveryNodes; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Priority; import org.opensearch.common.StopWatch; import org.opensearch.common.component.AbstractLifecycleComponent; @@ -41,7 +41,7 @@ import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.EsExecutors; import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; import org.elasticsearch.common.util.concurrent.PrioritizedEsThreadPoolExecutor; diff --git a/server/src/main/java/org/opensearch/cluster/service/MasterService.java b/server/src/main/java/org/opensearch/cluster/service/MasterService.java index 73f24cae221b9..7004a9b9a15b8 100644 --- a/server/src/main/java/org/opensearch/cluster/service/MasterService.java +++ b/server/src/main/java/org/opensearch/cluster/service/MasterService.java @@ -39,14 +39,14 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.routing.RoutingTable; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Priority; import org.opensearch.common.component.AbstractLifecycleComponent; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; import org.opensearch.common.text.Text; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.CountDown; import org.elasticsearch.common.util.concurrent.EsExecutors; import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; diff --git a/server/src/main/java/org/opensearch/cluster/service/PendingClusterTask.java b/server/src/main/java/org/opensearch/cluster/service/PendingClusterTask.java index 19ded0cc73608..c06ac143770bb 100644 --- a/server/src/main/java/org/opensearch/cluster/service/PendingClusterTask.java +++ b/server/src/main/java/org/opensearch/cluster/service/PendingClusterTask.java @@ -24,7 +24,7 @@ import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.text.Text; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/cluster/service/TaskBatcher.java b/server/src/main/java/org/opensearch/cluster/service/TaskBatcher.java index e1cf47327d501..3db22295bf3a5 100644 --- a/server/src/main/java/org/opensearch/cluster/service/TaskBatcher.java +++ b/server/src/main/java/org/opensearch/cluster/service/TaskBatcher.java @@ -20,9 +20,9 @@ package org.opensearch.cluster.service; import org.apache.logging.log4j.Logger; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Priority; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.EsRejectedExecutionException; import org.opensearch.common.util.concurrent.PrioritizedEsThreadPoolExecutor; diff --git a/server/src/main/java/org/opensearch/common/RandomBasedUUIDGenerator.java b/server/src/main/java/org/opensearch/common/RandomBasedUUIDGenerator.java index 8495f1e963378..2bd8fed501157 100644 --- a/server/src/main/java/org/opensearch/common/RandomBasedUUIDGenerator.java +++ b/server/src/main/java/org/opensearch/common/RandomBasedUUIDGenerator.java @@ -20,7 +20,6 @@ package org.opensearch.common; -import org.elasticsearch.common.CharArrays; import org.opensearch.common.settings.SecureString; import java.util.Arrays; diff --git a/server/src/main/java/org/opensearch/common/Randomness.java b/server/src/main/java/org/opensearch/common/Randomness.java index 6752def14f1cd..4fbe1db3df2fe 100644 --- a/server/src/main/java/org/opensearch/common/Randomness.java +++ b/server/src/main/java/org/opensearch/common/Randomness.java @@ -19,7 +19,6 @@ package org.opensearch.common; -import org.elasticsearch.common.SuppressForbidden; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; diff --git a/server/src/main/java/org/opensearch/common/Rounding.java b/server/src/main/java/org/opensearch/common/Rounding.java index fa33224fd74e1..5a0fd26bec402 100644 --- a/server/src/main/java/org/opensearch/common/Rounding.java +++ b/server/src/main/java/org/opensearch/common/Rounding.java @@ -29,7 +29,7 @@ import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.time.DateUtils; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.io.IOException; import java.time.Instant; diff --git a/server/src/main/java/org/opensearch/common/StopWatch.java b/server/src/main/java/org/opensearch/common/StopWatch.java index 6eea977b454b0..0d5e9287153f3 100644 --- a/server/src/main/java/org/opensearch/common/StopWatch.java +++ b/server/src/main/java/org/opensearch/common/StopWatch.java @@ -20,7 +20,7 @@ package org.opensearch.common; import org.opensearch.common.lease.Releasable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.text.NumberFormat; import java.util.LinkedList; diff --git a/server/src/main/java/org/opensearch/common/Strings.java b/server/src/main/java/org/opensearch/common/Strings.java index 00b1eb025f223..61683ff28c9ef 100644 --- a/server/src/main/java/org/opensearch/common/Strings.java +++ b/server/src/main/java/org/opensearch/common/Strings.java @@ -20,7 +20,6 @@ package org.opensearch.common; import org.apache.lucene.util.BytesRefBuilder; -import org.elasticsearch.common.Nullable; import org.opensearch.OpenSearchException; import org.elasticsearch.ExceptionsHelper; import org.opensearch.common.bytes.BytesReference; diff --git a/server/src/main/java/org/opensearch/common/blobstore/BlobPath.java b/server/src/main/java/org/opensearch/common/blobstore/BlobPath.java index 28f247199d772..fe52abfcefb1b 100644 --- a/server/src/main/java/org/opensearch/common/blobstore/BlobPath.java +++ b/server/src/main/java/org/opensearch/common/blobstore/BlobPath.java @@ -19,7 +19,7 @@ package org.opensearch.common.blobstore; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import java.util.ArrayList; import java.util.Collections; diff --git a/server/src/main/java/org/opensearch/common/blobstore/fs/FsBlobContainer.java b/server/src/main/java/org/opensearch/common/blobstore/fs/FsBlobContainer.java index 9b727c8628e09..6ebc91530623d 100644 --- a/server/src/main/java/org/opensearch/common/blobstore/fs/FsBlobContainer.java +++ b/server/src/main/java/org/opensearch/common/blobstore/fs/FsBlobContainer.java @@ -27,7 +27,7 @@ import org.opensearch.common.blobstore.support.AbstractBlobContainer; import org.opensearch.common.blobstore.support.PlainBlobMetadata; import org.opensearch.common.io.Streams; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import java.io.FileNotFoundException; import java.io.IOException; @@ -212,7 +212,7 @@ public void writeBlobAtomic(final String blobName, final InputStream inputStream private void writeToPath(InputStream inputStream, Path tempBlobPath, long blobSize) throws IOException { try (OutputStream outputStream = Files.newOutputStream(tempBlobPath, StandardOpenOption.CREATE_NEW)) { final int bufferSize = blobStore.bufferSizeInBytes(); - org.elasticsearch.core.internal.io.Streams.copy( + org.opensearch.core.internal.io.Streams.copy( inputStream, outputStream, new byte[blobSize < bufferSize ? Math.toIntExact(blobSize) : bufferSize]); } IOUtils.fsync(tempBlobPath, false); diff --git a/server/src/main/java/org/opensearch/common/bytes/RecyclingBytesStreamOutput.java b/server/src/main/java/org/opensearch/common/bytes/RecyclingBytesStreamOutput.java index 10f7beb0fdc65..f9bb2de21beef 100644 --- a/server/src/main/java/org/opensearch/common/bytes/RecyclingBytesStreamOutput.java +++ b/server/src/main/java/org/opensearch/common/bytes/RecyclingBytesStreamOutput.java @@ -21,12 +21,12 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefIterator; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.BytesStream; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.ByteArray; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import java.io.IOException; import java.util.Objects; diff --git a/server/src/main/java/org/opensearch/common/bytes/ReleasableBytesReference.java b/server/src/main/java/org/opensearch/common/bytes/ReleasableBytesReference.java index 97035c03b8a68..3ba101d263936 100644 --- a/server/src/main/java/org/opensearch/common/bytes/ReleasableBytesReference.java +++ b/server/src/main/java/org/opensearch/common/bytes/ReleasableBytesReference.java @@ -23,7 +23,7 @@ import org.apache.lucene.util.BytesRefIterator; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.lease.Releasable; -import org.elasticsearch.common.util.concurrent.AbstractRefCounted; +import org.opensearch.common.util.concurrent.AbstractRefCounted; import org.elasticsearch.common.xcontent.XContentBuilder; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/common/cache/Cache.java b/server/src/main/java/org/opensearch/common/cache/Cache.java index ce766c27096b1..68569a894a7fb 100644 --- a/server/src/main/java/org/opensearch/common/cache/Cache.java +++ b/server/src/main/java/org/opensearch/common/cache/Cache.java @@ -19,7 +19,7 @@ package org.opensearch.common.cache; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.util.concurrent.ReleasableLock; import java.util.Arrays; diff --git a/server/src/main/java/org/opensearch/common/cache/CacheBuilder.java b/server/src/main/java/org/opensearch/common/cache/CacheBuilder.java index 2625a2ef754a5..22de7e9429de5 100644 --- a/server/src/main/java/org/opensearch/common/cache/CacheBuilder.java +++ b/server/src/main/java/org/opensearch/common/cache/CacheBuilder.java @@ -19,7 +19,7 @@ package org.opensearch.common.cache; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.Objects; import java.util.function.ToLongBiFunction; diff --git a/server/src/main/java/org/opensearch/common/compress/CompressorFactory.java b/server/src/main/java/org/opensearch/common/compress/CompressorFactory.java index fae1064a3ecfe..42cfd8418cef4 100644 --- a/server/src/main/java/org/opensearch/common/compress/CompressorFactory.java +++ b/server/src/main/java/org/opensearch/common/compress/CompressorFactory.java @@ -19,7 +19,7 @@ package org.opensearch.common.compress; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentType; diff --git a/server/src/main/java/org/opensearch/common/geo/GeoPolygonDecomposer.java b/server/src/main/java/org/opensearch/common/geo/GeoPolygonDecomposer.java index a9eb4e4855bfa..4e3df08198c19 100644 --- a/server/src/main/java/org/opensearch/common/geo/GeoPolygonDecomposer.java +++ b/server/src/main/java/org/opensearch/common/geo/GeoPolygonDecomposer.java @@ -19,7 +19,7 @@ package org.opensearch.common.geo; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.geometry.LinearRing; import org.opensearch.geometry.MultiPolygon; import org.opensearch.geometry.Point; diff --git a/server/src/main/java/org/opensearch/common/geo/builders/PolygonBuilder.java b/server/src/main/java/org/opensearch/common/geo/builders/PolygonBuilder.java index 8795574ad33b9..8980925026414 100644 --- a/server/src/main/java/org/opensearch/common/geo/builders/PolygonBuilder.java +++ b/server/src/main/java/org/opensearch/common/geo/builders/PolygonBuilder.java @@ -19,7 +19,7 @@ package org.opensearch.common.geo.builders; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.geo.GeoShapeType; import org.opensearch.common.geo.parsers.ShapeParser; import org.opensearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/opensearch/common/inject/internal/Stopwatch.java b/server/src/main/java/org/opensearch/common/inject/internal/Stopwatch.java index 3c721dd761e3d..3346468b6ab4c 100644 --- a/server/src/main/java/org/opensearch/common/inject/internal/Stopwatch.java +++ b/server/src/main/java/org/opensearch/common/inject/internal/Stopwatch.java @@ -16,7 +16,7 @@ package org.opensearch.common.inject.internal; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.logging.Logger; diff --git a/server/src/main/java/org/opensearch/common/inject/matcher/Matchers.java b/server/src/main/java/org/opensearch/common/inject/matcher/Matchers.java index aaf0f9a389f00..04281e2e1a4e6 100644 --- a/server/src/main/java/org/opensearch/common/inject/matcher/Matchers.java +++ b/server/src/main/java/org/opensearch/common/inject/matcher/Matchers.java @@ -16,7 +16,7 @@ package org.opensearch.common.inject.matcher; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import java.lang.annotation.Annotation; import java.lang.annotation.Retention; diff --git a/server/src/main/java/org/opensearch/common/io/Channels.java b/server/src/main/java/org/opensearch/common/io/Channels.java index aafbcfaeebd10..2ab89fbf4a4db 100644 --- a/server/src/main/java/org/opensearch/common/io/Channels.java +++ b/server/src/main/java/org/opensearch/common/io/Channels.java @@ -19,7 +19,7 @@ package org.opensearch.common.io; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import java.io.EOFException; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/common/io/FileSystemUtils.java b/server/src/main/java/org/opensearch/common/io/FileSystemUtils.java index 2da099b083ce7..bee8326fe3cda 100644 --- a/server/src/main/java/org/opensearch/common/io/FileSystemUtils.java +++ b/server/src/main/java/org/opensearch/common/io/FileSystemUtils.java @@ -21,9 +21,9 @@ import org.apache.logging.log4j.Logger; import org.apache.lucene.util.Constants; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.common.Strings; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import java.io.IOException; import java.io.InputStream; diff --git a/server/src/main/java/org/opensearch/common/io/Streams.java b/server/src/main/java/org/opensearch/common/io/Streams.java index dee819cbfe271..f4c07cfcfbd1f 100644 --- a/server/src/main/java/org/opensearch/common/io/Streams.java +++ b/server/src/main/java/org/opensearch/common/io/Streams.java @@ -183,7 +183,7 @@ public static int readFully(InputStream reader, byte[] dest, int offset, int len * Fully consumes the input stream, throwing the bytes away. Returns the number of bytes consumed. */ public static long consumeFully(InputStream inputStream) throws IOException { - return org.elasticsearch.core.internal.io.Streams.copy(inputStream, NULL_OUTPUT_STREAM); + return org.opensearch.core.internal.io.Streams.copy(inputStream, NULL_OUTPUT_STREAM); } public static List readAllLines(InputStream input) throws IOException { @@ -229,7 +229,7 @@ public static BytesStream flushOnCloseStream(BytesStream os) { */ public static BytesReference readFully(InputStream in) throws IOException { BytesStreamOutput out = new BytesStreamOutput(); - org.elasticsearch.core.internal.io.Streams.copy(in, out); + org.opensearch.core.internal.io.Streams.copy(in, out); return out.bytes(); } diff --git a/server/src/main/java/org/opensearch/common/io/stream/BytesStreamOutput.java b/server/src/main/java/org/opensearch/common/io/stream/BytesStreamOutput.java index 970f14b23c85d..7e3d57057d4f3 100644 --- a/server/src/main/java/org/opensearch/common/io/stream/BytesStreamOutput.java +++ b/server/src/main/java/org/opensearch/common/io/stream/BytesStreamOutput.java @@ -21,7 +21,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefIterator; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.util.BigArrays; 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 77abe2f819d42..8d23cc30bff1e 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 @@ -30,8 +30,8 @@ import org.apache.lucene.util.CharsRef; import org.opensearch.OpenSearchException; import org.opensearch.Version; -import org.elasticsearch.common.CharArrays; -import org.elasticsearch.common.Nullable; +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; @@ -40,7 +40,7 @@ import org.opensearch.common.settings.SecureString; import org.opensearch.common.text.Text; import org.opensearch.common.time.DateUtils; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; import org.opensearch.script.JodaCompatibleZonedDateTime; import org.joda.time.DateTimeZone; diff --git a/server/src/main/java/org/opensearch/common/io/stream/StreamOutput.java b/server/src/main/java/org/opensearch/common/io/stream/StreamOutput.java index 03f65404a307e..9d39983e37936 100644 --- a/server/src/main/java/org/opensearch/common/io/stream/StreamOutput.java +++ b/server/src/main/java/org/opensearch/common/io/stream/StreamOutput.java @@ -32,8 +32,8 @@ import org.opensearch.Version; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.metadata.Metadata; -import org.elasticsearch.common.CharArrays; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.CharArrays; +import org.opensearch.common.Nullable; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.collect.ImmutableOpenMap; @@ -41,7 +41,7 @@ import org.opensearch.common.io.stream.Writeable.Writer; import org.opensearch.common.settings.SecureString; import org.opensearch.common.text.Text; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; import org.opensearch.script.JodaCompatibleZonedDateTime; import org.joda.time.DateTimeZone; diff --git a/server/src/main/java/org/opensearch/common/lease/Releasables.java b/server/src/main/java/org/opensearch/common/lease/Releasables.java index de037be536e2e..77ab9d861af8c 100644 --- a/server/src/main/java/org/opensearch/common/lease/Releasables.java +++ b/server/src/main/java/org/opensearch/common/lease/Releasables.java @@ -19,8 +19,8 @@ package org.opensearch.common.lease; -import org.elasticsearch.common.Nullable; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.common.Nullable; +import org.opensearch.core.internal.io.IOUtils; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/server/src/main/java/org/opensearch/common/logging/LogConfigurator.java b/server/src/main/java/org/opensearch/common/logging/LogConfigurator.java index b76458af559fe..b5163ee909b44 100644 --- a/server/src/main/java/org/opensearch/common/logging/LogConfigurator.java +++ b/server/src/main/java/org/opensearch/common/logging/LogConfigurator.java @@ -41,7 +41,7 @@ import org.opensearch.cli.ExitCodes; import org.opensearch.cli.UserException; import org.opensearch.cluster.ClusterName; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.opensearch.node.Node; diff --git a/server/src/main/java/org/opensearch/common/logging/NodeAndClusterIdStateListener.java b/server/src/main/java/org/opensearch/common/logging/NodeAndClusterIdStateListener.java index e6727b7d62af8..13289fc920fed 100644 --- a/server/src/main/java/org/opensearch/common/logging/NodeAndClusterIdStateListener.java +++ b/server/src/main/java/org/opensearch/common/logging/NodeAndClusterIdStateListener.java @@ -24,7 +24,7 @@ import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.ClusterStateObserver; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.ThreadContext; /** 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 d5d162213fa91..b0d43ad0d4007 100644 --- a/server/src/main/java/org/opensearch/common/lucene/Lucene.java +++ b/server/src/main/java/org/opensearch/common/lucene/Lucene.java @@ -83,9 +83,9 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Version; import org.elasticsearch.ExceptionsHelper; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; -import org.elasticsearch.common.SuppressForbidden; +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; diff --git a/server/src/main/java/org/opensearch/common/lucene/index/FilterableTermsEnum.java b/server/src/main/java/org/opensearch/common/lucene/index/FilterableTermsEnum.java index 0965bc910c68a..d5d0f40792903 100644 --- a/server/src/main/java/org/opensearch/common/lucene/index/FilterableTermsEnum.java +++ b/server/src/main/java/org/opensearch/common/lucene/index/FilterableTermsEnum.java @@ -37,7 +37,7 @@ import org.apache.lucene.util.BitSet; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/main/java/org/opensearch/common/lucene/index/FreqTermsEnum.java b/server/src/main/java/org/opensearch/common/lucene/index/FreqTermsEnum.java index f35f526469af9..fb7aa7356d7e2 100644 --- a/server/src/main/java/org/opensearch/common/lucene/index/FreqTermsEnum.java +++ b/server/src/main/java/org/opensearch/common/lucene/index/FreqTermsEnum.java @@ -23,7 +23,7 @@ import org.apache.lucene.index.PostingsEnum; import org.apache.lucene.search.Query; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.lease.Releasable; import org.opensearch.common.lease.Releasables; import org.opensearch.common.util.BigArrays; diff --git a/server/src/main/java/org/opensearch/common/lucene/index/OpenSearchDirectoryReader.java b/server/src/main/java/org/opensearch/common/lucene/index/OpenSearchDirectoryReader.java index a3adc7d9dd26b..3b49430708cc7 100644 --- a/server/src/main/java/org/opensearch/common/lucene/index/OpenSearchDirectoryReader.java +++ b/server/src/main/java/org/opensearch/common/lucene/index/OpenSearchDirectoryReader.java @@ -22,7 +22,7 @@ import org.apache.lucene.index.FilterDirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReader; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.elasticsearch.index.shard.ShardId; import java.io.IOException; 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 25ad760595aaf..d7976fb598c75 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 @@ -32,7 +32,7 @@ import org.apache.lucene.util.BytesRef; import org.opensearch.OpenSearchException; import org.opensearch.Version; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.index.mapper.SeqNoFieldMapper; import org.elasticsearch.index.mapper.TypeFieldMapper; diff --git a/server/src/main/java/org/opensearch/common/lucene/search/XMoreLikeThis.java b/server/src/main/java/org/opensearch/common/lucene/search/XMoreLikeThis.java index ec7fc779c9ed4..d070b762e9e4c 100644 --- a/server/src/main/java/org/opensearch/common/lucene/search/XMoreLikeThis.java +++ b/server/src/main/java/org/opensearch/common/lucene/search/XMoreLikeThis.java @@ -57,7 +57,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CharsRefBuilder; import org.apache.lucene.util.PriorityQueue; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import java.io.IOException; import java.io.Reader; diff --git a/server/src/main/java/org/opensearch/common/network/CloseableChannel.java b/server/src/main/java/org/opensearch/common/network/CloseableChannel.java index 1b49d817bc42f..b434307deb798 100644 --- a/server/src/main/java/org/opensearch/common/network/CloseableChannel.java +++ b/server/src/main/java/org/opensearch/common/network/CloseableChannel.java @@ -22,7 +22,7 @@ import org.opensearch.action.ActionFuture; import org.opensearch.action.ActionListener; import org.opensearch.action.support.PlainActionFuture; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import java.io.Closeable; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/common/network/InetAddresses.java b/server/src/main/java/org/opensearch/common/network/InetAddresses.java index 561d12d675317..18f917ec147bd 100644 --- a/server/src/main/java/org/opensearch/common/network/InetAddresses.java +++ b/server/src/main/java/org/opensearch/common/network/InetAddresses.java @@ -16,7 +16,7 @@ package org.opensearch.common.network; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import java.net.Inet4Address; import java.net.Inet6Address; diff --git a/server/src/main/java/org/opensearch/common/network/NetworkModule.java b/server/src/main/java/org/opensearch/common/network/NetworkModule.java index c6607e1f9324b..f7fe3aa48360d 100644 --- a/server/src/main/java/org/opensearch/common/network/NetworkModule.java +++ b/server/src/main/java/org/opensearch/common/network/NetworkModule.java @@ -26,7 +26,7 @@ import org.opensearch.cluster.routing.allocation.command.AllocationCommand; import org.opensearch.cluster.routing.allocation.command.CancelAllocationCommand; import org.opensearch.cluster.routing.allocation.command.MoveAllocationCommand; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.elasticsearch.common.ParseField; import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.io.stream.Writeable; diff --git a/server/src/main/java/org/opensearch/common/network/NetworkService.java b/server/src/main/java/org/opensearch/common/network/NetworkService.java index ee119642fcb36..576793243ddf6 100644 --- a/server/src/main/java/org/opensearch/common/network/NetworkService.java +++ b/server/src/main/java/org/opensearch/common/network/NetworkService.java @@ -22,7 +22,7 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.io.IOException; import java.net.InetAddress; diff --git a/server/src/main/java/org/opensearch/common/rounding/Rounding.java b/server/src/main/java/org/opensearch/common/rounding/Rounding.java index 61dc27004b934..ed1bbf2c4f85a 100644 --- a/server/src/main/java/org/opensearch/common/rounding/Rounding.java +++ b/server/src/main/java/org/opensearch/common/rounding/Rounding.java @@ -22,7 +22,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.joda.time.DateTimeField; import org.joda.time.DateTimeZone; import org.joda.time.IllegalInstantException; diff --git a/server/src/main/java/org/opensearch/common/settings/AbstractScopedSettings.java b/server/src/main/java/org/opensearch/common/settings/AbstractScopedSettings.java index d8f6bf7c2c0b0..82e667b23dc53 100644 --- a/server/src/main/java/org/opensearch/common/settings/AbstractScopedSettings.java +++ b/server/src/main/java/org/opensearch/common/settings/AbstractScopedSettings.java @@ -25,7 +25,7 @@ import org.apache.lucene.search.spell.LevenshteinDistance; import org.apache.lucene.util.CollectionUtil; import org.elasticsearch.ExceptionsHelper; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.regex.Regex; import java.util.ArrayList; diff --git a/server/src/main/java/org/opensearch/common/settings/SecureSetting.java b/server/src/main/java/org/opensearch/common/settings/SecureSetting.java index a52aca4248cce..db55a4e5f8122 100644 --- a/server/src/main/java/org/opensearch/common/settings/SecureSetting.java +++ b/server/src/main/java/org/opensearch/common/settings/SecureSetting.java @@ -24,7 +24,7 @@ import java.util.EnumSet; import java.util.Set; -import org.elasticsearch.common.Booleans; +import org.opensearch.common.Booleans; import org.elasticsearch.common.util.ArrayUtils; /** diff --git a/server/src/main/java/org/opensearch/common/settings/Setting.java b/server/src/main/java/org/opensearch/common/settings/Setting.java index 06c29f57fd124..8300ba6c126c1 100644 --- a/server/src/main/java/org/opensearch/common/settings/Setting.java +++ b/server/src/main/java/org/opensearch/common/settings/Setting.java @@ -23,14 +23,14 @@ import org.opensearch.OpenSearchException; import org.opensearch.OpenSearchParseException; import org.opensearch.Version; -import org.elasticsearch.common.Booleans; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Booleans; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.regex.Regex; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.MemorySizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.DeprecationHandler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.ToXContentObject; 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 f0c3cfe97236b..48e82f1247518 100644 --- a/server/src/main/java/org/opensearch/common/settings/Settings.java +++ b/server/src/main/java/org/opensearch/common/settings/Settings.java @@ -24,7 +24,7 @@ import org.opensearch.OpenSearchGenerationException; import org.opensearch.OpenSearchParseException; import org.opensearch.Version; -import org.elasticsearch.common.Booleans; +import org.opensearch.common.Booleans; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; @@ -33,7 +33,7 @@ import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.MemorySizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.DeprecationHandler; import org.opensearch.common.xcontent.LoggingDeprecationHandler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; @@ -43,7 +43,7 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParserUtils; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import java.io.IOException; import java.io.InputStream; @@ -74,7 +74,7 @@ import java.util.stream.Stream; import static org.opensearch.common.unit.ByteSizeValue.parseBytesSizeValue; -import static org.elasticsearch.common.unit.TimeValue.parseTimeValue; +import static org.opensearch.common.unit.TimeValue.parseTimeValue; /** * An immutable settings implementation. 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 bbfe2039e744b..4bb685d064175 100644 --- a/server/src/main/java/org/opensearch/common/time/DateFormatters.java +++ b/server/src/main/java/org/opensearch/common/time/DateFormatters.java @@ -20,7 +20,7 @@ package org.opensearch.common.time; import org.opensearch.common.Strings; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.logging.DeprecationLogger; import org.opensearch.common.util.LazyInitializable; diff --git a/server/src/main/java/org/opensearch/common/util/BigArrays.java b/server/src/main/java/org/opensearch/common/util/BigArrays.java index d6b21376a931e..c688004994681 100644 --- a/server/src/main/java/org/opensearch/common/util/BigArrays.java +++ b/server/src/main/java/org/opensearch/common/util/BigArrays.java @@ -22,7 +22,7 @@ import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.RamUsageEstimator; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.breaker.CircuitBreaker; import org.opensearch.common.breaker.CircuitBreakingException; import org.opensearch.common.lease.Releasable; diff --git a/server/src/main/java/org/opensearch/common/util/CancellableThreads.java b/server/src/main/java/org/opensearch/common/util/CancellableThreads.java index be0a05e9b9dc9..7317a87f30c9c 100644 --- a/server/src/main/java/org/opensearch/common/util/CancellableThreads.java +++ b/server/src/main/java/org/opensearch/common/util/CancellableThreads.java @@ -21,7 +21,7 @@ import org.apache.lucene.util.SetOnce; import org.apache.lucene.util.ThreadInterruptedException; import org.opensearch.OpenSearchException; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/common/util/SingleObjectCache.java b/server/src/main/java/org/opensearch/common/util/SingleObjectCache.java index 8363e95dbf091..b077c22622f62 100644 --- a/server/src/main/java/org/opensearch/common/util/SingleObjectCache.java +++ b/server/src/main/java/org/opensearch/common/util/SingleObjectCache.java @@ -18,7 +18,7 @@ */ package org.opensearch.common.util; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/AbstractAsyncTask.java b/server/src/main/java/org/opensearch/common/util/concurrent/AbstractAsyncTask.java index bfafa1ca530f0..cde0f6970b7f0 100644 --- a/server/src/main/java/org/opensearch/common/util/concurrent/AbstractAsyncTask.java +++ b/server/src/main/java/org/opensearch/common/util/concurrent/AbstractAsyncTask.java @@ -20,7 +20,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.threadpool.Scheduler; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/AsyncIOProcessor.java b/server/src/main/java/org/opensearch/common/util/concurrent/AsyncIOProcessor.java index 64ff6e4b9a24d..6a32b21b013e7 100644 --- a/server/src/main/java/org/opensearch/common/util/concurrent/AsyncIOProcessor.java +++ b/server/src/main/java/org/opensearch/common/util/concurrent/AsyncIOProcessor.java @@ -19,7 +19,7 @@ package org.opensearch.common.util.concurrent; import org.apache.logging.log4j.Logger; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/BaseFuture.java b/server/src/main/java/org/opensearch/common/util/concurrent/BaseFuture.java index a13408a5bb246..a04f51b54c21e 100644 --- a/server/src/main/java/org/opensearch/common/util/concurrent/BaseFuture.java +++ b/server/src/main/java/org/opensearch/common/util/concurrent/BaseFuture.java @@ -21,7 +21,7 @@ import org.opensearch.cluster.service.ClusterApplierService; import org.opensearch.cluster.service.MasterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.Transports; diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/EsExecutors.java b/server/src/main/java/org/opensearch/common/util/concurrent/EsExecutors.java index 665ec3f894937..8777bb897d9cd 100644 --- a/server/src/main/java/org/opensearch/common/util/concurrent/EsExecutors.java +++ b/server/src/main/java/org/opensearch/common/util/concurrent/EsExecutors.java @@ -20,12 +20,12 @@ package org.opensearch.common.util.concurrent; import org.elasticsearch.ExceptionsHelper; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.logging.DeprecationLogger; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.node.Node; import java.util.List; diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/EsThreadPoolExecutor.java b/server/src/main/java/org/opensearch/common/util/concurrent/EsThreadPoolExecutor.java index 30c84b727e4d3..7599878bc520b 100644 --- a/server/src/main/java/org/opensearch/common/util/concurrent/EsThreadPoolExecutor.java +++ b/server/src/main/java/org/opensearch/common/util/concurrent/EsThreadPoolExecutor.java @@ -19,7 +19,7 @@ package org.opensearch.common.util.concurrent; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import java.util.concurrent.BlockingQueue; import java.util.concurrent.ThreadFactory; diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/FutureUtils.java b/server/src/main/java/org/opensearch/common/util/concurrent/FutureUtils.java index 4a1970c9cc4a0..592a6154f199e 100644 --- a/server/src/main/java/org/opensearch/common/util/concurrent/FutureUtils.java +++ b/server/src/main/java/org/opensearch/common/util/concurrent/FutureUtils.java @@ -20,8 +20,8 @@ package org.opensearch.common.util.concurrent; import org.elasticsearch.OpenSearchTimeoutException; -import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.Nullable; +import org.opensearch.common.SuppressForbidden; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/ListenableFuture.java b/server/src/main/java/org/opensearch/common/util/concurrent/ListenableFuture.java index 599ee799c3620..d8661ccfb3b6a 100644 --- a/server/src/main/java/org/opensearch/common/util/concurrent/ListenableFuture.java +++ b/server/src/main/java/org/opensearch/common/util/concurrent/ListenableFuture.java @@ -22,7 +22,7 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRunnable; import org.opensearch.action.support.ContextPreservingActionListener; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import java.util.ArrayList; import java.util.List; diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java b/server/src/main/java/org/opensearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java index 045ce13d4d319..550eadc12173e 100644 --- a/server/src/main/java/org/opensearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java +++ b/server/src/main/java/org/opensearch/common/util/concurrent/PrioritizedEsThreadPoolExecutor.java @@ -19,7 +19,7 @@ package org.opensearch.common.util.concurrent; import org.opensearch.common.Priority; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.ArrayList; import java.util.List; diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java b/server/src/main/java/org/opensearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java index bd1d94074f8ed..532be312f9812 100644 --- a/server/src/main/java/org/opensearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java +++ b/server/src/main/java/org/opensearch/common/util/concurrent/QueueResizingEsThreadPoolExecutor.java @@ -23,7 +23,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.message.ParameterizedMessage; import org.opensearch.common.ExponentiallyWeightedMovingAverage; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.Locale; import java.util.concurrent.ThreadFactory; diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/ReleasableLock.java b/server/src/main/java/org/opensearch/common/util/concurrent/ReleasableLock.java index 7dbabf696c9ea..e45f21e1afb1c 100644 --- a/server/src/main/java/org/opensearch/common/util/concurrent/ReleasableLock.java +++ b/server/src/main/java/org/opensearch/common/util/concurrent/ReleasableLock.java @@ -21,7 +21,7 @@ import org.elasticsearch.Assertions; import org.opensearch.common.lease.Releasable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.index.engine.EngineException; import java.util.concurrent.locks.Lock; diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/ThreadContext.java b/server/src/main/java/org/opensearch/common/util/concurrent/ThreadContext.java index 2f86d5451018f..b3fc4438cf3d5 100644 --- a/server/src/main/java/org/opensearch/common/util/concurrent/ThreadContext.java +++ b/server/src/main/java/org/opensearch/common/util/concurrent/ThreadContext.java @@ -23,7 +23,7 @@ import org.opensearch.action.support.ContextPreservingActionListener; import org.opensearch.client.OriginSettingClient; import org.opensearch.common.collect.MapBuilder; -import org.elasticsearch.common.collect.Tuple; +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; diff --git a/server/src/main/java/org/opensearch/common/xcontent/ObjectParserHelper.java b/server/src/main/java/org/opensearch/common/xcontent/ObjectParserHelper.java index 1d5dec766dd50..979933c523327 100644 --- a/server/src/main/java/org/opensearch/common/xcontent/ObjectParserHelper.java +++ b/server/src/main/java/org/opensearch/common/xcontent/ObjectParserHelper.java @@ -19,7 +19,7 @@ package org.opensearch.common.xcontent; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.AbstractObjectParser; import org.elasticsearch.common.xcontent.ObjectParser; diff --git a/server/src/main/java/org/opensearch/common/xcontent/ParseFieldRegistry.java b/server/src/main/java/org/opensearch/common/xcontent/ParseFieldRegistry.java index 3bf7d1bc0b311..0117aa3826cfc 100644 --- a/server/src/main/java/org/opensearch/common/xcontent/ParseFieldRegistry.java +++ b/server/src/main/java/org/opensearch/common/xcontent/ParseFieldRegistry.java @@ -23,7 +23,7 @@ import org.elasticsearch.common.xcontent.DeprecationHandler; import org.elasticsearch.common.xcontent.XContentLocation; import org.opensearch.common.ParsingException; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import java.util.HashMap; import java.util.Map; diff --git a/server/src/main/java/org/opensearch/common/xcontent/SuggestingErrorOnUnknown.java b/server/src/main/java/org/opensearch/common/xcontent/SuggestingErrorOnUnknown.java index 6b667840a474c..50616c80a93df 100644 --- a/server/src/main/java/org/opensearch/common/xcontent/SuggestingErrorOnUnknown.java +++ b/server/src/main/java/org/opensearch/common/xcontent/SuggestingErrorOnUnknown.java @@ -21,7 +21,7 @@ import org.apache.lucene.search.spell.LevenshteinDistance; import org.apache.lucene.util.CollectionUtil; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.common.xcontent.ErrorOnUnknown; import java.util.ArrayList; diff --git a/server/src/main/java/org/opensearch/common/xcontent/XContentHelper.java b/server/src/main/java/org/opensearch/common/xcontent/XContentHelper.java index 6e800bcaba2f9..b254c81354720 100644 --- a/server/src/main/java/org/opensearch/common/xcontent/XContentHelper.java +++ b/server/src/main/java/org/opensearch/common/xcontent/XContentHelper.java @@ -32,7 +32,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.compress.Compressor; import org.opensearch.common.compress.CompressorFactory; import org.elasticsearch.common.xcontent.ToXContent.Params; diff --git a/server/src/main/java/org/opensearch/common/xcontent/XContentOpenSearchExtension.java b/server/src/main/java/org/opensearch/common/xcontent/XContentOpenSearchExtension.java index 6cae57518f0a5..7ef6dcf234265 100644 --- a/server/src/main/java/org/opensearch/common/xcontent/XContentOpenSearchExtension.java +++ b/server/src/main/java/org/opensearch/common/xcontent/XContentOpenSearchExtension.java @@ -25,7 +25,7 @@ import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.time.DateFormatter; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.script.JodaCompatibleZonedDateTime; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; 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 54d9ef9157cfb..c6cad6b3bcd0a 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 @@ -24,11 +24,11 @@ import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.apache.lucene.util.automaton.Operations; import org.elasticsearch.OpenSearchParseException; -import org.elasticsearch.common.Booleans; +import org.opensearch.common.Booleans; import org.opensearch.common.Numbers; import org.opensearch.common.Strings; import org.opensearch.common.regex.Regex; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.ArrayList; import java.util.Arrays; diff --git a/server/src/main/java/org/opensearch/discovery/BlockingClusterStatePublishResponseHandler.java b/server/src/main/java/org/opensearch/discovery/BlockingClusterStatePublishResponseHandler.java index d464afe68d847..563e5613119aa 100644 --- a/server/src/main/java/org/opensearch/discovery/BlockingClusterStatePublishResponseHandler.java +++ b/server/src/main/java/org/opensearch/discovery/BlockingClusterStatePublishResponseHandler.java @@ -19,7 +19,7 @@ package org.opensearch.discovery; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.ConcurrentCollections; import java.util.Collections; diff --git a/server/src/main/java/org/opensearch/discovery/DiscoverySettings.java b/server/src/main/java/org/opensearch/discovery/DiscoverySettings.java index 6ef40cc632c42..6bcbb60a11dd2 100644 --- a/server/src/main/java/org/opensearch/discovery/DiscoverySettings.java +++ b/server/src/main/java/org/opensearch/discovery/DiscoverySettings.java @@ -23,7 +23,7 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; /** * Exposes common discovery settings that may be supported by all the different discovery implementations diff --git a/server/src/main/java/org/opensearch/discovery/HandshakingTransportAddressConnector.java b/server/src/main/java/org/opensearch/discovery/HandshakingTransportAddressConnector.java index c90a08c5cb903..ab829234ba156 100644 --- a/server/src/main/java/org/opensearch/discovery/HandshakingTransportAddressConnector.java +++ b/server/src/main/java/org/opensearch/discovery/HandshakingTransportAddressConnector.java @@ -31,9 +31,9 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.AbstractRunnable; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.discovery.PeerFinder.TransportAddressConnector; import org.opensearch.transport.ConnectTransportException; import org.opensearch.transport.ConnectionProfile; diff --git a/server/src/main/java/org/opensearch/discovery/PeerFinder.java b/server/src/main/java/org/opensearch/discovery/PeerFinder.java index bd42ac33dc5f9..f32b647d036d5 100644 --- a/server/src/main/java/org/opensearch/discovery/PeerFinder.java +++ b/server/src/main/java/org/opensearch/discovery/PeerFinder.java @@ -30,12 +30,12 @@ import org.opensearch.cluster.coordination.PeersResponse; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.opensearch.discovery.zen.UnicastZenPing; import org.opensearch.discovery.zen.ZenDiscovery; diff --git a/server/src/main/java/org/opensearch/discovery/SeedHostsResolver.java b/server/src/main/java/org/opensearch/discovery/SeedHostsResolver.java index 78727c2c1ab2f..5acd806452ff7 100644 --- a/server/src/main/java/org/opensearch/discovery/SeedHostsResolver.java +++ b/server/src/main/java/org/opensearch/discovery/SeedHostsResolver.java @@ -26,7 +26,7 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.CancellableThreads; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.elasticsearch.common.util.concurrent.EsExecutors; diff --git a/server/src/main/java/org/opensearch/discovery/zen/FaultDetection.java b/server/src/main/java/org/opensearch/discovery/zen/FaultDetection.java index d96b4525e8130..c2749a67b9e41 100644 --- a/server/src/main/java/org/opensearch/discovery/zen/FaultDetection.java +++ b/server/src/main/java/org/opensearch/discovery/zen/FaultDetection.java @@ -28,14 +28,14 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.common.util.concurrent.AbstractRunnable; +import org.opensearch.common.unit.TimeValue; +import org.opensearch.common.util.concurrent.AbstractRunnable; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.Transport; import org.opensearch.transport.TransportConnectionListener; import org.opensearch.transport.TransportService; -import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds; +import static org.opensearch.common.unit.TimeValue.timeValueSeconds; /** * A base class for {@link MasterFaultDetection} & {@link NodesFaultDetection}, diff --git a/server/src/main/java/org/opensearch/discovery/zen/MasterFaultDetection.java b/server/src/main/java/org/opensearch/discovery/zen/MasterFaultDetection.java index 44eaa5b714bdf..4a7176fb74f99 100644 --- a/server/src/main/java/org/opensearch/discovery/zen/MasterFaultDetection.java +++ b/server/src/main/java/org/opensearch/discovery/zen/MasterFaultDetection.java @@ -30,11 +30,11 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.service.MasterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; import org.opensearch.tasks.Task; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/opensearch/discovery/zen/MembershipAction.java b/server/src/main/java/org/opensearch/discovery/zen/MembershipAction.java index c4de42d92cb1a..2ba57578a7850 100644 --- a/server/src/main/java/org/opensearch/discovery/zen/MembershipAction.java +++ b/server/src/main/java/org/opensearch/discovery/zen/MembershipAction.java @@ -26,7 +26,7 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.tasks.Task; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.EmptyTransportResponseHandler; diff --git a/server/src/main/java/org/opensearch/discovery/zen/NodeJoinController.java b/server/src/main/java/org/opensearch/discovery/zen/NodeJoinController.java index 2b0848e623f52..fcec51c45efb5 100644 --- a/server/src/main/java/org/opensearch/discovery/zen/NodeJoinController.java +++ b/server/src/main/java/org/opensearch/discovery/zen/NodeJoinController.java @@ -34,7 +34,7 @@ import org.opensearch.cluster.service.MasterService; import org.opensearch.common.Priority; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.ArrayList; import java.util.Collections; diff --git a/server/src/main/java/org/opensearch/discovery/zen/NodesFaultDetection.java b/server/src/main/java/org/opensearch/discovery/zen/NodesFaultDetection.java index f1151ddb4f209..4fb349fee96bc 100644 --- a/server/src/main/java/org/opensearch/discovery/zen/NodesFaultDetection.java +++ b/server/src/main/java/org/opensearch/discovery/zen/NodesFaultDetection.java @@ -28,7 +28,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; import org.opensearch.tasks.Task; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/opensearch/discovery/zen/PublishClusterStateAction.java b/server/src/main/java/org/opensearch/discovery/zen/PublishClusterStateAction.java index 30f530f1da79b..944393a4f6877 100644 --- a/server/src/main/java/org/opensearch/discovery/zen/PublishClusterStateAction.java +++ b/server/src/main/java/org/opensearch/discovery/zen/PublishClusterStateAction.java @@ -41,8 +41,8 @@ import org.opensearch.common.io.stream.OutputStreamStreamOutput; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.common.unit.TimeValue; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.discovery.AckClusterStatePublishResponseHandler; import org.opensearch.discovery.BlockingClusterStatePublishResponseHandler; import org.opensearch.discovery.Discovery; diff --git a/server/src/main/java/org/opensearch/discovery/zen/UnicastZenPing.java b/server/src/main/java/org/opensearch/discovery/zen/UnicastZenPing.java index 53f2b2b3aa77f..a85816ed6d9ac 100644 --- a/server/src/main/java/org/opensearch/discovery/zen/UnicastZenPing.java +++ b/server/src/main/java/org/opensearch/discovery/zen/UnicastZenPing.java @@ -27,7 +27,7 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.support.PlainActionFuture; import org.elasticsearch.common.util.CancellableThreads; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.Version; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterState; @@ -39,7 +39,7 @@ import org.opensearch.common.lease.Releasables; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.CollectionUtils; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.elasticsearch.common.util.concurrent.ConcurrentCollections; diff --git a/server/src/main/java/org/opensearch/discovery/zen/ZenDiscovery.java b/server/src/main/java/org/opensearch/discovery/zen/ZenDiscovery.java index 430fe95f356e1..bf735339f9c26 100644 --- a/server/src/main/java/org/opensearch/discovery/zen/ZenDiscovery.java +++ b/server/src/main/java/org/opensearch/discovery/zen/ZenDiscovery.java @@ -54,8 +54,8 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.common.unit.TimeValue; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.discovery.Discovery; import org.opensearch.discovery.DiscoverySettings; import org.opensearch.discovery.DiscoveryStats; @@ -86,7 +86,7 @@ import java.util.function.Consumer; import java.util.stream.Collectors; -import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds; +import static org.opensearch.common.unit.TimeValue.timeValueSeconds; import static org.opensearch.gateway.GatewayService.STATE_NOT_RECOVERED_BLOCK; public class ZenDiscovery extends AbstractLifecycleComponent implements Discovery, PingContextProvider, IncomingClusterStateListener { diff --git a/server/src/main/java/org/opensearch/discovery/zen/ZenPing.java b/server/src/main/java/org/opensearch/discovery/zen/ZenPing.java index 56159dfd07897..773be6a4f1f05 100644 --- a/server/src/main/java/org/opensearch/discovery/zen/ZenPing.java +++ b/server/src/main/java/org/opensearch/discovery/zen/ZenPing.java @@ -26,7 +26,7 @@ import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.lease.Releasable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/main/java/org/opensearch/env/Environment.java b/server/src/main/java/org/opensearch/env/Environment.java index b10c848bc97a9..7b74afce7f817 100644 --- a/server/src/main/java/org/opensearch/env/Environment.java +++ b/server/src/main/java/org/opensearch/env/Environment.java @@ -19,8 +19,8 @@ package org.opensearch.env; -import org.elasticsearch.common.SuppressForbidden; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.SuppressForbidden; +import org.opensearch.common.io.PathUtils; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.settings.Settings; diff --git a/server/src/main/java/org/opensearch/env/NodeEnvironment.java b/server/src/main/java/org/opensearch/env/NodeEnvironment.java index c697765404537..b4dc083c7ee70 100644 --- a/server/src/main/java/org/opensearch/env/NodeEnvironment.java +++ b/server/src/main/java/org/opensearch/env/NodeEnvironment.java @@ -36,20 +36,20 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodeRole; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.Randomness; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.UUIDs; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.FileSystemUtils; import org.opensearch.common.lease.Releasable; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.gateway.MetadataStateFormat; import org.opensearch.gateway.PersistedClusterStateService; import org.elasticsearch.index.Index; diff --git a/server/src/main/java/org/opensearch/env/NodeRepurposeCommand.java b/server/src/main/java/org/opensearch/env/NodeRepurposeCommand.java index 56ea717d67ce9..e135e9dd22654 100644 --- a/server/src/main/java/org/opensearch/env/NodeRepurposeCommand.java +++ b/server/src/main/java/org/opensearch/env/NodeRepurposeCommand.java @@ -30,7 +30,7 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.settings.Settings; import org.elasticsearch.common.util.set.Sets; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.gateway.MetadataStateFormat; import org.opensearch.gateway.PersistedClusterStateService; diff --git a/server/src/main/java/org/opensearch/env/OpenSearchFileStore.java b/server/src/main/java/org/opensearch/env/OpenSearchFileStore.java index 3ebfdb904a7f3..bde3c2ed44fa7 100644 --- a/server/src/main/java/org/opensearch/env/OpenSearchFileStore.java +++ b/server/src/main/java/org/opensearch/env/OpenSearchFileStore.java @@ -20,8 +20,8 @@ package org.opensearch.env; import org.apache.lucene.util.Constants; -import org.elasticsearch.common.SuppressForbidden; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.SuppressForbidden; +import org.opensearch.common.io.PathUtils; import java.io.IOException; import java.nio.file.FileStore; diff --git a/server/src/main/java/org/opensearch/repositories/IndexMetaDataGenerations.java b/server/src/main/java/org/opensearch/repositories/IndexMetaDataGenerations.java index c5ba79f933f44..68eda0ea644a3 100644 --- a/server/src/main/java/org/opensearch/repositories/IndexMetaDataGenerations.java +++ b/server/src/main/java/org/opensearch/repositories/IndexMetaDataGenerations.java @@ -20,7 +20,7 @@ package org.opensearch.repositories; import org.opensearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.snapshots.SnapshotId; import java.util.Collection; diff --git a/server/src/main/java/org/opensearch/repositories/RepositoriesService.java b/server/src/main/java/org/opensearch/repositories/RepositoriesService.java index a79587129c5bf..cfa0e859167f9 100644 --- a/server/src/main/java/org/opensearch/repositories/RepositoriesService.java +++ b/server/src/main/java/org/opensearch/repositories/RepositoriesService.java @@ -46,9 +46,9 @@ import org.opensearch.common.regex.Regex; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.ConcurrentCollections; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.repositories.blobstore.MeteredBlobStoreRepository; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; diff --git a/server/src/main/java/org/opensearch/repositories/RepositoriesStatsArchive.java b/server/src/main/java/org/opensearch/repositories/RepositoriesStatsArchive.java index f735c7b10d81e..1f4c7742a3770 100644 --- a/server/src/main/java/org/opensearch/repositories/RepositoriesStatsArchive.java +++ b/server/src/main/java/org/opensearch/repositories/RepositoriesStatsArchive.java @@ -21,7 +21,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/server/src/main/java/org/opensearch/repositories/Repository.java b/server/src/main/java/org/opensearch/repositories/Repository.java index 64a4074f549ae..4a0bb2f78dde8 100644 --- a/server/src/main/java/org/opensearch/repositories/Repository.java +++ b/server/src/main/java/org/opensearch/repositories/Repository.java @@ -28,7 +28,7 @@ import org.opensearch.cluster.metadata.Metadata; import org.opensearch.cluster.metadata.RepositoryMetadata; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.component.LifecycleComponent; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.shard.ShardId; diff --git a/server/src/main/java/org/opensearch/repositories/RepositoryData.java b/server/src/main/java/org/opensearch/repositories/RepositoryData.java index 1ad804d824fbf..0686884169c03 100644 --- a/server/src/main/java/org/opensearch/repositories/RepositoryData.java +++ b/server/src/main/java/org/opensearch/repositories/RepositoryData.java @@ -22,7 +22,7 @@ import org.elasticsearch.OpenSearchParseException; import org.elasticsearch.ResourceNotFoundException; import org.opensearch.Version; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.UUIDs; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/server/src/main/java/org/opensearch/repositories/RepositoryInfo.java b/server/src/main/java/org/opensearch/repositories/RepositoryInfo.java index aae6fc6a252e3..8ad98e5411a15 100644 --- a/server/src/main/java/org/opensearch/repositories/RepositoryInfo.java +++ b/server/src/main/java/org/opensearch/repositories/RepositoryInfo.java @@ -19,7 +19,7 @@ package org.opensearch.repositories; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/repositories/ShardGenerations.java b/server/src/main/java/org/opensearch/repositories/ShardGenerations.java index 3c13c873699f1..93c3c836deed5 100644 --- a/server/src/main/java/org/opensearch/repositories/ShardGenerations.java +++ b/server/src/main/java/org/opensearch/repositories/ShardGenerations.java @@ -19,7 +19,7 @@ package org.opensearch.repositories; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.index.snapshots.IndexShardSnapshotStatus; import java.util.Arrays; diff --git a/server/src/main/java/org/opensearch/repositories/blobstore/BlobStoreRepository.java b/server/src/main/java/org/opensearch/repositories/blobstore/BlobStoreRepository.java index 31f9ad64480c1..8e7e434a39dbd 100644 --- a/server/src/main/java/org/opensearch/repositories/blobstore/BlobStoreRepository.java +++ b/server/src/main/java/org/opensearch/repositories/blobstore/BlobStoreRepository.java @@ -51,7 +51,7 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.routing.allocation.AllocationService; import org.elasticsearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Numbers; import org.opensearch.common.Strings; import org.opensearch.common.UUIDs; @@ -63,7 +63,7 @@ import org.opensearch.common.blobstore.fs.FsBlobContainer; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.component.AbstractLifecycleComponent; import org.opensearch.common.compress.CompressorFactory; import org.opensearch.common.compress.NotXContentException; @@ -76,7 +76,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.elasticsearch.common.util.concurrent.ConcurrentCollections; import org.opensearch.common.xcontent.LoggingDeprecationHandler; diff --git a/server/src/main/java/org/opensearch/repositories/blobstore/ChecksumBlobStoreFormat.java b/server/src/main/java/org/opensearch/repositories/blobstore/ChecksumBlobStoreFormat.java index 71151ffebf0c6..dace517c9902b 100644 --- a/server/src/main/java/org/opensearch/repositories/blobstore/ChecksumBlobStoreFormat.java +++ b/server/src/main/java/org/opensearch/repositories/blobstore/ChecksumBlobStoreFormat.java @@ -28,7 +28,7 @@ import org.apache.lucene.store.OutputStreamIndexOutput; import org.apache.lucene.util.BytesRef; import org.opensearch.cluster.metadata.Metadata; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.blobstore.BlobContainer; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.compress.CompressorFactory; diff --git a/server/src/main/java/org/opensearch/rest/AbstractRestChannel.java b/server/src/main/java/org/opensearch/rest/AbstractRestChannel.java index 1c4549269fe12..b09aaa61597f8 100644 --- a/server/src/main/java/org/opensearch/rest/AbstractRestChannel.java +++ b/server/src/main/java/org/opensearch/rest/AbstractRestChannel.java @@ -18,7 +18,7 @@ */ package org.opensearch.rest; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.io.Streams; import org.opensearch.common.io.stream.BytesStreamOutput; diff --git a/server/src/main/java/org/opensearch/rest/BaseRestHandler.java b/server/src/main/java/org/opensearch/rest/BaseRestHandler.java index f6ec9468baaf3..d7fc7c72b2c54 100644 --- a/server/src/main/java/org/opensearch/rest/BaseRestHandler.java +++ b/server/src/main/java/org/opensearch/rest/BaseRestHandler.java @@ -24,8 +24,8 @@ import org.apache.lucene.search.spell.LevenshteinDistance; import org.apache.lucene.util.CollectionUtil; import org.opensearch.client.node.NodeClient; -import org.elasticsearch.common.CheckedConsumer; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.CheckedConsumer; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.plugins.ActionPlugin; diff --git a/server/src/main/java/org/opensearch/rest/MethodHandlers.java b/server/src/main/java/org/opensearch/rest/MethodHandlers.java index 409b468c6a365..889a53ee36dfd 100644 --- a/server/src/main/java/org/opensearch/rest/MethodHandlers.java +++ b/server/src/main/java/org/opensearch/rest/MethodHandlers.java @@ -19,7 +19,7 @@ package org.opensearch.rest; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import java.util.HashMap; import java.util.Map; diff --git a/server/src/main/java/org/opensearch/rest/RestChannel.java b/server/src/main/java/org/opensearch/rest/RestChannel.java index 506a5f89cb05c..e3abaaf4c94ac 100644 --- a/server/src/main/java/org/opensearch/rest/RestChannel.java +++ b/server/src/main/java/org/opensearch/rest/RestChannel.java @@ -19,7 +19,7 @@ package org.opensearch.rest; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentType; diff --git a/server/src/main/java/org/opensearch/rest/RestController.java b/server/src/main/java/org/opensearch/rest/RestController.java index 8af1934772349..1896578ea3856 100644 --- a/server/src/main/java/org/opensearch/rest/RestController.java +++ b/server/src/main/java/org/opensearch/rest/RestController.java @@ -24,7 +24,7 @@ import org.apache.logging.log4j.message.ParameterizedMessage; import org.opensearch.OpenSearchException; import org.opensearch.client.node.NodeClient; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.breaker.CircuitBreaker; import org.opensearch.common.bytes.BytesArray; @@ -35,7 +35,7 @@ import org.opensearch.common.util.concurrent.ThreadContext; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.core.internal.io.Streams; +import org.opensearch.core.internal.io.Streams; import org.opensearch.http.HttpServerTransport; import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.opensearch.usage.UsageService; diff --git a/server/src/main/java/org/opensearch/rest/RestRequest.java b/server/src/main/java/org/opensearch/rest/RestRequest.java index 4ca0e23ccef3d..7b26043f60005 100644 --- a/server/src/main/java/org/opensearch/rest/RestRequest.java +++ b/server/src/main/java/org/opensearch/rest/RestRequest.java @@ -21,15 +21,15 @@ import org.apache.lucene.util.SetOnce; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.common.Booleans; -import org.elasticsearch.common.CheckedConsumer; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Booleans; +import org.opensearch.common.CheckedConsumer; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.xcontent.LoggingDeprecationHandler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.ToXContent; @@ -52,7 +52,7 @@ import java.util.stream.Collectors; import static org.opensearch.common.unit.ByteSizeValue.parseBytesSizeValue; -import static org.elasticsearch.common.unit.TimeValue.parseTimeValue; +import static org.opensearch.common.unit.TimeValue.parseTimeValue; public class RestRequest implements ToXContent.Params { diff --git a/server/src/main/java/org/opensearch/rest/RestRequestFilter.java b/server/src/main/java/org/opensearch/rest/RestRequestFilter.java index 6bb008bc1a9b8..ccea16d53d97e 100644 --- a/server/src/main/java/org/opensearch/rest/RestRequestFilter.java +++ b/server/src/main/java/org/opensearch/rest/RestRequestFilter.java @@ -22,7 +22,7 @@ import org.opensearch.OpenSearchException; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentType; diff --git a/server/src/main/java/org/opensearch/rest/RestUtils.java b/server/src/main/java/org/opensearch/rest/RestUtils.java index 0d2765afbb6db..9a75d37702977 100644 --- a/server/src/main/java/org/opensearch/rest/RestUtils.java +++ b/server/src/main/java/org/opensearch/rest/RestUtils.java @@ -19,7 +19,7 @@ package org.opensearch.rest; -import org.elasticsearch.common.Booleans; +import org.opensearch.common.Booleans; import org.opensearch.common.Strings; import org.opensearch.common.path.PathTrie; 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 168fbea25cb72..69b2b82c070b5 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 @@ -25,7 +25,7 @@ import org.opensearch.action.admin.cluster.configuration.AddVotingConfigExclusionsRequest; import org.opensearch.client.node.NodeClient; import org.opensearch.common.Strings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; 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/RestGetTaskAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetTaskAction.java index fe3be047d19cd..915c38e9ac8c4 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetTaskAction.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestGetTaskAction.java @@ -21,7 +21,7 @@ import org.opensearch.action.admin.cluster.node.tasks.get.GetTaskRequest; import org.opensearch.client.node.NodeClient; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; 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 dbd805d8cae7b..240724fdc2b28 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 @@ -25,7 +25,7 @@ import org.opensearch.client.node.NodeClient; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.common.Strings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.BytesRestResponse; 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 6d160776cb44b..d0ff6679ddff0 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 @@ -24,7 +24,7 @@ import org.opensearch.action.admin.cluster.node.hotthreads.NodesHotThreadsResponse; import org.opensearch.client.node.NodeClient; import org.opensearch.common.Strings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestRequest; 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 9f288020f212c..2df28ec18d0d8 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 @@ -35,7 +35,7 @@ import org.elasticsearch.common.logging.DeprecationLogger; import org.opensearch.common.regex.Regex; import org.opensearch.common.util.set.Sets; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.indices.TypeMissingException; import org.opensearch.rest.BaseRestHandler; diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestResizeHandler.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestResizeHandler.java index 37d38a38f3016..24fc55a5d3b82 100644 --- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestResizeHandler.java +++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestResizeHandler.java @@ -26,7 +26,7 @@ import org.opensearch.action.admin.indices.shrink.ResizeType; import org.opensearch.action.support.ActiveShardCount; import org.opensearch.client.node.NodeClient; -import org.elasticsearch.common.Booleans; +import org.opensearch.common.Booleans; import org.opensearch.common.logging.DeprecationLogger; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; 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 1ccd9fcc3ebc2..b0b022c1ea593 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 @@ -28,7 +28,7 @@ import org.opensearch.cluster.routing.RecoverySource.SnapshotRecoverySource; import org.opensearch.common.Strings; import org.opensearch.common.Table; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.xcontent.XContentOpenSearchExtension; import org.opensearch.indices.recovery.RecoveryState; import org.opensearch.rest.RestRequest; 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 016dd9462dee9..f7ef2c5eb07b5 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 @@ -41,7 +41,7 @@ import org.opensearch.common.Table; import org.opensearch.common.settings.Settings; import org.opensearch.common.time.DateFormatter; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.index.IndexSettings; 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 f999fc23a1dc0..be1f8fae71e09 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 @@ -30,7 +30,7 @@ import org.opensearch.cluster.routing.UnassignedInfo; import org.opensearch.common.Strings; import org.opensearch.common.Table; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; 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/RestSnapshotAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestSnapshotAction.java index 378adcf3a4688..1da2ac74118d5 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestSnapshotAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestSnapshotAction.java @@ -25,7 +25,7 @@ import org.opensearch.client.node.NodeClient; import org.opensearch.common.Table; import org.opensearch.common.time.DateFormatter; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestResponse; import org.opensearch.rest.action.RestResponseListener; 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 971f25bc05295..a7a2599b0f36e 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 @@ -19,7 +19,7 @@ package org.opensearch.rest.action.cat; -import org.elasticsearch.common.Booleans; +import org.opensearch.common.Booleans; import org.opensearch.common.Strings; import org.opensearch.common.Table; import org.opensearch.common.io.Streams; @@ -28,7 +28,7 @@ import org.opensearch.common.regex.Regex; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.SizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.rest.BytesRestResponse; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestTasksAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestTasksAction.java index 2517e2a891f10..be844f379aaea 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestTasksAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestTasksAction.java @@ -28,7 +28,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.Table; import org.opensearch.common.time.DateFormatter; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestResponse; import org.opensearch.rest.action.RestResponseListener; diff --git a/server/src/main/java/org/opensearch/rest/action/ingest/RestPutPipelineAction.java b/server/src/main/java/org/opensearch/rest/action/ingest/RestPutPipelineAction.java index 6baee2c00ec25..4b4e7b0fdfbe3 100644 --- a/server/src/main/java/org/opensearch/rest/action/ingest/RestPutPipelineAction.java +++ b/server/src/main/java/org/opensearch/rest/action/ingest/RestPutPipelineAction.java @@ -22,7 +22,7 @@ import org.opensearch.action.ingest.PutPipelineRequest; import org.opensearch.client.node.NodeClient; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; diff --git a/server/src/main/java/org/opensearch/rest/action/ingest/RestSimulatePipelineAction.java b/server/src/main/java/org/opensearch/rest/action/ingest/RestSimulatePipelineAction.java index cd18657cb25ea..d51366d7e1957 100644 --- a/server/src/main/java/org/opensearch/rest/action/ingest/RestSimulatePipelineAction.java +++ b/server/src/main/java/org/opensearch/rest/action/ingest/RestSimulatePipelineAction.java @@ -22,7 +22,7 @@ import org.opensearch.action.ingest.SimulatePipelineRequest; import org.opensearch.client.node.NodeClient; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; 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 5cd7d41efe3dd..3740abb3f5eb7 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 @@ -27,7 +27,7 @@ import org.opensearch.common.CheckedBiConsumer; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +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; 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 9172dede244b6..fcec41af6ecef 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 @@ -26,7 +26,7 @@ import org.opensearch.action.search.SearchRequest; import org.opensearch.action.support.IndicesOptions; import org.opensearch.client.node.NodeClient; -import org.elasticsearch.common.Booleans; +import org.opensearch.common.Booleans; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.logging.DeprecationLogger; @@ -57,7 +57,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.unmodifiableList; import static org.opensearch.action.ValidateActions.addValidationError; -import static org.elasticsearch.common.unit.TimeValue.parseTimeValue; +import static org.opensearch.common.unit.TimeValue.parseTimeValue; import static org.opensearch.rest.RestRequest.Method.GET; import static org.opensearch.rest.RestRequest.Method.POST; import static org.opensearch.search.suggest.SuggestBuilders.termSuggestion; diff --git a/server/src/main/java/org/opensearch/rest/action/search/RestSearchScrollAction.java b/server/src/main/java/org/opensearch/rest/action/search/RestSearchScrollAction.java index 4e3d537d4cba4..f5755ee335efc 100644 --- a/server/src/main/java/org/opensearch/rest/action/search/RestSearchScrollAction.java +++ b/server/src/main/java/org/opensearch/rest/action/search/RestSearchScrollAction.java @@ -33,7 +33,7 @@ import static java.util.Arrays.asList; import static java.util.Collections.unmodifiableList; -import static org.elasticsearch.common.unit.TimeValue.parseTimeValue; +import static org.opensearch.common.unit.TimeValue.parseTimeValue; import static org.opensearch.rest.RestRequest.Method.GET; import static org.opensearch.rest.RestRequest.Method.POST; diff --git a/server/src/main/java/org/opensearch/script/IngestConditionalScript.java b/server/src/main/java/org/opensearch/script/IngestConditionalScript.java index fa190f2ae08e1..50b5cbe519a58 100644 --- a/server/src/main/java/org/opensearch/script/IngestConditionalScript.java +++ b/server/src/main/java/org/opensearch/script/IngestConditionalScript.java @@ -19,7 +19,7 @@ package org.opensearch.script; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.Map; diff --git a/server/src/main/java/org/opensearch/script/IngestScript.java b/server/src/main/java/org/opensearch/script/IngestScript.java index b8658084519a6..a7d405fa10304 100644 --- a/server/src/main/java/org/opensearch/script/IngestScript.java +++ b/server/src/main/java/org/opensearch/script/IngestScript.java @@ -20,7 +20,7 @@ package org.opensearch.script; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.Map; diff --git a/server/src/main/java/org/opensearch/script/JodaCompatibleZonedDateTime.java b/server/src/main/java/org/opensearch/script/JodaCompatibleZonedDateTime.java index b352ad0e1adb2..52686903440cb 100644 --- a/server/src/main/java/org/opensearch/script/JodaCompatibleZonedDateTime.java +++ b/server/src/main/java/org/opensearch/script/JodaCompatibleZonedDateTime.java @@ -19,7 +19,7 @@ package org.opensearch.script; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.SuppressLoggerChecks; import org.elasticsearch.common.logging.DeprecationLogger; import org.opensearch.common.time.DateFormatter; diff --git a/server/src/main/java/org/opensearch/script/ScoreScriptUtils.java b/server/src/main/java/org/opensearch/script/ScoreScriptUtils.java index ff4c340cbe957..aae3d1133fc14 100644 --- a/server/src/main/java/org/opensearch/script/ScoreScriptUtils.java +++ b/server/src/main/java/org/opensearch/script/ScoreScriptUtils.java @@ -27,7 +27,7 @@ import org.opensearch.common.geo.GeoUtils; import org.opensearch.common.time.DateMathParser; import org.opensearch.common.unit.DistanceUnit; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.index.fielddata.ScriptDocValues; import org.elasticsearch.index.mapper.DateFieldMapper; diff --git a/server/src/main/java/org/opensearch/script/ScriptCache.java b/server/src/main/java/org/opensearch/script/ScriptCache.java index 8ab00f2a3cda5..3ce6be794eb94 100644 --- a/server/src/main/java/org/opensearch/script/ScriptCache.java +++ b/server/src/main/java/org/opensearch/script/ScriptCache.java @@ -27,8 +27,8 @@ import org.opensearch.common.cache.CacheBuilder; import org.opensearch.common.cache.RemovalListener; import org.opensearch.common.cache.RemovalNotification; -import org.elasticsearch.common.collect.Tuple; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.collect.Tuple; +import org.opensearch.common.unit.TimeValue; import java.util.Map; import java.util.Objects; diff --git a/server/src/main/java/org/opensearch/script/ScriptContext.java b/server/src/main/java/org/opensearch/script/ScriptContext.java index edc9df6374e12..d576b76ebe816 100644 --- a/server/src/main/java/org/opensearch/script/ScriptContext.java +++ b/server/src/main/java/org/opensearch/script/ScriptContext.java @@ -19,8 +19,8 @@ package org.opensearch.script; -import org.elasticsearch.common.collect.Tuple; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.collect.Tuple; +import org.opensearch.common.unit.TimeValue; import java.lang.reflect.Method; diff --git a/server/src/main/java/org/opensearch/script/ScriptLanguagesInfo.java b/server/src/main/java/org/opensearch/script/ScriptLanguagesInfo.java index c701a3f75b13a..f8a4bd048a541 100644 --- a/server/src/main/java/org/opensearch/script/ScriptLanguagesInfo.java +++ b/server/src/main/java/org/opensearch/script/ScriptLanguagesInfo.java @@ -20,7 +20,7 @@ package org.opensearch.script; import org.elasticsearch.common.ParseField; -import org.elasticsearch.common.collect.Tuple; +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; diff --git a/server/src/main/java/org/opensearch/script/ScriptService.java b/server/src/main/java/org/opensearch/script/ScriptService.java index fa47791c1633a..57cc4c83c9b70 100644 --- a/server/src/main/java/org/opensearch/script/ScriptService.java +++ b/server/src/main/java/org/opensearch/script/ScriptService.java @@ -38,8 +38,8 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.common.unit.TimeValue; +import org.opensearch.core.internal.io.IOUtils; import java.io.Closeable; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/search/DefaultSearchContext.java b/server/src/main/java/org/opensearch/search/DefaultSearchContext.java index f907477813185..45895b69cfce1 100644 --- a/server/src/main/java/org/opensearch/search/DefaultSearchContext.java +++ b/server/src/main/java/org/opensearch/search/DefaultSearchContext.java @@ -30,10 +30,10 @@ import org.opensearch.action.search.SearchShardTask; import org.opensearch.action.search.SearchType; import org.elasticsearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.lease.Releasables; import org.elasticsearch.common.lucene.search.Queries; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.BigArrays; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.IndexSettings; diff --git a/server/src/main/java/org/opensearch/search/Scroll.java b/server/src/main/java/org/opensearch/search/Scroll.java index e4f715d58932b..8c092711fed15 100644 --- a/server/src/main/java/org/opensearch/search/Scroll.java +++ b/server/src/main/java/org/opensearch/search/Scroll.java @@ -22,7 +22,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.io.IOException; import java.util.Objects; diff --git a/server/src/main/java/org/opensearch/search/SearchExtBuilder.java b/server/src/main/java/org/opensearch/search/SearchExtBuilder.java index 83b0e4c4b1e98..5dc9777aded8e 100644 --- a/server/src/main/java/org/opensearch/search/SearchExtBuilder.java +++ b/server/src/main/java/org/opensearch/search/SearchExtBuilder.java @@ -19,7 +19,7 @@ package org.opensearch.search; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.io.stream.NamedWriteable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/search/SearchHit.java b/server/src/main/java/org/opensearch/search/SearchHit.java index 4468ae21c3257..f54fc6c0e0aa2 100644 --- a/server/src/main/java/org/opensearch/search/SearchHit.java +++ b/server/src/main/java/org/opensearch/search/SearchHit.java @@ -23,7 +23,7 @@ import org.elasticsearch.OpenSearchParseException; import org.opensearch.Version; import org.opensearch.action.OriginalIndices; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.ParsingException; import org.opensearch.common.Strings; diff --git a/server/src/main/java/org/opensearch/search/SearchHits.java b/server/src/main/java/org/opensearch/search/SearchHits.java index 3e344580db473..bf7f46e032e09 100644 --- a/server/src/main/java/org/opensearch/search/SearchHits.java +++ b/server/src/main/java/org/opensearch/search/SearchHits.java @@ -23,7 +23,7 @@ import org.apache.lucene.search.TotalHits; import org.apache.lucene.search.TotalHits.Relation; import org.opensearch.Version; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; diff --git a/server/src/main/java/org/opensearch/search/SearchParseException.java b/server/src/main/java/org/opensearch/search/SearchParseException.java index d49d7a0efdcfe..e2d02ce1a83f7 100644 --- a/server/src/main/java/org/opensearch/search/SearchParseException.java +++ b/server/src/main/java/org/opensearch/search/SearchParseException.java @@ -19,7 +19,7 @@ package org.opensearch.search; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/search/SearchPhaseResult.java b/server/src/main/java/org/opensearch/search/SearchPhaseResult.java index 392fe160656f2..609fc4d373b96 100644 --- a/server/src/main/java/org/opensearch/search/SearchPhaseResult.java +++ b/server/src/main/java/org/opensearch/search/SearchPhaseResult.java @@ -19,7 +19,7 @@ package org.opensearch.search; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.search.fetch.FetchSearchResult; diff --git a/server/src/main/java/org/opensearch/search/SearchService.java b/server/src/main/java/org/opensearch/search/SearchService.java index 769955a1dfa68..55d248247d93a 100644 --- a/server/src/main/java/org/opensearch/search/SearchService.java +++ b/server/src/main/java/org/opensearch/search/SearchService.java @@ -47,12 +47,12 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.util.CollectionUtils; import org.elasticsearch.common.util.concurrent.ConcurrentCollections; import org.elasticsearch.common.util.concurrent.ConcurrentMapLong; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexNotFoundException; import org.elasticsearch.index.IndexService; @@ -134,9 +134,9 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.LongSupplier; -import static org.elasticsearch.common.unit.TimeValue.timeValueHours; -import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; -import static org.elasticsearch.common.unit.TimeValue.timeValueMinutes; +import static org.opensearch.common.unit.TimeValue.timeValueHours; +import static org.opensearch.common.unit.TimeValue.timeValueMillis; +import static org.opensearch.common.unit.TimeValue.timeValueMinutes; public class SearchService extends AbstractLifecycleComponent implements IndexEventListener { private static final Logger logger = LogManager.getLogger(SearchService.class); diff --git a/server/src/main/java/org/opensearch/search/SearchShardTarget.java b/server/src/main/java/org/opensearch/search/SearchShardTarget.java index 3c7f065c87636..c3569d5192e37 100644 --- a/server/src/main/java/org/opensearch/search/SearchShardTarget.java +++ b/server/src/main/java/org/opensearch/search/SearchShardTarget.java @@ -20,7 +20,7 @@ package org.opensearch.search; import org.opensearch.action.OriginalIndices; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; diff --git a/server/src/main/java/org/opensearch/search/aggregations/ParsedMultiBucketAggregation.java b/server/src/main/java/org/opensearch/search/aggregations/ParsedMultiBucketAggregation.java index 3ddf4b5dde93a..28ead4fc4a9bd 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/ParsedMultiBucketAggregation.java +++ b/server/src/main/java/org/opensearch/search/aggregations/ParsedMultiBucketAggregation.java @@ -20,7 +20,7 @@ package org.opensearch.search.aggregations; import org.opensearch.common.CheckedBiConsumer; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/BinaryValuesSource.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/BinaryValuesSource.java index 1e9d17b719253..5745684c95c43 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/BinaryValuesSource.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/BinaryValuesSource.java @@ -25,7 +25,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.lease.Releasables; import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.ObjectArray; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/CompositeValuesSourceConfig.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/CompositeValuesSourceConfig.java index 8c7d6240fef8a..1ad5d084485b2 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/CompositeValuesSourceConfig.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/CompositeValuesSourceConfig.java @@ -20,7 +20,7 @@ package org.opensearch.search.aggregations.bucket.composite; import org.apache.lucene.index.IndexReader; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.util.BigArrays; import org.elasticsearch.index.mapper.MappedFieldType; import org.opensearch.search.DocValueFormat; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java index 6b22916d9f453..6b976d2fa090a 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java @@ -25,7 +25,7 @@ import org.opensearch.common.Rounding; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.BigArrays; import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -272,7 +272,7 @@ public DateHistogramValuesSourceBuilder offset(long offset) { public static void register(ValuesSourceRegistry.Builder builder) { builder.register( REGISTRY_KEY, - org.elasticsearch.common.collect.List.of(CoreValuesSourceType.DATE, CoreValuesSourceType.NUMERIC), + org.opensearch.common.collect.List.of(CoreValuesSourceType.DATE, CoreValuesSourceType.NUMERIC), (valuesSourceConfig, rounding, name, hasScript, format, missingBucket, order) -> { ValuesSource.Numeric numeric = (ValuesSource.Numeric) valuesSourceConfig.getValuesSource(); // TODO once composite is plugged in to the values source registry or at least understands Date values source types use it diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/DoubleValuesSource.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/DoubleValuesSource.java index 3b73fa4842a14..4d98e57d796c6 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/DoubleValuesSource.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/DoubleValuesSource.java @@ -22,7 +22,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.Query; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.lease.Releasables; import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.BitArray; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/GeoTileValuesSource.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/GeoTileValuesSource.java index f33ac643a8353..f7cfbc47fd41b 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/GeoTileValuesSource.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/GeoTileValuesSource.java @@ -21,7 +21,7 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.SortedNumericDocValues; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.util.BigArrays; import org.elasticsearch.index.mapper.MappedFieldType; import org.opensearch.search.DocValueFormat; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/GlobalOrdinalValuesSource.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/GlobalOrdinalValuesSource.java index 71cce0a7c56bc..3aa88b380ab01 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/GlobalOrdinalValuesSource.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/GlobalOrdinalValuesSource.java @@ -25,7 +25,7 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.lease.Releasables; import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.LongArray; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/LongValuesSource.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/LongValuesSource.java index 93ca4778838c7..103d27608ba50 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/LongValuesSource.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/LongValuesSource.java @@ -31,7 +31,7 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.PointRangeQuery; import org.apache.lucene.search.Query; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.lease.Releasables; import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.BitArray; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/SingleDimensionValuesSource.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/SingleDimensionValuesSource.java index a8606cd4d279c..f0bdf27f1e42b 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/SingleDimensionValuesSource.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/SingleDimensionValuesSource.java @@ -22,7 +22,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.Query; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.lease.Releasable; import org.opensearch.common.util.BigArrays; import org.elasticsearch.index.mapper.MappedFieldType; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/SortedDocsProducer.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/SortedDocsProducer.java index aac11d1da4e43..4dcd2a6a7263f 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/SortedDocsProducer.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/composite/SortedDocsProducer.java @@ -25,7 +25,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.util.Bits; import org.apache.lucene.util.DocIdSetBuilder; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.search.aggregations.LeafBucketCollector; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/geogrid/GeoTileUtils.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/geogrid/GeoTileUtils.java index 7984668ca064d..b6021b1448782 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/geogrid/GeoTileUtils.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/geogrid/GeoTileUtils.java @@ -22,7 +22,7 @@ import org.apache.lucene.util.SloppyMath; import org.elasticsearch.OpenSearchParseException; import org.opensearch.common.geo.GeoPoint; -import org.elasticsearch.common.util.ESSloppyMath; +import org.opensearch.common.util.OpenSearchSloppyMath; import org.elasticsearch.common.xcontent.ObjectParser.ValueType; import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.support.XContentMapValues; @@ -263,9 +263,9 @@ public static Rectangle toBoundingBox(int xTile, int yTile, int precision) { final double tiles = validateZXY(precision, xTile, yTile); final double minN = Math.PI - (2.0 * Math.PI * (yTile + 1)) / tiles; final double maxN = Math.PI - (2.0 * Math.PI * (yTile)) / tiles; - final double minY = Math.toDegrees(ESSloppyMath.atan(ESSloppyMath.sinh(minN))); + final double minY = Math.toDegrees(OpenSearchSloppyMath.atan(OpenSearchSloppyMath.sinh(minN))); final double minX = ((xTile) / tiles * 360.0) - 180; - final double maxY = Math.toDegrees(ESSloppyMath.atan(ESSloppyMath.sinh(maxN))); + final double maxY = Math.toDegrees(OpenSearchSloppyMath.atan(OpenSearchSloppyMath.sinh(maxN))); final double maxX = ((xTile + 1) / tiles * 360.0) - 180; return new Rectangle(minX, maxX, maxY, minY); @@ -289,7 +289,7 @@ private static int validateZXY(int zoom, int xTile, int yTile) { private static GeoPoint zxyToGeoPoint(int zoom, int xTile, int yTile) { final int tiles = validateZXY(zoom, xTile, yTile); final double n = Math.PI - (2.0 * Math.PI * (yTile + 0.5)) / tiles; - final double lat = Math.toDegrees(ESSloppyMath.atan(ESSloppyMath.sinh(n))); + final double lat = Math.toDegrees(OpenSearchSloppyMath.atan(OpenSearchSloppyMath.sinh(n))); final double lon = ((xTile + 0.5) / tiles * 360.0) - 180; return new GeoPoint(lat, lon); } diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/geogrid/ParsedGeoGrid.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/geogrid/ParsedGeoGrid.java index c05cd8a4c9582..db6bb87d173af 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/geogrid/ParsedGeoGrid.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/geogrid/ParsedGeoGrid.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.bucket.geogrid; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.search.aggregations.ParsedMultiBucketAggregation; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregatorSupplier.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregatorSupplier.java index 2dae760766720..b4d4684355fc5 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregatorSupplier.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregatorSupplier.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.bucket.histogram; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Rounding; import org.opensearch.search.aggregations.Aggregator; import org.opensearch.search.aggregations.AggregatorFactories; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregationBuilder.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregationBuilder.java index 0461554a9120e..eea7b6c85f33e 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregationBuilder.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregationBuilder.java @@ -23,7 +23,7 @@ import org.opensearch.common.Rounding; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregationSupplier.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregationSupplier.java index af18148eee4ac..8a9712f01142c 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregationSupplier.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregationSupplier.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.bucket.histogram; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Rounding; import org.opensearch.search.aggregations.Aggregator; import org.opensearch.search.aggregations.AggregatorFactories; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java index b5cb18616b176..ccd3ccbfb5b6a 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java @@ -22,7 +22,7 @@ import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.util.CollectionUtil; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Rounding; import org.opensearch.common.lease.Releasables; import org.opensearch.search.DocValueFormat; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregatorFactory.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregatorFactory.java index c10b9c1aa6831..babd96cbe6c42 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregatorFactory.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregatorFactory.java @@ -20,7 +20,7 @@ package org.opensearch.search.aggregations.bucket.histogram; import org.opensearch.common.Rounding; -import org.elasticsearch.common.collect.List; +import org.opensearch.common.collect.List; import org.elasticsearch.index.query.QueryShardContext; import org.opensearch.search.aggregations.Aggregator; import org.opensearch.search.aggregations.AggregatorFactories; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramInterval.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramInterval.java index acc8a8387cfc4..5950d643fbf75 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramInterval.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramInterval.java @@ -24,7 +24,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContentFragment; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateIntervalWrapper.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateIntervalWrapper.java index 8747444f836df..f0d646d7be945 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateIntervalWrapper.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateIntervalWrapper.java @@ -28,7 +28,7 @@ import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.logging.DeprecationLogger; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.ToXContentFragment; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateRangeHistogramAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateRangeHistogramAggregator.java index 11a957916f0e5..cf6df10b124a9 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateRangeHistogramAggregator.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/DateRangeHistogramAggregator.java @@ -22,7 +22,7 @@ import org.apache.lucene.search.ScoreMode; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.CollectionUtil; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Rounding; import org.opensearch.common.lease.Releasables; import org.elasticsearch.index.fielddata.SortedBinaryDocValues; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/HistogramAggregatorFactory.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/HistogramAggregatorFactory.java index 854fb2898b3e1..8858270c388db 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/HistogramAggregatorFactory.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/HistogramAggregatorFactory.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.bucket.histogram; -import org.elasticsearch.common.collect.List; +import org.opensearch.common.collect.List; import org.elasticsearch.index.query.QueryShardContext; import org.opensearch.search.aggregations.Aggregator; import org.opensearch.search.aggregations.AggregatorFactories; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/LongBounds.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/LongBounds.java index 069af1be6ea70..b46eba807c402 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/LongBounds.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/LongBounds.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.bucket.histogram; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.elasticsearch.common.ParseField; import org.opensearch.common.Rounding; import org.opensearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregator.java index fa5ecc28421ef..15d2fb5d174e8 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregator.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregator.java @@ -23,7 +23,7 @@ import org.apache.lucene.search.ScoreMode; import org.apache.lucene.util.CollectionUtil; import org.apache.lucene.util.InPlaceMergeSorter; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.lease.Releasable; import org.opensearch.common.lease.Releasables; import org.opensearch.common.util.BigArrays; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregatorSupplier.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregatorSupplier.java index 90570e696613b..d9cb862a16553 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregatorSupplier.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregatorSupplier.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.bucket.histogram; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.search.aggregations.Aggregator; import org.opensearch.search.aggregations.AggregatorFactories; import org.opensearch.search.aggregations.support.ValuesSourceConfig; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java index 7b50c82f80178..2cbf60928f6cb 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/range/IpRangeAggregationBuilder.java @@ -22,7 +22,7 @@ import org.apache.lucene.util.BytesRef; import org.elasticsearch.common.ParseField; import org.opensearch.common.ParsingException; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.network.InetAddresses; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/range/ParsedRange.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/range/ParsedRange.java index 1326ae30a2031..842ac2a29f9f3 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/range/ParsedRange.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/range/ParsedRange.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.bucket.range; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/NumericTermsAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/NumericTermsAggregator.java index 82445af1e8798..79694fd7b5bd9 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/NumericTermsAggregator.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/NumericTermsAggregator.java @@ -24,7 +24,7 @@ import org.apache.lucene.search.ScoreMode; import org.apache.lucene.util.NumericUtils; import org.apache.lucene.util.PriorityQueue; -import org.elasticsearch.common.collect.List; +import org.opensearch.common.collect.List; import org.opensearch.common.lease.Releasable; import org.opensearch.common.lease.Releasables; import org.opensearch.common.util.LongArray; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/ParsedRareTerms.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/ParsedRareTerms.java index 2e4c80548d5ef..046ad08548b15 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/ParsedRareTerms.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/ParsedRareTerms.java @@ -20,7 +20,7 @@ package org.opensearch.search.aggregations.bucket.terms; import org.opensearch.common.CheckedBiConsumer; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/ParsedSignificantTerms.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/ParsedSignificantTerms.java index 0e6f258f29e22..df4348a46a7d5 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/ParsedSignificantTerms.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/ParsedSignificantTerms.java @@ -20,7 +20,7 @@ package org.opensearch.search.aggregations.bucket.terms; import org.opensearch.common.CheckedBiConsumer; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.CheckedSupplier; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ObjectParser; diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/ParsedTerms.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/ParsedTerms.java index 8a0efa98e1eba..b23b434b28d9b 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/ParsedTerms.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/terms/ParsedTerms.java @@ -20,7 +20,7 @@ package org.opensearch.search.aggregations.bucket.terms; import org.opensearch.common.CheckedBiConsumer; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/server/src/main/java/org/opensearch/search/aggregations/metrics/AbstractPercentilesAggregationBuilder.java b/server/src/main/java/org/opensearch/search/aggregations/metrics/AbstractPercentilesAggregationBuilder.java index 5d28c0b98752e..81650d17b66b8 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/metrics/AbstractPercentilesAggregationBuilder.java +++ b/server/src/main/java/org/opensearch/search/aggregations/metrics/AbstractPercentilesAggregationBuilder.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.metrics; import org.opensearch.Version; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.TriFunction; import org.opensearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java index cbf9d9f0237e9..4ff4e5b71b0a6 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java +++ b/server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java @@ -28,7 +28,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.RamUsageEstimator; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.hash.MurmurHash3; import org.opensearch.common.lease.Releasable; import org.opensearch.common.lease.Releasables; diff --git a/server/src/main/java/org/opensearch/search/aggregations/metrics/MedianAbsoluteDeviationAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/metrics/MedianAbsoluteDeviationAggregator.java index 173618c977a60..31f127fb05397 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/metrics/MedianAbsoluteDeviationAggregator.java +++ b/server/src/main/java/org/opensearch/search/aggregations/metrics/MedianAbsoluteDeviationAggregator.java @@ -21,7 +21,7 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.ScoreMode; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.lease.Releasables; import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.ObjectArray; diff --git a/server/src/main/java/org/opensearch/search/aggregations/metrics/ParsedGeoBounds.java b/server/src/main/java/org/opensearch/search/aggregations/metrics/ParsedGeoBounds.java index 58b5a871cba40..513f92bd302f7 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/metrics/ParsedGeoBounds.java +++ b/server/src/main/java/org/opensearch/search/aggregations/metrics/ParsedGeoBounds.java @@ -19,8 +19,8 @@ package org.opensearch.search.aggregations.metrics; -import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.Nullable; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.geo.GeoBoundingBox; import org.opensearch.common.geo.GeoPoint; import org.elasticsearch.common.xcontent.ConstructingObjectParser; diff --git a/server/src/main/java/org/opensearch/search/aggregations/metrics/ScriptedMetricAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/metrics/ScriptedMetricAggregator.java index 6d3ffbab1218f..9582f8e4c73f3 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/metrics/ScriptedMetricAggregator.java +++ b/server/src/main/java/org/opensearch/search/aggregations/metrics/ScriptedMetricAggregator.java @@ -22,7 +22,7 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.Scorable; import org.apache.lucene.search.ScoreMode; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.lease.Releasables; import org.opensearch.common.util.CollectionUtils; diff --git a/server/src/main/java/org/opensearch/search/aggregations/metrics/ScriptedMetricAggregatorFactory.java b/server/src/main/java/org/opensearch/search/aggregations/metrics/ScriptedMetricAggregatorFactory.java index ad43b2602c3da..092332ae9079b 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/metrics/ScriptedMetricAggregatorFactory.java +++ b/server/src/main/java/org/opensearch/search/aggregations/metrics/ScriptedMetricAggregatorFactory.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.metrics; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.index.query.QueryShardContext; import org.opensearch.script.Script; import org.opensearch.script.ScriptedMetricAggContexts; @@ -83,7 +83,7 @@ public Aggregator createInternal(SearchContext searchContext, Aggregator parent, CardinalityUpperBound cardinality, Map metadata) throws IOException { - Map aggParams = this.aggParams == null ? org.elasticsearch.common.collect.Map.of() : this.aggParams; + Map aggParams = this.aggParams == null ? org.opensearch.common.collect.Map.of() : this.aggParams; Script reduceScript = deepCopyScript(this.reduceScript, searchContext, aggParams); 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 dd1e2d755316b..a9b29151822e2 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 @@ -20,7 +20,7 @@ package org.opensearch.search.aggregations.metrics; import org.opensearch.Version; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.ParsingException; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/opensearch/search/aggregations/pipeline/DerivativePipelineAggregationBuilder.java b/server/src/main/java/org/opensearch/search/aggregations/pipeline/DerivativePipelineAggregationBuilder.java index d0d25c7191cd0..b5b58f8f75e98 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/pipeline/DerivativePipelineAggregationBuilder.java +++ b/server/src/main/java/org/opensearch/search/aggregations/pipeline/DerivativePipelineAggregationBuilder.java @@ -24,7 +24,7 @@ import org.opensearch.common.Rounding; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.search.DocValueFormat; diff --git a/server/src/main/java/org/opensearch/search/aggregations/pipeline/EwmaModel.java b/server/src/main/java/org/opensearch/search/aggregations/pipeline/EwmaModel.java index 57151af4d2600..a6028a567bbca 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/pipeline/EwmaModel.java +++ b/server/src/main/java/org/opensearch/search/aggregations/pipeline/EwmaModel.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.pipeline; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/search/aggregations/pipeline/HoltLinearModel.java b/server/src/main/java/org/opensearch/search/aggregations/pipeline/HoltLinearModel.java index 336574633ba67..c0774dcee749d 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/pipeline/HoltLinearModel.java +++ b/server/src/main/java/org/opensearch/search/aggregations/pipeline/HoltLinearModel.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.pipeline; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/search/aggregations/pipeline/HoltWintersModel.java b/server/src/main/java/org/opensearch/search/aggregations/pipeline/HoltWintersModel.java index 33b6ff1e27f95..c369e83fc85d6 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/pipeline/HoltWintersModel.java +++ b/server/src/main/java/org/opensearch/search/aggregations/pipeline/HoltWintersModel.java @@ -21,7 +21,7 @@ import org.elasticsearch.OpenSearchParseException; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/search/aggregations/pipeline/LinearModel.java b/server/src/main/java/org/opensearch/search/aggregations/pipeline/LinearModel.java index 30dee40129fcc..fbfc5046a7a02 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/pipeline/LinearModel.java +++ b/server/src/main/java/org/opensearch/search/aggregations/pipeline/LinearModel.java @@ -20,7 +20,7 @@ package org.opensearch.search.aggregations.pipeline; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/search/aggregations/pipeline/MovAvgModel.java b/server/src/main/java/org/opensearch/search/aggregations/pipeline/MovAvgModel.java index 150131abe8d1b..82841fc62a5a6 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/pipeline/MovAvgModel.java +++ b/server/src/main/java/org/opensearch/search/aggregations/pipeline/MovAvgModel.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.pipeline; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.NamedWriteable; import org.opensearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.ToXContentFragment; diff --git a/server/src/main/java/org/opensearch/search/aggregations/pipeline/SerialDiffPipelineAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/pipeline/SerialDiffPipelineAggregator.java index 89f97009e0e6d..8481e2b0b6624 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/pipeline/SerialDiffPipelineAggregator.java +++ b/server/src/main/java/org/opensearch/search/aggregations/pipeline/SerialDiffPipelineAggregator.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.pipeline; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.collect.EvictingQueue; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/search/aggregations/pipeline/SimpleModel.java b/server/src/main/java/org/opensearch/search/aggregations/pipeline/SimpleModel.java index 96e5c5eca077c..203f62c3807bd 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/pipeline/SimpleModel.java +++ b/server/src/main/java/org/opensearch/search/aggregations/pipeline/SimpleModel.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.pipeline; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/search/aggregations/support/MultiValuesSourceAggregationBuilder.java b/server/src/main/java/org/opensearch/search/aggregations/support/MultiValuesSourceAggregationBuilder.java index 10682dd25b467..dbd0596f31ede 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/support/MultiValuesSourceAggregationBuilder.java +++ b/server/src/main/java/org/opensearch/search/aggregations/support/MultiValuesSourceAggregationBuilder.java @@ -18,7 +18,7 @@ */ package org.opensearch.search.aggregations.support; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/search/aggregations/support/ValuesSourceConfig.java b/server/src/main/java/org/opensearch/search/aggregations/support/ValuesSourceConfig.java index aa76df58f95b5..702fc99508c40 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/support/ValuesSourceConfig.java +++ b/server/src/main/java/org/opensearch/search/aggregations/support/ValuesSourceConfig.java @@ -18,7 +18,7 @@ */ package org.opensearch.search.aggregations.support; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.IndexGeoPointFieldData; import org.elasticsearch.index.fielddata.IndexNumericFieldData; diff --git a/server/src/main/java/org/opensearch/search/builder/PointInTimeBuilder.java b/server/src/main/java/org/opensearch/search/builder/PointInTimeBuilder.java index 151c2d28e7d61..870931ae9a9f9 100644 --- a/server/src/main/java/org/opensearch/search/builder/PointInTimeBuilder.java +++ b/server/src/main/java/org/opensearch/search/builder/PointInTimeBuilder.java @@ -19,12 +19,12 @@ package org.opensearch.search.builder; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; 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 185345eb24a7c..7538e71cf810c 100644 --- a/server/src/main/java/org/opensearch/search/builder/SearchSourceBuilder.java +++ b/server/src/main/java/org/opensearch/search/builder/SearchSourceBuilder.java @@ -21,8 +21,8 @@ import org.opensearch.OpenSearchException; import org.opensearch.Version; -import org.elasticsearch.common.Booleans; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Booleans; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.ParsingException; import org.opensearch.common.Strings; @@ -30,7 +30,7 @@ import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.logging.DeprecationLogger; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContentFragment; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/search/fetch/FetchPhase.java b/server/src/main/java/org/opensearch/search/fetch/FetchPhase.java index be7a8989730af..26d2ac675106d 100644 --- a/server/src/main/java/org/opensearch/search/fetch/FetchPhase.java +++ b/server/src/main/java/org/opensearch/search/fetch/FetchPhase.java @@ -32,7 +32,7 @@ import org.apache.lucene.util.BitSet; import org.opensearch.Version; import org.opensearch.common.CheckedBiConsumer; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.document.DocumentField; import org.elasticsearch.common.lucene.index.SequentialStoredFieldsLeafReader; import org.elasticsearch.common.lucene.search.Queries; diff --git a/server/src/main/java/org/opensearch/search/fetch/ShardFetchRequest.java b/server/src/main/java/org/opensearch/search/fetch/ShardFetchRequest.java index 1b1032350768b..df2372242e48b 100644 --- a/server/src/main/java/org/opensearch/search/fetch/ShardFetchRequest.java +++ b/server/src/main/java/org/opensearch/search/fetch/ShardFetchRequest.java @@ -23,7 +23,7 @@ import org.apache.lucene.search.FieldDoc; import org.apache.lucene.search.ScoreDoc; import org.opensearch.action.search.SearchShardTask; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.lucene.Lucene; 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 5cde57cbc3f75..8620503446150 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 @@ -19,7 +19,7 @@ package org.opensearch.search.fetch.subphase; -import org.elasticsearch.common.Booleans; +import org.opensearch.common.Booleans; import org.elasticsearch.common.ParseField; import org.opensearch.common.ParsingException; import org.opensearch.common.Strings; diff --git a/server/src/main/java/org/opensearch/search/fetch/subphase/FieldAndFormat.java b/server/src/main/java/org/opensearch/search/fetch/subphase/FieldAndFormat.java index 364333164b893..da99a2117497e 100644 --- a/server/src/main/java/org/opensearch/search/fetch/subphase/FieldAndFormat.java +++ b/server/src/main/java/org/opensearch/search/fetch/subphase/FieldAndFormat.java @@ -20,7 +20,7 @@ package org.opensearch.search.fetch.subphase; import org.opensearch.Version; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/search/internal/FilteredSearchContext.java b/server/src/main/java/org/opensearch/search/internal/FilteredSearchContext.java index e6741f3652e7f..9d26bd5d20c1b 100644 --- a/server/src/main/java/org/opensearch/search/internal/FilteredSearchContext.java +++ b/server/src/main/java/org/opensearch/search/internal/FilteredSearchContext.java @@ -24,7 +24,7 @@ import org.apache.lucene.search.Query; import org.opensearch.action.search.SearchShardTask; import org.opensearch.action.search.SearchType; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.BigArrays; import org.elasticsearch.index.cache.bitset.BitsetFilterCache; import org.elasticsearch.index.mapper.MappedFieldType; diff --git a/server/src/main/java/org/opensearch/search/internal/ReaderContext.java b/server/src/main/java/org/opensearch/search/internal/ReaderContext.java index b393b80f19bdc..af98a7ca52206 100644 --- a/server/src/main/java/org/opensearch/search/internal/ReaderContext.java +++ b/server/src/main/java/org/opensearch/search/internal/ReaderContext.java @@ -21,13 +21,12 @@ import org.opensearch.common.lease.Releasable; import org.opensearch.common.lease.Releasables; -import org.elasticsearch.common.util.concurrent.AbstractRefCounted; +import org.opensearch.common.util.concurrent.AbstractRefCounted; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.shard.IndexShard; import org.opensearch.search.RescoreDocIds; import org.opensearch.search.dfs.AggregatedDfs; -import org.opensearch.search.SearchService; import org.opensearch.transport.TransportRequest; import java.util.HashMap; @@ -40,7 +39,7 @@ /** * Holds a reference to a point in time {@link Engine.Searcher} that will be used to construct {@link SearchContext}. - * This class also implements {@link org.elasticsearch.common.util.concurrent.RefCounted} since in some situations like + * This class also implements {@link org.opensearch.common.util.concurrent.RefCounted} since in some situations like * in {@link org.opensearch.search.SearchService} a SearchContext can be closed concurrently due to independent events * ie. when an index gets removed. To prevent accessing closed IndexReader / IndexSearcher instances the SearchContext * can be guarded by a reference count and fail if it's been closed by an external event. diff --git a/server/src/main/java/org/opensearch/search/internal/SearchContext.java b/server/src/main/java/org/opensearch/search/internal/SearchContext.java index ddf752895209d..35e5dea670f42 100644 --- a/server/src/main/java/org/opensearch/search/internal/SearchContext.java +++ b/server/src/main/java/org/opensearch/search/internal/SearchContext.java @@ -24,10 +24,10 @@ import org.apache.lucene.search.Query; import org.opensearch.action.search.SearchShardTask; import org.opensearch.action.search.SearchType; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.lease.Releasable; import org.opensearch.common.lease.Releasables; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.BigArrays; import org.elasticsearch.index.cache.bitset.BitsetFilterCache; import org.elasticsearch.index.mapper.MappedFieldType; 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 b76d738c39692..0ad151e63784a 100644 --- a/server/src/main/java/org/opensearch/search/internal/ShardSearchRequest.java +++ b/server/src/main/java/org/opensearch/search/internal/ShardSearchRequest.java @@ -28,15 +28,15 @@ import org.opensearch.action.support.IndicesOptions; import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.common.CheckedFunction; -import org.elasticsearch.common.Nullable; +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.collect.ImmutableOpenMap; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.index.Index; import org.elasticsearch.index.query.BoolQueryBuilder; import org.elasticsearch.index.query.MatchNoneQueryBuilder; diff --git a/server/src/main/java/org/opensearch/search/internal/SubSearchContext.java b/server/src/main/java/org/opensearch/search/internal/SubSearchContext.java index c6835a54b6c4a..0e07e0b126e8f 100644 --- a/server/src/main/java/org/opensearch/search/internal/SubSearchContext.java +++ b/server/src/main/java/org/opensearch/search/internal/SubSearchContext.java @@ -19,7 +19,7 @@ package org.opensearch.search.internal; import org.apache.lucene.search.Query; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.index.query.ParsedQuery; import org.opensearch.search.aggregations.SearchContextAggregations; import org.opensearch.search.collapse.CollapseContext; diff --git a/server/src/main/java/org/opensearch/search/lookup/DocLookup.java b/server/src/main/java/org/opensearch/search/lookup/DocLookup.java index 541dd41628366..b9d531d398f6f 100644 --- a/server/src/main/java/org/opensearch/search/lookup/DocLookup.java +++ b/server/src/main/java/org/opensearch/search/lookup/DocLookup.java @@ -19,7 +19,7 @@ package org.opensearch.search.lookup; import org.apache.lucene.index.LeafReaderContext; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.MapperService; diff --git a/server/src/main/java/org/opensearch/search/lookup/FieldsLookup.java b/server/src/main/java/org/opensearch/search/lookup/FieldsLookup.java index 2bbd5e6dfa3a3..bb14cfc599b63 100644 --- a/server/src/main/java/org/opensearch/search/lookup/FieldsLookup.java +++ b/server/src/main/java/org/opensearch/search/lookup/FieldsLookup.java @@ -19,7 +19,7 @@ package org.opensearch.search.lookup; import org.apache.lucene.index.LeafReaderContext; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.index.mapper.MapperService; public class FieldsLookup { diff --git a/server/src/main/java/org/opensearch/search/lookup/LeafDocLookup.java b/server/src/main/java/org/opensearch/search/lookup/LeafDocLookup.java index 2d0ae694b151f..d5bce50d8f403 100644 --- a/server/src/main/java/org/opensearch/search/lookup/LeafDocLookup.java +++ b/server/src/main/java/org/opensearch/search/lookup/LeafDocLookup.java @@ -20,7 +20,7 @@ import org.apache.lucene.index.LeafReaderContext; import org.elasticsearch.ExceptionsHelper; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.logging.DeprecationLogger; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.ScriptDocValues; diff --git a/server/src/main/java/org/opensearch/search/lookup/LeafFieldsLookup.java b/server/src/main/java/org/opensearch/search/lookup/LeafFieldsLookup.java index d1705d0bd33e5..ac3ff85779fb7 100644 --- a/server/src/main/java/org/opensearch/search/lookup/LeafFieldsLookup.java +++ b/server/src/main/java/org/opensearch/search/lookup/LeafFieldsLookup.java @@ -20,7 +20,7 @@ import org.apache.lucene.index.LeafReader; import org.elasticsearch.OpenSearchParseException; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.index.fieldvisitor.SingleFieldsVisitor; import org.elasticsearch.index.mapper.DocumentMapper; import org.elasticsearch.index.mapper.MappedFieldType; diff --git a/server/src/main/java/org/opensearch/search/lookup/SearchLookup.java b/server/src/main/java/org/opensearch/search/lookup/SearchLookup.java index 5ac2c59efb9f7..6d7a5d35b1579 100644 --- a/server/src/main/java/org/opensearch/search/lookup/SearchLookup.java +++ b/server/src/main/java/org/opensearch/search/lookup/SearchLookup.java @@ -20,7 +20,7 @@ package org.opensearch.search.lookup; import org.apache.lucene.index.LeafReaderContext; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.MapperService; diff --git a/server/src/main/java/org/opensearch/search/lookup/SourceLookup.java b/server/src/main/java/org/opensearch/search/lookup/SourceLookup.java index 0a2c984132fa2..da9c344ed209b 100644 --- a/server/src/main/java/org/opensearch/search/lookup/SourceLookup.java +++ b/server/src/main/java/org/opensearch/search/lookup/SourceLookup.java @@ -22,9 +22,9 @@ import org.apache.lucene.index.LeafReaderContext; import org.opensearch.OpenSearchParseException; import org.opensearch.common.CheckedBiConsumer; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.lucene.index.SequentialStoredFieldsLeafReader; import org.opensearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentType; diff --git a/server/src/main/java/org/opensearch/search/profile/ProfileResult.java b/server/src/main/java/org/opensearch/search/profile/ProfileResult.java index 80dabc8f8c986..03895f54f1cbd 100644 --- a/server/src/main/java/org/opensearch/search/profile/ProfileResult.java +++ b/server/src/main/java/org/opensearch/search/profile/ProfileResult.java @@ -24,7 +24,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.InstantiatingObjectParser; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -70,8 +70,8 @@ public ProfileResult(String type, String description, Map breakdow this.type = type; this.description = description; this.breakdown = Objects.requireNonNull(breakdown, "required breakdown argument missing"); - this.debug = debug == null ? org.elasticsearch.common.collect.Map.of() : debug; - this.children = children == null ? org.elasticsearch.common.collect.List.of() : children; + this.debug = debug == null ? org.opensearch.common.collect.Map.of() : debug; + this.children = children == null ? org.opensearch.common.collect.List.of() : children; this.nodeTime = nodeTime; } @@ -86,7 +86,7 @@ public ProfileResult(StreamInput in) throws IOException{ if (in.getVersion().onOrAfter(Version.V_7_9_0)) { debug = in.readMap(StreamInput::readString, StreamInput::readGenericValue); } else { - debug = org.elasticsearch.common.collect.Map.of(); + debug = org.opensearch.common.collect.Map.of(); } children = in.readList(ProfileResult::new); } diff --git a/server/src/main/java/org/opensearch/search/profile/query/CollectorResult.java b/server/src/main/java/org/opensearch/search/profile/query/CollectorResult.java index 78a8ad62d294c..e8a936b2a64b6 100644 --- a/server/src/main/java/org/opensearch/search/profile/query/CollectorResult.java +++ b/server/src/main/java/org/opensearch/search/profile/query/CollectorResult.java @@ -23,7 +23,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/search/query/QueryPhase.java b/server/src/main/java/org/opensearch/search/query/QueryPhase.java index 2ea1cbd1add48..80ad1b23ea920 100644 --- a/server/src/main/java/org/opensearch/search/query/QueryPhase.java +++ b/server/src/main/java/org/opensearch/search/query/QueryPhase.java @@ -47,8 +47,8 @@ import org.apache.lucene.search.Weight; import org.apache.lucene.util.FutureArrays; import org.opensearch.action.search.SearchShardTask; -import org.elasticsearch.common.Booleans; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.Booleans; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.lucene.Lucene; import org.opensearch.common.lucene.search.TopDocsAndMaxScore; import org.opensearch.common.util.concurrent.QueueResizingEsThreadPoolExecutor; 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 ae55da92e00f4..836b6d1fd818f 100644 --- a/server/src/main/java/org/opensearch/search/query/QuerySearchRequest.java +++ b/server/src/main/java/org/opensearch/search/query/QuerySearchRequest.java @@ -24,7 +24,7 @@ import org.opensearch.action.OriginalIndices; import org.opensearch.action.search.SearchShardTask; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/search/query/TopDocsCollectorContext.java b/server/src/main/java/org/opensearch/search/query/TopDocsCollectorContext.java index 5ada305d76087..6f978603258c1 100644 --- a/server/src/main/java/org/opensearch/search/query/TopDocsCollectorContext.java +++ b/server/src/main/java/org/opensearch/search/query/TopDocsCollectorContext.java @@ -52,7 +52,7 @@ import org.apache.lucene.search.grouping.CollapsingTopDocsCollector; import org.apache.lucene.search.spans.SpanQuery; import org.opensearch.action.search.MaxScoreCollector; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.lucene.Lucene; import org.opensearch.common.lucene.search.TopDocsAndMaxScore; import org.opensearch.common.lucene.search.function.FunctionScoreQuery; diff --git a/server/src/main/java/org/opensearch/search/suggest/Suggest.java b/server/src/main/java/org/opensearch/search/suggest/Suggest.java index 087f1e4d1753c..ace98c2b69606 100644 --- a/server/src/main/java/org/opensearch/search/suggest/Suggest.java +++ b/server/src/main/java/org/opensearch/search/suggest/Suggest.java @@ -21,7 +21,7 @@ import org.apache.lucene.util.CollectionUtil; import org.apache.lucene.util.SetOnce; import org.opensearch.Version; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.elasticsearch.common.ParseField; import org.opensearch.common.ParsingException; import org.opensearch.common.Strings; diff --git a/server/src/main/java/org/opensearch/search/suggest/SuggestBuilder.java b/server/src/main/java/org/opensearch/search/suggest/SuggestBuilder.java index 9482ad8324df3..69ce7348e0eba 100644 --- a/server/src/main/java/org/opensearch/search/suggest/SuggestBuilder.java +++ b/server/src/main/java/org/opensearch/search/suggest/SuggestBuilder.java @@ -18,7 +18,7 @@ */ package org.opensearch.search.suggest; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.ParsingException; import org.opensearch.common.Strings; diff --git a/server/src/main/java/org/opensearch/search/suggest/completion/CompletionStats.java b/server/src/main/java/org/opensearch/search/suggest/completion/CompletionStats.java index 0e848c6cdbe80..60b4e940e44f5 100644 --- a/server/src/main/java/org/opensearch/search/suggest/completion/CompletionStats.java +++ b/server/src/main/java/org/opensearch/search/suggest/completion/CompletionStats.java @@ -19,7 +19,7 @@ package org.opensearch.search.suggest.completion; import org.opensearch.common.FieldMemoryStats; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; diff --git a/server/src/main/java/org/opensearch/search/suggest/phrase/DirectCandidateGenerator.java b/server/src/main/java/org/opensearch/search/suggest/phrase/DirectCandidateGenerator.java index b048ff71cfac1..b24618ab916d8 100644 --- a/server/src/main/java/org/opensearch/search/suggest/phrase/DirectCandidateGenerator.java +++ b/server/src/main/java/org/opensearch/search/suggest/phrase/DirectCandidateGenerator.java @@ -36,7 +36,7 @@ import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.CharsRef; import org.apache.lucene.util.CharsRefBuilder; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import java.io.CharArrayReader; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/snapshots/InFlightShardSnapshotStates.java b/server/src/main/java/org/opensearch/snapshots/InFlightShardSnapshotStates.java index 45349b22b017b..74f7ccf939187 100644 --- a/server/src/main/java/org/opensearch/snapshots/InFlightShardSnapshotStates.java +++ b/server/src/main/java/org/opensearch/snapshots/InFlightShardSnapshotStates.java @@ -21,7 +21,7 @@ import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import org.opensearch.cluster.SnapshotsInProgress; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.index.shard.ShardId; import org.opensearch.repositories.IndexId; import org.opensearch.repositories.RepositoryShardId; diff --git a/server/src/main/java/org/opensearch/snapshots/RestoreService.java b/server/src/main/java/org/opensearch/snapshots/RestoreService.java index 6fd216e072787..e5e7a63c90370 100644 --- a/server/src/main/java/org/opensearch/snapshots/RestoreService.java +++ b/server/src/main/java/org/opensearch/snapshots/RestoreService.java @@ -67,7 +67,7 @@ import org.opensearch.common.regex.Regex; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.index.Index; import org.opensearch.index.IndexSettings; import org.opensearch.index.shard.IndexShard; diff --git a/server/src/main/java/org/opensearch/snapshots/SnapshotException.java b/server/src/main/java/org/opensearch/snapshots/SnapshotException.java index 39e4ff8693f03..4909b57a25517 100644 --- a/server/src/main/java/org/opensearch/snapshots/SnapshotException.java +++ b/server/src/main/java/org/opensearch/snapshots/SnapshotException.java @@ -20,7 +20,7 @@ package org.opensearch.snapshots; import org.opensearch.OpenSearchException; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/snapshots/SnapshotInfo.java b/server/src/main/java/org/opensearch/snapshots/SnapshotInfo.java index 3debdd644820e..ff448802ef714 100644 --- a/server/src/main/java/org/opensearch/snapshots/SnapshotInfo.java +++ b/server/src/main/java/org/opensearch/snapshots/SnapshotInfo.java @@ -22,13 +22,13 @@ import org.opensearch.action.ShardOperationFailedException; import org.opensearch.action.admin.cluster.snapshots.get.GetSnapshotsRequest; import org.opensearch.cluster.SnapshotsInProgress; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.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.common.time.DateFormatter; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/snapshots/SnapshotShardFailure.java b/server/src/main/java/org/opensearch/snapshots/SnapshotShardFailure.java index 69170be36f14a..bc55afa6d2107 100644 --- a/server/src/main/java/org/opensearch/snapshots/SnapshotShardFailure.java +++ b/server/src/main/java/org/opensearch/snapshots/SnapshotShardFailure.java @@ -22,7 +22,7 @@ import org.elasticsearch.OpenSearchParseException; import org.opensearch.action.ShardOperationFailedException; import org.opensearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/opensearch/snapshots/SnapshotShardsService.java b/server/src/main/java/org/opensearch/snapshots/SnapshotShardsService.java index 1be999d2d46bd..aa6eb502225a7 100644 --- a/server/src/main/java/org/opensearch/snapshots/SnapshotShardsService.java +++ b/server/src/main/java/org/opensearch/snapshots/SnapshotShardsService.java @@ -34,12 +34,12 @@ import org.opensearch.cluster.SnapshotsInProgress.State; import org.opensearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.component.AbstractLifecycleComponent; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.settings.Settings; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.seqno.SequenceNumbers; import org.elasticsearch.index.shard.IndexEventListener; diff --git a/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java b/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java index ad82f980a0d29..76774215e37a8 100644 --- a/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java +++ b/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java @@ -65,18 +65,18 @@ import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Priority; import org.opensearch.common.Strings; import org.opensearch.common.UUIDs; import org.opensearch.common.collect.ImmutableOpenMap; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.component.AbstractLifecycleComponent; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.regex.Regex; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.elasticsearch.index.Index; import org.elasticsearch.index.shard.ShardId; diff --git a/server/src/main/java/org/opensearch/snapshots/UpdateIndexShardSnapshotStatusRequest.java b/server/src/main/java/org/opensearch/snapshots/UpdateIndexShardSnapshotStatusRequest.java index 34c0cf593d0c1..7abe6f0eef8f9 100644 --- a/server/src/main/java/org/opensearch/snapshots/UpdateIndexShardSnapshotStatusRequest.java +++ b/server/src/main/java/org/opensearch/snapshots/UpdateIndexShardSnapshotStatusRequest.java @@ -23,7 +23,7 @@ import org.opensearch.cluster.SnapshotsInProgress; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.index.shard.ShardId; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/tasks/CancellableTask.java b/server/src/main/java/org/opensearch/tasks/CancellableTask.java index 5151bf915c6a3..1c98c2cbe9c11 100644 --- a/server/src/main/java/org/opensearch/tasks/CancellableTask.java +++ b/server/src/main/java/org/opensearch/tasks/CancellableTask.java @@ -19,7 +19,7 @@ package org.opensearch.tasks; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/server/src/main/java/org/opensearch/tasks/TaskInfo.java b/server/src/main/java/org/opensearch/tasks/TaskInfo.java index 70a521c675bbf..7bf411414c7e0 100644 --- a/server/src/main/java/org/opensearch/tasks/TaskInfo.java +++ b/server/src/main/java/org/opensearch/tasks/TaskInfo.java @@ -26,7 +26,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ObjectParserHelper; import org.elasticsearch.common.xcontent.ToXContentFragment; diff --git a/server/src/main/java/org/opensearch/tasks/TaskManager.java b/server/src/main/java/org/opensearch/tasks/TaskManager.java index 37b0ae8d71ba7..b3ac1dc03d5a0 100644 --- a/server/src/main/java/org/opensearch/tasks/TaskManager.java +++ b/server/src/main/java/org/opensearch/tasks/TaskManager.java @@ -39,7 +39,7 @@ import org.opensearch.common.lease.Releasables; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.elasticsearch.common.util.concurrent.ConcurrentCollections; import org.elasticsearch.common.util.concurrent.ConcurrentMapLong; @@ -64,7 +64,7 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; +import static org.opensearch.common.unit.TimeValue.timeValueMillis; import static org.opensearch.http.HttpTransportSettings.SETTING_HTTP_MAX_HEADER_SIZE; /** diff --git a/server/src/main/java/org/opensearch/tasks/TaskResult.java b/server/src/main/java/org/opensearch/tasks/TaskResult.java index 345c148007ad4..47bf01e2da410 100644 --- a/server/src/main/java/org/opensearch/tasks/TaskResult.java +++ b/server/src/main/java/org/opensearch/tasks/TaskResult.java @@ -20,7 +20,7 @@ import org.opensearch.OpenSearchException; import org.opensearch.client.Requests; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; diff --git a/server/src/main/java/org/opensearch/tasks/TaskResultsService.java b/server/src/main/java/org/opensearch/tasks/TaskResultsService.java index 21c151d8c7e75..4f5f8696a1c44 100644 --- a/server/src/main/java/org/opensearch/tasks/TaskResultsService.java +++ b/server/src/main/java/org/opensearch/tasks/TaskResultsService.java @@ -39,13 +39,13 @@ import org.elasticsearch.cluster.service.ClusterService; import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.core.internal.io.Streams; +import org.opensearch.core.internal.io.Streams; import org.opensearch.threadpool.ThreadPool; import java.io.ByteArrayOutputStream; @@ -56,7 +56,7 @@ import java.util.Map; import static org.opensearch.action.admin.cluster.node.tasks.get.GetTaskAction.TASKS_ORIGIN; -import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; +import static org.opensearch.common.unit.TimeValue.timeValueMillis; /** * Service that can store task results. diff --git a/server/src/main/java/org/opensearch/threadpool/AutoQueueAdjustingExecutorBuilder.java b/server/src/main/java/org/opensearch/threadpool/AutoQueueAdjustingExecutorBuilder.java index f82419dbeef3a..3dfd956cf6ad6 100644 --- a/server/src/main/java/org/opensearch/threadpool/AutoQueueAdjustingExecutorBuilder.java +++ b/server/src/main/java/org/opensearch/threadpool/AutoQueueAdjustingExecutorBuilder.java @@ -22,7 +22,7 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.SizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.EsExecutors; import org.elasticsearch.common.util.concurrent.ThreadContext; import org.elasticsearch.node.Node; diff --git a/server/src/main/java/org/opensearch/threadpool/ScalingExecutorBuilder.java b/server/src/main/java/org/opensearch/threadpool/ScalingExecutorBuilder.java index bc0fdd3dcd64a..d82a45889609f 100644 --- a/server/src/main/java/org/opensearch/threadpool/ScalingExecutorBuilder.java +++ b/server/src/main/java/org/opensearch/threadpool/ScalingExecutorBuilder.java @@ -21,7 +21,7 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.EsExecutors; import org.elasticsearch.common.util.concurrent.ThreadContext; import org.elasticsearch.node.Node; diff --git a/server/src/main/java/org/opensearch/threadpool/Scheduler.java b/server/src/main/java/org/opensearch/threadpool/Scheduler.java index fc3433e0fcc27..83143cec94847 100644 --- a/server/src/main/java/org/opensearch/threadpool/Scheduler.java +++ b/server/src/main/java/org/opensearch/threadpool/Scheduler.java @@ -20,9 +20,9 @@ package org.opensearch.threadpool; import org.elasticsearch.ExceptionsHelper; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.elasticsearch.common.util.concurrent.EsAbortPolicy; import org.elasticsearch.common.util.concurrent.EsExecutors; diff --git a/server/src/main/java/org/opensearch/threadpool/ThreadPool.java b/server/src/main/java/org/opensearch/threadpool/ThreadPool.java index b9aeb8adc7730..d8c7fee888697 100644 --- a/server/src/main/java/org/opensearch/threadpool/ThreadPool.java +++ b/server/src/main/java/org/opensearch/threadpool/ThreadPool.java @@ -23,16 +23,15 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; import org.opensearch.Version; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; 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.settings.Setting; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.SizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.EsExecutors; -import org.opensearch.common.util.concurrent.EsRejectedExecutionException; import org.opensearch.common.util.concurrent.EsThreadPoolExecutor; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.common.util.concurrent.XRejectedExecutionHandler; diff --git a/server/src/main/java/org/opensearch/transport/CloseableConnection.java b/server/src/main/java/org/opensearch/transport/CloseableConnection.java index 8755cfcc0bd43..258fb53ea66dc 100644 --- a/server/src/main/java/org/opensearch/transport/CloseableConnection.java +++ b/server/src/main/java/org/opensearch/transport/CloseableConnection.java @@ -20,7 +20,7 @@ package org.opensearch.transport; import org.opensearch.action.ActionListener; -import org.elasticsearch.common.concurrent.CompletableContext; +import org.opensearch.common.concurrent.CompletableContext; /** diff --git a/server/src/main/java/org/opensearch/transport/ClusterConnectionManager.java b/server/src/main/java/org/opensearch/transport/ClusterConnectionManager.java index 928e75fec1fed..d2d3e1e11d13b 100644 --- a/server/src/main/java/org/opensearch/transport/ClusterConnectionManager.java +++ b/server/src/main/java/org/opensearch/transport/ClusterConnectionManager.java @@ -23,12 +23,12 @@ import org.opensearch.action.ActionListener; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.util.concurrent.AbstractRefCounted; +import org.opensearch.common.util.concurrent.AbstractRefCounted; import org.elasticsearch.common.util.concurrent.ConcurrentCollections; import org.elasticsearch.common.util.concurrent.EsExecutors; import org.elasticsearch.common.util.concurrent.ListenableFuture; import org.elasticsearch.common.util.concurrent.RunOnce; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import java.util.Collections; import java.util.Iterator; diff --git a/server/src/main/java/org/opensearch/transport/CompressibleBytesOutputStream.java b/server/src/main/java/org/opensearch/transport/CompressibleBytesOutputStream.java index 632437e74d269..b4486956cbd08 100644 --- a/server/src/main/java/org/opensearch/transport/CompressibleBytesOutputStream.java +++ b/server/src/main/java/org/opensearch/transport/CompressibleBytesOutputStream.java @@ -19,7 +19,7 @@ package org.opensearch.transport; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.compress.CompressorFactory; import org.opensearch.common.io.Streams; diff --git a/server/src/main/java/org/opensearch/transport/ConnectionProfile.java b/server/src/main/java/org/opensearch/transport/ConnectionProfile.java index a4e7345912107..404aef65b43c3 100644 --- a/server/src/main/java/org/opensearch/transport/ConnectionProfile.java +++ b/server/src/main/java/org/opensearch/transport/ConnectionProfile.java @@ -19,9 +19,9 @@ package org.opensearch.transport; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.ArrayList; import java.util.Arrays; diff --git a/server/src/main/java/org/opensearch/transport/Header.java b/server/src/main/java/org/opensearch/transport/Header.java index 8e12fd2dedbc2..812952669f0b7 100644 --- a/server/src/main/java/org/opensearch/transport/Header.java +++ b/server/src/main/java/org/opensearch/transport/Header.java @@ -20,7 +20,7 @@ package org.opensearch.transport; import org.opensearch.Version; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.util.concurrent.ThreadContext; diff --git a/server/src/main/java/org/opensearch/transport/InboundDecoder.java b/server/src/main/java/org/opensearch/transport/InboundDecoder.java index ae1df6420009d..9e24e962ae957 100644 --- a/server/src/main/java/org/opensearch/transport/InboundDecoder.java +++ b/server/src/main/java/org/opensearch/transport/InboundDecoder.java @@ -25,7 +25,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.lease.Releasable; import org.opensearch.common.util.PageCacheRecycler; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import java.io.IOException; import java.util.function.Consumer; diff --git a/server/src/main/java/org/opensearch/transport/InboundHandler.java b/server/src/main/java/org/opensearch/transport/InboundHandler.java index 0a6fa770646f6..f0b3ee3fcceb8 100644 --- a/server/src/main/java/org/opensearch/transport/InboundHandler.java +++ b/server/src/main/java/org/opensearch/transport/InboundHandler.java @@ -29,7 +29,7 @@ import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.AbstractRunnable; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/opensearch/transport/InboundMessage.java b/server/src/main/java/org/opensearch/transport/InboundMessage.java index 74d274e9c6572..e6d8ac2c477b6 100644 --- a/server/src/main/java/org/opensearch/transport/InboundMessage.java +++ b/server/src/main/java/org/opensearch/transport/InboundMessage.java @@ -23,7 +23,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.lease.Releasable; import org.opensearch.common.lease.Releasables; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/transport/OutboundHandler.java b/server/src/main/java/org/opensearch/transport/OutboundHandler.java index 17c4dc8fce7e5..7c6ed2a045445 100644 --- a/server/src/main/java/org/opensearch/transport/OutboundHandler.java +++ b/server/src/main/java/org/opensearch/transport/OutboundHandler.java @@ -36,7 +36,7 @@ import org.opensearch.common.transport.TransportAddress; import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.threadpool.ThreadPool; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/transport/RemoteClusterConnection.java b/server/src/main/java/org/opensearch/transport/RemoteClusterConnection.java index 05fb921c00fef..f1d14e485c588 100644 --- a/server/src/main/java/org/opensearch/transport/RemoteClusterConnection.java +++ b/server/src/main/java/org/opensearch/transport/RemoteClusterConnection.java @@ -27,9 +27,9 @@ import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.threadpool.ThreadPool; import java.io.Closeable; diff --git a/server/src/main/java/org/opensearch/transport/RemoteClusterService.java b/server/src/main/java/org/opensearch/transport/RemoteClusterService.java index e4ebebf9a4a33..ff1fcb2e99cd1 100644 --- a/server/src/main/java/org/opensearch/transport/RemoteClusterService.java +++ b/server/src/main/java/org/opensearch/transport/RemoteClusterService.java @@ -35,10 +35,10 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.SettingUpgrader; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.ConcurrentCollections; import org.elasticsearch.common.util.concurrent.CountDown; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.threadpool.ThreadPool; import java.io.Closeable; diff --git a/server/src/main/java/org/opensearch/transport/RemoteConnectionInfo.java b/server/src/main/java/org/opensearch/transport/RemoteConnectionInfo.java index af8cd621e6d35..bd7302f25aa89 100644 --- a/server/src/main/java/org/opensearch/transport/RemoteConnectionInfo.java +++ b/server/src/main/java/org/opensearch/transport/RemoteConnectionInfo.java @@ -24,7 +24,7 @@ import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContentFragment; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/main/java/org/opensearch/transport/RemoteConnectionStrategy.java b/server/src/main/java/org/opensearch/transport/RemoteConnectionStrategy.java index cb3fd4e0fcd15..b3d40e65fba0a 100644 --- a/server/src/main/java/org/opensearch/transport/RemoteConnectionStrategy.java +++ b/server/src/main/java/org/opensearch/transport/RemoteConnectionStrategy.java @@ -30,7 +30,7 @@ import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/opensearch/transport/SniffConnectionStrategy.java b/server/src/main/java/org/opensearch/transport/SniffConnectionStrategy.java index 70d9957611627..6861dae69c333 100644 --- a/server/src/main/java/org/opensearch/transport/SniffConnectionStrategy.java +++ b/server/src/main/java/org/opensearch/transport/SniffConnectionStrategy.java @@ -30,7 +30,7 @@ import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodeRole; -import org.elasticsearch.common.Booleans; +import org.opensearch.common.Booleans; import org.opensearch.common.Strings; import org.opensearch.common.UUIDs; import org.opensearch.common.io.stream.StreamInput; @@ -42,7 +42,7 @@ import org.opensearch.common.transport.TransportAddress; import org.elasticsearch.common.util.concurrent.ThreadContext; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.threadpool.ThreadPool; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/transport/TcpChannel.java b/server/src/main/java/org/opensearch/transport/TcpChannel.java index 5755bfd58f712..d1ec14df91c8c 100644 --- a/server/src/main/java/org/opensearch/transport/TcpChannel.java +++ b/server/src/main/java/org/opensearch/transport/TcpChannel.java @@ -22,7 +22,7 @@ import org.opensearch.action.ActionListener; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.network.CloseableChannel; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.net.InetSocketAddress; diff --git a/server/src/main/java/org/opensearch/transport/TcpTransport.java b/server/src/main/java/org/opensearch/transport/TcpTransport.java index defd35f5432c7..e2e046f295a67 100644 --- a/server/src/main/java/org/opensearch/transport/TcpTransport.java +++ b/server/src/main/java/org/opensearch/transport/TcpTransport.java @@ -28,7 +28,7 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.support.ThreadedActionListener; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.Booleans; +import org.opensearch.common.Booleans; import org.opensearch.common.Strings; import org.opensearch.common.breaker.CircuitBreaker; import org.opensearch.common.bytes.BytesArray; @@ -48,7 +48,7 @@ import org.opensearch.common.transport.PortsRange; import org.opensearch.common.transport.TransportAddress; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.util.PageCacheRecycler; import org.elasticsearch.common.util.concurrent.ConcurrentCollections; diff --git a/server/src/main/java/org/opensearch/transport/Transport.java b/server/src/main/java/org/opensearch/transport/Transport.java index 0105b919be31d..8eb4f189ec2a3 100644 --- a/server/src/main/java/org/opensearch/transport/Transport.java +++ b/server/src/main/java/org/opensearch/transport/Transport.java @@ -26,7 +26,7 @@ import org.opensearch.common.component.LifecycleComponent; import org.opensearch.common.transport.BoundTransportAddress; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.ConcurrentCollections; import org.opensearch.common.util.concurrent.ConcurrentMapLong; diff --git a/server/src/main/java/org/opensearch/transport/TransportHandshaker.java b/server/src/main/java/org/opensearch/transport/TransportHandshaker.java index 567493396e5d4..cb98981968647 100644 --- a/server/src/main/java/org/opensearch/transport/TransportHandshaker.java +++ b/server/src/main/java/org/opensearch/transport/TransportHandshaker.java @@ -26,7 +26,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.metrics.CounterMetric; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.threadpool.ThreadPool; import java.io.EOFException; diff --git a/server/src/main/java/org/opensearch/transport/TransportInfo.java b/server/src/main/java/org/opensearch/transport/TransportInfo.java index bc8df1bc53d12..ea8420b14d41a 100644 --- a/server/src/main/java/org/opensearch/transport/TransportInfo.java +++ b/server/src/main/java/org/opensearch/transport/TransportInfo.java @@ -19,7 +19,7 @@ package org.opensearch.transport; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.elasticsearch.common.logging.DeprecationLogger; @@ -33,7 +33,7 @@ import java.util.HashMap; import java.util.Map; -import static org.elasticsearch.common.Booleans.parseBoolean; +import static org.opensearch.common.Booleans.parseBoolean; public class TransportInfo implements ReportingService.Info { diff --git a/server/src/main/java/org/opensearch/transport/TransportKeepAlive.java b/server/src/main/java/org/opensearch/transport/TransportKeepAlive.java index ed4de2f1eba00..41b0c9d0bb10a 100644 --- a/server/src/main/java/org/opensearch/transport/TransportKeepAlive.java +++ b/server/src/main/java/org/opensearch/transport/TransportKeepAlive.java @@ -27,7 +27,7 @@ import org.opensearch.common.component.Lifecycle; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.metrics.CounterMetric; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.AbstractLifecycleRunnable; import org.opensearch.common.util.concurrent.ConcurrentCollections; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/opensearch/transport/TransportLogger.java b/server/src/main/java/org/opensearch/transport/TransportLogger.java index ddb57e1397b64..28669c0a0aae7 100644 --- a/server/src/main/java/org/opensearch/transport/TransportLogger.java +++ b/server/src/main/java/org/opensearch/transport/TransportLogger.java @@ -26,7 +26,7 @@ import org.opensearch.common.io.stream.InputStreamStreamInput; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/transport/TransportRequestOptions.java b/server/src/main/java/org/opensearch/transport/TransportRequestOptions.java index b16bac22157a5..402fb1aee286e 100644 --- a/server/src/main/java/org/opensearch/transport/TransportRequestOptions.java +++ b/server/src/main/java/org/opensearch/transport/TransportRequestOptions.java @@ -19,7 +19,7 @@ package org.opensearch.transport; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; public class TransportRequestOptions { diff --git a/server/src/main/java/org/opensearch/transport/TransportService.java b/server/src/main/java/org/opensearch/transport/TransportService.java index cb9e0732c019d..946dc399f4ca6 100644 --- a/server/src/main/java/org/opensearch/transport/TransportService.java +++ b/server/src/main/java/org/opensearch/transport/TransportService.java @@ -30,7 +30,7 @@ import org.opensearch.client.transport.TransportClient; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.component.AbstractLifecycleComponent; import org.opensearch.common.io.stream.StreamInput; @@ -43,11 +43,11 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.BoundTransportAddress; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.AbstractRunnable; import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; import org.elasticsearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.node.NodeClosedException; import org.elasticsearch.node.ReportingService; import org.opensearch.tasks.Task; diff --git a/server/src/main/java/org/opensearch/transport/TransportSettings.java b/server/src/main/java/org/opensearch/transport/TransportSettings.java index 15a3d01338346..332f98ed24f17 100644 --- a/server/src/main/java/org/opensearch/transport/TransportSettings.java +++ b/server/src/main/java/org/opensearch/transport/TransportSettings.java @@ -23,7 +23,7 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.Arrays; import java.util.List; diff --git a/server/src/test/java/org/elasticsearch/cluster/ClusterStateObserverTests.java b/server/src/test/java/org/elasticsearch/cluster/ClusterStateObserverTests.java index c76474ffaea52..952a9fdc8e8a6 100644 --- a/server/src/test/java/org/elasticsearch/cluster/ClusterStateObserverTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/ClusterStateObserverTests.java @@ -22,7 +22,7 @@ import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.service.ClusterApplierService; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.ThreadContext; import org.elasticsearch.test.ESTestCase; import org.opensearch.cluster.ClusterName; diff --git a/server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java index 0bee24c17c842..50aec23c08e22 100644 --- a/server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java @@ -29,7 +29,7 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodeRole; import org.opensearch.cluster.node.DiscoveryNodes; -import org.elasticsearch.common.CheckedRunnable; +import org.opensearch.common.CheckedRunnable; import org.opensearch.common.UUIDs; import org.opensearch.common.component.Lifecycle; import org.opensearch.common.component.LifecycleListener; @@ -70,7 +70,7 @@ import static java.util.Collections.emptySet; import static org.opensearch.cluster.NodeConnectionsService.CLUSTER_NODE_RECONNECT_INTERVAL_SETTING; import static org.opensearch.common.settings.Settings.builder; -import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; +import static org.opensearch.common.unit.TimeValue.timeValueMillis; import static org.opensearch.common.util.concurrent.ConcurrentCollections.newConcurrentMap; import static org.opensearch.node.Node.NODE_NAME_SETTING; import static org.hamcrest.Matchers.equalTo; diff --git a/server/src/test/java/org/elasticsearch/cluster/action/index/MappingUpdatedActionTests.java b/server/src/test/java/org/elasticsearch/cluster/action/index/MappingUpdatedActionTests.java index d751c6c8995fa..ea58aec9aa53f 100644 --- a/server/src/test/java/org/elasticsearch/cluster/action/index/MappingUpdatedActionTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/action/index/MappingUpdatedActionTests.java @@ -32,7 +32,7 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.collect.Map; +import org.opensearch.common.collect.Map; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.Index; diff --git a/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardFailedClusterStateTaskExecutorTests.java b/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardFailedClusterStateTaskExecutorTests.java index 46d57fa3c196f..7047bdc6f6c9f 100644 --- a/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardFailedClusterStateTaskExecutorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/action/shard/ShardFailedClusterStateTaskExecutorTests.java @@ -44,7 +44,7 @@ import org.opensearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider; import org.opensearch.common.Priority; import org.opensearch.common.UUIDs; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.set.Sets; import org.opensearch.index.Index; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java index d110ac18667f0..495330502b19e 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java @@ -43,7 +43,7 @@ import org.opensearch.common.regex.Regex; import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.Settings.Builder; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.set.Sets; import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.discovery.DiscoveryModule; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/ElectionSchedulerFactoryTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/ElectionSchedulerFactoryTests.java index 242ecdb7dbfec..3068f1b22ce2e 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/ElectionSchedulerFactoryTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/ElectionSchedulerFactoryTests.java @@ -22,7 +22,7 @@ import org.opensearch.common.lease.Releasable; import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.Settings.Builder; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import org.opensearch.cluster.coordination.ElectionSchedulerFactory; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/JoinTaskExecutorTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/JoinTaskExecutorTests.java index e2a0d19096eae..e3d9640a44fe1 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/JoinTaskExecutorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/JoinTaskExecutorTests.java @@ -29,7 +29,7 @@ import org.opensearch.cluster.routing.RerouteService; import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.common.UUIDs; -import org.elasticsearch.common.collect.List; +import org.opensearch.common.collect.List; import org.opensearch.common.settings.Settings; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.VersionUtils; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/LagDetectorTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/LagDetectorTests.java index 717ae41f9835a..2a86985f4fd45 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/LagDetectorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/LagDetectorTests.java @@ -20,7 +20,7 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import org.junit.Before; import org.opensearch.cluster.coordination.LagDetector; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/LinearizabilityCheckerTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/LinearizabilityCheckerTests.java index 4b2acd72877dc..89de998d00602 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/LinearizabilityCheckerTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/LinearizabilityCheckerTests.java @@ -21,7 +21,7 @@ import org.elasticsearch.cluster.coordination.LinearizabilityChecker.History; import org.elasticsearch.cluster.coordination.LinearizabilityChecker.KeyedSpec; import org.elasticsearch.cluster.coordination.LinearizabilityChecker.SequentialSpec; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.test.ESTestCase; import java.util.Optional; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/OpenSearchNodeCommandTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/OpenSearchNodeCommandTests.java index d05ea9b118bb0..a43985498ee1e 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/OpenSearchNodeCommandTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/OpenSearchNodeCommandTests.java @@ -26,7 +26,7 @@ import org.opensearch.cluster.metadata.Metadata; import org.opensearch.common.UUIDs; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.List; +import org.opensearch.common.collect.List; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTests.java b/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTests.java index 399820866b274..ebbc052131022 100644 --- a/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/coordination/PublicationTests.java @@ -28,10 +28,10 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodeRole; import org.opensearch.cluster.node.DiscoveryNodes; -import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.Nullable; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.set.Sets; import org.opensearch.discovery.Discovery; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexAbstractionTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexAbstractionTests.java index 753456da19693..8b5d8dd1ff3a5 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexAbstractionTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexAbstractionTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.cluster.metadata; import org.opensearch.Version; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.test.ESTestCase; import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.cluster.metadata.IndexAbstraction; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataTests.java index 0bba3c7b8284c..f6ed100761d87 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataTests.java @@ -33,7 +33,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.set.Sets; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ManifestTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ManifestTests.java index ff0a91d782a4b..70cdf66c636aa 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/ManifestTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/ManifestTests.java @@ -21,7 +21,7 @@ import org.opensearch.common.UUIDs; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamServiceTests.java index 988aebe37d4b6..6a5e0c5c19f88 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateDataStreamServiceTests.java @@ -30,7 +30,7 @@ import org.opensearch.cluster.metadata.MetadataCreateDataStreamService; import org.opensearch.cluster.metadata.MetadataCreateDataStreamService.CreateDataStreamClusterStateUpdateRequest; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import org.opensearch.cluster.metadata.MetadataCreateIndexService; diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java index 3c3d111ba2667..b25d58bb4eca0 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java @@ -53,7 +53,7 @@ import org.opensearch.common.settings.IndexScopedSettings; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.BigArrays; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentFactory; @@ -758,7 +758,7 @@ public void testClusterStateCreateIndexThrowsWriteIndexValidationException() thr assertThat( expectThrows(IllegalStateException.class, - () -> clusterStateCreateIndex(currentClusterState, org.elasticsearch.common.collect.Set.of(), newIndex, + () -> clusterStateCreateIndex(currentClusterState, org.opensearch.common.collect.Set.of(), newIndex, (state, reason) -> state, null)).getMessage(), startsWith("alias [alias1] has more than one write index [") ); @@ -783,7 +783,7 @@ public void testClusterStateCreateIndex() { }; ClusterState updatedClusterState = clusterStateCreateIndex(currentClusterState, - org.elasticsearch.common.collect.Set.of(INDEX_READ_ONLY_BLOCK), newIndexMetadata, rerouteRoutingTable, null); + org.opensearch.common.collect.Set.of(INDEX_READ_ONLY_BLOCK), newIndexMetadata, rerouteRoutingTable, null); assertThat(updatedClusterState.blocks().getIndexBlockWithId("test", INDEX_READ_ONLY_BLOCK.id()), is(INDEX_READ_ONLY_BLOCK)); assertThat(updatedClusterState.routingTable().index("test"), is(notNullValue())); assertThat(allocationRerouted.get(), is(true)); @@ -812,7 +812,7 @@ public void testClusterStateCreateIndexWithMetadataTransaction() { builder.put(IndexMetadata.builder(myIndex).putAlias(AliasMetadata.builder(newAlias.getAlias()).build())); }; - ClusterState updatedClusterState = clusterStateCreateIndex(currentClusterState, org.elasticsearch.common.collect.Set.of( + ClusterState updatedClusterState = clusterStateCreateIndex(currentClusterState, org.opensearch.common.collect.Set.of( INDEX_READ_ONLY_BLOCK), newIndexMetadata, (clusterState, y) -> clusterState, metadataTransformer); assertTrue(updatedClusterState.metadata().findAllAliases(new String[]{"my-index"}).containsKey("my-index")); assertNotNull(updatedClusterState.metadata().findAllAliases(new String[]{"my-index"}).get("my-index")); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataDeleteIndexServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataDeleteIndexServiceTests.java index d77a8870b200b..2bf5b16a65aaa 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataDeleteIndexServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataDeleteIndexServiceTests.java @@ -27,7 +27,7 @@ import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.common.collect.ImmutableOpenMap; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexNotFoundException; @@ -88,7 +88,7 @@ public void testDeleteSnapshotting() { String index = randomAlphaOfLength(5); Snapshot snapshot = new Snapshot("doesn't matter", new SnapshotId("snapshot name", "snapshot uuid")); SnapshotsInProgress snaps = SnapshotsInProgress.of( - org.elasticsearch.common.collect.List.of(new SnapshotsInProgress.Entry(snapshot, true, false, + org.opensearch.common.collect.List.of(new SnapshotsInProgress.Entry(snapshot, true, false, SnapshotsInProgress.State.INIT, singletonList(new IndexId(index, "doesn't matter")), Collections.emptyList(), System.currentTimeMillis(), (long) randomIntBetween(0, 1000), ImmutableOpenMap.of(), null, SnapshotInfoTests.randomUserMetadata(), VersionUtils.randomVersion(random())))); @@ -125,13 +125,13 @@ public void testDeleteBackingIndexForDataStream() { int numBackingIndices = randomIntBetween(2, 5); String dataStreamName = randomAlphaOfLength(6).toLowerCase(Locale.ROOT); ClusterState before = DataStreamTestHelper.getClusterStateWithDataStreams( - org.elasticsearch.common.collect.List.of(new Tuple<>(dataStreamName, numBackingIndices)), - org.elasticsearch.common.collect.List.of()); + org.opensearch.common.collect.List.of(new Tuple<>(dataStreamName, numBackingIndices)), + org.opensearch.common.collect.List.of()); int numIndexToDelete = randomIntBetween(1, numBackingIndices - 1); Index indexToDelete = before.metadata().index(DataStream.getDefaultBackingIndexName(dataStreamName, numIndexToDelete)).getIndex(); - ClusterState after = service.deleteIndices(before, org.elasticsearch.common.collect.Set.of(indexToDelete)); + ClusterState after = service.deleteIndices(before, org.opensearch.common.collect.Set.of(indexToDelete)); assertThat(after.metadata().getIndices().get(indexToDelete.getName()), IsNull.nullValue()); assertThat(after.metadata().getIndices().size(), equalTo(numBackingIndices - 1)); @@ -144,8 +144,8 @@ public void testDeleteMultipleBackingIndexForDataStream() { int numBackingIndicesToDelete = randomIntBetween(2, numBackingIndices - 1); String dataStreamName = randomAlphaOfLength(6).toLowerCase(Locale.ROOT); ClusterState before = DataStreamTestHelper.getClusterStateWithDataStreams( - org.elasticsearch.common.collect.List.of(new Tuple<>(dataStreamName, numBackingIndices)), - org.elasticsearch.common.collect.List.of()); + org.opensearch.common.collect.List.of(new Tuple<>(dataStreamName, numBackingIndices)), + org.opensearch.common.collect.List.of()); List indexNumbersToDelete = randomSubsetOf(numBackingIndicesToDelete, IntStream.rangeClosed(1, numBackingIndices - 1).boxed().collect(Collectors.toList())); @@ -170,12 +170,12 @@ public void testDeleteCurrentWriteIndexForDataStream() { int numBackingIndices = randomIntBetween(1, 5); String dataStreamName = randomAlphaOfLength(6).toLowerCase(Locale.ROOT); ClusterState before = DataStreamTestHelper.getClusterStateWithDataStreams( - org.elasticsearch.common.collect.List.of(new Tuple<>(dataStreamName, numBackingIndices)), - org.elasticsearch.common.collect.List.of()); + org.opensearch.common.collect.List.of(new Tuple<>(dataStreamName, numBackingIndices)), + org.opensearch.common.collect.List.of()); Index indexToDelete = before.metadata().index(DataStream.getDefaultBackingIndexName(dataStreamName, numBackingIndices)).getIndex(); Exception e = expectThrows(IllegalArgumentException.class, - () -> service.deleteIndices(before, org.elasticsearch.common.collect.Set.of(indexToDelete))); + () -> service.deleteIndices(before, org.opensearch.common.collect.Set.of(indexToDelete))); assertThat(e.getMessage(), containsString("index [" + indexToDelete.getName() + "] is the write index for data stream [" + dataStreamName + "] and cannot be deleted")); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexStateServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexStateServiceTests.java index 2397bb3f0fa9e..26fac6c2fbea8 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexStateServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexStateServiceTests.java @@ -44,10 +44,10 @@ import org.opensearch.cluster.routing.ShardRoutingState; import org.opensearch.cluster.routing.UnassignedInfo; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.collect.ImmutableOpenMap; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexNotFoundException; @@ -406,7 +406,7 @@ public void testCloseCurrentWriteIndexForDataStream() { writeIndices.add(DataStream.getDefaultBackingIndexName(dataStreamName, numBackingIndices)); } ClusterState cs = DeleteDataStreamRequestTests.getClusterStateWithDataStreams(dataStreamsToCreate, - org.elasticsearch.common.collect.List.of()); + org.opensearch.common.collect.List.of()); ClusterService clusterService = mock(ClusterService.class); when(clusterService.state()).thenReturn(cs); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java index ae11e8c4fde57..b7dd6cff1184b 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java @@ -42,7 +42,7 @@ import org.opensearch.common.compress.CompressedXContent; import org.opensearch.common.settings.IndexScopedSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.xcontent.LoggingDeprecationHandler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentFactory; @@ -346,18 +346,18 @@ public void testUpdateComponentTemplateWithIndexHiddenSetting() throws Exception assertNotNull(state.metadata().componentTemplates().get("foo")); ComposableIndexTemplate firstGlobalIndexTemplate = - new ComposableIndexTemplate(org.elasticsearch.common.collect.List.of("*"), template, - org.elasticsearch.common.collect.List.of("foo"), 1L, null, null, null); + new ComposableIndexTemplate(org.opensearch.common.collect.List.of("*"), template, + org.opensearch.common.collect.List.of("foo"), 1L, null, null, null); state = metadataIndexTemplateService.addIndexTemplateV2(state, true, "globalindextemplate1", firstGlobalIndexTemplate); ComposableIndexTemplate secondGlobalIndexTemplate = - new ComposableIndexTemplate(org.elasticsearch.common.collect.List.of("*"), template, - org.elasticsearch.common.collect.List.of("foo"), 2L, null, null, null); + new ComposableIndexTemplate(org.opensearch.common.collect.List.of("*"), template, + org.opensearch.common.collect.List.of("foo"), 2L, null, null, null); state = metadataIndexTemplateService.addIndexTemplateV2(state, true, "globalindextemplate2", secondGlobalIndexTemplate); ComposableIndexTemplate fooPatternIndexTemplate = - new ComposableIndexTemplate(org.elasticsearch.common.collect.List.of("foo-*"), template, - org.elasticsearch.common.collect.List.of("foo"), 3L, null, null, null); + new ComposableIndexTemplate(org.opensearch.common.collect.List.of("foo-*"), template, + org.opensearch.common.collect.List.of("foo"), 3L, null, null, null); state = metadataIndexTemplateService.addIndexTemplateV2(state, true, "foopatternindextemplate", fooPatternIndexTemplate); // update the component template to set the index.hidden setting @@ -483,8 +483,8 @@ public void onFailure(Exception e) { waitToCreateComponentTemplate.await(10, TimeUnit.SECONDS); - ComposableIndexTemplate globalIndexTemplate = new ComposableIndexTemplate(org.elasticsearch.common.collect.List.of("*"), - null, org.elasticsearch.common.collect.List.of("ct-with-index-hidden-setting"), null, null, null, null); + ComposableIndexTemplate globalIndexTemplate = new ComposableIndexTemplate(org.opensearch.common.collect.List.of("*"), + null, org.opensearch.common.collect.List.of("ct-with-index-hidden-setting"), null, null, null, null); expectThrows(InvalidIndexTemplateException.class, () -> metadataIndexTemplateService.putIndexTemplateV2("testing", true, "template-referencing-ct-with-hidden-index-setting", @@ -695,10 +695,10 @@ public void testFindV2InvalidGlobalTemplate() { Template templateWithHiddenSetting = new Template(builder().put(IndexMetadata.SETTING_INDEX_HIDDEN, true).build(), null, null); try { // add an invalid global template that specifies the `index.hidden` setting - ComposableIndexTemplate invalidGlobalTemplate = new ComposableIndexTemplate(org.elasticsearch.common.collect.List.of("*"), - templateWithHiddenSetting, org.elasticsearch.common.collect.List.of("ct"), 5L, 1L, null, null); + ComposableIndexTemplate invalidGlobalTemplate = new ComposableIndexTemplate(org.opensearch.common.collect.List.of("*"), + templateWithHiddenSetting, org.opensearch.common.collect.List.of("ct"), 5L, 1L, null, null); Metadata invalidGlobalTemplateMetadata = Metadata.builder().putCustom(ComposableIndexTemplateMetadata.TYPE, - new ComposableIndexTemplateMetadata(org.elasticsearch.common.collect.Map.of("invalid_global_template", + new ComposableIndexTemplateMetadata(org.opensearch.common.collect.Map.of("invalid_global_template", invalidGlobalTemplate))).build(); MetadataIndexTemplateService.findV2Template(invalidGlobalTemplateMetadata, "index-name", false); @@ -852,7 +852,7 @@ public void testDefinedTimestampMappingIsAddedForDataStreamTemplates() throws Ex state = service.addComponentTemplate(state, true, "ct1", ct1); { - ComposableIndexTemplate it = new ComposableIndexTemplate(org.elasticsearch.common.collect.List.of("logs*"), + ComposableIndexTemplate it = new ComposableIndexTemplate(org.opensearch.common.collect.List.of("logs*"), new Template(null, new CompressedXContent("{\n" + " \"properties\": {\n" + @@ -861,7 +861,7 @@ public void testDefinedTimestampMappingIsAddedForDataStreamTemplates() throws Ex " }\n" + " }\n" + " }"), null), - org.elasticsearch.common.collect.List.of("ct1"), 0L, 1L, null, + org.opensearch.common.collect.List.of("ct1"), 0L, 1L, null, new ComposableIndexTemplate.DataStreamTemplate()); state = service.addIndexTemplateV2(state, true, "logs-data-stream-template", it); @@ -874,7 +874,7 @@ public void testDefinedTimestampMappingIsAddedForDataStreamTemplates() throws Ex .map(m -> { try { return MapperService.parseMapping( - new NamedXContentRegistry(org.elasticsearch.common.collect.List.of()), m.string()); + new NamedXContentRegistry(org.opensearch.common.collect.List.of()), m.string()); } catch (Exception e) { logger.error(e); fail("failed to parse mappings: " + m.string()); @@ -883,29 +883,29 @@ public void testDefinedTimestampMappingIsAddedForDataStreamTemplates() throws Ex }) .collect(Collectors.toList()); - Map firstParsedMapping = org.elasticsearch.common.collect.Map.of("_doc", - org.elasticsearch.common.collect.Map.of("properties", - org.elasticsearch.common.collect.Map.of(DEFAULT_TIMESTAMP_FIELD, - org.elasticsearch.common.collect.Map.of("type", "date")))); + Map firstParsedMapping = org.opensearch.common.collect.Map.of("_doc", + org.opensearch.common.collect.Map.of("properties", + org.opensearch.common.collect.Map.of(DEFAULT_TIMESTAMP_FIELD, + org.opensearch.common.collect.Map.of("type", "date")))); assertThat(parsedMappings.get(0), equalTo(firstParsedMapping)); - Map secondMapping = org.elasticsearch.common.collect.Map.of("_doc", - org.elasticsearch.common.collect.Map.of("properties", - org.elasticsearch.common.collect.Map.of("field1", - org.elasticsearch.common.collect.Map.of("type", "keyword")))); + Map secondMapping = org.opensearch.common.collect.Map.of("_doc", + org.opensearch.common.collect.Map.of("properties", + org.opensearch.common.collect.Map.of("field1", + org.opensearch.common.collect.Map.of("type", "keyword")))); assertThat(parsedMappings.get(1), equalTo(secondMapping)); - Map thirdMapping = org.elasticsearch.common.collect.Map.of("_doc", - org.elasticsearch.common.collect.Map.of("properties", - org.elasticsearch.common.collect.Map.of("field2", - org.elasticsearch.common.collect.Map.of("type", "integer")))); + Map thirdMapping = org.opensearch.common.collect.Map.of("_doc", + org.opensearch.common.collect.Map.of("properties", + org.opensearch.common.collect.Map.of("field2", + org.opensearch.common.collect.Map.of("type", "integer")))); assertThat(parsedMappings.get(2), equalTo(thirdMapping)); } { // indices matched by templates without the data stream field defined don't get the default @timestamp mapping - ComposableIndexTemplate it = new ComposableIndexTemplate(org.elasticsearch.common.collect.List.of("timeseries*"), + ComposableIndexTemplate it = new ComposableIndexTemplate(org.opensearch.common.collect.List.of("timeseries*"), new Template(null, new CompressedXContent("{\n" + " \"properties\": {\n" + @@ -914,7 +914,7 @@ public void testDefinedTimestampMappingIsAddedForDataStreamTemplates() throws Ex " }\n" + " }\n" + " }"), null), - org.elasticsearch.common.collect.List.of("ct1"), 0L, 1L, null, null); + org.opensearch.common.collect.List.of("ct1"), 0L, 1L, null, null); state = service.addIndexTemplateV2(state, true, "timeseries-template", it); List mappings = MetadataIndexTemplateService.collectMappings(state, "timeseries-template", "timeseries"); @@ -925,7 +925,7 @@ public void testDefinedTimestampMappingIsAddedForDataStreamTemplates() throws Ex .map(m -> { try { return MapperService.parseMapping( - new NamedXContentRegistry(org.elasticsearch.common.collect.List.of()), m.string()); + new NamedXContentRegistry(org.opensearch.common.collect.List.of()), m.string()); } catch (Exception e) { logger.error(e); fail("failed to parse mappings: " + m.string()); @@ -934,17 +934,17 @@ public void testDefinedTimestampMappingIsAddedForDataStreamTemplates() throws Ex }) .collect(Collectors.toList()); - Map firstMapping = org.elasticsearch.common.collect.Map.of("_doc", - org.elasticsearch.common.collect.Map.of("properties", - org.elasticsearch.common.collect.Map.of("field1", - org.elasticsearch.common.collect.Map.of("type", "keyword")))); + Map firstMapping = org.opensearch.common.collect.Map.of("_doc", + org.opensearch.common.collect.Map.of("properties", + org.opensearch.common.collect.Map.of("field1", + org.opensearch.common.collect.Map.of("type", "keyword")))); assertThat(parsedMappings.get(0), equalTo(firstMapping)); - Map secondMapping = org.elasticsearch.common.collect.Map.of("_doc", - org.elasticsearch.common.collect.Map.of("properties", - org.elasticsearch.common.collect.Map.of("field2", - org.elasticsearch.common.collect.Map.of("type", "integer")))); + Map secondMapping = org.opensearch.common.collect.Map.of("_doc", + org.opensearch.common.collect.Map.of("properties", + org.opensearch.common.collect.Map.of("field2", + org.opensearch.common.collect.Map.of("type", "integer")))); assertThat(parsedMappings.get(1), equalTo(secondMapping)); // a default @timestamp mapping will not be added if the matching template doesn't have the data stream field configured, even @@ -958,7 +958,7 @@ public void testDefinedTimestampMappingIsAddedForDataStreamTemplates() throws Ex .map(m -> { try { return MapperService.parseMapping( - new NamedXContentRegistry(org.elasticsearch.common.collect.List.of()), m.string()); + new NamedXContentRegistry(org.opensearch.common.collect.List.of()), m.string()); } catch (Exception e) { logger.error(e); fail("failed to parse mappings: " + m.string()); @@ -967,17 +967,17 @@ public void testDefinedTimestampMappingIsAddedForDataStreamTemplates() throws Ex }) .collect(Collectors.toList()); - firstMapping = org.elasticsearch.common.collect.Map.of("_doc", - org.elasticsearch.common.collect.Map.of("properties", - org.elasticsearch.common.collect.Map.of("field1", - org.elasticsearch.common.collect.Map.of("type", "keyword")))); + firstMapping = org.opensearch.common.collect.Map.of("_doc", + org.opensearch.common.collect.Map.of("properties", + org.opensearch.common.collect.Map.of("field1", + org.opensearch.common.collect.Map.of("type", "keyword")))); assertThat(parsedMappings.get(0), equalTo(firstMapping)); - secondMapping = org.elasticsearch.common.collect.Map.of("_doc", - org.elasticsearch.common.collect.Map.of("properties", - org.elasticsearch.common.collect.Map.of("field2", - org.elasticsearch.common.collect.Map.of("type", "integer")))); + secondMapping = org.opensearch.common.collect.Map.of("_doc", + org.opensearch.common.collect.Map.of("properties", + org.opensearch.common.collect.Map.of("field2", + org.opensearch.common.collect.Map.of("type", "integer")))); assertThat(parsedMappings.get(1), equalTo(secondMapping)); } } @@ -998,8 +998,8 @@ public void testUserDefinedMappingTakesPrecedenceOverDefault() throws Exception " }"), null), null, null); state = service.addComponentTemplate(state, true, "ct1", ct1); - ComposableIndexTemplate it = new ComposableIndexTemplate(org.elasticsearch.common.collect.List.of("logs*"), null, - org.elasticsearch.common.collect.List.of("ct1"), 0L, 1L, null, + ComposableIndexTemplate it = new ComposableIndexTemplate(org.opensearch.common.collect.List.of("logs*"), null, + org.opensearch.common.collect.List.of("ct1"), 0L, 1L, null, new ComposableIndexTemplate.DataStreamTemplate()); state = service.addIndexTemplateV2(state, true, "logs-template", it); @@ -1012,7 +1012,7 @@ public void testUserDefinedMappingTakesPrecedenceOverDefault() throws Exception .map(m -> { try { return MapperService.parseMapping( - new NamedXContentRegistry(org.elasticsearch.common.collect.List.of()), m.string()); + new NamedXContentRegistry(org.opensearch.common.collect.List.of()), m.string()); } catch (Exception e) { logger.error(e); fail("failed to parse mappings: " + m.string()); @@ -1021,16 +1021,16 @@ public void testUserDefinedMappingTakesPrecedenceOverDefault() throws Exception }) .collect(Collectors.toList()); - Map firstMapping = org.elasticsearch.common.collect.Map.of("_doc", - org.elasticsearch.common.collect.Map.of("properties", - org.elasticsearch.common.collect.Map.of(DEFAULT_TIMESTAMP_FIELD, - org.elasticsearch.common.collect.Map.of("type", "date")))); + Map firstMapping = org.opensearch.common.collect.Map.of("_doc", + org.opensearch.common.collect.Map.of("properties", + org.opensearch.common.collect.Map.of(DEFAULT_TIMESTAMP_FIELD, + org.opensearch.common.collect.Map.of("type", "date")))); assertThat(parsedMappings.get(0), equalTo(firstMapping)); - Map secondMapping = org.elasticsearch.common.collect.Map.of("_doc", - org.elasticsearch.common.collect.Map.of("properties", - org.elasticsearch.common.collect.Map.of(DEFAULT_TIMESTAMP_FIELD, - org.elasticsearch.common.collect.Map.of("type", "date_nanos")))); + Map secondMapping = org.opensearch.common.collect.Map.of("_doc", + org.opensearch.common.collect.Map.of("properties", + org.opensearch.common.collect.Map.of(DEFAULT_TIMESTAMP_FIELD, + org.opensearch.common.collect.Map.of("type", "date_nanos")))); assertThat(parsedMappings.get(1), equalTo(secondMapping)); } @@ -1044,7 +1044,7 @@ public void testUserDefinedMappingTakesPrecedenceOverDefault() throws Exception " }\n" + " }"), null); ComposableIndexTemplate it = new ComposableIndexTemplate( - org.elasticsearch.common.collect.List.of("timeseries*"), template, null, 0L, 1L, null, + org.opensearch.common.collect.List.of("timeseries*"), template, null, 0L, 1L, null, new ComposableIndexTemplate.DataStreamTemplate()); state = service.addIndexTemplateV2(state, true, "timeseries-template", it); @@ -1057,7 +1057,7 @@ public void testUserDefinedMappingTakesPrecedenceOverDefault() throws Exception .map(m -> { try { return MapperService.parseMapping( - new NamedXContentRegistry(org.elasticsearch.common.collect.List.of()), m.string()); + new NamedXContentRegistry(org.opensearch.common.collect.List.of()), m.string()); } catch (Exception e) { logger.error(e); fail("failed to parse mappings: " + m.string()); @@ -1065,16 +1065,16 @@ public void testUserDefinedMappingTakesPrecedenceOverDefault() throws Exception } }) .collect(Collectors.toList()); - Map firstMapping = org.elasticsearch.common.collect.Map.of("_doc", - org.elasticsearch.common.collect.Map.of("properties", - org.elasticsearch.common.collect.Map.of(DEFAULT_TIMESTAMP_FIELD, - org.elasticsearch.common.collect.Map.of("type", "date")))); + Map firstMapping = org.opensearch.common.collect.Map.of("_doc", + org.opensearch.common.collect.Map.of("properties", + org.opensearch.common.collect.Map.of(DEFAULT_TIMESTAMP_FIELD, + org.opensearch.common.collect.Map.of("type", "date")))); assertThat(parsedMappings.get(0), equalTo(firstMapping)); - Map secondMapping = org.elasticsearch.common.collect.Map.of("_doc", - org.elasticsearch.common.collect.Map.of("properties", - org.elasticsearch.common.collect.Map.of(DEFAULT_TIMESTAMP_FIELD, - org.elasticsearch.common.collect.Map.of("type", "date_nanos")))); + Map secondMapping = org.opensearch.common.collect.Map.of("_doc", + org.opensearch.common.collect.Map.of("properties", + org.opensearch.common.collect.Map.of(DEFAULT_TIMESTAMP_FIELD, + org.opensearch.common.collect.Map.of("type", "date_nanos")))); assertThat(parsedMappings.get(1), equalTo(secondMapping)); } } diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java index f55f40f0c4b47..9221573965783 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/TemplateUpgradeServiceTests.java @@ -40,7 +40,7 @@ import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.collect.ImmutableOpenMap; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.util.concurrent.ThreadContext; import org.elasticsearch.test.ESTestCase; import org.opensearch.threadpool.TestThreadPool; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java index e2e1f90b53b2c..6da4db248a6e4 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationServiceTests.java @@ -38,7 +38,7 @@ import org.opensearch.cluster.routing.allocation.AllocationService; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.NodeRoles; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; @@ -53,8 +53,8 @@ import static java.util.Collections.singleton; import static org.opensearch.cluster.routing.DelayedAllocationService.CLUSTER_UPDATE_TASK_SOURCE; import static org.opensearch.cluster.routing.ShardRoutingState.STARTED; -import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; -import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds; +import static org.opensearch.common.unit.TimeValue.timeValueMillis; +import static org.opensearch.common.unit.TimeValue.timeValueSeconds; import static org.hamcrest.Matchers.equalTo; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java index b33c63af44dd7..9796f693cbf06 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/OperationRoutingTests.java @@ -32,8 +32,8 @@ import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.common.unit.TimeValue; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.index.Index; import org.elasticsearch.index.shard.ShardId; import org.opensearch.node.ResponseCollectorService; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java index 52301a9c24cbe..b24884510209d 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java @@ -43,7 +43,7 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.index.Index; import org.opensearch.repositories.IndexId; import org.opensearch.snapshots.Snapshot; diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalancedSingleShardTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalancedSingleShardTests.java index 5d8503e05adc5..d02b13f5a09f2 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalancedSingleShardTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalancedSingleShardTests.java @@ -39,7 +39,7 @@ import org.opensearch.cluster.routing.allocation.decider.AllocationDeciders; import org.opensearch.cluster.routing.allocation.decider.Decision; import org.opensearch.cluster.routing.allocation.decider.Decision.Type; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.Settings; import org.opensearch.snapshots.SnapshotShardSizeInfo; diff --git a/server/src/test/java/org/elasticsearch/cluster/service/ClusterApplierServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/service/ClusterApplierServiceTests.java index 0e015aa5b219e..3c7ebb79a3d8e 100644 --- a/server/src/test/java/org/elasticsearch/cluster/service/ClusterApplierServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/service/ClusterApplierServiceTests.java @@ -37,7 +37,7 @@ import org.opensearch.common.logging.Loggers; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.ThreadContext; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.MockLogAppender; diff --git a/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java index 8397512fc6125..e17d922ed54cf 100644 --- a/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/service/MasterServiceTests.java @@ -38,13 +38,13 @@ import org.opensearch.cluster.coordination.FailedToCommitClusterStateException; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Priority; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.logging.Loggers; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.BaseFuture; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.node.Node; diff --git a/server/src/test/java/org/elasticsearch/cluster/service/TaskBatcherTests.java b/server/src/test/java/org/elasticsearch/cluster/service/TaskBatcherTests.java index 88c2ddb1af546..67b73a2c0251d 100644 --- a/server/src/test/java/org/elasticsearch/cluster/service/TaskBatcherTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/service/TaskBatcherTests.java @@ -24,8 +24,8 @@ import org.opensearch.cluster.ClusterStateTaskConfig; import org.opensearch.cluster.metadata.ProcessClusterEventTimeoutException; import org.opensearch.common.Priority; -import org.elasticsearch.common.collect.Tuple; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.collect.Tuple; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.PrioritizedEsThreadPoolExecutor; import org.junit.Before; import org.opensearch.cluster.service.TaskBatcher; diff --git a/server/src/test/java/org/elasticsearch/cluster/service/TaskExecutorTests.java b/server/src/test/java/org/elasticsearch/cluster/service/TaskExecutorTests.java index 9d75ae06423eb..edc860b41752b 100644 --- a/server/src/test/java/org/elasticsearch/cluster/service/TaskExecutorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/service/TaskExecutorTests.java @@ -20,11 +20,11 @@ import org.opensearch.cluster.ClusterStateTaskConfig; import org.opensearch.cluster.metadata.ProcessClusterEventTimeoutException; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Priority; import org.opensearch.common.lease.Releasable; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.EsExecutors; import org.opensearch.common.util.concurrent.PrioritizedEsThreadPoolExecutor; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/common/LocalTimeOffsetTests.java b/server/src/test/java/org/elasticsearch/common/LocalTimeOffsetTests.java index cae202ea8dff7..de2ec82d4604a 100644 --- a/server/src/test/java/org/elasticsearch/common/LocalTimeOffsetTests.java +++ b/server/src/test/java/org/elasticsearch/common/LocalTimeOffsetTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common; -import org.elasticsearch.bootstrap.JavaVersion; +import org.opensearch.bootstrap.JavaVersion; import org.opensearch.common.LocalTimeOffset; import org.opensearch.common.LocalTimeOffset.Gap; import org.opensearch.common.LocalTimeOffset.Overlap; diff --git a/server/src/test/java/org/elasticsearch/common/RoundingTests.java b/server/src/test/java/org/elasticsearch/common/RoundingTests.java index 4ce19edd94f69..e2cb0a1909aea 100644 --- a/server/src/test/java/org/elasticsearch/common/RoundingTests.java +++ b/server/src/test/java/org/elasticsearch/common/RoundingTests.java @@ -19,11 +19,11 @@ package org.elasticsearch.common; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.rounding.DateTimeUnit; import org.opensearch.common.time.DateFormatter; import org.opensearch.common.time.DateFormatters; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/server/src/test/java/org/elasticsearch/common/RoundingWireTests.java b/server/src/test/java/org/elasticsearch/common/RoundingWireTests.java index b2fdf815b2ff4..3694ff39edbad 100644 --- a/server/src/test/java/org/elasticsearch/common/RoundingWireTests.java +++ b/server/src/test/java/org/elasticsearch/common/RoundingWireTests.java @@ -22,7 +22,7 @@ import org.opensearch.common.Rounding; import org.opensearch.common.Rounding.DateTimeUnit; import org.opensearch.common.io.stream.Writeable.Reader; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.AbstractWireSerializingTestCase; public class RoundingWireTests extends AbstractWireSerializingTestCase { diff --git a/server/src/test/java/org/elasticsearch/common/UUIDTests.java b/server/src/test/java/org/elasticsearch/common/UUIDTests.java index 80cf0734e7ba3..07d6d29b5aa93 100644 --- a/server/src/test/java/org/elasticsearch/common/UUIDTests.java +++ b/server/src/test/java/org/elasticsearch/common/UUIDTests.java @@ -33,7 +33,7 @@ import org.apache.lucene.util.TestUtil; import org.opensearch.common.lucene.Lucene; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; import org.opensearch.common.RandomBasedUUIDGenerator; diff --git a/server/src/test/java/org/elasticsearch/common/blobstore/fs/FsBlobContainerTests.java b/server/src/test/java/org/elasticsearch/common/blobstore/fs/FsBlobContainerTests.java index 6af4b60bdc417..874aaff6ba306 100644 --- a/server/src/test/java/org/elasticsearch/common/blobstore/fs/FsBlobContainerTests.java +++ b/server/src/test/java/org/elasticsearch/common/blobstore/fs/FsBlobContainerTests.java @@ -22,10 +22,10 @@ import org.apache.lucene.mockfile.FilterSeekableByteChannel; import org.apache.lucene.util.LuceneTestCase; import org.opensearch.common.blobstore.BlobPath; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.io.PathUtils; import org.elasticsearch.common.io.PathUtilsForTesting; import org.opensearch.common.io.Streams; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.test.ESTestCase; import org.junit.After; import org.junit.Before; diff --git a/server/src/test/java/org/elasticsearch/common/cache/CacheBuilderTests.java b/server/src/test/java/org/elasticsearch/common/cache/CacheBuilderTests.java index 2a236a6a0a0c4..d5945bfb6745d 100644 --- a/server/src/test/java/org/elasticsearch/common/cache/CacheBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/common/cache/CacheBuilderTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.cache; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import org.opensearch.common.cache.Cache; import org.opensearch.common.cache.CacheBuilder; diff --git a/server/src/test/java/org/elasticsearch/common/cache/CacheTests.java b/server/src/test/java/org/elasticsearch/common/cache/CacheTests.java index 1cd173748decc..2170a4d902e81 100644 --- a/server/src/test/java/org/elasticsearch/common/cache/CacheTests.java +++ b/server/src/test/java/org/elasticsearch/common/cache/CacheTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.cache; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import org.junit.Before; import org.opensearch.common.cache.Cache; diff --git a/server/src/test/java/org/elasticsearch/common/geo/GeoUtilTests.java b/server/src/test/java/org/elasticsearch/common/geo/GeoUtilTests.java index 41de665fd869b..d79fb55b0c6ea 100644 --- a/server/src/test/java/org/elasticsearch/common/geo/GeoUtilTests.java +++ b/server/src/test/java/org/elasticsearch/common/geo/GeoUtilTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.common.geo; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/server/src/test/java/org/elasticsearch/common/io/StreamsTests.java b/server/src/test/java/org/elasticsearch/common/io/StreamsTests.java index d7993a84f3a97..7e1fdb35adb4f 100644 --- a/server/src/test/java/org/elasticsearch/common/io/StreamsTests.java +++ b/server/src/test/java/org/elasticsearch/common/io/StreamsTests.java @@ -92,7 +92,7 @@ public void testLimitInputStream() throws IOException { final int limit = randomIntBetween(0, bytes.length); final BytesArray stuffArray = new BytesArray(bytes); final ByteArrayOutputStream out = new ByteArrayOutputStream(bytes.length); - final long count = org.elasticsearch.core.internal.io.Streams.copy(Streams.limitStream(stuffArray.streamInput(), limit), out); + final long count = org.opensearch.core.internal.io.Streams.copy(Streams.limitStream(stuffArray.streamInput(), limit), out); assertEquals(limit, count); assertThat(Arrays.equals(out.toByteArray(), Arrays.copyOf(bytes, limit)), equalTo(true)); } diff --git a/server/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java b/server/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java index a570d768d22a6..a89cde4bf6331 100644 --- a/server/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java +++ b/server/src/test/java/org/elasticsearch/common/io/stream/BytesStreamsTests.java @@ -27,7 +27,7 @@ import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.geo.GeoPoint; import org.opensearch.common.lucene.BytesRefs; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.PageCacheRecycler; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.NamedWriteable; diff --git a/server/src/test/java/org/elasticsearch/common/io/stream/StreamTests.java b/server/src/test/java/org/elasticsearch/common/io/stream/StreamTests.java index b2659955d7851..95d96aebde79e 100644 --- a/server/src/test/java/org/elasticsearch/common/io/stream/StreamTests.java +++ b/server/src/test/java/org/elasticsearch/common/io/stream/StreamTests.java @@ -21,11 +21,11 @@ import org.apache.lucene.util.BytesRef; import org.opensearch.common.CheckedBiConsumer; -import org.elasticsearch.common.CheckedConsumer; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedConsumer; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.SecureString; import org.elasticsearch.test.ESTestCase; import org.opensearch.common.io.stream.BytesStreamOutput; diff --git a/server/src/test/java/org/elasticsearch/common/joda/JavaJodaTimeDuellingTests.java b/server/src/test/java/org/elasticsearch/common/joda/JavaJodaTimeDuellingTests.java index 18688db5e886b..032a1e53292e6 100644 --- a/server/src/test/java/org/elasticsearch/common/joda/JavaJodaTimeDuellingTests.java +++ b/server/src/test/java/org/elasticsearch/common/joda/JavaJodaTimeDuellingTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.joda; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.bootstrap.JavaVersion; +import org.opensearch.bootstrap.JavaVersion; import org.opensearch.common.joda.Joda; import org.opensearch.common.joda.JodaDateFormatter; import org.opensearch.common.time.DateFormatter; diff --git a/server/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java b/server/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java index bfb667e0342db..1dc1812340a3c 100644 --- a/server/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java +++ b/server/src/test/java/org/elasticsearch/common/lucene/LuceneTests.java @@ -59,9 +59,9 @@ import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.NamedWriteableRegistry; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource; import org.elasticsearch.index.fielddata.fieldcomparator.DoubleValuesComparatorSource; diff --git a/server/src/test/java/org/elasticsearch/common/lucene/index/ESDirectoryReaderTests.java b/server/src/test/java/org/elasticsearch/common/lucene/index/ESDirectoryReaderTests.java index d710946222061..9053d8d7571b4 100644 --- a/server/src/test/java/org/elasticsearch/common/lucene/index/ESDirectoryReaderTests.java +++ b/server/src/test/java/org/elasticsearch/common/lucene/index/ESDirectoryReaderTests.java @@ -28,7 +28,7 @@ import org.apache.lucene.index.NoMergePolicy; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.test.ESTestCase; import org.opensearch.common.lucene.index.OpenSearchDirectoryReader; diff --git a/server/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java b/server/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java index dd14c55e8e497..4ccec6e449b1e 100644 --- a/server/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java +++ b/server/src/test/java/org/elasticsearch/common/lucene/index/FreqTermsEnumTests.java @@ -35,7 +35,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.common.lucene.index.FreqTermsEnum; import org.opensearch.common.lucene.search.Queries; import org.opensearch.common.util.BigArrays; diff --git a/server/src/test/java/org/elasticsearch/common/network/CidrsTests.java b/server/src/test/java/org/elasticsearch/common/network/CidrsTests.java index aba6e780707fc..002ad4d8ecc1e 100644 --- a/server/src/test/java/org/elasticsearch/common/network/CidrsTests.java +++ b/server/src/test/java/org/elasticsearch/common/network/CidrsTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.network; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.test.ESTestCase; import org.opensearch.common.network.Cidrs; diff --git a/server/src/test/java/org/elasticsearch/common/network/InetAddressesTests.java b/server/src/test/java/org/elasticsearch/common/network/InetAddressesTests.java index 62734779bae97..b2be50b899aca 100644 --- a/server/src/test/java/org/elasticsearch/common/network/InetAddressesTests.java +++ b/server/src/test/java/org/elasticsearch/common/network/InetAddressesTests.java @@ -16,7 +16,7 @@ package org.elasticsearch.common.network; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; import org.opensearch.common.network.InetAddresses; diff --git a/server/src/test/java/org/elasticsearch/common/rounding/RoundingDuelTests.java b/server/src/test/java/org/elasticsearch/common/rounding/RoundingDuelTests.java index 15d1db4c688cd..4a20d983d9439 100644 --- a/server/src/test/java/org/elasticsearch/common/rounding/RoundingDuelTests.java +++ b/server/src/test/java/org/elasticsearch/common/rounding/RoundingDuelTests.java @@ -21,7 +21,7 @@ import org.opensearch.Version; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.VersionUtils; import org.joda.time.DateTimeZone; diff --git a/server/src/test/java/org/elasticsearch/common/rounding/TimeZoneRoundingTests.java b/server/src/test/java/org/elasticsearch/common/rounding/TimeZoneRoundingTests.java index afb37d0e981dc..a689d9e2f53a8 100644 --- a/server/src/test/java/org/elasticsearch/common/rounding/TimeZoneRoundingTests.java +++ b/server/src/test/java/org/elasticsearch/common/rounding/TimeZoneRoundingTests.java @@ -19,12 +19,12 @@ package org.elasticsearch.common.rounding; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.rounding.DateTimeUnit; import org.opensearch.common.rounding.Rounding; import org.opensearch.common.rounding.Rounding.TimeIntervalRounding; import org.opensearch.common.rounding.Rounding.TimeUnitRounding; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java b/server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java index d66b493840633..8c18bf6b1540c 100644 --- a/server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java +++ b/server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java @@ -24,7 +24,7 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.routing.allocation.decider.FilterAllocationDecider; import org.opensearch.cluster.routing.allocation.decider.ShardsLimitAllocationDecider; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.logging.Loggers; import org.opensearch.common.settings.Setting.Property; import org.opensearch.index.IndexModule; diff --git a/server/src/test/java/org/elasticsearch/common/settings/SettingTests.java b/server/src/test/java/org/elasticsearch/common/settings/SettingTests.java index 6acedde248807..aa0393fcd1ca1 100644 --- a/server/src/test/java/org/elasticsearch/common/settings/SettingTests.java +++ b/server/src/test/java/org/elasticsearch/common/settings/SettingTests.java @@ -23,7 +23,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LogEvent; import org.opensearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.logging.Loggers; import org.opensearch.common.settings.AbstractScopedSettings; import org.opensearch.common.settings.AbstractScopedSettings.SettingUpdater; @@ -34,7 +34,7 @@ import org.opensearch.common.settings.SettingsException; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.index.IndexSettings; import org.opensearch.monitor.jvm.JvmInfo; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/common/settings/SettingsTests.java b/server/src/test/java/org/elasticsearch/common/settings/SettingsTests.java index 8f98423d260c2..2eb7fd5a53579 100644 --- a/server/src/test/java/org/elasticsearch/common/settings/SettingsTests.java +++ b/server/src/test/java/org/elasticsearch/common/settings/SettingsTests.java @@ -31,7 +31,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/server/src/test/java/org/elasticsearch/common/time/DateFormattersTests.java b/server/src/test/java/org/elasticsearch/common/time/DateFormattersTests.java index cd3330b2f5665..48ca4e4153510 100644 --- a/server/src/test/java/org/elasticsearch/common/time/DateFormattersTests.java +++ b/server/src/test/java/org/elasticsearch/common/time/DateFormattersTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.time; -import org.elasticsearch.bootstrap.JavaVersion; +import org.opensearch.bootstrap.JavaVersion; import org.opensearch.common.joda.Joda; import org.elasticsearch.test.ESTestCase; import org.opensearch.common.time.DateFormatter; diff --git a/server/src/test/java/org/elasticsearch/common/time/JavaDateMathParserTests.java b/server/src/test/java/org/elasticsearch/common/time/JavaDateMathParserTests.java index d3f255e8c9329..c4fe9daffdc57 100644 --- a/server/src/test/java/org/elasticsearch/common/time/JavaDateMathParserTests.java +++ b/server/src/test/java/org/elasticsearch/common/time/JavaDateMathParserTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.time; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.bootstrap.JavaVersion; +import org.opensearch.bootstrap.JavaVersion; import org.elasticsearch.test.ESTestCase; import org.opensearch.common.time.DateFormatter; import org.opensearch.common.time.DateFormatters; diff --git a/server/src/test/java/org/elasticsearch/common/util/SingleObjectCacheTests.java b/server/src/test/java/org/elasticsearch/common/util/SingleObjectCacheTests.java index a1a2da5976923..b0b81755ce648 100644 --- a/server/src/test/java/org/elasticsearch/common/util/SingleObjectCacheTests.java +++ b/server/src/test/java/org/elasticsearch/common/util/SingleObjectCacheTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.util; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import org.opensearch.common.util.SingleObjectCache; diff --git a/server/src/test/java/org/elasticsearch/common/util/concurrent/AbstractAsyncTaskTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/AbstractAsyncTaskTests.java index 642e3823219fa..dceadb3f83692 100644 --- a/server/src/test/java/org/elasticsearch/common/util/concurrent/AbstractAsyncTaskTests.java +++ b/server/src/test/java/org/elasticsearch/common/util/concurrent/AbstractAsyncTaskTests.java @@ -19,8 +19,8 @@ package org.elasticsearch.common.util.concurrent; import org.opensearch.common.Randomness; -import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.common.unit.TimeValue; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.test.ESTestCase; import org.opensearch.common.util.concurrent.AbstractAsyncTask; import org.opensearch.threadpool.TestThreadPool; diff --git a/server/src/test/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessorTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessorTests.java index cb376b3d9eb46..a23145a3517cb 100644 --- a/server/src/test/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessorTests.java +++ b/server/src/test/java/org/elasticsearch/common/util/concurrent/AsyncIOProcessorTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.common.util.concurrent; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.Settings; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/server/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java index 729e952bbc152..ec1a704ea92de 100644 --- a/server/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java +++ b/server/src/test/java/org/elasticsearch/common/util/concurrent/PrioritizedExecutorsTests.java @@ -20,7 +20,7 @@ import org.opensearch.common.Priority; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import org.opensearch.common.util.concurrent.EsExecutors; import org.opensearch.common.util.concurrent.PrioritizedCallable; diff --git a/server/src/test/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutorTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutorTests.java index 843d4b40c0d3c..03bf838202683 100644 --- a/server/src/test/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutorTests.java +++ b/server/src/test/java/org/elasticsearch/common/util/concurrent/QueueResizingEsThreadPoolExecutorTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.util.concurrent; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import org.opensearch.common.util.concurrent.ConcurrentCollections; import org.opensearch.common.util.concurrent.EsAbortPolicy; diff --git a/server/src/test/java/org/elasticsearch/common/util/concurrent/ReleasableLockTests.java b/server/src/test/java/org/elasticsearch/common/util/concurrent/ReleasableLockTests.java index c9dd4378525f0..6820331923bba 100644 --- a/server/src/test/java/org/elasticsearch/common/util/concurrent/ReleasableLockTests.java +++ b/server/src/test/java/org/elasticsearch/common/util/concurrent/ReleasableLockTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.common.util.concurrent; import org.opensearch.common.lease.Releasable; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import org.opensearch.common.util.concurrent.ReleasableLock; diff --git a/server/src/test/java/org/elasticsearch/common/util/set/SetsTests.java b/server/src/test/java/org/elasticsearch/common/util/set/SetsTests.java index 1a7dce0b3eae5..7cea118b36661 100644 --- a/server/src/test/java/org/elasticsearch/common/util/set/SetsTests.java +++ b/server/src/test/java/org/elasticsearch/common/util/set/SetsTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.util.set; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.test.ESTestCase; import org.opensearch.common.util.set.Sets; diff --git a/server/src/test/java/org/elasticsearch/common/xcontent/BaseXContentTestCase.java b/server/src/test/java/org/elasticsearch/common/xcontent/BaseXContentTestCase.java index c353950ada777..0dd155216f2e7 100644 --- a/server/src/test/java/org/elasticsearch/common/xcontent/BaseXContentTestCase.java +++ b/server/src/test/java/org/elasticsearch/common/xcontent/BaseXContentTestCase.java @@ -31,7 +31,7 @@ import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.geo.GeoPoint; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.io.PathUtils; import org.opensearch.common.text.Text; import org.opensearch.common.unit.DistanceUnit; import org.opensearch.common.util.CollectionUtils; diff --git a/server/src/test/java/org/elasticsearch/common/xcontent/XContentParserUtilsTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/XContentParserUtilsTests.java index b1cc7bdf4ed8d..9f9529106d15d 100644 --- a/server/src/test/java/org/elasticsearch/common/xcontent/XContentParserUtilsTests.java +++ b/server/src/test/java/org/elasticsearch/common/xcontent/XContentParserUtilsTests.java @@ -21,7 +21,7 @@ import org.apache.lucene.util.SetOnce; import org.opensearch.common.CheckedBiConsumer; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.elasticsearch.common.ParseField; import org.opensearch.common.ParsingException; import org.opensearch.common.bytes.BytesArray; diff --git a/server/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java index e38a82a3382bc..f7d71475645ac 100644 --- a/server/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/common/xcontent/builder/XContentBuilderTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.geo.GeoPoint; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.io.PathUtils; import org.opensearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentOpenSearchExtension; diff --git a/server/src/test/java/org/elasticsearch/common/xcontent/support/AbstractFilteringTestCase.java b/server/src/test/java/org/elasticsearch/common/xcontent/support/AbstractFilteringTestCase.java index 4f985e4a30c8b..e8830d7d83d3f 100644 --- a/server/src/test/java/org/elasticsearch/common/xcontent/support/AbstractFilteringTestCase.java +++ b/server/src/test/java/org/elasticsearch/common/xcontent/support/AbstractFilteringTestCase.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.xcontent.support; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.util.set.Sets; import org.elasticsearch.common.xcontent.XContent; diff --git a/server/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java b/server/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java index d6de2ec2f3c24..ce793eac7f222 100644 --- a/server/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java +++ b/server/src/test/java/org/elasticsearch/common/xcontent/support/XContentMapValuesTests.java @@ -21,7 +21,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; @@ -189,9 +189,9 @@ public void testExtractValueWithNullValue() throws Exception { assertNull(XContentMapValues.extractValue("object1.missing", map, "NULL")); assertEquals("NULL", XContentMapValues.extractValue("other_field", map, "NULL")); - assertEquals(org.elasticsearch.common.collect.List.of("value1", "NULL", "value2"), + assertEquals(org.opensearch.common.collect.List.of("value1", "NULL", "value2"), XContentMapValues.extractValue("array", map, "NULL")); - assertEquals(org.elasticsearch.common.collect.List.of("NULL", "value"), + assertEquals(org.opensearch.common.collect.List.of("NULL", "value"), XContentMapValues.extractValue("object_array.field", map, "NULL")); assertEquals("NULL", XContentMapValues.extractValue("object1.object2.field", map, "NULL")); } diff --git a/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java b/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java index b3c1a38fb4c65..195b0e69064ca 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java @@ -40,7 +40,7 @@ import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.UnassignedInfo; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.breaker.CircuitBreaker; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; @@ -49,7 +49,7 @@ import org.opensearch.common.util.PageCacheRecycler; import org.opensearch.common.util.concurrent.EsRejectedExecutionException; import org.opensearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.env.Environment; import org.opensearch.env.NodeEnvironment; import org.opensearch.env.ShardLock; diff --git a/server/src/test/java/org/elasticsearch/index/IndexServiceTests.java b/server/src/test/java/org/elasticsearch/index/IndexServiceTests.java index 402a9271311d0..519d338984827 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexServiceTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexServiceTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.compress.CompressedXContent; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; diff --git a/server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java b/server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java index dce01923b5da7..de9936ee9b4b2 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java @@ -28,7 +28,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.index.translog.Translog; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.VersionUtils; diff --git a/server/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java b/server/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java index 0bf64010f2eae..933df6079db15 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java @@ -33,7 +33,7 @@ import org.opensearch.common.logging.Loggers; import org.elasticsearch.common.logging.MockAppender; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.IndexingSlowLog.IndexingSlowLogMessage; diff --git a/server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java b/server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java index c4beec404ba8b..13e8825ec179e 100644 --- a/server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java +++ b/server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java @@ -29,7 +29,7 @@ import org.opensearch.common.logging.Loggers; import org.elasticsearch.common.logging.MockAppender; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.BigArrays; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.shard.ShardId; diff --git a/server/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTests.java b/server/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTests.java index d13d12e0632b5..0398f766f6df3 100644 --- a/server/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTests.java +++ b/server/src/test/java/org/elasticsearch/index/cache/bitset/BitSetFilterCacheTests.java @@ -39,7 +39,7 @@ import org.apache.lucene.util.BitSet; import org.opensearch.common.lucene.index.OpenSearchDirectoryReader; import org.opensearch.common.settings.Settings; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.index.IndexSettings; import org.opensearch.index.shard.ShardId; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java b/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java index 02e4021b115e3..7802247db9bd3 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/CompletionStatsCacheTests.java @@ -30,7 +30,7 @@ import org.apache.lucene.search.suggest.document.SuggestField; import org.apache.lucene.store.Directory; import org.opensearch.OpenSearchException; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.search.suggest.completion.CompletionStats; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java index 64645d22157ce..9b7279ad24581 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java @@ -80,7 +80,7 @@ import org.opensearch.cluster.routing.ShardRoutingState; import org.elasticsearch.cluster.routing.TestShardRouting; import org.opensearch.common.CheckedBiConsumer; -import org.elasticsearch.common.CheckedRunnable; +import org.opensearch.common.CheckedRunnable; import org.opensearch.common.Randomness; import org.opensearch.common.Strings; import org.opensearch.common.TriFunction; @@ -88,7 +88,7 @@ import org.opensearch.common.breaker.CircuitBreaker; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.logging.Loggers; import org.opensearch.common.lucene.Lucene; import org.opensearch.common.lucene.index.OpenSearchDirectoryReader; @@ -98,12 +98,12 @@ import org.opensearch.common.lucene.uid.VersionsAndSeqNoResolver.DocIdAndSeqNo; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.concurrent.AbstractRunnable; import org.opensearch.common.util.concurrent.ConcurrentCollections; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.index.IndexSettings; import org.opensearch.index.VersionType; import org.opensearch.index.codec.CodecService; diff --git a/server/src/test/java/org/elasticsearch/index/engine/LuceneChangesSnapshotTests.java b/server/src/test/java/org/elasticsearch/index/engine/LuceneChangesSnapshotTests.java index de47a7b780079..3ef43b3f7de65 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/LuceneChangesSnapshotTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/LuceneChangesSnapshotTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.engine; import org.opensearch.common.settings.Settings; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.ParsedDocument; diff --git a/server/src/test/java/org/elasticsearch/index/engine/NoOpEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/NoOpEngineTests.java index 1df8eac2520be..2a39a85235052 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/NoOpEngineTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/NoOpEngineTests.java @@ -30,8 +30,8 @@ import org.elasticsearch.cluster.routing.TestShardRouting; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.common.unit.TimeValue; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.seqno.ReplicationTracker; diff --git a/server/src/test/java/org/elasticsearch/index/engine/ReadOnlyEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/ReadOnlyEngineTests.java index c1a7d7219a35a..23c31e9b195ee 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/ReadOnlyEngineTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/ReadOnlyEngineTests.java @@ -24,7 +24,7 @@ import org.opensearch.Version; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.lucene.index.OpenSearchDirectoryReader; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.seqno.SeqNoStats; import org.elasticsearch.index.seqno.SequenceNumbers; diff --git a/server/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java index cab35b1f9cd45..a945da9f6a0b3 100644 --- a/server/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java +++ b/server/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java @@ -21,7 +21,7 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.SortField; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.util.BigArrays; import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested; import org.elasticsearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource; diff --git a/server/src/test/java/org/elasticsearch/index/fielddata/plain/HalfFloatFielddataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/plain/HalfFloatFielddataTests.java index 66145c7a866f2..0cb32c07b967d 100644 --- a/server/src/test/java/org/elasticsearch/index/fielddata/plain/HalfFloatFielddataTests.java +++ b/server/src/test/java/org/elasticsearch/index/fielddata/plain/HalfFloatFielddataTests.java @@ -26,7 +26,7 @@ import org.apache.lucene.index.IndexableField; import org.apache.lucene.index.LeafReader; import org.apache.lucene.store.Directory; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.apache.lucene.util.TestUtil; import org.elasticsearch.index.fielddata.FieldData; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; diff --git a/server/src/test/java/org/elasticsearch/index/get/DocumentFieldTests.java b/server/src/test/java/org/elasticsearch/index/get/DocumentFieldTests.java index 0794d89f989f9..44733300204c6 100644 --- a/server/src/test/java/org/elasticsearch/index/get/DocumentFieldTests.java +++ b/server/src/test/java/org/elasticsearch/index/get/DocumentFieldTests.java @@ -21,8 +21,8 @@ import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Map; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Map; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.document.DocumentField; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/server/src/test/java/org/elasticsearch/index/get/GetResultTests.java b/server/src/test/java/org/elasticsearch/index/get/GetResultTests.java index ace1bcc6cf004..dffb3efa67bdc 100644 --- a/server/src/test/java/org/elasticsearch/index/get/GetResultTests.java +++ b/server/src/test/java/org/elasticsearch/index/get/GetResultTests.java @@ -22,7 +22,7 @@ import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.document.DocumentField; import org.opensearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java index 4ad8c6fa3a15e..49523f8f1f413 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java @@ -21,8 +21,8 @@ import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.IndexableField; -import org.elasticsearch.bootstrap.JavaVersion; -import org.elasticsearch.common.collect.List; +import org.opensearch.bootstrap.JavaVersion; +import org.opensearch.common.collect.List; import org.opensearch.common.time.DateFormatter; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.termvectors.TermVectorsService; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java index 2e94402eb19a9..68f253243d08d 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java @@ -39,7 +39,7 @@ import org.opensearch.common.time.DateFormatters; import org.opensearch.common.time.DateMathParser; import org.opensearch.common.util.BigArrays; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.fielddata.IndexNumericFieldData; import org.elasticsearch.index.fielddata.LeafNumericFieldData; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java index 96d186b161d2a..f19d78cbeb646 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DynamicMappingTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.index.mapper; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java b/server/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java index 8014a966ecd62..4fa1cf26ea32f 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/FieldTypeLookupTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.mapper; -import org.elasticsearch.common.collect.Set; +import org.opensearch.common.collect.Set; import org.elasticsearch.test.ESTestCase; import java.util.Arrays; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldMapperTests.java index 7380f38f3562a..34d8cf80ad5d3 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/GeoShapeFieldMapperTests.java @@ -20,7 +20,7 @@ import org.opensearch.common.Explicit; import org.opensearch.common.Strings; -import org.elasticsearch.common.collect.List; +import org.opensearch.common.collect.List; import org.opensearch.common.geo.builders.ShapeBuilder; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -42,7 +42,7 @@ public class GeoShapeFieldMapperTests extends FieldMapperTestCase2 unsupportedProperties() { - return org.elasticsearch.common.collect.Set.of("analyzer", "similarity", "doc_values", "store"); + return org.opensearch.common.collect.Set.of("analyzer", "similarity", "doc_values", "store"); } @Override diff --git a/server/src/test/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapperTests.java index 0627224eeabe6..5f1c9a6664033 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/LegacyGeoShapeFieldMapperTests.java @@ -26,7 +26,7 @@ import org.opensearch.OpenSearchException; import org.opensearch.common.Explicit; import org.opensearch.common.Strings; -import org.elasticsearch.common.collect.List; +import org.opensearch.common.collect.List; import org.opensearch.common.geo.GeoUtils; import org.opensearch.common.geo.ShapeRelation; import org.opensearch.common.geo.SpatialStrategy; @@ -66,7 +66,7 @@ protected LegacyGeoShapeFieldMapper.Builder newBuilder() { @Override protected Set unsupportedProperties() { - return org.elasticsearch.common.collect.Set.of("analyzer", "similarity", "doc_values", "store"); + return org.opensearch.common.collect.Set.of("analyzer", "similarity", "doc_values", "store"); } @Override diff --git a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java index 3da7554416522..2ec1b15f8d4a1 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java @@ -46,7 +46,7 @@ import org.opensearch.common.util.BigArrays; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.index.IndexSettings; import org.opensearch.index.fielddata.IndexNumericFieldData; import org.opensearch.index.mapper.MappedFieldType.Relation; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java index 765fdd1326a1a..37145fa7b4314 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java @@ -22,7 +22,7 @@ import org.apache.lucene.document.InetAddressPoint; import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.IndexableField; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.Strings; import org.opensearch.common.network.InetAddresses; import org.elasticsearch.common.xcontent.ToXContent; @@ -55,7 +55,7 @@ public class RangeFieldMapperTests extends AbstractNumericFieldMapperTestCase { @Override protected Set types() { - return org.elasticsearch.common.collect.Set.of( + return org.opensearch.common.collect.Set.of( "date_range", "ip_range", "float_range", @@ -67,7 +67,7 @@ protected Set types() { @Override protected Set wholeTypes() { - return org.elasticsearch.common.collect.Set.of("integer_range", "long_range"); + return org.opensearch.common.collect.Set.of("integer_range", "long_range"); } @Override diff --git a/server/src/test/java/org/elasticsearch/index/query/DistanceFeatureQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/DistanceFeatureQueryBuilderTests.java index 68821704f34b6..1a7d21740dfb9 100644 --- a/server/src/test/java/org/elasticsearch/index/query/DistanceFeatureQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/DistanceFeatureQueryBuilderTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.geo.GeoUtils; import org.opensearch.common.lucene.search.Queries; import org.opensearch.common.unit.DistanceUnit; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.index.mapper.DateFieldMapper; import org.elasticsearch.index.mapper.DateFieldMapper.DateFieldType; import org.elasticsearch.index.mapper.MapperService; diff --git a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java index 57e49a4255484..2a9a384b02110 100644 --- a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java @@ -42,7 +42,7 @@ import org.apache.lucene.util.Accountable; import org.apache.lucene.util.BytesRef; import org.opensearch.OpenSearchException; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.lucene.search.function.CombineFunction; import org.opensearch.common.lucene.search.function.FieldValueFactorFunction; import org.opensearch.common.lucene.search.function.FunctionScoreQuery; diff --git a/server/src/test/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestTestCase.java b/server/src/test/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestTestCase.java index 8c74cc59040d3..1c98c962c895d 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestTestCase.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/AbstractBulkByScrollRequestTestCase.java @@ -26,7 +26,7 @@ import org.elasticsearch.test.AbstractXContentTestCase; import org.elasticsearch.test.ESTestCase; -import static org.elasticsearch.common.unit.TimeValue.parseTimeValue; +import static org.opensearch.common.unit.TimeValue.parseTimeValue; /** * Shared superclass for testing reindex and friends. In particular it makes sure to test the slice features. diff --git a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java index bb15b15a2f588..35010d1c8b903 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollResponseTests.java @@ -39,7 +39,7 @@ import static java.util.Collections.emptyList; import static java.util.Collections.singletonList; import static org.apache.lucene.util.TestUtil.randomSimpleString; -import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; +import static org.opensearch.common.unit.TimeValue.timeValueMillis; public class BulkByScrollResponseTests extends AbstractXContentTestCase { diff --git a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java index 95daad889a7ed..1d8f681051f87 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskStatusTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.Randomness; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.test.AbstractXContentTestCase; diff --git a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskTests.java b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskTests.java index 392d254c4f4e5..4992a813bebdd 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/BulkByScrollTaskTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.reindex; import org.opensearch.common.Strings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.json.JsonXContent; @@ -30,9 +30,9 @@ import java.util.Arrays; import static java.lang.Math.min; -import static org.elasticsearch.common.unit.TimeValue.parseTimeValue; -import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; -import static org.elasticsearch.common.unit.TimeValue.timeValueNanos; +import static org.opensearch.common.unit.TimeValue.parseTimeValue; +import static org.opensearch.common.unit.TimeValue.timeValueMillis; +import static org.opensearch.common.unit.TimeValue.timeValueNanos; import static org.hamcrest.Matchers.containsString; public class BulkByScrollTaskTests extends ESTestCase { diff --git a/server/src/test/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskStateTests.java b/server/src/test/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskStateTests.java index 738908677353c..da2ec38669802 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskStateTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/LeaderBulkByScrollTaskStateTests.java @@ -30,7 +30,7 @@ import java.util.List; import static java.util.Collections.emptyList; -import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; +import static org.opensearch.common.unit.TimeValue.timeValueMillis; import static org.mockito.Mockito.atMost; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/server/src/test/java/org/elasticsearch/index/reindex/ReindexRequestTests.java b/server/src/test/java/org/elasticsearch/index/reindex/ReindexRequestTests.java index e929588b3b1d2..d43567a88e44c 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/ReindexRequestTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/ReindexRequestTests.java @@ -39,8 +39,8 @@ import java.util.Map; import static java.util.Collections.emptyMap; -import static org.elasticsearch.common.unit.TimeValue.parseTimeValue; -import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds; +import static org.opensearch.common.unit.TimeValue.parseTimeValue; +import static org.opensearch.common.unit.TimeValue.timeValueSeconds; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; /** diff --git a/server/src/test/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskStateTests.java b/server/src/test/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskStateTests.java index 14f219500c231..2ec82dc5086c1 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskStateTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/WorkerBulkByScrollTaskStateTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.reindex; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.AbstractRunnable; import org.opensearch.tasks.TaskId; import org.elasticsearch.test.ESTestCase; @@ -36,7 +36,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds; +import static org.opensearch.common.unit.TimeValue.timeValueSeconds; import static org.hamcrest.Matchers.both; import static org.hamcrest.Matchers.closeTo; import static org.hamcrest.Matchers.empty; diff --git a/server/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java b/server/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java index 26aac47b58ba4..f79107ba7df84 100644 --- a/server/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java +++ b/server/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java @@ -33,7 +33,7 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.iterable.Iterables; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.IndexSettings; diff --git a/server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java b/server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java index d005282713041..e53e4fabaf5bc 100644 --- a/server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java +++ b/server/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java @@ -38,7 +38,7 @@ import org.opensearch.common.lucene.uid.Versions; import org.opensearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.index.IndexSettings; import org.opensearch.index.VersionType; import org.elasticsearch.index.engine.DocIdSeqNoAndSource; diff --git a/server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncActionTests.java b/server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncActionTests.java index e2df9c1be42ea..7ffd9d1324c53 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncActionTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/GlobalCheckpointSyncActionTests.java @@ -24,7 +24,7 @@ import org.opensearch.cluster.action.shard.ShardStateAction; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.shard.IndexShard; diff --git a/server/src/test/java/org/elasticsearch/index/seqno/PeerRecoveryRetentionLeaseExpiryTests.java b/server/src/test/java/org/elasticsearch/index/seqno/PeerRecoveryRetentionLeaseExpiryTests.java index 266b4eeaaa952..4e7aeb8473eec 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/PeerRecoveryRetentionLeaseExpiryTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/PeerRecoveryRetentionLeaseExpiryTests.java @@ -23,9 +23,9 @@ import org.opensearch.cluster.routing.AllocationId; import org.opensearch.cluster.routing.IndexShardRoutingTable; import org.opensearch.cluster.routing.ShardRouting; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.index.IndexSettings; import org.opensearch.index.engine.SafeCommitInfo; import org.opensearch.index.shard.ShardId; diff --git a/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerRetentionLeaseTests.java b/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerRetentionLeaseTests.java index 4dd3e32ec0af8..2ddf231dc04c2 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerRetentionLeaseTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerRetentionLeaseTests.java @@ -23,9 +23,9 @@ import org.opensearch.action.support.PlainActionFuture; import org.opensearch.action.support.replication.ReplicationResponse; import org.opensearch.cluster.routing.AllocationId; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.opensearch.gateway.WriteStateException; import org.opensearch.index.IndexSettings; diff --git a/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerTests.java b/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerTests.java index 1a01dc9c477f0..813ded10358a5 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/ReplicationTrackerTests.java @@ -27,7 +27,7 @@ import org.opensearch.cluster.routing.ShardRoutingState; import org.elasticsearch.cluster.routing.TestShardRouting; import org.opensearch.common.Randomness; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.settings.Settings; diff --git a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseActionsTests.java b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseActionsTests.java index 155923711429b..7b707516f392a 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseActionsTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseActionsTests.java @@ -25,7 +25,7 @@ import org.opensearch.action.admin.indices.stats.IndicesStatsResponse; import org.opensearch.common.lease.Releasable; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.shard.ShardId; diff --git a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseBackgroundSyncActionTests.java b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseBackgroundSyncActionTests.java index 5cd73988f3c68..458a79c6079b0 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseBackgroundSyncActionTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseBackgroundSyncActionTests.java @@ -28,7 +28,7 @@ import org.opensearch.cluster.action.shard.ShardStateAction; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.gateway.WriteStateException; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexService; diff --git a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseSyncActionTests.java b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseSyncActionTests.java index 456be93cf6a85..ce68de4083f71 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseSyncActionTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseSyncActionTests.java @@ -28,7 +28,7 @@ import org.opensearch.cluster.action.shard.ShardStateAction; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.shard.IndexShard; diff --git a/server/src/test/java/org/elasticsearch/index/shard/GlobalCheckpointListenersTests.java b/server/src/test/java/org/elasticsearch/index/shard/GlobalCheckpointListenersTests.java index 76b51664ecce1..281a560396595 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/GlobalCheckpointListenersTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/GlobalCheckpointListenersTests.java @@ -23,7 +23,7 @@ import org.apache.logging.log4j.message.ParameterizedMessage; import org.elasticsearch.Assertions; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.EsExecutors; import org.elasticsearch.index.Index; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexReaderWrapperTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexReaderWrapperTests.java index 30c779a8955a7..2324f2d7e918a 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/IndexReaderWrapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/IndexReaderWrapperTests.java @@ -33,9 +33,9 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.Directory; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.lucene.index.OpenSearchDirectoryReader; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.index.engine.Engine; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexShardOperationPermitsTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardOperationPermitsTests.java index 01ab357fbc5b0..ffa50d49c4437 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/IndexShardOperationPermitsTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/IndexShardOperationPermitsTests.java @@ -20,7 +20,7 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.support.PlainActionFuture; -import org.elasticsearch.common.CheckedRunnable; +import org.opensearch.common.CheckedRunnable; import org.opensearch.common.lease.Releasable; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.EsRejectedExecutionException; diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexShardRetentionLeaseTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardRetentionLeaseTests.java index 74d139332085a..58c2ddec31f1b 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/IndexShardRetentionLeaseTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/IndexShardRetentionLeaseTests.java @@ -22,9 +22,9 @@ import org.opensearch.action.ActionListener; import org.opensearch.cluster.routing.RecoverySource; import org.elasticsearch.cluster.routing.ShardRoutingHelper; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.engine.InternalEngineFactory; import org.elasticsearch.index.seqno.ReplicationTracker; diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java index 70defdd090a4e..55118d4cfd7dd 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java @@ -53,13 +53,13 @@ import org.opensearch.cluster.routing.ShardRoutingState; import org.elasticsearch.cluster.routing.TestShardRouting; import org.opensearch.cluster.routing.UnassignedInfo; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.Randomness; import org.opensearch.common.Strings; import org.opensearch.common.UUIDs; import org.opensearch.common.breaker.CircuitBreaker; import org.opensearch.common.bytes.BytesArray; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.lease.Releasable; @@ -67,7 +67,7 @@ import org.opensearch.common.lucene.uid.Versions; import org.opensearch.common.settings.IndexScopedSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.AbstractRunnable; import org.opensearch.common.util.concurrent.AtomicArray; import org.opensearch.common.util.concurrent.ConcurrentCollections; @@ -75,7 +75,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.env.NodeEnvironment; import org.opensearch.index.IndexSettings; import org.opensearch.index.VersionType; diff --git a/server/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java b/server/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java index e60fd4e9cf2f5..ca2ee9fdc80a6 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java @@ -21,7 +21,7 @@ import org.apache.lucene.mockfile.FilterFileSystemProvider; import org.opensearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.io.PathUtils; import org.elasticsearch.common.io.PathUtilsForTesting; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; diff --git a/server/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java b/server/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java index 52d32075ff33a..58a415fa533b6 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java @@ -27,7 +27,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; import org.opensearch.Version; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.UUIDs; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; @@ -35,11 +35,11 @@ import org.opensearch.common.lucene.uid.Versions; import org.opensearch.common.metrics.MeanMetric; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.concurrent.ThreadContext; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.codec.CodecService; @@ -79,7 +79,7 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; -import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; +import static org.opensearch.common.unit.TimeValue.timeValueMillis; import static org.hamcrest.Matchers.arrayContaining; /** diff --git a/server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java b/server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java index eadd09f566a13..d81b10abb1adc 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java @@ -34,7 +34,7 @@ import org.elasticsearch.cluster.routing.ShardRoutingHelper; import org.opensearch.cluster.routing.ShardRoutingState; import org.elasticsearch.cluster.routing.TestShardRouting; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.UUIDs; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; diff --git a/server/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java b/server/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java index 57bbb9d8a61f8..54b163ea1b2c2 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/ShardUtilsTests.java @@ -27,7 +27,7 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.store.BaseDirectoryWrapper; import org.opensearch.common.lucene.index.OpenSearchDirectoryReader; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.test.ESTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java b/server/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java index 6b0058b01e026..32b7aaf0b4330 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/StoreRecoveryTests.java @@ -43,7 +43,7 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.routing.OperationRouting; import org.opensearch.common.settings.Settings; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.mapper.IdFieldMapper; import org.elasticsearch.index.mapper.Uid; diff --git a/server/src/test/java/org/elasticsearch/index/store/ByteSizeCachingDirectoryTests.java b/server/src/test/java/org/elasticsearch/index/store/ByteSizeCachingDirectoryTests.java index 509f5e2a4c41b..4a790714f906c 100644 --- a/server/src/test/java/org/elasticsearch/index/store/ByteSizeCachingDirectoryTests.java +++ b/server/src/test/java/org/elasticsearch/index/store/ByteSizeCachingDirectoryTests.java @@ -24,7 +24,7 @@ import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexOutput; import org.apache.lucene.util.LuceneTestCase; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/store/StoreTests.java b/server/src/test/java/org/elasticsearch/index/store/StoreTests.java index a2e4ac7845494..d0ec632c9053b 100644 --- a/server/src/test/java/org/elasticsearch/index/store/StoreTests.java +++ b/server/src/test/java/org/elasticsearch/index/store/StoreTests.java @@ -58,8 +58,8 @@ import org.opensearch.common.io.stream.OutputStreamStreamOutput; import org.opensearch.common.lucene.Lucene; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.common.unit.TimeValue; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.env.ShardLock; import org.opensearch.index.Index; import org.opensearch.index.IndexSettings; diff --git a/server/src/test/java/org/elasticsearch/index/translog/TestTranslog.java b/server/src/test/java/org/elasticsearch/index/translog/TestTranslog.java index 7b07f59892255..1fac319441069 100644 --- a/server/src/test/java/org/elasticsearch/index/translog/TestTranslog.java +++ b/server/src/test/java/org/elasticsearch/index/translog/TestTranslog.java @@ -24,7 +24,7 @@ import org.apache.logging.log4j.Logger; import org.apache.lucene.util.LuceneTestCase; import org.opensearch.common.io.stream.InputStreamStreamInput; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/server/src/test/java/org/elasticsearch/index/translog/TranslogDeletionPolicyTests.java b/server/src/test/java/org/elasticsearch/index/translog/TranslogDeletionPolicyTests.java index cc3e90ec66b2b..f3b18330393db 100644 --- a/server/src/test/java/org/elasticsearch/index/translog/TranslogDeletionPolicyTests.java +++ b/server/src/test/java/org/elasticsearch/index/translog/TranslogDeletionPolicyTests.java @@ -23,10 +23,10 @@ import org.opensearch.common.UUIDs; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.ReleasableBytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.lease.Releasable; import org.opensearch.common.util.BigArrays; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.test.ESTestCase; import org.mockito.Mockito; diff --git a/server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java b/server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java index 2f03f6ae23525..b3cc79030c67b 100644 --- a/server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java +++ b/server/src/test/java/org/elasticsearch/index/translog/TranslogTests.java @@ -43,7 +43,7 @@ import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.bytes.ReleasableBytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.FileSystemUtils; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; @@ -57,7 +57,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.VersionType; import org.elasticsearch.index.engine.Engine; diff --git a/server/src/test/java/org/elasticsearch/indices/IndicesQueryCacheTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesQueryCacheTests.java index 39b80b09877e4..8e9d45d101075 100644 --- a/server/src/test/java/org/elasticsearch/indices/IndicesQueryCacheTests.java +++ b/server/src/test/java/org/elasticsearch/indices/IndicesQueryCacheTests.java @@ -38,7 +38,7 @@ import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; import org.opensearch.common.lucene.index.OpenSearchDirectoryReader; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.cache.query.QueryCacheStats; import org.elasticsearch.index.shard.ShardId; diff --git a/server/src/test/java/org/elasticsearch/indices/IndicesRequestCacheTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesRequestCacheTests.java index eaac4dded2589..f7841ea11cfbb 100644 --- a/server/src/test/java/org/elasticsearch/indices/IndicesRequestCacheTests.java +++ b/server/src/test/java/org/elasticsearch/indices/IndicesRequestCacheTests.java @@ -41,7 +41,7 @@ import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.index.cache.request.ShardRequestCache; import org.opensearch.index.query.TermQueryBuilder; import org.opensearch.index.shard.ShardId; diff --git a/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java index 8f342a6a9bb9f..6a567240140b1 100644 --- a/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java +++ b/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java @@ -35,7 +35,7 @@ import org.opensearch.common.io.FileSystemUtils; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.env.ShardLockObtainFailedException; import org.opensearch.gateway.GatewayMetaState; diff --git a/server/src/test/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerServiceTests.java b/server/src/test/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerServiceTests.java index e763cf01fd0ae..e63cae3c4877f 100644 --- a/server/src/test/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerServiceTests.java +++ b/server/src/test/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerServiceTests.java @@ -27,7 +27,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.monitor.jvm.JvmInfo; import org.opensearch.search.aggregations.MultiBucketConsumerService; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java b/server/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java index 6ae5089d39a3b..dd7dff065db5b 100644 --- a/server/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java +++ b/server/src/test/java/org/elasticsearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java @@ -26,9 +26,9 @@ import org.opensearch.cluster.routing.IndexShardRoutingTable; import org.opensearch.cluster.routing.RoutingNode; import org.opensearch.cluster.routing.ShardRouting; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.IndexSettings; diff --git a/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java b/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java index 90ea133b59b32..d61dc3b230669 100644 --- a/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java +++ b/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java @@ -76,7 +76,7 @@ import org.opensearch.cluster.routing.allocation.decider.SameShardAllocationDecider; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.Priority; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.UUIDs; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.IndexScopedSettings; diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java index 630cb870e64bf..2a1d6214c9345 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetServiceTests.java @@ -35,7 +35,7 @@ import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.index.engine.NoOpEngine; import org.elasticsearch.index.mapper.SourceToParse; import org.elasticsearch.index.seqno.SeqNoStats; diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySettingsDynamicUpdateTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySettingsDynamicUpdateTests.java index 42381c46cb0ea..3391b6914e208 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySettingsDynamicUpdateTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySettingsDynamicUpdateTests.java @@ -21,7 +21,7 @@ import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.indices.recovery.RecoverySettings; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java index d95d4fc264fc7..ccd5ff0ebe4df 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java @@ -52,11 +52,11 @@ import org.opensearch.common.lucene.uid.Versions; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.CancellableThreads; import org.opensearch.common.util.concurrent.ConcurrentCollections; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.index.IndexSettings; import org.opensearch.index.engine.Engine; import org.opensearch.index.engine.RecoveryEngineException; diff --git a/server/src/test/java/org/elasticsearch/monitor/fs/FsHealthServiceTests.java b/server/src/test/java/org/elasticsearch/monitor/fs/FsHealthServiceTests.java index fb7ac3499da48..bdfdc6c378b4c 100644 --- a/server/src/test/java/org/elasticsearch/monitor/fs/FsHealthServiceTests.java +++ b/server/src/test/java/org/elasticsearch/monitor/fs/FsHealthServiceTests.java @@ -25,7 +25,7 @@ import org.apache.lucene.mockfile.FilterFileChannel; import org.apache.lucene.mockfile.FilterFileSystemProvider; import org.elasticsearch.cluster.coordination.DeterministicTaskQueue; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.io.PathUtils; import org.elasticsearch.common.io.PathUtilsForTesting; import org.opensearch.common.logging.Loggers; import org.opensearch.common.settings.ClusterSettings; diff --git a/server/src/test/java/org/elasticsearch/monitor/fs/FsProbeTests.java b/server/src/test/java/org/elasticsearch/monitor/fs/FsProbeTests.java index e441e58ca7ba4..922ab24cef32b 100644 --- a/server/src/test/java/org/elasticsearch/monitor/fs/FsProbeTests.java +++ b/server/src/test/java/org/elasticsearch/monitor/fs/FsProbeTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.monitor.fs; import org.apache.lucene.util.Constants; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.env.NodeEnvironment.NodePath; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceSettingsTests.java b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceSettingsTests.java index ec198c10f70d9..5b42c7481f4bc 100644 --- a/server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceSettingsTests.java +++ b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceSettingsTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.monitor.jvm; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import org.opensearch.threadpool.Scheduler.Cancellable; import org.opensearch.threadpool.TestThreadPool; diff --git a/server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceTests.java b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceTests.java index a75d7a7b06cd0..4ff5ba025b659 100644 --- a/server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceTests.java +++ b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmGcMonitorServiceTests.java @@ -21,7 +21,7 @@ import org.apache.logging.log4j.Logger; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import static org.mockito.Mockito.mock; diff --git a/server/src/test/java/org/elasticsearch/monitor/jvm/JvmInfoTests.java b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmInfoTests.java index 131593cd1143c..bd9147ea2e36c 100644 --- a/server/src/test/java/org/elasticsearch/monitor/jvm/JvmInfoTests.java +++ b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmInfoTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.monitor.jvm; import org.apache.lucene.util.Constants; -import org.elasticsearch.bootstrap.JavaVersion; +import org.opensearch.bootstrap.JavaVersion; import org.elasticsearch.test.ESTestCase; public class JvmInfoTests extends ESTestCase { diff --git a/server/src/test/java/org/elasticsearch/monitor/jvm/JvmMonitorTests.java b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmMonitorTests.java index 278a47ed21f0f..75019061b2b90 100644 --- a/server/src/test/java/org/elasticsearch/monitor/jvm/JvmMonitorTests.java +++ b/server/src/test/java/org/elasticsearch/monitor/jvm/JvmMonitorTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.monitor.jvm; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksClusterServiceTests.java b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksClusterServiceTests.java index f013457738a1a..21e573096e2e4 100644 --- a/server/src/test/java/org/elasticsearch/persistent/PersistentTasksClusterServiceTests.java +++ b/server/src/test/java/org/elasticsearch/persistent/PersistentTasksClusterServiceTests.java @@ -36,7 +36,7 @@ import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.UUIDs; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.persistent.PersistentTasksCustomMetadata.Assignment; import org.elasticsearch.persistent.PersistentTasksCustomMetadata.PersistentTask; import org.elasticsearch.persistent.TestPersistentTasksPlugin.TestParams; diff --git a/server/src/test/java/org/elasticsearch/plugins/IndexStorePluginTests.java b/server/src/test/java/org/elasticsearch/plugins/IndexStorePluginTests.java index 2ef2bc9acaf85..ef9d6c6af7d14 100644 --- a/server/src/test/java/org/elasticsearch/plugins/IndexStorePluginTests.java +++ b/server/src/test/java/org/elasticsearch/plugins/IndexStorePluginTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.plugins; -import org.elasticsearch.bootstrap.JavaVersion; +import org.opensearch.bootstrap.JavaVersion; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.common.settings.Settings; diff --git a/server/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java b/server/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java index a8ef4654580fe..c8d4612ee9088 100644 --- a/server/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java +++ b/server/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java @@ -23,9 +23,9 @@ import org.apache.lucene.util.Constants; import org.apache.lucene.util.LuceneTestCase; import org.opensearch.Version; -import org.elasticsearch.bootstrap.JarHell; -import org.elasticsearch.common.collect.Tuple; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.bootstrap.JarHell; +import org.opensearch.common.collect.Tuple; +import org.opensearch.common.io.PathUtils; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.env.TestEnvironment; diff --git a/server/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java b/server/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java index 483b0662507e5..febb8eeab63b5 100644 --- a/server/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java +++ b/server/src/test/java/org/elasticsearch/recovery/RecoveriesCollectionTests.java @@ -20,7 +20,7 @@ import org.opensearch.OpenSearchException; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.index.replication.ESIndexLevelReplicationTestCase; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.shard.ShardId; diff --git a/server/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java b/server/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java index 54658b670884f..22bdac78edbb4 100644 --- a/server/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java +++ b/server/src/test/java/org/elasticsearch/watcher/FileWatcherTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.watcher; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java b/server/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java index 8289fdaaad67d..36b9cf5a32d7f 100644 --- a/server/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java +++ b/server/src/test/java/org/elasticsearch/watcher/ResourceWatcherServiceTests.java @@ -24,7 +24,7 @@ import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; -import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds; +import static org.opensearch.common.unit.TimeValue.timeValueSeconds; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; diff --git a/server/src/test/java/org/opensearch/repositories/RepositoriesStatsArchiveTests.java b/server/src/test/java/org/opensearch/repositories/RepositoriesStatsArchiveTests.java index 0c3b9f168fa08..32c27c76ba8cc 100644 --- a/server/src/test/java/org/opensearch/repositories/RepositoriesStatsArchiveTests.java +++ b/server/src/test/java/org/opensearch/repositories/RepositoriesStatsArchiveTests.java @@ -20,7 +20,7 @@ package org.opensearch.repositories; import org.opensearch.common.UUIDs; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import java.util.List; @@ -47,7 +47,7 @@ public void testStatsAreEvictedOnceTheyAreOlderThanRetentionPeriod() { int statsToBeRetainedCount = randomInt(10); for (int i = 0; i < statsToBeRetainedCount; i++) { RepositoryStatsSnapshot repoStats = - createRepositoryStats(new RepositoryStats(org.elasticsearch.common.collect.Map.of("GET", 10L))); + createRepositoryStats(new RepositoryStats(org.opensearch.common.collect.Map.of("GET", 10L))); repositoriesStatsArchive.archive(repoStats); } @@ -55,7 +55,7 @@ public void testStatsAreEvictedOnceTheyAreOlderThanRetentionPeriod() { assertThat(archivedStats.size(), equalTo(statsToBeRetainedCount)); for (RepositoryStatsSnapshot repositoryStatsSnapshot : archivedStats) { assertThat(repositoryStatsSnapshot.getRepositoryStats().requestCounts, - equalTo(org.elasticsearch.common.collect.Map.of("GET", 10L))); + equalTo(org.opensearch.common.collect.Map.of("GET", 10L))); } } @@ -109,7 +109,7 @@ private RepositoryStatsSnapshot createRepositoryStats(RepositoryStats repository RepositoryInfo repositoryInfo = new RepositoryInfo(UUIDs.randomBase64UUID(), randomAlphaOfLength(10), randomAlphaOfLength(10), - org.elasticsearch.common.collect.Map.of("bucket", randomAlphaOfLength(10)), + org.opensearch.common.collect.Map.of("bucket", randomAlphaOfLength(10)), System.currentTimeMillis(), null); return new RepositoryStatsSnapshot(repositoryInfo, repositoryStats, clusterVersion, true); diff --git a/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java b/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java index 249b884c86e5b..0427492ffb721 100644 --- a/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java +++ b/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java @@ -32,7 +32,7 @@ import org.opensearch.common.UUIDs; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.env.Environment; import org.elasticsearch.env.TestEnvironment; import org.elasticsearch.index.engine.InternalEngineFactory; diff --git a/server/src/test/java/org/opensearch/rest/RestControllerTests.java b/server/src/test/java/org/opensearch/rest/RestControllerTests.java index 8ed95e94a3a9a..75efff0335be1 100644 --- a/server/src/test/java/org/opensearch/rest/RestControllerTests.java +++ b/server/src/test/java/org/opensearch/rest/RestControllerTests.java @@ -33,7 +33,7 @@ import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.yaml.YamlXContent; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.http.HttpInfo; import org.opensearch.http.HttpRequest; import org.opensearch.http.HttpResponse; diff --git a/server/src/test/java/org/opensearch/rest/RestRequestTests.java b/server/src/test/java/org/opensearch/rest/RestRequestTests.java index a2cde5154a659..f76111547de70 100644 --- a/server/src/test/java/org/opensearch/rest/RestRequestTests.java +++ b/server/src/test/java/org/opensearch/rest/RestRequestTests.java @@ -20,7 +20,7 @@ package org.opensearch.rest; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.collect.MapBuilder; diff --git a/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestClusterHealthActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestClusterHealthActionTests.java index a68e867b3a5e1..788be3685bf50 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestClusterHealthActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/cluster/RestClusterHealthActionTests.java @@ -23,7 +23,7 @@ import org.opensearch.action.support.ActiveShardCount; import org.opensearch.cluster.health.ClusterHealthStatus; import org.opensearch.common.Priority; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.rest.RestRequest; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.rest.FakeRestRequest; diff --git a/server/src/test/java/org/opensearch/rest/action/cat/RestRecoveryActionTests.java b/server/src/test/java/org/opensearch/rest/action/cat/RestRecoveryActionTests.java index b2bb869c45f1a..442c06b2016f6 100644 --- a/server/src/test/java/org/opensearch/rest/action/cat/RestRecoveryActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/cat/RestRecoveryActionTests.java @@ -27,7 +27,7 @@ import org.elasticsearch.cluster.routing.TestShardRouting; import org.opensearch.common.Randomness; import org.opensearch.common.Table; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.xcontent.XContentOpenSearchExtension; import org.elasticsearch.index.Index; import org.elasticsearch.index.shard.ShardId; diff --git a/server/src/test/java/org/opensearch/script/ScriptCacheTests.java b/server/src/test/java/org/opensearch/script/ScriptCacheTests.java index 4e12569712d33..477f918b87e17 100644 --- a/server/src/test/java/org/opensearch/script/ScriptCacheTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptCacheTests.java @@ -20,7 +20,7 @@ import org.opensearch.common.breaker.CircuitBreakingException; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; public class ScriptCacheTests extends ESTestCase { diff --git a/server/src/test/java/org/opensearch/script/ScriptContextInfoTests.java b/server/src/test/java/org/opensearch/script/ScriptContextInfoTests.java index 1e0db3ac7b257..bbd1b5a55b206 100644 --- a/server/src/test/java/org/opensearch/script/ScriptContextInfoTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptContextInfoTests.java @@ -20,7 +20,7 @@ package org.opensearch.script; import org.opensearch.common.bytes.BytesArray; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.common.xcontent.DeprecationHandler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/test/java/org/opensearch/script/ScriptServiceTests.java b/server/src/test/java/org/opensearch/script/ScriptServiceTests.java index 183c2aa1f63b6..9cad49511e2c2 100644 --- a/server/src/test/java/org/opensearch/script/ScriptServiceTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptServiceTests.java @@ -29,7 +29,7 @@ import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.env.Environment; diff --git a/server/src/test/java/org/opensearch/search/AbstractSearchTestCase.java b/server/src/test/java/org/opensearch/search/AbstractSearchTestCase.java index 86a4c0560117b..24277088372aa 100644 --- a/server/src/test/java/org/opensearch/search/AbstractSearchTestCase.java +++ b/server/src/test/java/org/opensearch/search/AbstractSearchTestCase.java @@ -20,8 +20,7 @@ package org.opensearch.search; import org.opensearch.action.search.SearchRequest; -import org.elasticsearch.common.CheckedFunction; -import org.opensearch.search.RandomSearchRequestGenerator; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.ParsingException; import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.io.stream.StreamInput; diff --git a/server/src/test/java/org/opensearch/search/DefaultSearchContextTests.java b/server/src/test/java/org/opensearch/search/DefaultSearchContextTests.java index b136b30ba9d5a..636332b20125b 100644 --- a/server/src/test/java/org/opensearch/search/DefaultSearchContextTests.java +++ b/server/src/test/java/org/opensearch/search/DefaultSearchContextTests.java @@ -33,7 +33,7 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.UUIDs; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.BigArrays; import org.elasticsearch.common.util.MockBigArrays; import org.elasticsearch.common.util.MockPageCacheRecycler; diff --git a/server/src/test/java/org/opensearch/search/SearchCancellationTests.java b/server/src/test/java/org/opensearch/search/SearchCancellationTests.java index c978852acc7bf..51c243ca0c93c 100644 --- a/server/src/test/java/org/opensearch/search/SearchCancellationTests.java +++ b/server/src/test/java/org/opensearch/search/SearchCancellationTests.java @@ -35,7 +35,7 @@ import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.automaton.CompiledAutomaton; import org.apache.lucene.util.automaton.RegExp; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.search.internal.ContextIndexSearcher; import org.opensearch.tasks.TaskCancelledException; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/opensearch/search/SearchServiceTests.java b/server/src/test/java/org/opensearch/search/SearchServiceTests.java index 89a8d88918ff7..e2881b9029392 100644 --- a/server/src/test/java/org/opensearch/search/SearchServiceTests.java +++ b/server/src/test/java/org/opensearch/search/SearchServiceTests.java @@ -24,7 +24,6 @@ import org.apache.lucene.index.LeafReader; import org.apache.lucene.search.Query; import org.apache.lucene.store.AlreadyClosedException; -import org.opensearch.search.MockSearchService; import org.opensearch.OpenSearchException; import org.opensearch.action.ActionListener; import org.opensearch.action.OriginalIndices; @@ -43,7 +42,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.index.Index; import org.opensearch.index.IndexModule; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/GlobalAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/GlobalAggregatorTests.java index 16c9f157b61ac..a85e99ffe1c79 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/GlobalAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/GlobalAggregatorTests.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.opensearch.search.aggregations.AggregatorTestCase; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoGridAggregatorTestCase.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoGridAggregatorTestCase.java index 76800d1d41b0c..16d6a14af8511 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoGridAggregatorTestCase.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoGridAggregatorTestCase.java @@ -30,7 +30,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.geo.GeoBoundingBox; import org.elasticsearch.common.geo.GeoBoundingBoxTests; import org.opensearch.common.geo.GeoUtils; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DateRangeHistogramAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DateRangeHistogramAggregatorTests.java index 5f1c876e80a59..76f1053ded9dc 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DateRangeHistogramAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DateRangeHistogramAggregatorTests.java @@ -30,7 +30,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.lucene.search.Queries; import org.opensearch.common.time.DateFormatters; import org.elasticsearch.index.mapper.DateFieldMapper; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalDateHistogramTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalDateHistogramTests.java index 9cf2a16e3a27b..55e7c9077098d 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalDateHistogramTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalDateHistogramTests.java @@ -20,7 +20,7 @@ package org.opensearch.search.aggregations.bucket.histogram; import org.opensearch.common.Rounding; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.search.DocValueFormat; import org.opensearch.search.aggregations.BucketOrder; import org.opensearch.search.aggregations.InternalAggregations; @@ -34,9 +34,9 @@ import java.util.Map; import java.util.TreeMap; -import static org.elasticsearch.common.unit.TimeValue.timeValueHours; -import static org.elasticsearch.common.unit.TimeValue.timeValueMinutes; -import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds; +import static org.opensearch.common.unit.TimeValue.timeValueHours; +import static org.opensearch.common.unit.TimeValue.timeValueMinutes; +import static org.opensearch.common.unit.TimeValue.timeValueSeconds; public class InternalDateHistogramTests extends InternalMultiBucketAggregationTestCase { diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/NumericHistogramAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/NumericHistogramAggregatorTests.java index 9b953cf5fced1..d1832e5b55a37 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/NumericHistogramAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/NumericHistogramAggregatorTests.java @@ -30,7 +30,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.NumericUtils; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.elasticsearch.index.mapper.DateFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; @@ -435,7 +435,7 @@ public void testAsSubAgg() throws IOException { CheckedConsumer buildIndex = iw -> { List> docs = new ArrayList<>(); for (int n = 0; n < 10000; n++) { - docs.add(org.elasticsearch.common.collect.List.of( + docs.add(org.opensearch.common.collect.List.of( new SortedNumericDocValuesField("outer", n % 100), new SortedNumericDocValuesField("inner", n / 100), new SortedNumericDocValuesField("n", n) diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/RangeHistogramAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/RangeHistogramAggregatorTests.java index 2695730ff9676..8ee09793638f0 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/RangeHistogramAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/RangeHistogramAggregatorTests.java @@ -29,7 +29,7 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.network.InetAddresses; import org.elasticsearch.index.mapper.RangeFieldMapper; import org.elasticsearch.index.mapper.RangeType; @@ -465,14 +465,14 @@ public void testAsSubAgg() throws IOException { CheckedConsumer buildIndex = iw -> { List> docs = new ArrayList<>(); for (int n = 0; n < 10000; n++) { - BytesRef outerRange = RangeType.LONG.encodeRanges(org.elasticsearch.common.collect.Set.of( + BytesRef outerRange = RangeType.LONG.encodeRanges(org.opensearch.common.collect.Set.of( new RangeFieldMapper.Range(RangeType.LONG, n % 100, n % 100 + 10, true, true) )); - BytesRef innerRange = RangeType.LONG.encodeRanges(org.elasticsearch.common.collect.Set.of( + BytesRef innerRange = RangeType.LONG.encodeRanges(org.opensearch.common.collect.Set.of( new RangeFieldMapper.Range(RangeType.LONG, n / 100, n / 100 + 10, true, true) )); - docs.add(org.elasticsearch.common.collect.List.of( + docs.add(org.opensearch.common.collect.List.of( new BinaryDocValuesField("outer", outerRange), new BinaryDocValuesField("inner", innerRange), new SortedNumericDocValuesField("n", n) diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregatorTests.java index 3e1c952e5af6f..14a84cb5f9c6e 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregatorTests.java @@ -31,7 +31,7 @@ import org.apache.lucene.util.NumericUtils; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.mapper.MappedFieldType; @@ -449,20 +449,20 @@ public void testAsSubAggregation() throws IOException { .subAggregation(new VariableWidthHistogramAggregationBuilder("v").field("v").setNumBuckets(2)); CheckedConsumer buildIndex = iw -> { iw.addDocument( - org.elasticsearch.common.collect.List.of(new SortedNumericDocValuesField("t", 1), new SortedNumericDocValuesField("v", 1)) + org.opensearch.common.collect.List.of(new SortedNumericDocValuesField("t", 1), new SortedNumericDocValuesField("v", 1)) ); iw.addDocument( - org.elasticsearch.common.collect.List.of(new SortedNumericDocValuesField("t", 1), new SortedNumericDocValuesField("v", 10)) + org.opensearch.common.collect.List.of(new SortedNumericDocValuesField("t", 1), new SortedNumericDocValuesField("v", 10)) ); iw.addDocument( - org.elasticsearch.common.collect.List.of(new SortedNumericDocValuesField("t", 1), new SortedNumericDocValuesField("v", 11)) + org.opensearch.common.collect.List.of(new SortedNumericDocValuesField("t", 1), new SortedNumericDocValuesField("v", 11)) ); iw.addDocument( - org.elasticsearch.common.collect.List.of(new SortedNumericDocValuesField("t", 2), new SortedNumericDocValuesField("v", 20)) + org.opensearch.common.collect.List.of(new SortedNumericDocValuesField("t", 2), new SortedNumericDocValuesField("v", 20)) ); iw.addDocument( - org.elasticsearch.common.collect.List.of(new SortedNumericDocValuesField("t", 2), new SortedNumericDocValuesField("v", 30)) + org.opensearch.common.collect.List.of(new SortedNumericDocValuesField("t", 2), new SortedNumericDocValuesField("v", 30)) ); }; Consumer verify = terms -> { @@ -475,14 +475,14 @@ public void testAsSubAggregation() throws IOException { InternalVariableWidthHistogram v1 = t1.getAggregations().get("v"); assertThat( v1.getBuckets().stream().map(InternalVariableWidthHistogram.Bucket::centroid).collect(toList()), - equalTo(org.elasticsearch.common.collect.List.of(1.0, 10.5)) + equalTo(org.opensearch.common.collect.List.of(1.0, 10.5)) ); LongTerms.Bucket t2 = terms.getBucketByKey("1"); InternalVariableWidthHistogram v2 = t2.getAggregations().get("v"); assertThat( v2.getBuckets().stream().map(InternalVariableWidthHistogram.Bucket::centroid).collect(toList()), - equalTo(org.elasticsearch.common.collect.List.of(20.0, 30)) + equalTo(org.opensearch.common.collect.List.of(20.0, 30)) ); }; Exception e = expectThrows( @@ -501,7 +501,7 @@ public void testShardSizeTooSmall() throws Exception{ public void testSmallShardSize() throws Exception { Exception e = expectThrows(IllegalArgumentException.class, () -> testSearchCase( DEFAULT_QUERY, - org.elasticsearch.common.collect.List.of(), + org.opensearch.common.collect.List.of(), true, aggregation -> aggregation.field(NUMERIC_FIELD).setNumBuckets(2).setShardSize(2), histogram -> {fail();} @@ -514,14 +514,14 @@ public void testHugeShardSize() throws Exception { testSearchCase(DEFAULT_QUERY, dataset, true, aggregation -> aggregation.field(NUMERIC_FIELD).setShardSize(1000000000), histogram -> assertThat( histogram.getBuckets().stream().map(InternalVariableWidthHistogram.Bucket::getKey).collect(toList()), - equalTo(org.elasticsearch.common.collect.List.of(1.0, 2.0, 3.0))) + equalTo(org.opensearch.common.collect.List.of(1.0, 2.0, 3.0))) ); } public void testSmallInitialBuffer() throws Exception { Exception e = expectThrows(IllegalArgumentException.class, () -> testSearchCase( DEFAULT_QUERY, - org.elasticsearch.common.collect.List.of(), + org.opensearch.common.collect.List.of(), true, aggregation -> aggregation.field(NUMERIC_FIELD).setInitialBuffer(1), histogram -> {fail();} @@ -539,7 +539,7 @@ public void testOutOfOrderInitialBuffer() throws Exception { histogram -> { assertThat( histogram.getBuckets().stream().map(InternalVariableWidthHistogram.Bucket::getKey).collect(toList()), - equalTo(org.elasticsearch.common.collect.List.of(1.0, 2.0, 3.0)) + equalTo(org.opensearch.common.collect.List.of(1.0, 2.0, 3.0)) ); } ); diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/missing/MissingAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/missing/MissingAggregatorTests.java index 7a50967b76ca4..95ed47bde2fee 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/missing/MissingAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/missing/MissingAggregatorTests.java @@ -29,7 +29,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; @@ -121,7 +121,7 @@ public void testMatchAllDocs() throws IOException { assertEquals(numDocs, internalMissing.getDocCount()); assertTrue(AggregationInspectionHelper.hasValue(internalMissing)); }, - org.elasticsearch.common.collect.List.of(aggFieldType, anotherFieldType) + org.opensearch.common.collect.List.of(aggFieldType, anotherFieldType) ); } @@ -153,7 +153,7 @@ public void testMatchSparse() throws IOException { assertEquals(finalDocsMissingAggField, internalMissing.getDocCount()); assertTrue(AggregationInspectionHelper.hasValue(internalMissing)); }, - org.elasticsearch.common.collect.List.of(aggFieldType, anotherFieldType) + org.opensearch.common.collect.List.of(aggFieldType, anotherFieldType) ); } @@ -263,7 +263,7 @@ public void testMissingParam() throws IOException { assertEquals(0, internalMissing.getDocCount()); assertFalse(AggregationInspectionHelper.hasValue(internalMissing)); }, - org.elasticsearch.common.collect.List.of(aggFieldType, anotherFieldType) + org.opensearch.common.collect.List.of(aggFieldType, anotherFieldType) ); } @@ -280,7 +280,7 @@ public void testMultiValuedField() throws IOException { for (int i = 0; i < numDocs; i++) { if (randomBoolean()) { final long randomLong = randomLong(); - docs.add(org.elasticsearch.common.collect.Set.of( + docs.add(org.opensearch.common.collect.Set.of( new SortedNumericDocValuesField(aggFieldType.name(), randomLong), new SortedNumericDocValuesField(aggFieldType.name(), randomLong + 1) )); @@ -299,7 +299,7 @@ public void testMultiValuedField() throws IOException { assertEquals(finalDocsMissingAggField, internalMissing.getDocCount()); assertTrue(AggregationInspectionHelper.hasValue(internalMissing)); }, - org.elasticsearch.common.collect.List.of(aggFieldType, anotherFieldType) + org.opensearch.common.collect.List.of(aggFieldType, anotherFieldType) ); } @@ -340,13 +340,13 @@ private void valueScriptTestCase(Script script) throws IOException { assertEquals(finalDocsMissingField, internalMissing.getDocCount()); assertTrue(AggregationInspectionHelper.hasValue(internalMissing)); }, - org.elasticsearch.common.collect.List.of(aggFieldType, anotherFieldType) + org.opensearch.common.collect.List.of(aggFieldType, anotherFieldType) ); } public void testMultiValuedFieldWithFieldScriptWithParams() throws IOException { final long threshold = 10; - final Map params = org.elasticsearch.common.collect.Map.of("field", "agg_field", "threshold", threshold); + final Map params = org.opensearch.common.collect.Map.of("field", "agg_field", "threshold", threshold); fieldScriptTestCase(new Script(ScriptType.INLINE, MockScriptEngine.NAME, FIELD_SCRIPT_PARAMS, params), threshold); } @@ -370,7 +370,7 @@ private void fieldScriptTestCase(Script script, long threshold) throws IOExcepti if (firstValue < threshold && secondValue < threshold) { docsBelowThreshold++; } - docs.add(org.elasticsearch.common.collect.Set.of( + docs.add(org.opensearch.common.collect.Set.of( new SortedNumericDocValuesField(aggFieldType.name(), firstValue), new SortedNumericDocValuesField(aggFieldType.name(), secondValue) )); @@ -416,7 +416,7 @@ protected AggregationBuilder createAggBuilderForTypeTest(MappedFieldType fieldTy @Override protected List getSupportedValuesSourceTypes() { - return org.elasticsearch.common.collect.List.of( + return org.opensearch.common.collect.List.of( CoreValuesSourceType.NUMERIC, CoreValuesSourceType.BYTES, CoreValuesSourceType.GEOPOINT, diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/nested/NestedAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/nested/NestedAggregatorTests.java index f279d4306428b..787a5474927e0 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/nested/NestedAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/nested/NestedAggregatorTests.java @@ -38,8 +38,8 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.opensearch.Version; -import org.elasticsearch.common.CheckedConsumer; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.CheckedConsumer; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.lucene.search.Queries; import org.opensearch.common.settings.Settings; import org.opensearch.index.mapper.IdFieldMapper; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java index 350cdccb76e12..d3a6a760a6ab1 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java @@ -31,7 +31,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.elasticsearch.index.mapper.DateFieldMapper; import org.elasticsearch.index.mapper.KeywordFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/InternalBinaryRangeTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/InternalBinaryRangeTests.java index b6653b6c7b7f5..5b6d7bc3de824 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/InternalBinaryRangeTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/InternalBinaryRangeTests.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.bucket.range; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.search.DocValueFormat; import org.opensearch.search.aggregations.InternalAggregations; import org.opensearch.search.aggregations.InternalMultiBucketAggregation; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/InternalDateRangeTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/InternalDateRangeTests.java index be066a3242a8f..4fcd7101abcf7 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/InternalDateRangeTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/InternalDateRangeTests.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.bucket.range; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.search.DocValueFormat; import org.opensearch.search.aggregations.InternalAggregations; import org.opensearch.search.aggregations.InternalMultiBucketAggregation; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/InternalGeoDistanceTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/InternalGeoDistanceTests.java index c1125a50043fd..5f11cad1f2633 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/InternalGeoDistanceTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/InternalGeoDistanceTests.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.bucket.range; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.search.aggregations.InternalAggregations; import org.opensearch.search.aggregations.InternalMultiBucketAggregation; import org.opensearch.search.aggregations.ParsedMultiBucketAggregation; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/InternalRangeTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/InternalRangeTests.java index c961abba2826c..ad99d547ec7d1 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/InternalRangeTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/InternalRangeTests.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.bucket.range; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.search.DocValueFormat; import org.opensearch.search.aggregations.InternalAggregations; import org.opensearch.search.aggregations.InternalMultiBucketAggregation; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java index bde1e846405af..f9a52ac3bbb5c 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java @@ -27,7 +27,7 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.network.NetworkAddress; import org.elasticsearch.index.mapper.IpFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/RangeAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/RangeAggregatorTests.java index 1ad8d39afe560..175977feeb32b 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/RangeAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/RangeAggregatorTests.java @@ -30,7 +30,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.elasticsearch.index.mapper.DateFieldMapper; import org.elasticsearch.index.mapper.KeywordFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/AvgAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/AvgAggregatorTests.java index 3dcdb459d79bf..4507e9ed2fe75 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/AvgAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/AvgAggregatorTests.java @@ -33,7 +33,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.apache.lucene.util.NumericUtils; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/CardinalityAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/CardinalityAggregatorTests.java index c576bed5d4ea6..cb3bcd85403e5 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/CardinalityAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/CardinalityAggregatorTests.java @@ -27,7 +27,7 @@ import org.apache.lucene.search.DocValuesFieldExistsQuery; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.geo.GeoPoint; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/ExtendedStatsAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/ExtendedStatsAggregatorTests.java index e60596fffbe46..a2e463bcfbd87 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/ExtendedStatsAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/ExtendedStatsAggregatorTests.java @@ -28,7 +28,7 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.util.NumericUtils; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.opensearch.search.aggregations.AggregatorTestCase; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/HDRPercentilesAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/HDRPercentilesAggregatorTests.java index 0538e30611f55..3f0268b061208 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/HDRPercentilesAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/HDRPercentilesAggregatorTests.java @@ -33,7 +33,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.elasticsearch.index.mapper.KeywordFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalTopHitsTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalTopHitsTests.java index 07ae66cfbdfba..f6afeeb119d63 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalTopHitsTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalTopHitsTests.java @@ -29,7 +29,7 @@ import org.apache.lucene.search.TotalHits; import org.apache.lucene.util.BytesRef; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.document.DocumentField; import org.opensearch.common.lucene.search.TopDocsAndMaxScore; import org.opensearch.common.text.Text; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/MaxAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/MaxAggregatorTests.java index 800eaab3762a5..bbf4f6d30ff56 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/MaxAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/MaxAggregatorTests.java @@ -45,8 +45,8 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.Bits; import org.apache.lucene.util.FutureArrays; -import org.elasticsearch.common.CheckedConsumer; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.CheckedConsumer; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/MedianAbsoluteDeviationAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/MedianAbsoluteDeviationAggregatorTests.java index 28654574a933d..519451cd8daff 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/MedianAbsoluteDeviationAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/MedianAbsoluteDeviationAggregatorTests.java @@ -27,7 +27,7 @@ import org.apache.lucene.search.DocValuesFieldExistsQuery; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/MinAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/MinAggregatorTests.java index d961dbc299e45..0d8597081457e 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/MinAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/MinAggregatorTests.java @@ -45,8 +45,8 @@ import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.common.CheckedConsumer; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.CheckedConsumer; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.common.settings.Settings; import org.opensearch.common.util.BigArrays; import org.opensearch.index.IndexSettings; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/ScriptedMetricAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/ScriptedMetricAggregatorTests.java index e536d895054e7..849ba090d7a95 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/ScriptedMetricAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/ScriptedMetricAggregatorTests.java @@ -30,7 +30,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.breaker.CircuitBreaker; import org.opensearch.common.breaker.CircuitBreakingException; import org.opensearch.common.breaker.NoopCircuitBreaker; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/StatsAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/StatsAggregatorTests.java index 1989df821cafe..52ab356175eb7 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/StatsAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/StatsAggregatorTests.java @@ -29,7 +29,7 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.util.NumericUtils; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; @@ -507,7 +507,7 @@ protected AggregationBuilder createAggBuilderForTypeTest(MappedFieldType fieldTy @Override protected ScriptService getMockScriptService() { - final Map, Object>> scripts = org.elasticsearch.common.collect.Map.of( + final Map, Object>> scripts = org.opensearch.common.collect.Map.of( VALUE_SCRIPT_NAME, vars -> ((Number) vars.get("_value")).doubleValue() + 1, FIELD_SCRIPT_NAME, vars -> { final String fieldName = (String) vars.get("field"); diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/SumAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/SumAggregatorTests.java index 4e472b4e44f33..ff47778a4a43f 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/SumAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/SumAggregatorTests.java @@ -37,7 +37,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.NumericUtils; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.TriConsumer; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.mapper.MappedFieldType; @@ -414,7 +414,7 @@ protected AggregationBuilder createAggBuilderForTypeTest(MappedFieldType fieldTy @Override protected ScriptService getMockScriptService() { - final Map, Object>> scripts = org.elasticsearch.common.collect.Map.of( + final Map, Object>> scripts = org.opensearch.common.collect.Map.of( VALUE_SCRIPT_NAME, vars -> ((Number) vars.get("_value")).doubleValue() + 1, FIELD_SCRIPT_NAME, vars -> { final String fieldName = (String) vars.get("field"); diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/TDigestPercentilesAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/TDigestPercentilesAggregatorTests.java index 29a1bd9c0e5dc..e3ddc5aba5cfe 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/TDigestPercentilesAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/TDigestPercentilesAggregatorTests.java @@ -30,7 +30,7 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.opensearch.search.aggregations.AggregationBuilder; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/ValueCountAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/ValueCountAggregatorTests.java index b8cca45984be5..8eb01106e1b11 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/ValueCountAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/ValueCountAggregatorTests.java @@ -33,7 +33,7 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.geo.GeoPoint; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.mapper.BooleanFieldMapper; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/WeightedAvgAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/WeightedAvgAggregatorTests.java index 60049a692119c..40d9e7f97e0e0 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/WeightedAvgAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/WeightedAvgAggregatorTests.java @@ -31,7 +31,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.apache.lucene.util.NumericUtils; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.opensearch.search.aggregations.AggregationExecutionException; diff --git a/server/src/test/java/org/opensearch/search/aggregations/pipeline/BucketScriptAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/pipeline/BucketScriptAggregatorTests.java index bd1fe33584fee..396ac0e30efb5 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/pipeline/BucketScriptAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/pipeline/BucketScriptAggregatorTests.java @@ -30,7 +30,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.mapper.KeywordFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; diff --git a/server/src/test/java/org/opensearch/search/aggregations/pipeline/CumulativeSumAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/pipeline/CumulativeSumAggregatorTests.java index cc1cd50485efa..9c696dfbf3923 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/pipeline/CumulativeSumAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/pipeline/CumulativeSumAggregatorTests.java @@ -30,7 +30,7 @@ import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.time.DateFormatters; import org.elasticsearch.index.mapper.DateFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; 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 0283d97d4a9f8..3810a7442389e 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 @@ -30,7 +30,7 @@ import org.apache.lucene.store.Directory; import org.elasticsearch.ExceptionsHelper; import org.opensearch.action.search.SearchPhaseExecutionException; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.elasticsearch.index.mapper.DateFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper; diff --git a/server/src/test/java/org/opensearch/search/builder/SearchSourceBuilderTests.java b/server/src/test/java/org/opensearch/search/builder/SearchSourceBuilderTests.java index a7098a171ae3e..e4126a16c6694 100644 --- a/server/src/test/java/org/opensearch/search/builder/SearchSourceBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/builder/SearchSourceBuilderTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; diff --git a/server/src/test/java/org/opensearch/search/internal/ContextIndexSearcherTests.java b/server/src/test/java/org/opensearch/search/internal/ContextIndexSearcherTests.java index 1e45469448bd6..0f11b1de240e8 100644 --- a/server/src/test/java/org/opensearch/search/internal/ContextIndexSearcherTests.java +++ b/server/src/test/java/org/opensearch/search/internal/ContextIndexSearcherTests.java @@ -63,7 +63,7 @@ import org.opensearch.common.lucene.index.OpenSearchDirectoryReader; import org.opensearch.common.lucene.index.SequentialStoredFieldsLeafReader; import org.opensearch.common.settings.Settings; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.index.IndexSettings; import org.opensearch.index.cache.bitset.BitsetFilterCache; import org.opensearch.index.shard.ShardId; diff --git a/server/src/test/java/org/opensearch/search/internal/ShardSearchRequestTests.java b/server/src/test/java/org/opensearch/search/internal/ShardSearchRequestTests.java index 23b404e19e7b9..a4fdb8d264e4a 100644 --- a/server/src/test/java/org/opensearch/search/internal/ShardSearchRequestTests.java +++ b/server/src/test/java/org/opensearch/search/internal/ShardSearchRequestTests.java @@ -24,12 +24,12 @@ import org.opensearch.action.search.SearchRequest; import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.UUIDs; import org.opensearch.common.compress.CompressedXContent; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.DeprecationHandler; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/server/src/test/java/org/opensearch/search/profile/query/QueryProfilerTests.java b/server/src/test/java/org/opensearch/search/profile/query/QueryProfilerTests.java index ec22630243de5..7b3faa33bcb76 100644 --- a/server/src/test/java/org/opensearch/search/profile/query/QueryProfilerTests.java +++ b/server/src/test/java/org/opensearch/search/profile/query/QueryProfilerTests.java @@ -44,7 +44,7 @@ import org.apache.lucene.search.Weight; import org.apache.lucene.store.Directory; import org.apache.lucene.util.TestUtil; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.search.internal.ContextIndexSearcher; import org.opensearch.search.profile.ProfileResult; import org.elasticsearch.test.ESTestCase; 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 3b01ab0f5e84f..27df40d55941e 100644 --- a/server/src/test/java/org/opensearch/search/slice/SliceBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/slice/SliceBuilderTests.java @@ -40,7 +40,7 @@ import org.opensearch.cluster.routing.PlainShardIterator; import org.opensearch.cluster.routing.ShardIterator; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Strings; import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.settings.Settings; diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java index fc5629b47231f..703c1a4cbc119 100644 --- a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java +++ b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java @@ -133,8 +133,8 @@ import org.opensearch.cluster.service.ClusterService; import org.elasticsearch.cluster.service.FakeThreadPoolMasterService; import org.elasticsearch.cluster.service.MasterService; -import org.elasticsearch.common.CheckedConsumer; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.CheckedConsumer; +import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.network.NetworkModule; import org.opensearch.common.settings.ClusterSettings; diff --git a/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepository.java b/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepository.java index 21a586bfea901..bf43d276a9ba6 100644 --- a/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepository.java +++ b/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepository.java @@ -21,7 +21,7 @@ import org.opensearch.cluster.metadata.RepositoryMetadata; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.blobstore.BlobContainer; import org.opensearch.common.blobstore.BlobMetadata; import org.opensearch.common.blobstore.BlobPath; diff --git a/server/src/test/java/org/opensearch/tasks/TaskManagerTests.java b/server/src/test/java/org/opensearch/tasks/TaskManagerTests.java index e861f181cdd01..2dfb19f191adb 100644 --- a/server/src/test/java/org/opensearch/tasks/TaskManagerTests.java +++ b/server/src/test/java/org/opensearch/tasks/TaskManagerTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.lease.Releasable; import org.opensearch.common.lease.Releasables; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.ConcurrentCollections; import org.elasticsearch.test.ESTestCase; import org.opensearch.threadpool.TestThreadPool; diff --git a/server/src/test/java/org/opensearch/threadpool/ScheduleWithFixedDelayTests.java b/server/src/test/java/org/opensearch/threadpool/ScheduleWithFixedDelayTests.java index 1e7c979d35b13..fcee64b3184e8 100644 --- a/server/src/test/java/org/opensearch/threadpool/ScheduleWithFixedDelayTests.java +++ b/server/src/test/java/org/opensearch/threadpool/ScheduleWithFixedDelayTests.java @@ -21,7 +21,7 @@ import org.opensearch.OpenSearchException; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.BaseFuture; import org.opensearch.common.util.concurrent.EsRejectedExecutionException; import org.elasticsearch.node.Node; diff --git a/server/src/test/java/org/opensearch/threadpool/SchedulerTests.java b/server/src/test/java/org/opensearch/threadpool/SchedulerTests.java index 1ffbadb790d89..f714956016d68 100644 --- a/server/src/test/java/org/opensearch/threadpool/SchedulerTests.java +++ b/server/src/test/java/org/opensearch/threadpool/SchedulerTests.java @@ -20,7 +20,7 @@ package org.opensearch.threadpool; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; diff --git a/server/src/test/java/org/opensearch/threadpool/ThreadPoolSerializationTests.java b/server/src/test/java/org/opensearch/threadpool/ThreadPoolSerializationTests.java index e70d1cdce4a0f..2e8499475fa4e 100644 --- a/server/src/test/java/org/opensearch/threadpool/ThreadPoolSerializationTests.java +++ b/server/src/test/java/org/opensearch/threadpool/ThreadPoolSerializationTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.SizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentHelper; diff --git a/server/src/test/java/org/opensearch/threadpool/ThreadPoolTests.java b/server/src/test/java/org/opensearch/threadpool/ThreadPoolTests.java index 2ed25d9b69d76..5d14344ec6632 100644 --- a/server/src/test/java/org/opensearch/threadpool/ThreadPoolTests.java +++ b/server/src/test/java/org/opensearch/threadpool/ThreadPoolTests.java @@ -20,7 +20,7 @@ package org.opensearch.threadpool; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.EsExecutors; import org.opensearch.common.util.concurrent.FutureUtils; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/opensearch/threadpool/UpdateThreadPoolSettingsTests.java b/server/src/test/java/org/opensearch/threadpool/UpdateThreadPoolSettingsTests.java index 147a5debead74..e373114712acc 100644 --- a/server/src/test/java/org/opensearch/threadpool/UpdateThreadPoolSettingsTests.java +++ b/server/src/test/java/org/opensearch/threadpool/UpdateThreadPoolSettingsTests.java @@ -20,7 +20,7 @@ package org.opensearch.threadpool; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.EsExecutors; import org.opensearch.common.util.concurrent.EsThreadPoolExecutor; import org.opensearch.threadpool.ThreadPool.Names; diff --git a/server/src/test/java/org/opensearch/transport/ClusterConnectionManagerTests.java b/server/src/test/java/org/opensearch/transport/ClusterConnectionManagerTests.java index 7e0a7e1d20eea..73ab7312b5fd0 100644 --- a/server/src/test/java/org/opensearch/transport/ClusterConnectionManagerTests.java +++ b/server/src/test/java/org/opensearch/transport/ClusterConnectionManagerTests.java @@ -25,7 +25,7 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import org.opensearch.threadpool.ThreadPool; import org.junit.After; diff --git a/server/src/test/java/org/opensearch/transport/ConnectionProfileTests.java b/server/src/test/java/org/opensearch/transport/ConnectionProfileTests.java index 0db0b599f0025..65134ba4cae5b 100644 --- a/server/src/test/java/org/opensearch/transport/ConnectionProfileTests.java +++ b/server/src/test/java/org/opensearch/transport/ConnectionProfileTests.java @@ -20,7 +20,7 @@ import org.opensearch.cluster.node.DiscoveryNodeRole; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; diff --git a/server/src/test/java/org/opensearch/transport/InboundAggregatorTests.java b/server/src/test/java/org/opensearch/transport/InboundAggregatorTests.java index c982d9cd792b2..454f7a786402c 100644 --- a/server/src/test/java/org/opensearch/transport/InboundAggregatorTests.java +++ b/server/src/test/java/org/opensearch/transport/InboundAggregatorTests.java @@ -24,7 +24,7 @@ import org.elasticsearch.common.breaker.TestCircuitBreaker; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.ReleasableBytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; diff --git a/server/src/test/java/org/opensearch/transport/InboundHandlerTests.java b/server/src/test/java/org/opensearch/transport/InboundHandlerTests.java index 3c215eea9f160..ed9524f0bf81a 100644 --- a/server/src/test/java/org/opensearch/transport/InboundHandlerTests.java +++ b/server/src/test/java/org/opensearch/transport/InboundHandlerTests.java @@ -28,14 +28,14 @@ import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.bytes.ReleasableBytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.InputStreamStreamInput; import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.logging.Loggers; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.BigArrays; import org.opensearch.tasks.TaskManager; import org.elasticsearch.test.ESTestCase; @@ -191,8 +191,8 @@ public void testSendsErrorResponseToHandshakeFromCompatibleVersion() throws Exce TransportStatus.setRequest(TransportStatus.setHandshake((byte) 0)), remoteVersion); final InboundMessage requestMessage = unreadableInboundHandshake(remoteVersion, requestHeader); requestHeader.actionName = TransportHandshaker.HANDSHAKE_ACTION_NAME; - requestHeader.headers = Tuple.tuple(org.elasticsearch.common.collect.Map.of(), org.elasticsearch.common.collect.Map.of()); - requestHeader.features = org.elasticsearch.common.collect.Set.of(); + requestHeader.headers = Tuple.tuple(org.opensearch.common.collect.Map.of(), org.opensearch.common.collect.Map.of()); + requestHeader.features = org.opensearch.common.collect.Set.of(); handler.inboundMessage(channel, requestMessage); final BytesReference responseBytesReference = channel.getMessageCaptor().get(); @@ -230,8 +230,8 @@ public void testClosesChannelOnErrorInHandshakeWithIncompatibleVersion() throws TransportStatus.setRequest(TransportStatus.setHandshake((byte) 0)), remoteVersion); final InboundMessage requestMessage = unreadableInboundHandshake(remoteVersion, requestHeader); requestHeader.actionName = TransportHandshaker.HANDSHAKE_ACTION_NAME; - requestHeader.headers = Tuple.tuple(org.elasticsearch.common.collect.Map.of(), org.elasticsearch.common.collect.Map.of()); - requestHeader.features = org.elasticsearch.common.collect.Set.of(); + requestHeader.headers = Tuple.tuple(org.opensearch.common.collect.Map.of(), org.opensearch.common.collect.Map.of()); + requestHeader.features = org.opensearch.common.collect.Set.of(); handler.inboundMessage(channel, requestMessage); assertTrue(isClosed.get()); assertNull(channel.getMessageCaptor().get()); @@ -270,7 +270,7 @@ public void testLogsSlowInboundProcessing() throws Exception { }); requestHeader.actionName = TransportHandshaker.HANDSHAKE_ACTION_NAME; requestHeader.headers = Tuple.tuple(Collections.emptyMap(), Collections.emptyMap()); - requestHeader.features = org.elasticsearch.common.collect.Set.of(); + requestHeader.features = org.opensearch.common.collect.Set.of(); handler.inboundMessage(channel, requestMessage); assertNotNull(channel.getMessageCaptor().get()); mockAppender.assertAllExpectationsMatched(); diff --git a/server/src/test/java/org/opensearch/transport/InboundPipelineTests.java b/server/src/test/java/org/opensearch/transport/InboundPipelineTests.java index 47419584a235e..eb3ad048a12dd 100644 --- a/server/src/test/java/org/opensearch/transport/InboundPipelineTests.java +++ b/server/src/test/java/org/opensearch/transport/InboundPipelineTests.java @@ -27,14 +27,14 @@ import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.bytes.ReleasableBytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.lease.Releasable; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.PageCacheRecycler; import org.opensearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.core.internal.io.Streams; +import org.opensearch.core.internal.io.Streams; import org.elasticsearch.test.ESTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/opensearch/transport/OutboundHandlerTests.java b/server/src/test/java/org/opensearch/transport/OutboundHandlerTests.java index 90ce9eb3fefd8..f7332c6dddfad 100644 --- a/server/src/test/java/org/opensearch/transport/OutboundHandlerTests.java +++ b/server/src/test/java/org/opensearch/transport/OutboundHandlerTests.java @@ -28,14 +28,14 @@ import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.bytes.ReleasableBytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.PageCacheRecycler; import org.opensearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.core.internal.io.Streams; +import org.opensearch.core.internal.io.Streams; import org.elasticsearch.test.ESTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/test/java/org/opensearch/transport/ProxyConnectionStrategyTests.java b/server/src/test/java/org/opensearch/transport/ProxyConnectionStrategyTests.java index fd171b115cb38..8fbfb0f064d3a 100644 --- a/server/src/test/java/org/opensearch/transport/ProxyConnectionStrategyTests.java +++ b/server/src/test/java/org/opensearch/transport/ProxyConnectionStrategyTests.java @@ -23,7 +23,7 @@ import org.opensearch.action.support.PlainActionFuture; import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.AbstractScopedSettings; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Setting; diff --git a/server/src/test/java/org/opensearch/transport/RemoteClusterConnectionTests.java b/server/src/test/java/org/opensearch/transport/RemoteClusterConnectionTests.java index 3ef359ca63f49..6f2d4360de219 100644 --- a/server/src/test/java/org/opensearch/transport/RemoteClusterConnectionTests.java +++ b/server/src/test/java/org/opensearch/transport/RemoteClusterConnectionTests.java @@ -39,15 +39,15 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.common.Strings; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.index.IndexNotFoundException; import org.elasticsearch.mocksocket.MockServerSocket; import org.opensearch.search.SearchHit; diff --git a/server/src/test/java/org/opensearch/transport/RemoteClusterServiceTests.java b/server/src/test/java/org/opensearch/transport/RemoteClusterServiceTests.java index c60a1a5a8aac3..e21a8851ba5d7 100644 --- a/server/src/test/java/org/opensearch/transport/RemoteClusterServiceTests.java +++ b/server/src/test/java/org/opensearch/transport/RemoteClusterServiceTests.java @@ -29,8 +29,8 @@ import org.opensearch.common.settings.AbstractScopedSettings; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.common.unit.TimeValue; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.transport.MockTransportService; import org.opensearch.threadpool.TestThreadPool; diff --git a/server/src/test/java/org/opensearch/transport/RemoteClusterSettingsTests.java b/server/src/test/java/org/opensearch/transport/RemoteClusterSettingsTests.java index 8e38e311f6764..85be6b9245574 100644 --- a/server/src/test/java/org/opensearch/transport/RemoteClusterSettingsTests.java +++ b/server/src/test/java/org/opensearch/transport/RemoteClusterSettingsTests.java @@ -23,7 +23,7 @@ import org.opensearch.cluster.node.DiscoveryNodeRole; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.node.NodeRoleSettings; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/opensearch/transport/RemoteConnectionStrategyTests.java b/server/src/test/java/org/opensearch/transport/RemoteConnectionStrategyTests.java index 9e949a4e9d194..bc04b6be34361 100644 --- a/server/src/test/java/org/opensearch/transport/RemoteConnectionStrategyTests.java +++ b/server/src/test/java/org/opensearch/transport/RemoteConnectionStrategyTests.java @@ -22,7 +22,7 @@ import org.opensearch.action.ActionListener; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import static org.mockito.Mockito.mock; diff --git a/server/src/test/java/org/opensearch/transport/SniffConnectionStrategyTests.java b/server/src/test/java/org/opensearch/transport/SniffConnectionStrategyTests.java index 9afc36f3b4097..b7b009c8b500f 100644 --- a/server/src/test/java/org/opensearch/transport/SniffConnectionStrategyTests.java +++ b/server/src/test/java/org/opensearch/transport/SniffConnectionStrategyTests.java @@ -30,7 +30,7 @@ import org.opensearch.cluster.node.DiscoveryNodeRole; import org.opensearch.cluster.node.DiscoveryNodes; import org.opensearch.common.Strings; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.AbstractScopedSettings; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Setting; diff --git a/server/src/test/java/org/opensearch/transport/TransportActionProxyTests.java b/server/src/test/java/org/opensearch/transport/TransportActionProxyTests.java index 8e26bc8160ce5..f224ed597bc24 100644 --- a/server/src/test/java/org/opensearch/transport/TransportActionProxyTests.java +++ b/server/src/test/java/org/opensearch/transport/TransportActionProxyTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.settings.Settings; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.transport.MockTransportService; import org.opensearch.threadpool.TestThreadPool; diff --git a/server/src/test/java/org/opensearch/transport/TransportHandshakerTests.java b/server/src/test/java/org/opensearch/transport/TransportHandshakerTests.java index 90f6e5250f244..fad24a4704287 100644 --- a/server/src/test/java/org/opensearch/transport/TransportHandshakerTests.java +++ b/server/src/test/java/org/opensearch/transport/TransportHandshakerTests.java @@ -23,7 +23,7 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.tasks.TaskId; import org.elasticsearch.test.ESTestCase; import org.opensearch.threadpool.TestThreadPool; diff --git a/server/src/test/java/org/opensearch/transport/TransportKeepAliveTests.java b/server/src/test/java/org/opensearch/transport/TransportKeepAliveTests.java index c8be659f0863f..3f0d0a2733cce 100644 --- a/server/src/test/java/org/opensearch/transport/TransportKeepAliveTests.java +++ b/server/src/test/java/org/opensearch/transport/TransportKeepAliveTests.java @@ -20,10 +20,10 @@ import org.opensearch.common.AsyncBiFunction; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import org.opensearch.threadpool.TestThreadPool; diff --git a/test/external-modules/delayed-aggs/src/internalClusterTest/java/org/elasticsearch/search/aggregations/DelayedShardAggregationIT.java b/test/external-modules/delayed-aggs/src/internalClusterTest/java/org/elasticsearch/search/aggregations/DelayedShardAggregationIT.java index ddc9adb696928..9b3c8688317a0 100644 --- a/test/external-modules/delayed-aggs/src/internalClusterTest/java/org/elasticsearch/search/aggregations/DelayedShardAggregationIT.java +++ b/test/external-modules/delayed-aggs/src/internalClusterTest/java/org/elasticsearch/search/aggregations/DelayedShardAggregationIT.java @@ -20,7 +20,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.plugins.Plugin; import org.opensearch.search.aggregations.bucket.filter.InternalFilter; import org.opensearch.search.aggregations.metrics.InternalMax; diff --git a/test/external-modules/delayed-aggs/src/main/java/org/opensearch/search/aggregations/DelayedShardAggregationBuilder.java b/test/external-modules/delayed-aggs/src/main/java/org/opensearch/search/aggregations/DelayedShardAggregationBuilder.java index 73dae66610a3c..095d1d18fadf3 100644 --- a/test/external-modules/delayed-aggs/src/main/java/org/opensearch/search/aggregations/DelayedShardAggregationBuilder.java +++ b/test/external-modules/delayed-aggs/src/main/java/org/opensearch/search/aggregations/DelayedShardAggregationBuilder.java @@ -22,7 +22,7 @@ import org.elasticsearch.common.ParseField; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.query.QueryBuilders; diff --git a/test/external-modules/delayed-aggs/src/test/java/org/opensearch/search/aggregations/DelayedShardAggregationBuilderTests.java b/test/external-modules/delayed-aggs/src/test/java/org/opensearch/search/aggregations/DelayedShardAggregationBuilderTests.java index a708940c8ecf4..4d7564013e765 100644 --- a/test/external-modules/delayed-aggs/src/test/java/org/opensearch/search/aggregations/DelayedShardAggregationBuilderTests.java +++ b/test/external-modules/delayed-aggs/src/test/java/org/opensearch/search/aggregations/DelayedShardAggregationBuilderTests.java @@ -18,7 +18,7 @@ */ package org.opensearch.search.aggregations; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; diff --git a/test/fixtures/azure-fixture/src/main/java/fixture/azure/AzureHttpHandler.java b/test/fixtures/azure-fixture/src/main/java/fixture/azure/AzureHttpHandler.java index 96dce925d16db..6d3fde2b71832 100644 --- a/test/fixtures/azure-fixture/src/main/java/fixture/azure/AzureHttpHandler.java +++ b/test/fixtures/azure-fixture/src/main/java/fixture/azure/AzureHttpHandler.java @@ -21,7 +21,7 @@ import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.io.Streams; diff --git a/test/fixtures/gcs-fixture/src/main/java/fixture/gcs/FakeOAuth2HttpHandler.java b/test/fixtures/gcs-fixture/src/main/java/fixture/gcs/FakeOAuth2HttpHandler.java index 21fcb28c732c6..6b177b59e2629 100644 --- a/test/fixtures/gcs-fixture/src/main/java/fixture/gcs/FakeOAuth2HttpHandler.java +++ b/test/fixtures/gcs-fixture/src/main/java/fixture/gcs/FakeOAuth2HttpHandler.java @@ -20,7 +20,7 @@ import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.rest.RestStatus; import java.io.IOException; 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 f5b726d8214e5..aeb11b1ff90e4 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 @@ -24,12 +24,12 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.message.ParameterizedMessage; import org.opensearch.common.Strings; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.UUIDs; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.bytes.CompositeBytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.Streams; import org.opensearch.common.regex.Regex; import org.opensearch.rest.RestStatus; diff --git a/test/fixtures/s3-fixture/src/main/java/fixture/s3/S3HttpHandler.java b/test/fixtures/s3-fixture/src/main/java/fixture/s3/S3HttpHandler.java index 4c6bb6f0804e4..435fac6360452 100644 --- a/test/fixtures/s3-fixture/src/main/java/fixture/s3/S3HttpHandler.java +++ b/test/fixtures/s3-fixture/src/main/java/fixture/s3/S3HttpHandler.java @@ -21,12 +21,12 @@ import com.sun.net.httpserver.Headers; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; -import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.Nullable; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.UUIDs; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.hash.MessageDigests; import org.opensearch.common.io.Streams; import org.opensearch.common.regex.Regex; diff --git a/test/framework/src/main/java/org/elasticsearch/action/support/ActionTestUtils.java b/test/framework/src/main/java/org/elasticsearch/action/support/ActionTestUtils.java index ddbbcdc94ddb0..cd8e798def895 100644 --- a/test/framework/src/main/java/org/elasticsearch/action/support/ActionTestUtils.java +++ b/test/framework/src/main/java/org/elasticsearch/action/support/ActionTestUtils.java @@ -22,7 +22,7 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionResponse; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.tasks.Task; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.action.support.TransportAction; diff --git a/test/framework/src/main/java/org/elasticsearch/action/support/replication/TransportWriteActionTestHelper.java b/test/framework/src/main/java/org/elasticsearch/action/support/replication/TransportWriteActionTestHelper.java index ba3eb5dc82c7f..45092e22c2d37 100644 --- a/test/framework/src/main/java/org/elasticsearch/action/support/replication/TransportWriteActionTestHelper.java +++ b/test/framework/src/main/java/org/elasticsearch/action/support/replication/TransportWriteActionTestHelper.java @@ -20,7 +20,7 @@ import org.apache.logging.log4j.Logger; import org.opensearch.action.support.WriteRequest; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.translog.Translog; import org.opensearch.action.support.replication.TransportWriteAction; diff --git a/test/framework/src/main/java/org/elasticsearch/bootstrap/BootstrapForTesting.java b/test/framework/src/main/java/org/elasticsearch/bootstrap/BootstrapForTesting.java index 5223a5321f2a1..6defe8f2e42ca 100644 --- a/test/framework/src/main/java/org/elasticsearch/bootstrap/BootstrapForTesting.java +++ b/test/framework/src/main/java/org/elasticsearch/bootstrap/BootstrapForTesting.java @@ -23,11 +23,12 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.util.LuceneTestCase; -import org.elasticsearch.common.Booleans; +import org.opensearch.bootstrap.JarHell; +import org.opensearch.common.Booleans; import org.opensearch.common.Strings; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.io.FileSystemUtils; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.io.PathUtils; import org.opensearch.common.network.IfConfig; import org.opensearch.common.settings.Settings; import org.elasticsearch.plugins.PluginInfo; diff --git a/test/framework/src/main/java/org/elasticsearch/cluster/DataStreamTestHelper.java b/test/framework/src/main/java/org/elasticsearch/cluster/DataStreamTestHelper.java index 872bb57d96bd8..201075c3d81e1 100644 --- a/test/framework/src/main/java/org/elasticsearch/cluster/DataStreamTestHelper.java +++ b/test/framework/src/main/java/org/elasticsearch/cluster/DataStreamTestHelper.java @@ -25,7 +25,7 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.Metadata; import org.opensearch.common.UUIDs; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.Settings; import org.elasticsearch.index.Index; import org.elasticsearch.test.ESTestCase; diff --git a/test/framework/src/main/java/org/elasticsearch/cluster/MockInternalClusterInfoService.java b/test/framework/src/main/java/org/elasticsearch/cluster/MockInternalClusterInfoService.java index f674083addb85..f9d9535d63773 100644 --- a/test/framework/src/main/java/org/elasticsearch/cluster/MockInternalClusterInfoService.java +++ b/test/framework/src/main/java/org/elasticsearch/cluster/MockInternalClusterInfoService.java @@ -23,9 +23,9 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.monitor.fs.FsInfo; import org.opensearch.plugins.Plugin; import org.opensearch.cluster.ClusterInfo; diff --git a/test/framework/src/main/java/org/elasticsearch/cluster/coordination/AbstractCoordinatorTestCase.java b/test/framework/src/main/java/org/elasticsearch/cluster/coordination/AbstractCoordinatorTestCase.java index e6e430d51f893..8cabffa844d47 100644 --- a/test/framework/src/main/java/org/elasticsearch/cluster/coordination/AbstractCoordinatorTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/cluster/coordination/AbstractCoordinatorTestCase.java @@ -44,10 +44,10 @@ import org.opensearch.cluster.service.ClusterApplierService; import org.opensearch.cluster.service.ClusterService; import org.elasticsearch.cluster.service.FakeThreadPoolMasterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Randomness; import org.opensearch.common.UUIDs; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput; import org.opensearch.common.io.stream.NamedWriteableRegistry; @@ -57,7 +57,7 @@ import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.BigArrays; import org.elasticsearch.common.util.MockBigArrays; import org.elasticsearch.common.util.MockPageCacheRecycler; diff --git a/test/framework/src/main/java/org/elasticsearch/cluster/coordination/DeterministicTaskQueue.java b/test/framework/src/main/java/org/elasticsearch/cluster/coordination/DeterministicTaskQueue.java index 370dc3ae197b1..9c7ee2473d74f 100644 --- a/test/framework/src/main/java/org/elasticsearch/cluster/coordination/DeterministicTaskQueue.java +++ b/test/framework/src/main/java/org/elasticsearch/cluster/coordination/DeterministicTaskQueue.java @@ -23,7 +23,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.EsExecutors; import org.opensearch.threadpool.ThreadPool; import org.opensearch.threadpool.ThreadPoolInfo; diff --git a/test/framework/src/main/java/org/elasticsearch/cluster/coordination/LinearizabilityChecker.java b/test/framework/src/main/java/org/elasticsearch/cluster/coordination/LinearizabilityChecker.java index 7dc1167fe7bb5..a5b4f9ec9e495 100644 --- a/test/framework/src/main/java/org/elasticsearch/cluster/coordination/LinearizabilityChecker.java +++ b/test/framework/src/main/java/org/elasticsearch/cluster/coordination/LinearizabilityChecker.java @@ -23,7 +23,7 @@ import org.apache.logging.log4j.Logger; import org.apache.lucene.util.FixedBitSet; import org.opensearch.common.Strings; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import java.util.ArrayList; import java.util.Collection; diff --git a/test/framework/src/main/java/org/elasticsearch/cluster/service/FakeThreadPoolMasterService.java b/test/framework/src/main/java/org/elasticsearch/cluster/service/FakeThreadPoolMasterService.java index 85a784b023786..e4ba5d85ddd39 100644 --- a/test/framework/src/main/java/org/elasticsearch/cluster/service/FakeThreadPoolMasterService.java +++ b/test/framework/src/main/java/org/elasticsearch/cluster/service/FakeThreadPoolMasterService.java @@ -27,7 +27,7 @@ import org.opensearch.common.UUIDs; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.EsExecutors; import org.opensearch.common.util.concurrent.PrioritizedEsThreadPoolExecutor; import org.opensearch.common.util.concurrent.ThreadContext; diff --git a/test/framework/src/main/java/org/elasticsearch/common/logging/JsonLogsIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/common/logging/JsonLogsIntegTestCase.java index 73abec4b06dc1..ef3fcbd472820 100644 --- a/test/framework/src/main/java/org/elasticsearch/common/logging/JsonLogsIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/common/logging/JsonLogsIntegTestCase.java @@ -19,7 +19,7 @@ package org.elasticsearch.common.logging; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.elasticsearch.test.rest.ESRestTestCase; import java.io.BufferedReader; diff --git a/test/framework/src/main/java/org/elasticsearch/gateway/MockGatewayMetaState.java b/test/framework/src/main/java/org/elasticsearch/gateway/MockGatewayMetaState.java index dae8e84d11a64..3412384156bc3 100644 --- a/test/framework/src/main/java/org/elasticsearch/gateway/MockGatewayMetaState.java +++ b/test/framework/src/main/java/org/elasticsearch/gateway/MockGatewayMetaState.java @@ -25,7 +25,7 @@ import org.opensearch.cluster.metadata.MetadataIndexUpgradeService; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.BigArrays; diff --git a/test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java index 2d8342ecde5c9..31ba8f470c18d 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java @@ -55,7 +55,7 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.routing.AllocationId; import org.opensearch.common.CheckedBiFunction; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Randomness; import org.opensearch.common.Strings; import org.opensearch.common.breaker.CircuitBreaker; @@ -65,14 +65,14 @@ import org.opensearch.common.lucene.Lucene; import org.opensearch.common.lucene.uid.Versions; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.set.Sets; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.index.Index; import org.opensearch.index.IndexSettings; import org.elasticsearch.index.MapperTestUtils; diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java index b5987347615a0..86fab0f3db9b6 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java @@ -26,7 +26,7 @@ import org.apache.lucene.store.Directory; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.compress.CompressedXContent; diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java index 03622a7f42cdc..a40cb2c271b74 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java @@ -30,7 +30,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.util.SetOnce; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/test/framework/src/main/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java index 001d5aeda8353..2fe5f1ba0d613 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/replication/ESIndexLevelReplicationTestCase.java @@ -64,7 +64,7 @@ import org.opensearch.common.lease.Releasable; import org.opensearch.common.lease.Releasables; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexSettings; diff --git a/test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java index 40673c6c3847d..3b3ed17977fc6 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java @@ -35,8 +35,8 @@ import org.elasticsearch.cluster.routing.ShardRoutingHelper; import org.opensearch.cluster.routing.ShardRoutingState; import org.elasticsearch.cluster.routing.TestShardRouting; -import org.elasticsearch.common.CheckedFunction; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.CheckedFunction; +import org.opensearch.common.Nullable; import org.opensearch.common.UUIDs; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.lucene.uid.Versions; @@ -44,7 +44,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.util.BigArrays; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.env.NodeEnvironment; import org.opensearch.index.Index; import org.opensearch.index.IndexSettings; diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java index 6d5930a6ef77f..e0fbdc8c85d05 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java @@ -44,7 +44,7 @@ import org.opensearch.common.settings.SettingsModule; import org.opensearch.common.util.BigArrays; import org.elasticsearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.env.Environment; import org.elasticsearch.env.TestEnvironment; import org.opensearch.index.Index; diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractMultiClustersTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/AbstractMultiClustersTestCase.java index 42ec88d8f3044..24d2cf8c09b61 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractMultiClustersTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/AbstractMultiClustersTestCase.java @@ -24,7 +24,7 @@ import org.opensearch.client.Client; import org.opensearch.common.network.NetworkModule; import org.opensearch.common.settings.Settings; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.test.transport.MockTransportService; import org.opensearch.transport.RemoteClusterAware; diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java index 8f9c21841548e..0d641edbcfb6f 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java @@ -32,7 +32,7 @@ import org.opensearch.common.ParsingException; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput; import org.opensearch.common.io.stream.StreamInput; diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractXContentTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/AbstractXContentTestCase.java index afa5456f6cb1c..8a8cc4fea0b1b 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractXContentTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/AbstractXContentTestCase.java @@ -21,7 +21,7 @@ import org.opensearch.common.CheckedBiConsumer; import org.opensearch.common.CheckedBiFunction; -import org.elasticsearch.common.CheckedFunction; +import org.opensearch.common.CheckedFunction; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/test/framework/src/main/java/org/elasticsearch/test/BackgroundIndexer.java b/test/framework/src/main/java/org/elasticsearch/test/BackgroundIndexer.java index b9de66882b8ad..098a6529fcddd 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/BackgroundIndexer.java +++ b/test/framework/src/main/java/org/elasticsearch/test/BackgroundIndexer.java @@ -32,7 +32,7 @@ import org.opensearch.action.bulk.BulkShardRequest; import org.opensearch.action.index.IndexResponse; import org.opensearch.client.Client; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.ConcurrentCollections; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java index 562eae72d0465..994456ffb1b2f 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java @@ -57,7 +57,7 @@ import org.opensearch.action.search.SearchResponse; import org.opensearch.action.support.DefaultShardOperationFailedException; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.bootstrap.JavaVersion; +import org.opensearch.bootstrap.JavaVersion; import org.opensearch.client.AdminClient; import org.opensearch.client.Client; import org.opensearch.client.ClusterAdminClient; @@ -83,11 +83,11 @@ import org.opensearch.cluster.routing.allocation.DiskThresholdSettings; import org.opensearch.cluster.routing.allocation.decider.EnableAllocationDecider; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Priority; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.network.NetworkAddress; import org.opensearch.common.network.NetworkModule; @@ -98,7 +98,7 @@ import org.opensearch.common.transport.TransportAddress; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.EsRejectedExecutionException; import org.opensearch.common.util.concurrent.ThreadContext; import org.elasticsearch.common.xcontent.NamedXContentRegistry; @@ -108,7 +108,7 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.smile.SmileXContent; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.discovery.Discovery; import org.opensearch.discovery.zen.ElectMasterService; import org.opensearch.discovery.zen.ZenDiscovery; @@ -192,7 +192,7 @@ import static org.opensearch.client.Requests.syncedFlushRequest; import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; -import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; +import static org.opensearch.common.unit.TimeValue.timeValueMillis; import static org.opensearch.common.util.CollectionUtils.eagerPartition; import static org.opensearch.discovery.DiscoveryModule.DISCOVERY_SEED_PROVIDERS_SETTING; import static org.opensearch.discovery.SettingsBasedSeedHostsProvider.DISCOVERY_SEED_HOSTS_SETTING; diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java index 2ad7ba06f005e..1b4e4b89e1821 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESSingleNodeTestCase.java @@ -34,12 +34,12 @@ import org.opensearch.common.Priority; import org.opensearch.common.Strings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.concurrent.EsExecutors; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.env.Environment; import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.index.Index; diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java index a823299d2ae32..f4efc321dd169 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java @@ -49,16 +49,16 @@ import org.apache.lucene.util.TimeUnits; import org.opensearch.Version; import org.elasticsearch.bootstrap.BootstrapForTesting; -import org.elasticsearch.bootstrap.JavaVersion; +import org.opensearch.bootstrap.JavaVersion; import org.opensearch.client.Requests; import org.opensearch.cluster.ClusterModule; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.CheckedRunnable; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.CheckedRunnable; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.io.PathUtils; import org.elasticsearch.common.io.PathUtilsForTesting; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.NamedWriteable; diff --git a/test/framework/src/main/java/org/elasticsearch/test/InternalSettingsPlugin.java b/test/framework/src/main/java/org/elasticsearch/test/InternalSettingsPlugin.java index fca06ce569a03..8b8d94e326c3d 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/InternalSettingsPlugin.java +++ b/test/framework/src/main/java/org/elasticsearch/test/InternalSettingsPlugin.java @@ -21,7 +21,7 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.index.IndexModule; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.IndexSettings; diff --git a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java index 214fa757318f7..7791d90fc149d 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java +++ b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java @@ -56,7 +56,7 @@ import org.opensearch.cluster.routing.allocation.DiskThresholdSettings; import org.opensearch.cluster.routing.allocation.decider.ThrottlingAllocationDecider; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Randomness; import org.opensearch.common.Strings; import org.opensearch.common.breaker.CircuitBreaker; @@ -72,13 +72,13 @@ import org.opensearch.common.transport.TransportAddress; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.PageCacheRecycler; import org.opensearch.common.util.concurrent.EsExecutors; import org.opensearch.common.util.concurrent.FutureUtils; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.common.util.set.Sets; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.discovery.zen.ElectMasterService; import org.opensearch.discovery.zen.ZenDiscovery; import org.elasticsearch.env.Environment; @@ -154,8 +154,8 @@ import static org.apache.lucene.util.LuceneTestCase.TEST_NIGHTLY; import static org.apache.lucene.util.LuceneTestCase.rarely; import static org.opensearch.cluster.coordination.ClusterBootstrapService.INITIAL_MASTER_NODES_SETTING; -import static org.elasticsearch.common.unit.TimeValue.timeValueMillis; -import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds; +import static org.opensearch.common.unit.TimeValue.timeValueMillis; +import static org.opensearch.common.unit.TimeValue.timeValueSeconds; import static org.opensearch.discovery.DiscoveryModule.DISCOVERY_TYPE_SETTING; import static org.opensearch.discovery.DiscoveryModule.ZEN2_DISCOVERY_TYPE; import static org.opensearch.discovery.DiscoveryModule.ZEN_DISCOVERY_TYPE; diff --git a/test/framework/src/main/java/org/elasticsearch/test/MockIndexEventListener.java b/test/framework/src/main/java/org/elasticsearch/test/MockIndexEventListener.java index 9bc4d442c18a8..d78fbb5cc3cac 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/MockIndexEventListener.java +++ b/test/framework/src/main/java/org/elasticsearch/test/MockIndexEventListener.java @@ -19,7 +19,7 @@ package org.elasticsearch.test; import org.opensearch.cluster.routing.ShardRouting; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.inject.Module; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; diff --git a/test/framework/src/main/java/org/elasticsearch/test/NotEqualMessageBuilder.java b/test/framework/src/main/java/org/elasticsearch/test/NotEqualMessageBuilder.java index fdb3368d93e7f..d6322f5725759 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/NotEqualMessageBuilder.java +++ b/test/framework/src/main/java/org/elasticsearch/test/NotEqualMessageBuilder.java @@ -19,7 +19,7 @@ package org.elasticsearch.test; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import java.util.List; import java.util.Locale; @@ -28,7 +28,7 @@ import java.util.TreeMap; /** - * Builds a message describing how two sets of values are unequal. + * Builds a message describing how two sets of values are unequal. */ public class NotEqualMessageBuilder { private final StringBuilder message; diff --git a/test/framework/src/main/java/org/elasticsearch/test/RandomObjects.java b/test/framework/src/main/java/org/elasticsearch/test/RandomObjects.java index fb2ea83d660d4..2333824cd2e15 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/RandomObjects.java +++ b/test/framework/src/main/java/org/elasticsearch/test/RandomObjects.java @@ -33,7 +33,7 @@ import org.opensearch.cluster.coordination.NoMasterBlockService; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; diff --git a/test/framework/src/main/java/org/elasticsearch/test/StreamsUtils.java b/test/framework/src/main/java/org/elasticsearch/test/StreamsUtils.java index 83972b30c02e7..377b2bea93810 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/StreamsUtils.java +++ b/test/framework/src/main/java/org/elasticsearch/test/StreamsUtils.java @@ -21,7 +21,7 @@ import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.core.internal.io.Streams; +import org.opensearch.core.internal.io.Streams; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/test/framework/src/main/java/org/elasticsearch/test/TestSearchContext.java b/test/framework/src/main/java/org/elasticsearch/test/TestSearchContext.java index da5a73b7522c8..4b502aada183f 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/TestSearchContext.java +++ b/test/framework/src/main/java/org/elasticsearch/test/TestSearchContext.java @@ -24,7 +24,7 @@ import org.opensearch.action.OriginalIndices; import org.opensearch.action.search.SearchShardTask; import org.opensearch.action.search.SearchType; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.BigArrays; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.cache.bitset.BitsetFilterCache; diff --git a/test/framework/src/main/java/org/elasticsearch/test/VersionUtils.java b/test/framework/src/main/java/org/elasticsearch/test/VersionUtils.java index 8759e16076825..afe30f663800a 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/VersionUtils.java +++ b/test/framework/src/main/java/org/elasticsearch/test/VersionUtils.java @@ -20,8 +20,8 @@ package org.elasticsearch.test; import org.opensearch.Version; -import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.Nullable; +import org.opensearch.common.collect.Tuple; import java.util.ArrayList; import java.util.Collections; diff --git a/test/framework/src/main/java/org/elasticsearch/test/client/RandomizingClient.java b/test/framework/src/main/java/org/elasticsearch/test/client/RandomizingClient.java index a847ce42f9593..ac13bf24e5b84 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/client/RandomizingClient.java +++ b/test/framework/src/main/java/org/elasticsearch/test/client/RandomizingClient.java @@ -26,7 +26,7 @@ import org.opensearch.client.Client; import org.opensearch.client.FilterClient; import org.opensearch.cluster.routing.Preference; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.Arrays; import java.util.Random; diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/BlockClusterStateProcessing.java b/test/framework/src/main/java/org/elasticsearch/test/disruption/BlockClusterStateProcessing.java index 9bd1cfcdb8434..1981c8d23c1c0 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/BlockClusterStateProcessing.java +++ b/test/framework/src/main/java/org/elasticsearch/test/disruption/BlockClusterStateProcessing.java @@ -21,7 +21,7 @@ import org.apache.logging.log4j.core.util.Throwables; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.Priority; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.InternalTestCluster; import java.util.Random; diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/BlockMasterServiceOnMaster.java b/test/framework/src/main/java/org/elasticsearch/test/disruption/BlockMasterServiceOnMaster.java index 9c5e43cfdc7d7..d34a0defe8ddc 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/BlockMasterServiceOnMaster.java +++ b/test/framework/src/main/java/org/elasticsearch/test/disruption/BlockMasterServiceOnMaster.java @@ -23,7 +23,7 @@ import org.opensearch.cluster.ClusterStateUpdateTask; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.Priority; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.InternalTestCluster; import java.util.Random; diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/BusyMasterServiceDisruption.java b/test/framework/src/main/java/org/elasticsearch/test/disruption/BusyMasterServiceDisruption.java index 315c4722740b1..57aeaa059c249 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/BusyMasterServiceDisruption.java +++ b/test/framework/src/main/java/org/elasticsearch/test/disruption/BusyMasterServiceDisruption.java @@ -22,7 +22,7 @@ import org.opensearch.cluster.ClusterStateUpdateTask; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.Priority; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.InternalTestCluster; import java.util.Random; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/DisruptableMockTransport.java b/test/framework/src/main/java/org/elasticsearch/test/disruption/DisruptableMockTransport.java index f4f2fa05735f9..178f30470559e 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/DisruptableMockTransport.java +++ b/test/framework/src/main/java/org/elasticsearch/test/disruption/DisruptableMockTransport.java @@ -23,7 +23,7 @@ import org.opensearch.action.ActionListener; import org.elasticsearch.cluster.coordination.DeterministicTaskQueue; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.BoundTransportAddress; diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/IntermittentLongGCDisruption.java b/test/framework/src/main/java/org/elasticsearch/test/disruption/IntermittentLongGCDisruption.java index b6ee8f1831cb2..2ffff8c49d50e 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/IntermittentLongGCDisruption.java +++ b/test/framework/src/main/java/org/elasticsearch/test/disruption/IntermittentLongGCDisruption.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.test.disruption; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import java.util.HashSet; import java.util.Random; diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/LongGCDisruption.java b/test/framework/src/main/java/org/elasticsearch/test/disruption/LongGCDisruption.java index b572ee90c7b8d..eb7da359df637 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/LongGCDisruption.java +++ b/test/framework/src/main/java/org/elasticsearch/test/disruption/LongGCDisruption.java @@ -19,9 +19,9 @@ package org.elasticsearch.test.disruption; -import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.SuppressForbidden; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.Nullable; +import org.opensearch.common.SuppressForbidden; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.AbstractRunnable; import org.elasticsearch.test.InternalTestCluster; diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/NetworkDisruption.java b/test/framework/src/main/java/org/elasticsearch/test/disruption/NetworkDisruption.java index 7209b7913fc30..186842920b0b5 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/NetworkDisruption.java +++ b/test/framework/src/main/java/org/elasticsearch/test/disruption/NetworkDisruption.java @@ -24,7 +24,7 @@ import org.apache.logging.log4j.Logger; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.service.ClusterService; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.set.Sets; import org.elasticsearch.test.InternalTestCluster; import org.elasticsearch.test.transport.MockTransportService; diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/ServiceDisruptionScheme.java b/test/framework/src/main/java/org/elasticsearch/test/disruption/ServiceDisruptionScheme.java index b5f3bcacbd647..57eb60b9261d9 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/ServiceDisruptionScheme.java +++ b/test/framework/src/main/java/org/elasticsearch/test/disruption/ServiceDisruptionScheme.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.test.disruption; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.InternalTestCluster; public interface ServiceDisruptionScheme { diff --git a/test/framework/src/main/java/org/elasticsearch/test/disruption/SlowClusterStateProcessing.java b/test/framework/src/main/java/org/elasticsearch/test/disruption/SlowClusterStateProcessing.java index 5b825fc37a655..094a00d10583f 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/disruption/SlowClusterStateProcessing.java +++ b/test/framework/src/main/java/org/elasticsearch/test/disruption/SlowClusterStateProcessing.java @@ -21,7 +21,7 @@ import org.elasticsearch.ExceptionsHelper; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.Priority; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.InternalTestCluster; import java.util.Random; diff --git a/test/framework/src/main/java/org/elasticsearch/test/fixture/AbstractHttpFixture.java b/test/framework/src/main/java/org/elasticsearch/test/fixture/AbstractHttpFixture.java index 92905926b50d2..3640d119d46fd 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/fixture/AbstractHttpFixture.java +++ b/test/framework/src/main/java/org/elasticsearch/test/fixture/AbstractHttpFixture.java @@ -20,8 +20,8 @@ package org.elasticsearch.test.fixture; import com.sun.net.httpserver.HttpServer; -import org.elasticsearch.common.SuppressForbidden; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.SuppressForbidden; +import org.opensearch.common.io.PathUtils; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java b/test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java index b23ab7247bca0..262931eca7e8c 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java +++ b/test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java @@ -46,9 +46,9 @@ import org.opensearch.cluster.block.ClusterBlockException; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.IndexTemplateMetadata; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.DeprecationHandler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/TupleMatchers.java b/test/framework/src/main/java/org/elasticsearch/test/hamcrest/TupleMatchers.java index a3175cb7b90b5..ff9a243141468 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/hamcrest/TupleMatchers.java +++ b/test/framework/src/main/java/org/elasticsearch/test/hamcrest/TupleMatchers.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.test.hamcrest; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; diff --git a/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java b/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java index 612933f3d0cc6..74b557f70d327 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java +++ b/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java @@ -22,9 +22,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.util.Constants; -import org.elasticsearch.bootstrap.JavaVersion; +import org.opensearch.bootstrap.JavaVersion; import org.opensearch.common.Strings; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java index 041be75cbde1a..f3adf2c42db61 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java @@ -40,11 +40,11 @@ import org.opensearch.client.RestClient; import org.opensearch.client.RestClientBuilder; import org.opensearch.client.WarningsHandler; -import org.elasticsearch.common.CheckedRunnable; +import org.opensearch.common.CheckedRunnable; import org.opensearch.common.Strings; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.io.PathUtils; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.ThreadContext; import org.elasticsearch.common.xcontent.DeprecationHandler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; @@ -54,7 +54,7 @@ import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.opensearch.common.xcontent.support.XContentMapValues; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.seqno.ReplicationTracker; import org.elasticsearch.indices.flush.SyncedFlushService; @@ -578,7 +578,7 @@ protected static void wipeDataStreams() throws IOException { // We hit a version of ES that doesn't serialize DeleteDataStreamAction.Request#wildcardExpressionsOriginallySpecified field or // that doesn't support data streams so it's safe to ignore int statusCode = e.getResponse().getStatusLine().getStatusCode(); - if (org.elasticsearch.common.collect.Set.of(404, 405, 500).contains(statusCode) == false) { + if (org.opensearch.common.collect.Set.of(404, 405, 500).contains(statusCode) == false) { throw e; } } diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java index fe7d9a4be24ab..fd4e3beef0f11 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/ESClientYamlSuiteTestCase.java @@ -33,10 +33,10 @@ import org.opensearch.client.WarningsHandler; import org.opensearch.client.sniff.OpenSearchNodesSniffer; import org.opensearch.common.Strings; -import org.elasticsearch.common.collect.Tuple; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.collect.Tuple; +import org.opensearch.common.io.PathUtils; import org.elasticsearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.yaml.restspec.ClientYamlSuiteRestApi; import org.elasticsearch.test.rest.yaml.restspec.ClientYamlSuiteRestSpec; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/Features.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/Features.java index 46469fe17214d..b08d6725430ff 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/Features.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/Features.java @@ -19,7 +19,7 @@ package org.elasticsearch.test.rest.yaml; -import org.elasticsearch.bootstrap.JavaVersion; +import org.opensearch.bootstrap.JavaVersion; import java.util.Arrays; import java.util.List; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApi.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApi.java index ce8de16356999..d6c1aa3250947 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApi.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestApi.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.test.rest.yaml.restspec; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import java.util.ArrayList; import java.util.Collection; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestSpec.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestSpec.java index d1e5de7bb46ee..b42e9d1b95704 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestSpec.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/restspec/ClientYamlSuiteRestSpec.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.test.rest.yaml.restspec; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.io.PathUtils; import org.opensearch.common.xcontent.LoggingDeprecationHandler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ContainsAssertion.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ContainsAssertion.java index 3241149dfae72..d95ffae7cf54c 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ContainsAssertion.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ContainsAssertion.java @@ -20,7 +20,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.common.xcontent.XContentLocation; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java index 927ac3ef67611..1a79978c14987 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/DoSection.java @@ -27,7 +27,7 @@ import org.opensearch.client.NodeSelector; import org.opensearch.common.ParsingException; import org.opensearch.common.Strings; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.logging.HeaderWarning; import org.elasticsearch.common.xcontent.DeprecationHandler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; @@ -55,7 +55,7 @@ import static java.util.Collections.unmodifiableList; import static java.util.stream.Collectors.toCollection; import static java.util.stream.Collectors.toSet; -import static org.elasticsearch.common.collect.Tuple.tuple; +import static org.opensearch.common.collect.Tuple.tuple; import static org.elasticsearch.test.hamcrest.RegexMatcher.matches; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.equalTo; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/GreaterThanAssertion.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/GreaterThanAssertion.java index f3518bedd0266..feb7eb0aed34f 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/GreaterThanAssertion.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/GreaterThanAssertion.java @@ -20,7 +20,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.common.xcontent.XContentLocation; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/GreaterThanEqualToAssertion.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/GreaterThanEqualToAssertion.java index e35fc4450509a..bccb2a1f1eafd 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/GreaterThanEqualToAssertion.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/GreaterThanEqualToAssertion.java @@ -21,7 +21,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.common.xcontent.XContentLocation; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LengthAssertion.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LengthAssertion.java index cad415b40f9d0..dc339552048bb 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LengthAssertion.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LengthAssertion.java @@ -20,7 +20,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.common.xcontent.XContentLocation; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LessThanAssertion.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LessThanAssertion.java index 84461202df4bb..7c6e3becd79a7 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LessThanAssertion.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LessThanAssertion.java @@ -20,7 +20,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.common.xcontent.XContentLocation; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LessThanOrEqualToAssertion.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LessThanOrEqualToAssertion.java index 0b11b304ce60c..72adad879a392 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LessThanOrEqualToAssertion.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/LessThanOrEqualToAssertion.java @@ -21,7 +21,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.common.xcontent.XContentLocation; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/MatchAssertion.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/MatchAssertion.java index 211fa2f20959e..4c89e5dd2807e 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/MatchAssertion.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/MatchAssertion.java @@ -20,7 +20,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.common.xcontent.XContentLocation; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.test.NotEqualMessageBuilder; diff --git a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ParserUtils.java b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ParserUtils.java index b35450c66e61a..5790b144fcf0e 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ParserUtils.java +++ b/test/framework/src/main/java/org/elasticsearch/test/rest/yaml/section/ParserUtils.java @@ -19,7 +19,7 @@ package org.elasticsearch.test.rest.yaml.section; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.elasticsearch.common.xcontent.XContentParser; import java.io.IOException; @@ -72,5 +72,5 @@ public static void advanceToFieldName(XContentParser parser) throws IOException throw new IllegalArgumentException("malformed test section: field name expected but found " + token + " at " + parser.getTokenLocation()); } - } + } } diff --git a/test/framework/src/main/java/org/elasticsearch/test/store/MockFSIndexStore.java b/test/framework/src/main/java/org/elasticsearch/test/store/MockFSIndexStore.java index 7dc9360c00777..2f536689798a4 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/store/MockFSIndexStore.java +++ b/test/framework/src/main/java/org/elasticsearch/test/store/MockFSIndexStore.java @@ -20,7 +20,7 @@ package org.elasticsearch.test.store; import org.apache.logging.log4j.Logger; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.logging.Loggers; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; diff --git a/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransport.java b/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransport.java index 1ef181c1658f1..c3aad156a955e 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransport.java +++ b/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransport.java @@ -21,9 +21,9 @@ import org.opensearch.cluster.ClusterModule; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.Randomness; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput; import org.opensearch.common.io.stream.NamedWriteableRegistry; diff --git a/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java b/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java index 58ceb40dc1856..0987583862116 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java +++ b/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java @@ -25,7 +25,7 @@ import org.opensearch.action.ActionListener; import org.opensearch.cluster.ClusterModule; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.opensearch.common.UUIDs; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.NamedWriteableRegistry; @@ -35,11 +35,11 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.BoundTransportAddress; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.util.MockPageCacheRecycler; import org.opensearch.common.util.concurrent.AbstractRunnable; import org.opensearch.common.util.concurrent.RunOnce; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.node.Node; import org.opensearch.plugins.Plugin; diff --git a/test/framework/src/main/java/org/elasticsearch/upgrades/AbstractFullClusterRestartTestCase.java b/test/framework/src/main/java/org/elasticsearch/upgrades/AbstractFullClusterRestartTestCase.java index 12388f4e83d0b..6c729673d9849 100644 --- a/test/framework/src/main/java/org/elasticsearch/upgrades/AbstractFullClusterRestartTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/upgrades/AbstractFullClusterRestartTestCase.java @@ -21,7 +21,7 @@ import org.opensearch.Version; import org.opensearch.client.Request; -import org.elasticsearch.common.Booleans; +import org.opensearch.common.Booleans; import org.opensearch.common.Strings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.support.XContentMapValues; diff --git a/test/framework/src/main/java/org/opensearch/repositories/blobstore/AbstractBlobContainerRetriesTestCase.java b/test/framework/src/main/java/org/opensearch/repositories/blobstore/AbstractBlobContainerRetriesTestCase.java index e019d049341c1..4dc7a1fa00528 100644 --- a/test/framework/src/main/java/org/opensearch/repositories/blobstore/AbstractBlobContainerRetriesTestCase.java +++ b/test/framework/src/main/java/org/opensearch/repositories/blobstore/AbstractBlobContainerRetriesTestCase.java @@ -23,14 +23,14 @@ import com.sun.net.httpserver.HttpServer; import org.apache.http.ConnectionClosedException; import org.apache.http.HttpStatus; -import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.Nullable; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.blobstore.BlobContainer; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.Streams; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.CountDown; import org.elasticsearch.mocksocket.MockHttpServer; import org.elasticsearch.test.ESTestCase; 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 e34d501d2ccaa..974721f8c650d 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 @@ -39,7 +39,7 @@ import org.opensearch.common.blobstore.BlobMetadata; import org.opensearch.common.blobstore.BlobPath; import org.opensearch.common.blobstore.BlobStore; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.xcontent.LoggingDeprecationHandler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentParser; diff --git a/test/framework/src/main/java/org/opensearch/repositories/blobstore/ESBlobStoreRepositoryIntegTestCase.java b/test/framework/src/main/java/org/opensearch/repositories/blobstore/ESBlobStoreRepositoryIntegTestCase.java index 9c0d9023515cc..b7645198de990 100644 --- a/test/framework/src/main/java/org/opensearch/repositories/blobstore/ESBlobStoreRepositoryIntegTestCase.java +++ b/test/framework/src/main/java/org/opensearch/repositories/blobstore/ESBlobStoreRepositoryIntegTestCase.java @@ -36,7 +36,7 @@ import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.io.Streams; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.repositories.IndexId; import org.opensearch.repositories.RepositoriesService; import org.opensearch.repositories.Repository; diff --git a/test/framework/src/main/java/org/opensearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java b/test/framework/src/main/java/org/opensearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java index 0b25cf51ca14f..47b591f9844ab 100644 --- a/test/framework/src/main/java/org/opensearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java +++ b/test/framework/src/main/java/org/opensearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java @@ -30,7 +30,7 @@ import org.opensearch.action.admin.indices.forcemerge.ForceMergeResponse; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.Strings; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.network.InetAddresses; import org.opensearch.common.settings.Settings; @@ -345,7 +345,7 @@ public HttpHandler getDelegate() { } synchronized Map getOperationsCount() { - return org.elasticsearch.common.collect.Map.copyOf(operationCount); + return org.opensearch.common.collect.Map.copyOf(operationCount); } protected synchronized void trackRequest(final String requestType) { diff --git a/test/framework/src/main/java/org/opensearch/search/RandomSearchRequestGenerator.java b/test/framework/src/main/java/org/opensearch/search/RandomSearchRequestGenerator.java index 187eb230376db..0dc1698f38790 100644 --- a/test/framework/src/main/java/org/opensearch/search/RandomSearchRequestGenerator.java +++ b/test/framework/src/main/java/org/opensearch/search/RandomSearchRequestGenerator.java @@ -24,7 +24,7 @@ import org.opensearch.action.support.IndicesOptions; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.text.Text; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.DeprecationHandler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -35,7 +35,6 @@ import org.opensearch.script.Script; import org.opensearch.script.ScriptType; import org.opensearch.search.aggregations.AggregationBuilders; -import org.opensearch.search.SearchExtBuilder; import org.opensearch.search.builder.PointInTimeBuilder; import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.search.collapse.CollapseBuilder; diff --git a/test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java b/test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java index b6e57f1e43ca7..366c14cba59d7 100644 --- a/test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java +++ b/test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java @@ -48,7 +48,7 @@ import org.apache.lucene.util.NumericUtils; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.common.CheckedConsumer; +import org.opensearch.common.CheckedConsumer; import org.opensearch.common.TriFunction; import org.opensearch.common.breaker.CircuitBreaker; import org.opensearch.common.io.stream.StreamOutput; diff --git a/test/framework/src/main/java/org/opensearch/snapshots/AbstractSnapshotIntegTestCase.java b/test/framework/src/main/java/org/opensearch/snapshots/AbstractSnapshotIntegTestCase.java index a3ecf39f6d8b9..de934a053a49b 100644 --- a/test/framework/src/main/java/org/opensearch/snapshots/AbstractSnapshotIntegTestCase.java +++ b/test/framework/src/main/java/org/opensearch/snapshots/AbstractSnapshotIntegTestCase.java @@ -41,7 +41,7 @@ import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeUnit; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.DeprecationHandler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/test/framework/src/main/java/org/opensearch/snapshots/mockstore/MockRepository.java b/test/framework/src/main/java/org/opensearch/snapshots/mockstore/MockRepository.java index 5febc839546dc..5294bb74086ad 100644 --- a/test/framework/src/main/java/org/opensearch/snapshots/mockstore/MockRepository.java +++ b/test/framework/src/main/java/org/opensearch/snapshots/mockstore/MockRepository.java @@ -33,7 +33,7 @@ import org.opensearch.common.blobstore.DeleteResult; import org.opensearch.common.blobstore.fs.FsBlobContainer; import org.opensearch.common.blobstore.support.FilterBlobContainer; -import org.elasticsearch.common.io.PathUtils; +import org.opensearch.common.io.PathUtils; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.settings.Settings; 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 2cd02b5a10a07..943044aacb8ef 100644 --- a/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java +++ b/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java @@ -32,8 +32,8 @@ import org.opensearch.action.ActionListenerResponseHandler; import org.opensearch.action.support.PlainActionFuture; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.Nullable; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.Nullable; +import org.opensearch.common.SuppressForbidden; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; @@ -46,10 +46,10 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.BoundTransportAddress; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.AbstractRunnable; import org.opensearch.common.util.concurrent.ConcurrentCollections; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.mocksocket.MockServerSocket; import org.elasticsearch.node.Node; import org.opensearch.tasks.Task; diff --git a/test/framework/src/main/java/org/opensearch/transport/FakeTcpChannel.java b/test/framework/src/main/java/org/opensearch/transport/FakeTcpChannel.java index 16eb7da0905a4..91ab9e7f79c59 100644 --- a/test/framework/src/main/java/org/opensearch/transport/FakeTcpChannel.java +++ b/test/framework/src/main/java/org/opensearch/transport/FakeTcpChannel.java @@ -20,7 +20,7 @@ import org.opensearch.action.ActionListener; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.common.concurrent.CompletableContext; +import org.opensearch.common.concurrent.CompletableContext; import java.net.InetSocketAddress; import java.util.concurrent.atomic.AtomicReference; diff --git a/test/framework/src/main/java/org/opensearch/transport/nio/MockNioTransport.java b/test/framework/src/main/java/org/opensearch/transport/nio/MockNioTransport.java index 4ac9e45b33c27..f8386a0f920d7 100644 --- a/test/framework/src/main/java/org/opensearch/transport/nio/MockNioTransport.java +++ b/test/framework/src/main/java/org/opensearch/transport/nio/MockNioTransport.java @@ -37,9 +37,9 @@ import org.opensearch.common.network.NetworkService; import org.opensearch.common.recycler.Recycler; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.PageCacheRecycler; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.opensearch.nio.BytesChannelContext; import org.opensearch.nio.BytesWriteHandler; diff --git a/test/framework/src/test/java/org/elasticsearch/cluster/coordination/DeterministicTaskQueueTests.java b/test/framework/src/test/java/org/elasticsearch/cluster/coordination/DeterministicTaskQueueTests.java index f476782a7aa82..32a1ec24c4d4e 100644 --- a/test/framework/src/test/java/org/elasticsearch/cluster/coordination/DeterministicTaskQueueTests.java +++ b/test/framework/src/test/java/org/elasticsearch/cluster/coordination/DeterministicTaskQueueTests.java @@ -20,7 +20,7 @@ package org.elasticsearch.cluster.coordination; import org.opensearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.unit.TimeValue; import org.elasticsearch.test.ESTestCase; import org.opensearch.threadpool.Scheduler; import org.opensearch.threadpool.ThreadPool; diff --git a/test/framework/src/test/java/org/elasticsearch/test/AbstractQueryTestCaseTests.java b/test/framework/src/test/java/org/elasticsearch/test/AbstractQueryTestCaseTests.java index eb989bccb643f..ed32fd9b1ca74 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/AbstractQueryTestCaseTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/AbstractQueryTestCaseTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.test; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.util.set.Sets; import org.hamcrest.Matcher; diff --git a/test/framework/src/test/java/org/elasticsearch/test/VersionUtilsTests.java b/test/framework/src/test/java/org/elasticsearch/test/VersionUtilsTests.java index 9d692e55ea53a..fbfbd10da1b41 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/VersionUtilsTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/VersionUtilsTests.java @@ -19,8 +19,8 @@ package org.elasticsearch.test; import org.opensearch.Version; -import org.elasticsearch.common.Booleans; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.Booleans; +import org.opensearch.common.collect.Tuple; import java.util.ArrayList; import java.util.Arrays; diff --git a/test/framework/src/test/java/org/elasticsearch/test/disruption/DisruptableMockTransportTests.java b/test/framework/src/test/java/org/elasticsearch/test/disruption/DisruptableMockTransportTests.java index cf191565abc18..1660b53cb3ffc 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/disruption/DisruptableMockTransportTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/disruption/DisruptableMockTransportTests.java @@ -23,7 +23,7 @@ import org.opensearch.action.support.PlainActionFuture; import org.elasticsearch.cluster.coordination.DeterministicTaskQueue; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; diff --git a/test/framework/src/test/java/org/elasticsearch/test/disruption/LongGCDisruptionTests.java b/test/framework/src/test/java/org/elasticsearch/test/disruption/LongGCDisruptionTests.java index 992b9617fb9d9..b6c18eaafd933 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/disruption/LongGCDisruptionTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/disruption/LongGCDisruptionTests.java @@ -18,7 +18,7 @@ */ package org.elasticsearch.test.disruption; -import org.elasticsearch.common.Nullable; +import org.opensearch.common.Nullable; import org.elasticsearch.test.ESTestCase; import java.lang.management.ThreadInfo; diff --git a/test/framework/src/test/java/org/elasticsearch/test/disruption/NetworkDisruptionIT.java b/test/framework/src/test/java/org/elasticsearch/test/disruption/NetworkDisruptionIT.java index 49f9a6b463240..d78f92c66139d 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/disruption/NetworkDisruptionIT.java +++ b/test/framework/src/test/java/org/elasticsearch/test/disruption/NetworkDisruptionIT.java @@ -23,7 +23,7 @@ import org.opensearch.action.admin.cluster.health.ClusterHealthRequest; import org.opensearch.action.admin.cluster.health.ClusterHealthResponse; import org.opensearch.cluster.NodeConnectionsService; -import org.elasticsearch.common.collect.Tuple; +import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.settings.Settings; import org.elasticsearch.plugins.Plugin; diff --git a/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java b/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java index 74e3528be064d..9b146d9f5bdc3 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java +++ b/test/framework/src/test/java/org/elasticsearch/test/test/InternalTestClusterTests.java @@ -25,7 +25,7 @@ import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.network.NetworkModule; import org.opensearch.common.settings.Settings; -import org.elasticsearch.core.internal.io.IOUtils; +import org.opensearch.core.internal.io.IOUtils; import org.opensearch.discovery.DiscoveryModule; import org.opensearch.discovery.DiscoverySettings; import org.opensearch.discovery.SettingsBasedSeedHostsProvider; diff --git a/test/framework/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterIT.java b/test/framework/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterIT.java index 4e0623cd13448..f97ce5f4cb576 100644 --- a/test/framework/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterIT.java +++ b/test/framework/src/test/java/org/elasticsearch/test/test/SuiteScopeClusterIT.java @@ -19,7 +19,7 @@ package org.elasticsearch.test.test; import com.carrotsearch.randomizedtesting.annotations.Repeat; -import org.elasticsearch.common.SuppressForbidden; +import org.opensearch.common.SuppressForbidden; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.TestCluster; import org.junit.Test; diff --git a/test/framework/src/test/java/org/opensearch/transport/nio/TestEventHandlerTests.java b/test/framework/src/test/java/org/opensearch/transport/nio/TestEventHandlerTests.java index 9757e786e3422..714ad2c36d99e 100644 --- a/test/framework/src/test/java/org/opensearch/transport/nio/TestEventHandlerTests.java +++ b/test/framework/src/test/java/org/opensearch/transport/nio/TestEventHandlerTests.java @@ -21,7 +21,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; -import org.elasticsearch.common.CheckedRunnable; +import org.opensearch.common.CheckedRunnable; import org.opensearch.common.logging.Loggers; import org.opensearch.common.settings.Settings; import org.opensearch.nio.ServerChannelContext; diff --git a/test/logger-usage/src/main/java/org/elasticsearch/test/loggerusage/ESLoggerUsageChecker.java b/test/logger-usage/src/main/java/org/elasticsearch/test/loggerusage/ESLoggerUsageChecker.java index 501f2fec2ad48..35732530c8bac 100644 --- a/test/logger-usage/src/main/java/org/elasticsearch/test/loggerusage/ESLoggerUsageChecker.java +++ b/test/logger-usage/src/main/java/org/elasticsearch/test/loggerusage/ESLoggerUsageChecker.java @@ -69,7 +69,7 @@ public class ESLoggerUsageChecker { public static final Type SUPPLIER_ARRAY_CLASS = Type.getType(Supplier[].class); public static final Type MARKER_CLASS = Type.getType(Marker.class); public static final List LOGGER_METHODS = Arrays.asList("trace", "debug", "info", "warn", "error", "fatal"); - public static final String IGNORE_CHECKS_ANNOTATION = "org.elasticsearch.common.SuppressLoggerChecks"; + public static final String IGNORE_CHECKS_ANNOTATION = "org.opensearch.common.SuppressLoggerChecks"; // types which are subject to checking when used in logger. TestMessage is also declared here to // make sure this functionality works public static final Set DEPRECATED_TYPES = Stream.of(