honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Rename] refactor the libs/core module. (#350) 

Refactor the code in the `libs/core` module and any references to those in the entire code base. The refactoring is done as part of the renaming to OpenSearch work.

Signed-off-by: Rabi Panda <adnapibar@gmail.com>
This commit is contained in:
Rabi Panda 2021-03-17 10:13:44 -07:00 committed by Nick Knize
parent 50c3251d36
commit 972d8ea920
1010 changed files with 1500 additions and 1514 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/benchmark/src/main/java/org/opensearch/client/benchmark/AbstractBenchmark.java
View File

@ -22,7 +22,7 @@ import org.opensearch.client.benchmark.ops.bulk.BulkBenchmarkTask;
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;

2
client/benchmark/src/main/java/org/opensearch/client/benchmark/BenchmarkMain.java
View File

@ -20,7 +20,7 @@ package org.opensearch.client.benchmark;
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;

2
client/benchmark/src/main/java/org/opensearch/client/benchmark/BenchmarkRunner.java
View File

@ -22,7 +22,7 @@ import org.opensearch.client.benchmark.metrics.Metrics;
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;

4
client/benchmark/src/main/java/org/opensearch/client/benchmark/ops/bulk/BulkBenchmarkTask.java
View File

@ -24,8 +24,8 @@ import org.opensearch.OpenSearchException;
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;

2
client/rest-high-level/src/main/java/org/opensearch/client/NodesResponseHeader.java
View File

@ -20,7 +20,7 @@ package org.opensearch.client;
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;

7
client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java
View File

@ -28,7 +28,6 @@ import org.apache.http.client.methods.HttpPut;
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.core.TermVectorsRequest;
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;

4
client/rest-high-level/src/main/java/org/opensearch/client/RestHighLevelClient.java
View File

@ -73,8 +73,8 @@ import org.opensearch.client.core.MultiTermVectorsResponse;
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;

4
client/rest-high-level/src/main/java/org/opensearch/client/TimedRequest.java
View File

@ -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.

2
client/rest-high-level/src/main/java/org/opensearch/client/ValidationException.java
View File

@ -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;

2
client/rest-high-level/src/main/java/org/opensearch/client/core/PageParams.java
View File

@ -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;

2
client/rest-high-level/src/main/java/org/opensearch/client/core/TermVectorsRequest.java
View File

@ -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;

2
client/rest-high-level/src/main/java/org/opensearch/client/core/TermVectorsResponse.java
View File

@ -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;

2
client/rest-high-level/src/main/java/org/opensearch/client/indices/CloseIndexResponse.java
View File

@ -21,7 +21,7 @@ package org.opensearch.client.indices;
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;

2
client/rest-high-level/src/main/java/org/opensearch/client/indices/DataStream.java
View File

@ -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;

4
client/rest-high-level/src/main/java/org/opensearch/client/indices/GetComponentTemplatesRequest.java
View File

@ -21,8 +21,8 @@ package org.opensearch.client.indices;
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

4
client/rest-high-level/src/main/java/org/opensearch/client/indices/GetComposableIndexTemplateRequest.java
View File

@ -21,8 +21,8 @@ package org.opensearch.client.indices;
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

4
client/rest-high-level/src/main/java/org/opensearch/client/indices/GetIndexTemplatesRequest.java
View File

@ -21,9 +21,9 @@ package org.opensearch.client.indices;
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;

2
client/rest-high-level/src/main/java/org/opensearch/client/indices/IndexTemplateMetadata.java
View File

@ -21,7 +21,7 @@ package org.opensearch.client.indices;
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;

2
client/rest-high-level/src/main/java/org/opensearch/client/indices/PutIndexTemplateRequest.java
View File

@ -25,7 +25,7 @@ import org.opensearch.action.IndicesRequest;
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;

2
client/rest-high-level/src/main/java/org/opensearch/client/indices/SimulateIndexTemplateRequest.java
View File

@ -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;
/**

2
client/rest-high-level/src/main/java/org/opensearch/client/indices/SimulateIndexTemplateResponse.java
View File

@ -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;

2
client/rest-high-level/src/main/java/org/opensearch/client/indices/rollover/RolloverRequest.java
View File

@ -25,7 +25,7 @@ import org.opensearch.action.admin.indices.rollover.MaxSizeCondition;
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;

2
client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotLifecyclePolicy.java
View File

@ -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;

2
client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotLifecyclePolicyMetadata.java
View File

@ -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;

2
client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotLifecycleStats.java
View File

@ -21,7 +21,7 @@ package org.opensearch.client.slm;
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;

4
client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotRetentionConfiguration.java
View File

@ -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;

2
client/rest-high-level/src/main/java/org/opensearch/client/tasks/CancelTasksRequest.java
View File

@ -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;

2
client/rest-high-level/src/main/java/org/opensearch/client/tasks/GetTaskRequest.java
View File

@ -20,7 +20,7 @@ package org.opensearch.client.tasks;
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;

2
client/rest-high-level/src/test/java/org/opensearch/client/BulkProcessorIT.java
View File

@ -36,7 +36,7 @@ import org.opensearch.common.Strings;
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;

2
client/rest-high-level/src/test/java/org/opensearch/client/BulkProcessorRetryIT.java
View File

@ -27,7 +27,7 @@ import org.opensearch.action.bulk.BulkRequest;
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;

2
client/rest-high-level/src/test/java/org/opensearch/client/ClusterClientIT.java
View File

@ -50,7 +50,7 @@ import org.opensearch.cluster.routing.allocation.decider.EnableAllocationDecider
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;

2
client/rest-high-level/src/test/java/org/opensearch/client/CustomRestHighLevelClientTests.java
View File

@ -41,7 +41,7 @@ import org.opensearch.action.main.MainRequest;
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;

8
client/rest-high-level/src/test/java/org/opensearch/client/IndicesClientIT.java
View File

@ -107,7 +107,7 @@ import org.opensearch.common.settings.Setting;
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 class IndicesClientIT extends OpenSearchRestHighLevelClientTestCase {
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<String> pattern = org.elasticsearch.common.collect.List.of("pattern");
Template template = new Template(settings, mappings, org.opensearch.common.collect.Map.of("alias", alias));
List<String> 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 class IndicesClientIT extends OpenSearchRestHighLevelClientTestCase {
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);

4
client/rest-high-level/src/test/java/org/opensearch/client/IndicesRequestConvertersTests.java
View File

@ -60,10 +60,10 @@ import org.opensearch.client.indices.PutMappingRequest;
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;

6
client/rest-high-level/src/test/java/org/opensearch/client/OpenSearchRestHighLevelClientTestCase.java
View File

@ -33,8 +33,8 @@ import org.opensearch.action.support.PlainActionFuture;
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.elasticsearch.common.xcontent.XContentBuilder;
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;

4
client/rest-high-level/src/test/java/org/opensearch/client/RequestConvertersTests.java
View File

@ -62,11 +62,11 @@ import org.opensearch.common.CheckedBiConsumer;
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;

4
client/rest-high-level/src/test/java/org/opensearch/client/RestHighLevelClientTests.java
View File

@ -52,9 +52,9 @@ import org.opensearch.action.search.SearchScrollRequest;
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;

2
client/rest-high-level/src/test/java/org/opensearch/client/SearchIT.java
View File

@ -40,7 +40,7 @@ import org.opensearch.client.core.CountRequest;
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;

2
client/rest-high-level/src/test/java/org/opensearch/client/SnapshotRequestConvertersTests.java
View File

@ -34,7 +34,7 @@ import org.opensearch.action.admin.cluster.snapshots.get.GetSnapshotsRequest;
import org.opensearch.action.admin.cluster.snapshots.restore.RestoreSnapshotRequest;
import org.opensearch.action.admin.cluster.snapshots.status.SnapshotsStatusRequest;
import org.opensearch.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;

2
client/rest-high-level/src/test/java/org/opensearch/client/TimedRequestTests.java
View File

@ -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 {

2
client/rest-high-level/src/test/java/org/opensearch/client/cluster/RemoteInfoResponseTests.java
View File

@ -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;

2
client/rest-high-level/src/test/java/org/opensearch/client/documentation/CRUDDocumentationIT.java
View File

@ -66,7 +66,7 @@ import org.opensearch.common.bytes.BytesArray;
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;

2
client/rest-high-level/src/test/java/org/opensearch/client/documentation/ClusterClientDocumentationIT.java
View File

@ -51,7 +51,7 @@ import org.opensearch.common.Priority;
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;

2
client/rest-high-level/src/test/java/org/opensearch/client/documentation/IndicesClientDocumentationIT.java
View File

@ -95,7 +95,7 @@ import org.opensearch.common.compress.CompressedXContent;
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;

2
client/rest-high-level/src/test/java/org/opensearch/client/documentation/IngestClientDocumentationIT.java
View File

@ -36,7 +36,7 @@ import org.opensearch.client.OpenSearchRestHighLevelClientTestCase;
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;

2
client/rest-high-level/src/test/java/org/opensearch/client/documentation/SearchDocumentationIT.java
View File

@ -56,7 +56,7 @@ import org.opensearch.common.bytes.BytesReference;
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;

4
client/rest-high-level/src/test/java/org/opensearch/client/documentation/SnapshotClientDocumentationIT.java
View File

@ -48,9 +48,9 @@ import org.opensearch.client.RestHighLevelClient;
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;

2
client/rest-high-level/src/test/java/org/opensearch/client/documentation/StoredScriptsDocumentationIT.java
View File

@ -31,7 +31,7 @@ import org.opensearch.client.RequestOptions;
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;

2
client/rest-high-level/src/test/java/org/opensearch/client/documentation/TasksClientDocumentationIT.java
View File

@ -31,7 +31,7 @@ import org.opensearch.client.RequestOptions;
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;

2
client/rest-high-level/src/test/java/org/opensearch/client/indices/CloseIndexRequestTests.java
View File

@ -23,7 +23,7 @@ import org.opensearch.action.support.IndicesOptions;
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;

2
client/rest-high-level/src/test/java/org/opensearch/client/indices/rollover/RolloverRequestTests.java
View File

@ -24,7 +24,7 @@ import org.opensearch.action.admin.indices.rollover.MaxAgeCondition;
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;

2
client/rest-high-level/src/test/java/org/opensearch/client/indices/rollover/RolloverResponseTests.java
View File

@ -24,7 +24,7 @@ import org.opensearch.action.admin.indices.rollover.MaxAgeCondition;
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;

2
client/transport/src/main/java/org/opensearch/transport/client/PreBuiltTransportClient.java
View File

@ -23,7 +23,7 @@ import io.netty.util.ThreadDeathWatcher;
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;

2
distribution/docker/src/test/java/org/elasticsearch/docker/test/DockerYmlTestSuiteIT.java
View File

@ -21,7 +21,7 @@ package org.opensearch.docker.test;
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;

4
distribution/tools/keystore-cli/src/main/java/org/opensearch/common/settings/AddFileKeyStoreCommand.java
View File

@ -24,8 +24,8 @@ import joptsimple.OptionSpec;
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;

2
distribution/tools/keystore-cli/src/main/java/org/opensearch/common/settings/AddStringKeyStoreCommand.java
View File

@ -24,7 +24,7 @@ import joptsimple.OptionSpec;
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;

2
distribution/tools/keystore-cli/src/test/java/org/opensearch/bootstrap/BootstrapTests.java
View File

@ -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;

2
distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/AddFileKeyStoreCommandTests.java
View File

@ -22,7 +22,7 @@ package org.opensearch.common.settings;
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;

2
distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreCommandTestCase.java
View File

@ -29,7 +29,7 @@ import java.util.List;
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;

2
distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreWrapperTests.java
View File

@ -24,7 +24,7 @@ import org.apache.lucene.store.IOContext;
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;

8
distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/InstallPluginCommand.java
View File

@ -37,15 +37,15 @@ import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator;
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;

2
distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/PluginCli.java
View File

@ -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;

2
distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/RemovePluginCommand.java
View File

@ -25,7 +25,7 @@ import org.opensearch.cli.EnvironmentAwareCommand;
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;

6
distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java
View File

@ -47,11 +47,11 @@ import org.opensearch.cli.ExitCodes;
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;

2
libs/cli/src/main/java/org/opensearch/cli/MultiCommand.java
View File

@ -23,7 +23,7 @@ import joptsimple.NonOptionArgumentSpec;
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;

2
libs/cli/src/main/java/org/opensearch/cli/UserException.java
View File

@ -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.

16
libs/core/.classpath1
View File

@ -49,7 +49,7 @@
<attribute name="test" value="false"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="/:libs:elasticsearch-nio">
<classpathentry kind="src" path="/:libs:opensearch-nio">
<attributes>
<attribute name="test" value="false"/>
</attributes>
@ -59,22 +59,22 @@
<attribute name="test" value="false"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="/:libs:elasticsearch-cli">
<classpathentry kind="src" path="/:libs:opensearch-cli">
<attributes>
<attribute name="test" value="false"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="/:libs:elasticsearch-x-content">
<classpathentry kind="src" path="/:libs:opensearch-x-content">
<attributes>
<attribute name="test" value="false"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="/:libs:elasticsearch-secure-sm">
<classpathentry kind="src" path="/:libs:opensearch-secure-sm">
<attributes>
<attribute name="test" value="false"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="/:libs:elasticsearch-geo">
<classpathentry kind="src" path="/:libs:opensearch-geo">
<attributes>
<attribute name="test" value="false"/>
</attributes>
@ -121,13 +121,13 @@
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="/home/alpar/.gradle/caches/modules-2/files-2.1/org.elasticsearch/securemock/1.2/98201d4ad5ac93f6b415ae9172d52b5e7cda490e/securemock-1.2.jar">
<classpathentry kind="lib" path="/home/alpar/.gradle/caches/modules-2/files-2.1/org.opensearch/securemock/1.2/98201d4ad5ac93f6b415ae9172d52b5e7cda490e/securemock-1.2.jar">
<attributes>
<attribute name="gradle_used_by_scope" value="test"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry sourcepath="/home/alpar/.gradle/caches/modules-2/files-2.1/org.elasticsearch/mocksocket/1.2/5a7e4e48580119231e834b5d77333248275e3fb7/mocksocket-1.2-sources.jar" kind="lib" path="/home/alpar/.gradle/caches/modules-2/files-2.1/org.elasticsearch/mocksocket/1.2/190ad3f42fd6ab7367bae0c0e14d1dc4e4a3c361/mocksocket-1.2.jar">
<classpathentry sourcepath="/home/alpar/.gradle/caches/modules-2/files-2.1/org.opensearch/mocksocket/1.2/5a7e4e48580119231e834b5d77333248275e3fb7/mocksocket-1.2-sources.jar" kind="lib" path="/home/alpar/.gradle/caches/modules-2/files-2.1/org.opensearch/mocksocket/1.2/190ad3f42fd6ab7367bae0c0e14d1dc4e4a3c361/mocksocket-1.2.jar">
<attributes>
<attribute name="gradle_used_by_scope" value="test"/>
<attribute name="test" value="true"/>
@ -301,7 +301,7 @@
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry sourcepath="/home/alpar/.gradle/caches/modules-2/files-2.1/org.elasticsearch/jna/4.5.1/965bf0f4cf5b71c2b1e9bb5a8d7b6919020e0492/jna-4.5.1-sources.jar" kind="lib" path="/home/alpar/.gradle/caches/modules-2/files-2.1/org.elasticsearch/jna/4.5.1/da10908ae23dc59b19dc258e63aea1c44621dc3a/jna-4.5.1.jar">
<classpathentry sourcepath="/home/alpar/.gradle/caches/modules-2/files-2.1/org.opensearch/jna/4.5.1/965bf0f4cf5b71c2b1e9bb5a8d7b6919020e0492/jna-4.5.1-sources.jar" kind="lib" path="/home/alpar/.gradle/caches/modules-2/files-2.1/org.opensearch/jna/4.5.1/da10908ae23dc59b19dc258e63aea1c44621dc3a/jna-4.5.1.jar">
<attributes>
<attribute name="gradle_used_by_scope" value="test"/>
<attribute name="test" value="true"/>

10
libs/core/build.gradle
View File

@ -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'
}

8
libs/core/src/main/java/org/elasticsearch/bootstrap/JarHell.java → libs/core/src/main/java/org/opensearch/bootstrap/JarHell.java
View File

@ -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 @@ public class JarHell {
// 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() +

2
libs/core/src/main/java/org/elasticsearch/bootstrap/JavaVersion.java → libs/core/src/main/java/org/opensearch/bootstrap/JavaVersion.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.bootstrap;
package org.opensearch.bootstrap;
import java.math.BigInteger;
import java.util.ArrayList;

4
libs/core/src/main/java/org/elasticsearch/bootstrap/JdkJarHellCheck.java → libs/core/src/main/java/org/opensearch/bootstrap/JdkJarHellCheck.java
View File

@ -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;

2
libs/core/src/main/java/org/elasticsearch/common/Booleans.java → libs/core/src/main/java/org/opensearch/common/Booleans.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.common;
package org.opensearch.common;
public final class Booleans {
private Booleans() {

2
libs/core/src/main/java/org/elasticsearch/common/CharArrays.java → libs/core/src/main/java/org/opensearch/common/CharArrays.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.common;
package org.opensearch.common;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;

2
libs/core/src/main/java/org/elasticsearch/common/CheckedConsumer.java → libs/core/src/main/java/org/opensearch/common/CheckedConsumer.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.common;
package org.opensearch.common;
import java.util.function.Consumer;

2
libs/core/src/main/java/org/elasticsearch/common/CheckedFunction.java → libs/core/src/main/java/org/opensearch/common/CheckedFunction.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.common;
package org.opensearch.common;
import java.util.function.Function;

2
libs/core/src/main/java/org/elasticsearch/common/CheckedRunnable.java → libs/core/src/main/java/org/opensearch/common/CheckedRunnable.java
View File

@ -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.

2
libs/core/src/main/java/org/elasticsearch/common/Glob.java → libs/core/src/main/java/org/opensearch/common/Glob.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.common;
package org.opensearch.common;
/**
* Utility class for glob-like matching

2
libs/core/src/main/java/org/elasticsearch/common/MemoizedSupplier.java → libs/core/src/main/java/org/opensearch/common/MemoizedSupplier.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.common;
package org.opensearch.common;
import java.util.function.Supplier;

2
libs/core/src/main/java/org/elasticsearch/common/Nullable.java → libs/core/src/main/java/org/opensearch/common/Nullable.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.common;
package org.opensearch.common;
import javax.annotation.CheckForNull;
import javax.annotation.meta.TypeQualifierNickname;

2
libs/core/src/main/java/org/elasticsearch/common/SuppressForbidden.java → libs/core/src/main/java/org/opensearch/common/SuppressForbidden.java
View File

@ -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;

2
libs/core/src/main/java/org/elasticsearch/common/collect/List.java → libs/core/src/main/java/org/opensearch/common/collect/List.java
View File

@ -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;

2
libs/core/src/main/java/org/elasticsearch/common/collect/Map.java → libs/core/src/main/java/org/opensearch/common/collect/Map.java
View File

@ -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;

2
libs/core/src/main/java/org/elasticsearch/common/collect/Set.java → libs/core/src/main/java/org/opensearch/common/collect/Set.java
View File

@ -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;

2
libs/core/src/main/java/org/elasticsearch/common/collect/Tuple.java → libs/core/src/main/java/org/opensearch/common/collect/Tuple.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.common.collect;
package org.opensearch.common.collect;
public class Tuple<V1, V2> {

2
libs/core/src/main/java/org/elasticsearch/common/concurrent/CompletableContext.java → libs/core/src/main/java/org/opensearch/common/concurrent/CompletableContext.java
View File

@ -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;

18
libs/core/src/main/java/org/elasticsearch/common/io/PathUtils.java → libs/core/src/main/java/org/opensearch/common/io/PathUtils.java
View File

@ -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.FileSystems;
import java.nio.file.Path;
import java.nio.file.Paths;
/**
/**
* Utilities for creating a Path from names,
* or accessing the default FileSystem.
* <p>
@ -39,14 +39,14 @@ import java.nio.file.Paths;
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.
* <p>
* This works just like {@code Paths.get()}.
@ -59,8 +59,8 @@ public final class PathUtils {
public static Path get(String first, String... more) {
return DEFAULT.getPath(first, more);
}
/**
/**
* Returns a {@code Path} from a URI
* <p>
* This works just like {@code Paths.get()}.

2
libs/core/src/main/java/org/elasticsearch/common/unit/TimeValue.java → libs/core/src/main/java/org/opensearch/common/unit/TimeValue.java
View File

@ -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;

2
libs/core/src/main/java/org/elasticsearch/common/util/FastMath.java → libs/core/src/main/java/org/opensearch/common/util/FastMath.java
View File

@ -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

6
libs/core/src/main/java/org/elasticsearch/common/util/ESSloppyMath.java → libs/core/src/main/java/org/opensearch/common/util/OpenSearchSloppyMath.java
View File

@ -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);

2
libs/core/src/main/java/org/elasticsearch/common/util/concurrent/AbstractRefCounted.java → libs/core/src/main/java/org/opensearch/common/util/concurrent/AbstractRefCounted.java
View File

@ -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;

2
libs/core/src/main/java/org/elasticsearch/common/util/concurrent/RefCounted.java → libs/core/src/main/java/org/opensearch/common/util/concurrent/RefCounted.java
View File

@ -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

4
libs/core/src/main/java/org/elasticsearch/core/internal/io/IOUtils.java → libs/core/src/main/java/org/opensearch/core/internal/io/IOUtils.java
View File

@ -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;

2
libs/core/src/main/java/org/elasticsearch/core/internal/io/Streams.java → libs/core/src/main/java/org/opensearch/core/internal/io/Streams.java
View File

@ -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;

2
libs/core/src/main/java/org/elasticsearch/core/internal/net/NetUtils.java → libs/core/src/main/java/org/opensearch/core/internal/net/NetUtils.java
View File

@ -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;

2
libs/core/src/main/java11/org/elasticsearch/common/collect/List.java → libs/core/src/main/java11/org/opensearch/common/collect/List.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.common.collect;
package org.opensearch.common.collect;
import java.util.Collection;

2
libs/core/src/main/java11/org/elasticsearch/common/collect/Map.java → libs/core/src/main/java11/org/opensearch/common/collect/Map.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.common.collect;
package org.opensearch.common.collect;
public class Map {

2
libs/core/src/main/java11/org/elasticsearch/common/collect/Set.java → libs/core/src/main/java11/org/opensearch/common/collect/Set.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.common.collect;
package org.opensearch.common.collect;
import java.util.Collection;

2
libs/core/src/main/java11/org/elasticsearch/core/internal/io/Streams.java → libs/core/src/main/java11/org/opensearch/core/internal/io/Streams.java
View File

@ -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;

4
libs/core/src/test/java/org/elasticsearch/bootstrap/JarHellTests.java → libs/core/src/test/java/org/opensearch/bootstrap/JarHellTests.java
View File

@ -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;

2
libs/core/src/test/java/org/elasticsearch/common/CharArraysTests.java → libs/core/src/test/java/org/opensearch/common/CharArraysTests.java
View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.common;
package org.opensearch.common;
import org.elasticsearch.test.ESTestCase;

Some files were not shown because too many files have changed in this diff Show More