Skip to content

Commit

Permalink
Merge branch 'rename/opensearch' of github.com:opensearch-project/Ope…
Browse files Browse the repository at this point in the history 
…nSearch into server/src/main/java/org/opensearch/node

Signed-off-by: Harold Wang <harowang@amazon.com>
  • Loading branch information
@harold-wang
harold-wang committed Mar 17, 2021
2 parents 518ce26 + c2a0a76 commit 7cbbee9
Show file tree
Hide file tree
Showing 1,698 changed files with 3,750 additions and 3,752 deletions.
2 changes: 1 addition & 1 deletion client/benchmark/src/main/java/org/opensearch/client/benchmark/AbstractBenchmark.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion client/benchmark/src/main/java/org/opensearch/client/benchmark/BenchmarkMain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion client/benchmark/src/main/java/org/opensearch/client/benchmark/BenchmarkRunner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...t/benchmark/src/main/java/org/opensearch/client/benchmark/ops/bulk/BulkBenchmarkTask.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ark/src/main/java/org/opensearch/client/benchmark/transport/TransportClientBenchmark.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import org.opensearch.client.benchmark.ops.bulk.BulkRequestExecutor;
import org.opensearch.client.benchmark.ops.search.SearchRequestExecutor;
import org.opensearch.client.transport.TransportClient;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.elasticsearch.common.xcontent.XContentType;
import org.opensearch.index.query.QueryBuilders;
Expand Down
8 changes: 4 additions & 4 deletions ...client-benchmark-noop-api-plugin/src/main/java/org/opensearch/plugin/noop/NoopPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
import org.opensearch.action.ActionResponse;
import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
import org.opensearch.cluster.node.DiscoveryNodes;
import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.IndexScopedSettings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.settings.SettingsFilter;
import org.opensearch.common.settings.ClusterSettings;
import org.opensearch.common.settings.IndexScopedSettings;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.settings.SettingsFilter;
import org.opensearch.plugin.noop.action.search.NoopSearchAction;
import org.opensearch.plugin.noop.action.search.RestNoopSearchAction;
import org.opensearch.plugin.noop.action.search.TransportNoopSearchAction;
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/main/java/org/opensearch/client/NodesResponseHeader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 3 additions & 4 deletions client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions client/rest-high-level/src/main/java/org/opensearch/client/RestHighLevelClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions client/rest-high-level/src/main/java/org/opensearch/client/TimedRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/main/java/org/opensearch/client/ValidationException.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/main/java/org/opensearch/client/core/PageParams.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/main/java/org/opensearch/client/core/TermVectorsRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/main/java/org/opensearch/client/core/TermVectorsResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/main/java/org/opensearch/client/indices/AnalyzeRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import org.opensearch.client.Validatable;
import org.opensearch.common.Strings;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.ToXContentFragment;
import org.elasticsearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder;
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/main/java/org/opensearch/client/indices/CloseIndexResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions client/rest-high-level/src/main/java/org/opensearch/client/indices/CreateIndexRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import org.opensearch.common.Strings;
import org.opensearch.common.bytes.BytesArray;
import org.opensearch.common.bytes.BytesReference;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.DeprecationHandler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.ToXContentObject;
Expand All @@ -47,7 +47,7 @@
import java.util.Objects;
import java.util.Set;

import static org.elasticsearch.common.settings.Settings.Builder.EMPTY_SETTINGS;
import static org.opensearch.common.settings.Settings.Builder.EMPTY_SETTINGS;

/**
* A request to create an index.
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/main/java/org/opensearch/client/indices/DataStream.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...-high-level/src/main/java/org/opensearch/client/indices/GetComponentTemplatesRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...-level/src/main/java/org/opensearch/client/indices/GetComposableIndexTemplateRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/main/java/org/opensearch/client/indices/GetIndexResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.apache.lucene.util.CollectionUtil;
import org.opensearch.cluster.metadata.AliasMetadata;
import org.opensearch.cluster.metadata.MappingMetadata;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentParser.Token;
import org.elasticsearch.index.mapper.MapperService;
Expand Down
4 changes: 2 additions & 2 deletions ...rest-high-level/src/main/java/org/opensearch/client/indices/GetIndexTemplatesRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...nt/rest-high-level/src/main/java/org/opensearch/client/indices/IndexTemplateMetadata.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
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.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.mapper.MapperService;
Expand Down
6 changes: 3 additions & 3 deletions .../rest-high-level/src/main/java/org/opensearch/client/indices/PutIndexTemplateRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
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.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.DeprecationHandler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.ToXContentFragment;
Expand All @@ -51,7 +51,7 @@
import java.util.stream.Collectors;

import static org.opensearch.action.ValidateActions.addValidationError;
import static org.elasticsearch.common.settings.Settings.Builder.EMPTY_SETTINGS;
import static org.opensearch.common.settings.Settings.Builder.EMPTY_SETTINGS;

/**
* A request to create an index template.
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/main/java/org/opensearch/client/indices/ResizeRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.opensearch.client.TimedRequest;
import org.opensearch.client.Validatable;
import org.opensearch.client.ValidationException;
import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder;

Expand Down
2 changes: 1 addition & 1 deletion ...-high-level/src/main/java/org/opensearch/client/indices/SimulateIndexTemplateRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...high-level/src/main/java/org/opensearch/client/indices/SimulateIndexTemplateResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rest-high-level/src/main/java/org/opensearch/client/indices/rollover/RolloverRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotLifecyclePolicy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...t-high-level/src/main/java/org/opensearch/client/slm/SnapshotLifecyclePolicyMetadata.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotLifecycleStats.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...st-high-level/src/main/java/org/opensearch/client/slm/SnapshotRetentionConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/main/java/org/opensearch/client/tasks/CancelTasksRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/main/java/org/opensearch/client/tasks/GetTaskRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/test/java/org/opensearch/client/BulkProcessorIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion client/rest-high-level/src/test/java/org/opensearch/client/BulkProcessorRetryIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading

0 comments on commit 7cbbee9

Please sign in to comment.