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/x-content module. (#354) 

Refactor the code in the `libs/x-content` 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 14:25:07 -07:00 committed by Nick Knize
parent 1a726277ed
commit 0aa52bd2e8
1404 changed files with 4078 additions and 4107 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/transport/TransportClientBenchmark.java
View File

@ -30,7 +30,7 @@ import org.opensearch.client.benchmark.ops.search.SearchRequestExecutor;
import org.opensearch.client.transport.TransportClient; import org.opensearch.client.transport.TransportClient;
import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress; import org.opensearch.common.transport.TransportAddress;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.opensearch.index.query.QueryBuilders; import org.opensearch.index.query.QueryBuilders;
import org.opensearch.plugin.noop.NoopPlugin; import org.opensearch.plugin.noop.NoopPlugin;
import org.opensearch.plugin.noop.action.bulk.NoopBulkAction; import org.opensearch.plugin.noop.action.bulk.NoopBulkAction;

2
client/client-benchmark-noop-api-plugin/src/main/java/org/opensearch/plugin/noop/action/bulk/RestNoopBulkAction.java
View File

@ -27,7 +27,7 @@ import org.opensearch.action.support.ActiveShardCount;
import org.opensearch.action.update.UpdateResponse; import org.opensearch.action.update.UpdateResponse;
import org.opensearch.client.Requests; import org.opensearch.client.Requests;
import org.opensearch.client.node.NodeClient; import org.opensearch.client.node.NodeClient;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.shard.ShardId;
import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.BaseRestHandler;
import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.BytesRestResponse;

8
client/rest-high-level/src/main/java/org/opensearch/client/GetAliasesResponse.java
View File

@ -22,10 +22,10 @@ package org.opensearch.client;
import org.opensearch.OpenSearchException; import org.opensearch.OpenSearchException;
import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.cluster.metadata.AliasMetadata;
import org.opensearch.common.xcontent.StatusToXContentObject; import org.opensearch.common.xcontent.StatusToXContentObject;
import org.elasticsearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentParser.Token; import org.opensearch.common.xcontent.XContentParser.Token;
import org.opensearch.rest.RestStatus; import org.opensearch.rest.RestStatus;
import java.io.IOException; import java.io.IOException;

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

@ -19,8 +19,8 @@
package org.opensearch.client; package org.opensearch.client;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
/** /**
* Base class for responses that are node responses. These responses always contain the cluster * Base class for responses that are node responses. These responses always contain the cluster

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

@ -21,11 +21,11 @@ package org.opensearch.client;
import org.opensearch.OpenSearchException; import org.opensearch.OpenSearchException;
import org.opensearch.action.support.nodes.BaseNodesResponse; import org.opensearch.action.support.nodes.BaseNodesResponse;
import org.opensearch.common.Nullable; import org.opensearch.common.Nullable;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.rest.action.RestActions; import org.opensearch.rest.action.RestActions;
import java.io.IOException; import java.io.IOException;

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

@ -63,14 +63,14 @@ import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.lucene.uid.Versions; import org.opensearch.common.lucene.uid.Versions;
import org.opensearch.common.unit.TimeValue; import org.opensearch.common.unit.TimeValue;
import org.opensearch.common.util.CollectionUtils; import org.opensearch.common.util.CollectionUtils;
import org.elasticsearch.common.xcontent.DeprecationHandler; import org.opensearch.common.xcontent.DeprecationHandler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContent; import org.opensearch.common.xcontent.XContent;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentHelper;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.opensearch.index.VersionType; import org.opensearch.index.VersionType;
import org.opensearch.index.mapper.MapperService; import org.opensearch.index.mapper.MapperService;
import org.opensearch.index.rankeval.RankEvalRequest; import org.opensearch.index.rankeval.RankEvalRequest;

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

@ -75,12 +75,12 @@ import org.opensearch.client.core.TermVectorsResponse;
import org.opensearch.client.tasks.TaskSubmissionResponse; import org.opensearch.client.tasks.TaskSubmissionResponse;
import org.opensearch.common.CheckedConsumer; import org.opensearch.common.CheckedConsumer;
import org.opensearch.common.CheckedFunction; import org.opensearch.common.CheckedFunction;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ContextParser; import org.opensearch.common.xcontent.ContextParser;
import org.elasticsearch.common.xcontent.DeprecationHandler; import org.opensearch.common.xcontent.DeprecationHandler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.opensearch.index.rankeval.RankEvalRequest; import org.opensearch.index.rankeval.RankEvalRequest;
import org.opensearch.index.rankeval.RankEvalResponse; import org.opensearch.index.rankeval.RankEvalResponse;
import org.opensearch.index.reindex.BulkByScrollResponse; import org.opensearch.index.reindex.BulkByScrollResponse;

20
client/rest-high-level/src/main/java/org/opensearch/client/SyncedFlushResponse.java
View File

@ -18,15 +18,15 @@
*/ */
package org.opensearch.client; package org.opensearch.client;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.opensearch.common.ParsingException; import org.opensearch.common.ParsingException;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.ToXContentFragment; import org.opensearch.common.xcontent.ToXContentFragment;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentLocation; import org.opensearch.common.xcontent.XContentLocation;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentParser.Token; import org.opensearch.common.xcontent.XContentParser.Token;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
@ -35,8 +35,8 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg; import static org.opensearch.common.xcontent.ConstructingObjectParser.constructorArg;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg; import static org.opensearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg;
import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
public class SyncedFlushResponse implements ToXContentObject { public class SyncedFlushResponse implements ToXContentObject {

10
client/rest-high-level/src/main/java/org/opensearch/client/cluster/RemoteConnectionInfo.java
View File

@ -19,16 +19,16 @@
package org.opensearch.client.cluster; package org.opensearch.client.cluster;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg; import static org.opensearch.common.xcontent.ConstructingObjectParser.constructorArg;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg; import static org.opensearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg;
/** /**
* This class encapsulates all remote cluster information to be rendered on * This class encapsulates all remote cluster information to be rendered on

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

@ -18,7 +18,7 @@
*/ */
package org.opensearch.client.cluster; package org.opensearch.client.cluster;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;

8
client/rest-high-level/src/main/java/org/opensearch/client/core/AcknowledgedResponse.java
View File

@ -19,15 +19,15 @@
package org.opensearch.client.core; package org.opensearch.client.core;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.Objects; import java.util.Objects;
import java.util.function.Function; import java.util.function.Function;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg; import static org.opensearch.common.xcontent.ConstructingObjectParser.constructorArg;
public class AcknowledgedResponse { public class AcknowledgedResponse {

6
client/rest-high-level/src/main/java/org/opensearch/client/core/BroadcastResponse.java
View File

@ -20,9 +20,9 @@
package org.opensearch.client.core; package org.opensearch.client.core;
import org.opensearch.action.support.DefaultShardOperationFailedException; import org.opensearch.action.support.DefaultShardOperationFailedException;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.Collection; import java.util.Collection;

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

@ -24,8 +24,8 @@ import org.opensearch.action.ActionRequestValidationException;
import org.opensearch.action.IndicesRequest; import org.opensearch.action.IndicesRequest;
import org.opensearch.action.support.IndicesOptions; import org.opensearch.action.support.IndicesOptions;
import org.opensearch.common.Strings; import org.opensearch.common.Strings;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryBuilder;
import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.search.builder.SearchSourceBuilder;
import org.opensearch.search.internal.SearchContext; import org.opensearch.search.internal.SearchContext;

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

@ -20,8 +20,8 @@
package org.opensearch.client.core; package org.opensearch.client.core;
import org.opensearch.action.search.ShardSearchFailure; import org.opensearch.action.search.ShardSearchFailure;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.rest.RestStatus; import org.opensearch.rest.RestStatus;
import java.io.IOException; import java.io.IOException;

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

@ -19,7 +19,7 @@
package org.opensearch.client.core; package org.opensearch.client.core;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;

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

@ -19,7 +19,7 @@
package org.opensearch.client.core; package org.opensearch.client.core;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import java.util.Objects; import java.util.Objects;

6
client/rest-high-level/src/main/java/org/opensearch/client/core/MainResponse.java
View File

@ -19,9 +19,9 @@
package org.opensearch.client.core; package org.opensearch.client.core;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.util.Objects; import java.util.Objects;

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

@ -20,8 +20,8 @@
package org.opensearch.client.core; package org.opensearch.client.core;
import org.opensearch.client.Validatable; import org.opensearch.client.Validatable;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;

8
client/rest-high-level/src/main/java/org/opensearch/client/core/MultiTermVectorsResponse.java
View File

@ -20,14 +20,14 @@
package org.opensearch.client.core; package org.opensearch.client.core;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg; import static org.opensearch.common.xcontent.ConstructingObjectParser.constructorArg;
public class MultiTermVectorsResponse { public class MultiTermVectorsResponse {
private final List<TermVectorsResponse> responses; private final List<TermVectorsResponse> responses;

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

@ -19,10 +19,10 @@
package org.opensearch.client.core; package org.opensearch.client.core;
import org.opensearch.common.Nullable; import org.opensearch.common.Nullable;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import java.io.IOException; import java.io.IOException;
import java.util.Objects; import java.util.Objects;

8
client/rest-high-level/src/main/java/org/opensearch/client/core/ShardsAcknowledgedResponse.java
View File

@ -18,13 +18,13 @@
*/ */
package org.opensearch.client.core; package org.opensearch.client.core;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg; import static org.opensearch.common.xcontent.ConstructingObjectParser.constructorArg;
public class ShardsAcknowledgedResponse extends AcknowledgedResponse { public class ShardsAcknowledgedResponse extends AcknowledgedResponse {

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

@ -22,8 +22,8 @@ package org.opensearch.client.core;
import org.opensearch.client.Validatable; import org.opensearch.client.Validatable;
import org.opensearch.common.Nullable; import org.opensearch.common.Nullable;
import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.bytes.BytesReference;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;

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

@ -20,11 +20,11 @@
package org.opensearch.client.core; package org.opensearch.client.core;
import org.opensearch.common.Nullable; import org.opensearch.common.Nullable;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg; import static org.opensearch.common.xcontent.ConstructingObjectParser.constructorArg;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg; import static org.opensearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;

6
client/rest-high-level/src/main/java/org/opensearch/client/indices/AnalyzeRequest.java
View File

@ -22,9 +22,9 @@ package org.opensearch.client.indices;
import org.opensearch.client.Validatable; import org.opensearch.client.Validatable;
import org.opensearch.common.Strings; import org.opensearch.common.Strings;
import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.ToXContentFragment; import org.opensearch.common.xcontent.ToXContentFragment;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;

10
client/rest-high-level/src/main/java/org/opensearch/client/indices/AnalyzeResponse.java
View File

@ -19,10 +19,10 @@
package org.opensearch.client.indices; package org.opensearch.client.indices;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.ObjectParser; import org.opensearch.common.xcontent.ObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
@ -30,7 +30,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg; import static org.opensearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg;
public class AnalyzeResponse { public class AnalyzeResponse {

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

@ -22,9 +22,9 @@ import org.opensearch.OpenSearchException;
import org.opensearch.action.support.DefaultShardOperationFailedException; import org.opensearch.action.support.DefaultShardOperationFailedException;
import org.opensearch.action.support.master.ShardsAcknowledgedResponse; import org.opensearch.action.support.master.ShardsAcknowledgedResponse;
import org.opensearch.common.Nullable; import org.opensearch.common.Nullable;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.common.xcontent.XContentParserUtils; import org.opensearch.common.xcontent.XContentParserUtils;
import java.util.List; import java.util.List;
@ -32,8 +32,8 @@ import java.util.Objects;
import static java.util.Collections.emptyList; import static java.util.Collections.emptyList;
import static java.util.Collections.unmodifiableList; import static java.util.Collections.unmodifiableList;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg; import static org.opensearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg;
import static org.elasticsearch.common.xcontent.ObjectParser.ValueType; import static org.opensearch.common.xcontent.ObjectParser.ValueType;
public class CloseIndexResponse extends ShardsAcknowledgedResponse { public class CloseIndexResponse extends ShardsAcknowledgedResponse {

16
client/rest-high-level/src/main/java/org/opensearch/client/indices/CreateIndexRequest.java
View File

@ -25,19 +25,19 @@ import org.opensearch.action.admin.indices.alias.Alias;
import org.opensearch.action.support.ActiveShardCount; import org.opensearch.action.support.ActiveShardCount;
import org.opensearch.client.TimedRequest; import org.opensearch.client.TimedRequest;
import org.opensearch.client.Validatable; import org.opensearch.client.Validatable;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.opensearch.common.Strings; import org.opensearch.common.Strings;
import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesArray;
import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.DeprecationHandler; import org.opensearch.common.xcontent.DeprecationHandler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentHelper;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;

10
client/rest-high-level/src/main/java/org/opensearch/client/indices/CreateIndexResponse.java
View File

@ -20,14 +20,14 @@
package org.opensearch.client.indices; package org.opensearch.client.indices;
import org.opensearch.action.support.master.ShardsAcknowledgedResponse; import org.opensearch.action.support.master.ShardsAcknowledgedResponse;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.ObjectParser; import org.opensearch.common.xcontent.ObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.util.Objects; import java.util.Objects;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg; import static org.opensearch.common.xcontent.ConstructingObjectParser.constructorArg;
/** /**
* A response for a create index action. * A response for a create index action.

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

@ -20,9 +20,9 @@ package org.opensearch.client.indices;
import org.opensearch.cluster.health.ClusterHealthStatus; import org.opensearch.cluster.health.ClusterHealthStatus;
import org.opensearch.common.Nullable; import org.opensearch.common.Nullable;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;

10
client/rest-high-level/src/main/java/org/opensearch/client/indices/DataStreamsStatsResponse.java
View File

@ -20,11 +20,11 @@
package org.opensearch.client.indices; package org.opensearch.client.indices;
import org.opensearch.client.core.BroadcastResponse; import org.opensearch.client.core.BroadcastResponse;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.ObjectParser; import org.opensearch.common.xcontent.ObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
@ -32,7 +32,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg; import static org.opensearch.common.xcontent.ConstructingObjectParser.constructorArg;
public class DataStreamsStatsResponse extends BroadcastResponse { public class DataStreamsStatsResponse extends BroadcastResponse {

10
client/rest-high-level/src/main/java/org/opensearch/client/indices/DetailAnalyzeResponse.java
View File

@ -19,18 +19,18 @@
package org.opensearch.client.indices; package org.opensearch.client.indices;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.opensearch.common.Strings; import org.opensearch.common.Strings;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg; import static org.opensearch.common.xcontent.ConstructingObjectParser.constructorArg;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg; import static org.opensearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg;
public class DetailAnalyzeResponse { public class DetailAnalyzeResponse {

6
client/rest-high-level/src/main/java/org/opensearch/client/indices/GetComponentTemplatesResponse.java
View File

@ -19,9 +19,9 @@
package org.opensearch.client.indices; package org.opensearch.client.indices;
import org.opensearch.cluster.metadata.ComponentTemplate; import org.opensearch.cluster.metadata.ComponentTemplate;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.Collections; import java.util.Collections;

6
client/rest-high-level/src/main/java/org/opensearch/client/indices/GetComposableIndexTemplatesResponse.java
View File

@ -19,9 +19,9 @@
package org.opensearch.client.indices; package org.opensearch.client.indices;
import org.opensearch.cluster.metadata.ComposableIndexTemplate; import org.opensearch.cluster.metadata.ComposableIndexTemplate;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.Collections; import java.util.Collections;

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

@ -18,7 +18,7 @@
*/ */
package org.opensearch.client.indices; package org.opensearch.client.indices;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;

16
client/rest-high-level/src/main/java/org/opensearch/client/indices/GetFieldMappingsResponse.java
View File

@ -19,14 +19,14 @@
package org.opensearch.client.indices; package org.opensearch.client.indices;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.bytes.BytesReference;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.ObjectParser; import org.opensearch.common.xcontent.ObjectParser;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentHelper;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.elasticsearch.index.mapper.Mapper; import org.elasticsearch.index.mapper.Mapper;
import java.io.IOException; import java.io.IOException;
@ -34,8 +34,8 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg; import static org.opensearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder;
import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken; import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
/** Response object for {@link GetFieldMappingsRequest} API */ /** Response object for {@link GetFieldMappingsRequest} API */

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

@ -23,8 +23,8 @@ import org.apache.lucene.util.CollectionUtil;
import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.cluster.metadata.AliasMetadata;
import org.opensearch.cluster.metadata.MappingMetadata; import org.opensearch.cluster.metadata.MappingMetadata;
import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentParser.Token; import org.opensearch.common.xcontent.XContentParser.Token;
import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MapperService;
import java.io.IOException; import java.io.IOException;

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

@ -18,7 +18,7 @@
*/ */
package org.opensearch.client.indices; package org.opensearch.client.indices;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;

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

@ -20,8 +20,8 @@
package org.opensearch.client.indices; package org.opensearch.client.indices;
import org.opensearch.cluster.metadata.MappingMetadata; import org.opensearch.cluster.metadata.MappingMetadata;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.common.xcontent.XContentParserUtils; import org.opensearch.common.xcontent.XContentParserUtils;
import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MapperService;

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

@ -22,11 +22,11 @@ import org.opensearch.cluster.metadata.AliasMetadata;
import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.cluster.metadata.MappingMetadata; import org.opensearch.cluster.metadata.MappingMetadata;
import org.opensearch.common.Nullable; import org.opensearch.common.Nullable;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.collect.ImmutableOpenMap;
import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MapperService;
import java.io.IOException; import java.io.IOException;
@ -36,7 +36,7 @@ import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg; import static org.opensearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg;
public class IndexTemplateMetadata { public class IndexTemplateMetadata {

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

@ -21,8 +21,8 @@ package org.opensearch.client.indices;
import org.opensearch.client.TimedRequest; import org.opensearch.client.TimedRequest;
import org.opensearch.cluster.metadata.ComponentTemplate; import org.opensearch.cluster.metadata.ComponentTemplate;
import org.opensearch.common.Strings; import org.opensearch.common.Strings;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import java.io.IOException; import java.io.IOException;

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

@ -21,8 +21,8 @@ package org.opensearch.client.indices;
import org.opensearch.client.TimedRequest; import org.opensearch.client.TimedRequest;
import org.opensearch.cluster.metadata.ComposableIndexTemplate; import org.opensearch.cluster.metadata.ComposableIndexTemplate;
import org.opensearch.common.Strings; import org.opensearch.common.Strings;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import java.io.IOException; import java.io.IOException;

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

@ -29,15 +29,15 @@ import org.opensearch.common.Nullable;
import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesArray;
import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.DeprecationHandler; import org.opensearch.common.xcontent.DeprecationHandler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.ToXContentFragment; import org.opensearch.common.xcontent.ToXContentFragment;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentHelper;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.elasticsearch.common.xcontent.json.JsonXContent; import org.opensearch.common.xcontent.json.JsonXContent;
import org.opensearch.common.xcontent.support.XContentMapValues; import org.opensearch.common.xcontent.support.XContentMapValues;
import java.io.IOException; import java.io.IOException;

10
client/rest-high-level/src/main/java/org/opensearch/client/indices/PutMappingRequest.java
View File

@ -25,11 +25,11 @@ import org.opensearch.action.support.IndicesOptions;
import org.opensearch.client.TimedRequest; import org.opensearch.client.TimedRequest;
import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesArray;
import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.bytes.BytesReference;
import org.elasticsearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;

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

@ -24,8 +24,8 @@ import org.opensearch.client.TimedRequest;
import org.opensearch.client.Validatable; import org.opensearch.client.Validatable;
import org.opensearch.client.ValidationException; import org.opensearch.client.ValidationException;
import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import java.io.IOException; import java.io.IOException;
import java.util.Collections; import java.util.Collections;

10
client/rest-high-level/src/main/java/org/opensearch/client/indices/ResizeResponse.java
View File

@ -21,14 +21,14 @@ package org.opensearch.client.indices;
import org.opensearch.client.core.AcknowledgedResponse; import org.opensearch.client.core.AcknowledgedResponse;
import org.opensearch.client.core.ShardsAcknowledgedResponse; import org.opensearch.client.core.ShardsAcknowledgedResponse;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.ObjectParser; import org.opensearch.common.xcontent.ObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.util.Objects; import java.util.Objects;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg; import static org.opensearch.common.xcontent.ConstructingObjectParser.constructorArg;
/** /**
* The response from a {@link ResizeRequest} call * The response from a {@link ResizeRequest} call

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

@ -20,9 +20,9 @@ package org.opensearch.client.indices;
import org.opensearch.cluster.metadata.Template; import org.opensearch.cluster.metadata.Template;
import org.opensearch.common.Nullable; import org.opensearch.common.Nullable;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;

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

@ -26,8 +26,8 @@ import org.opensearch.client.TimedRequest;
import org.opensearch.client.indices.CreateIndexRequest; import org.opensearch.client.indices.CreateIndexRequest;
import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.TimeValue; import org.opensearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;

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

@ -20,14 +20,14 @@
package org.opensearch.client.indices.rollover; package org.opensearch.client.indices.rollover;
import org.opensearch.action.support.master.ShardsAcknowledgedResponse; import org.opensearch.action.support.master.ShardsAcknowledgedResponse;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg; import static org.opensearch.common.xcontent.ConstructingObjectParser.constructorArg;
/** /**
* Response object for {@link RolloverRequest} API * Response object for {@link RolloverRequest} API

10
client/rest-high-level/src/main/java/org/opensearch/client/slm/ExecuteSnapshotLifecyclePolicyResponse.java
View File

@ -19,11 +19,11 @@
package org.opensearch.client.slm; package org.opensearch.client.slm;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;

6
client/rest-high-level/src/main/java/org/opensearch/client/slm/GetSnapshotLifecyclePolicyResponse.java
View File

@ -19,9 +19,9 @@
package org.opensearch.client.slm; package org.opensearch.client.slm;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;

6
client/rest-high-level/src/main/java/org/opensearch/client/slm/GetSnapshotLifecycleStatsResponse.java
View File

@ -19,9 +19,9 @@
package org.opensearch.client.slm; package org.opensearch.client.slm;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.Objects; import java.util.Objects;

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

@ -20,8 +20,8 @@
package org.opensearch.client.slm; package org.opensearch.client.slm;
import org.opensearch.client.TimedRequest; import org.opensearch.client.TimedRequest;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import java.io.IOException; import java.io.IOException;
import java.util.Objects; import java.util.Objects;

10
client/rest-high-level/src/main/java/org/opensearch/client/slm/SnapshotInvocationRecord.java
View File

@ -19,11 +19,11 @@
package org.opensearch.client.slm; package org.opensearch.client.slm;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.Objects; import java.util.Objects;

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

@ -20,12 +20,12 @@
package org.opensearch.client.slm; package org.opensearch.client.slm;
import org.opensearch.common.Nullable; import org.opensearch.common.Nullable;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.opensearch.common.Strings; import org.opensearch.common.Strings;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.Map; import java.util.Map;

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

@ -20,12 +20,12 @@
package org.opensearch.client.slm; package org.opensearch.client.slm;
import org.opensearch.common.Nullable; import org.opensearch.common.Nullable;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.opensearch.common.Strings; import org.opensearch.common.Strings;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.snapshots.SnapshotId; import org.opensearch.snapshots.SnapshotId;
import java.io.IOException; import java.io.IOException;

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

@ -19,14 +19,14 @@
package org.opensearch.client.slm; package org.opensearch.client.slm;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.opensearch.common.Strings; import org.opensearch.common.Strings;
import org.opensearch.common.unit.TimeValue; import org.opensearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.ToXContentFragment; import org.opensearch.common.xcontent.ToXContentFragment;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.Collections; import java.util.Collections;

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

@ -20,13 +20,13 @@
package org.opensearch.client.slm; package org.opensearch.client.slm;
import org.opensearch.common.Nullable; import org.opensearch.common.Nullable;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.opensearch.common.Strings; import org.opensearch.common.Strings;
import org.opensearch.common.unit.TimeValue; import org.opensearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.Objects; import java.util.Objects;

8
client/rest-high-level/src/main/java/org/opensearch/client/tasks/CancelTasksResponse.java
View File

@ -18,14 +18,14 @@
*/ */
package org.opensearch.client.tasks; package org.opensearch.client.tasks;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg; import static org.opensearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg;
/** /**
* cancel tasks response that contains * cancel tasks response that contains

8
client/rest-high-level/src/main/java/org/opensearch/client/tasks/GetTaskResponse.java
View File

@ -18,12 +18,12 @@
*/ */
package org.opensearch.client.tasks; package org.opensearch.client.tasks;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.tasks.TaskInfo; import org.opensearch.tasks.TaskInfo;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg; import static org.opensearch.common.xcontent.ConstructingObjectParser.constructorArg;
public class GetTaskResponse { public class GetTaskResponse {
private final boolean completed; private final boolean completed;

6
client/rest-high-level/src/main/java/org/opensearch/client/tasks/NodeData.java
View File

@ -23,9 +23,9 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ObjectParser; import org.opensearch.common.xcontent.ObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
class NodeData { class NodeData {

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

@ -17,8 +17,8 @@
* under the License. * under the License.
*/ */
package org.opensearch.client.tasks; package org.opensearch.client.tasks;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

6
client/rest-high-level/src/main/java/org/opensearch/client/tasks/TaskInfo.java
View File

@ -18,9 +18,9 @@
*/ */
package org.opensearch.client.tasks; package org.opensearch.client.tasks;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ObjectParser; import org.opensearch.common.xcontent.ObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

8
client/rest-high-level/src/main/java/org/opensearch/client/tasks/TaskOperationFailure.java
View File

@ -18,13 +18,13 @@
*/ */
package org.opensearch.client.tasks; package org.opensearch.client.tasks;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.util.Objects; import java.util.Objects;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg; import static org.opensearch.common.xcontent.ConstructingObjectParser.constructorArg;
/** /**
* client side counterpart of server side * client side counterpart of server side

6
client/rest-high-level/src/main/java/org/opensearch/client/tasks/TaskSubmissionResponse.java
View File

@ -19,9 +19,9 @@
package org.opensearch.client.tasks; package org.opensearch.client.tasks;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.opensearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import java.io.IOException; import java.io.IOException;
import java.util.Objects; import java.util.Objects;

12
client/rest-high-level/src/test/java/org/opensearch/client/AbstractRequestTestCase.java
View File

@ -20,12 +20,12 @@ package org.opensearch.client;
import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.xcontent.LoggingDeprecationHandler; import org.opensearch.common.xcontent.LoggingDeprecationHandler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContent; import org.opensearch.common.xcontent.XContent;
import org.elasticsearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import java.io.IOException; import java.io.IOException;

12
client/rest-high-level/src/test/java/org/opensearch/client/AbstractResponseTestCase.java
View File

@ -20,12 +20,12 @@ package org.opensearch.client;
import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.xcontent.LoggingDeprecationHandler; import org.opensearch.common.xcontent.LoggingDeprecationHandler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContent; import org.opensearch.common.xcontent.XContent;
import org.elasticsearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import java.io.IOException; import java.io.IOException;

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

@ -37,8 +37,8 @@ import org.opensearch.common.bytes.BytesArray;
import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.TimeValue; import org.opensearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.opensearch.index.mapper.MapperService; import org.opensearch.index.mapper.MapperService;
import org.opensearch.rest.action.document.RestBulkAction; import org.opensearch.rest.action.document.RestBulkAction;
import org.opensearch.search.SearchHit; import org.opensearch.search.SearchHit;
@ -56,7 +56,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.IntStream; import java.util.stream.IntStream;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.fieldFromSource; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.fieldFromSource;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasId; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasId;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasIndex; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.hasIndex;

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

@ -28,7 +28,7 @@ import org.opensearch.action.bulk.BulkResponse;
import org.opensearch.action.get.MultiGetRequest; import org.opensearch.action.get.MultiGetRequest;
import org.opensearch.action.index.IndexRequest; import org.opensearch.action.index.IndexRequest;
import org.opensearch.common.unit.TimeValue; import org.opensearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.opensearch.rest.RestStatus; import org.opensearch.rest.RestStatus;
import org.opensearch.transport.RemoteTransportException; import org.opensearch.transport.RemoteTransportException;

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

@ -24,7 +24,7 @@ import org.opensearch.action.bulk.BulkRequest;
import org.opensearch.action.bulk.BulkResponse; import org.opensearch.action.bulk.BulkResponse;
import org.opensearch.action.index.IndexRequest; import org.opensearch.action.index.IndexRequest;
import org.opensearch.action.search.SearchRequest; import org.opensearch.action.search.SearchRequest;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.opensearch.rest.action.document.RestBulkAction; import org.opensearch.rest.action.document.RestBulkAction;
import org.opensearch.search.SearchHit; import org.opensearch.search.SearchHit;

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

@ -51,7 +51,7 @@ import org.opensearch.common.compress.CompressedXContent;
import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.TimeValue; import org.opensearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.opensearch.common.xcontent.support.XContentMapValues; import org.opensearch.common.xcontent.support.XContentMapValues;
import org.elasticsearch.indices.recovery.RecoverySettings; import org.elasticsearch.indices.recovery.RecoverySettings;
import org.opensearch.rest.RestStatus; import org.opensearch.rest.RestStatus;

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

@ -51,9 +51,9 @@ import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.elasticsearch.index.VersionType; import org.elasticsearch.index.VersionType;
import org.elasticsearch.index.get.GetResult; import org.elasticsearch.index.get.GetResult;
import org.opensearch.rest.RestStatus; import org.opensearch.rest.RestStatus;

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

@ -43,7 +43,7 @@ import org.opensearch.action.support.PlainActionFuture;
import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterName;
import org.opensearch.common.SuppressForbidden; import org.opensearch.common.SuppressForbidden;
import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentHelper;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import org.junit.Before; import org.junit.Before;

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

@ -20,8 +20,8 @@
package org.opensearch.client; package org.opensearch.client;
import org.opensearch.cluster.metadata.AliasMetadata; import org.opensearch.cluster.metadata.AliasMetadata;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.json.JsonXContent; import org.opensearch.common.xcontent.json.JsonXContent;
import org.opensearch.rest.RestStatus; import org.opensearch.rest.RestStatus;
import org.elasticsearch.test.AbstractXContentTestCase; import org.elasticsearch.test.AbstractXContentTestCase;

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

@ -108,10 +108,10 @@ import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.TimeValue; import org.opensearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.elasticsearch.common.xcontent.json.JsonXContent; import org.opensearch.common.xcontent.json.JsonXContent;
import org.opensearch.common.xcontent.support.XContentMapValues; import org.opensearch.common.xcontent.support.XContentMapValues;
import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.MapperService;

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

@ -65,7 +65,7 @@ import org.opensearch.common.Strings;
import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.TimeValue; import org.opensearch.common.unit.TimeValue;
import org.opensearch.common.util.CollectionUtils; import org.opensearch.common.util.CollectionUtils;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import org.junit.Assert; import org.junit.Assert;

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

@ -30,8 +30,8 @@ import org.opensearch.action.ingest.SimulatePipelineRequest;
import org.opensearch.action.ingest.SimulatePipelineResponse; import org.opensearch.action.ingest.SimulatePipelineResponse;
import org.opensearch.action.support.master.AcknowledgedResponse; import org.opensearch.action.support.master.AcknowledgedResponse;
import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.bytes.BytesReference;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.elasticsearch.ingest.PipelineConfiguration; import org.elasticsearch.ingest.PipelineConfiguration;
import java.io.IOException; import java.io.IOException;

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

@ -30,7 +30,7 @@ import org.opensearch.action.ingest.SimulatePipelineRequest;
import org.elasticsearch.client.Request; import org.elasticsearch.client.Request;
import org.opensearch.action.support.master.AcknowledgedRequest; import org.opensearch.action.support.master.AcknowledgedRequest;
import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesArray;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import org.junit.Assert; import org.junit.Assert;

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

@ -19,8 +19,8 @@
package org.opensearch.client; package org.opensearch.client;
import org.opensearch.OpenSearchException; import org.opensearch.OpenSearchException;
import org.elasticsearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.client.NodesResponseHeader; import org.opensearch.client.NodesResponseHeader;
import java.io.IOException; import java.io.IOException;

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

@ -38,10 +38,10 @@ import org.opensearch.common.CheckedRunnable;
import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.Settings;
import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.common.util.concurrent.ThreadContext;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentHelper;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.elasticsearch.common.xcontent.json.JsonXContent; import org.opensearch.common.xcontent.json.JsonXContent;
import org.opensearch.core.internal.io.IOUtils; import org.opensearch.core.internal.io.IOUtils;
import org.opensearch.ingest.Pipeline; import org.opensearch.ingest.Pipeline;
import org.opensearch.search.SearchHit; import org.opensearch.search.SearchHit;
@ -63,7 +63,7 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder;
import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.hasSize;

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

@ -29,7 +29,7 @@ import org.opensearch.action.search.SearchRequest;
import org.opensearch.action.support.WriteRequest; import org.opensearch.action.support.WriteRequest;
import org.opensearch.client.tasks.TaskSubmissionResponse; import org.opensearch.client.tasks.TaskSubmissionResponse;
import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.opensearch.index.query.IdsQueryBuilder; import org.opensearch.index.query.IdsQueryBuilder;
import org.opensearch.index.reindex.BulkByScrollResponse; import org.opensearch.index.reindex.BulkByScrollResponse;
import org.opensearch.index.reindex.DeleteByQueryAction; import org.opensearch.index.reindex.DeleteByQueryAction;

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

@ -67,12 +67,12 @@ import org.opensearch.common.io.Streams;
import org.opensearch.common.logging.DeprecationLogger; import org.opensearch.common.logging.DeprecationLogger;
import org.opensearch.common.lucene.uid.Versions; import org.opensearch.common.lucene.uid.Versions;
import org.opensearch.common.unit.TimeValue; import org.opensearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentHelper;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.elasticsearch.common.xcontent.json.JsonXContent; import org.opensearch.common.xcontent.json.JsonXContent;
import org.opensearch.index.VersionType; import org.opensearch.index.VersionType;
import org.opensearch.index.mapper.MapperService; import org.opensearch.index.mapper.MapperService;
import org.opensearch.index.query.MatchAllQueryBuilder; import org.opensearch.index.query.MatchAllQueryBuilder;

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

@ -23,9 +23,9 @@ import org.apache.http.HttpEntity;
import org.apache.http.entity.ContentType; import org.apache.http.entity.ContentType;
import org.apache.http.nio.entity.NStringEntity; import org.apache.http.nio.entity.NStringEntity;
import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestClient;
import org.elasticsearch.common.ParseField; import org.opensearch.common.ParseField;
import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import org.junit.Before; import org.junit.Before;

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

@ -56,13 +56,13 @@ import org.opensearch.common.CheckedFunction;
import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.collect.Tuple; import org.opensearch.common.collect.Tuple;
import org.opensearch.common.util.set.Sets; import org.opensearch.common.util.set.Sets;
import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.ToXContentFragment; import org.opensearch.common.xcontent.ToXContentFragment;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.cbor.CborXContent; import org.opensearch.common.xcontent.cbor.CborXContent;
import org.elasticsearch.common.xcontent.smile.SmileXContent; import org.opensearch.common.xcontent.smile.SmileXContent;
import org.opensearch.index.rankeval.DiscountedCumulativeGain; import org.opensearch.index.rankeval.DiscountedCumulativeGain;
import org.opensearch.index.rankeval.EvaluationMetric; import org.opensearch.index.rankeval.EvaluationMetric;
import org.opensearch.index.rankeval.ExpectedReciprocalRank; import org.opensearch.index.rankeval.ExpectedReciprocalRank;

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

@ -41,9 +41,9 @@ import org.opensearch.client.core.CountResponse;
import org.opensearch.common.Strings; import org.opensearch.common.Strings;
import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.unit.TimeValue; import org.opensearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.opensearch.index.query.MatchQueryBuilder; import org.opensearch.index.query.MatchQueryBuilder;
import org.opensearch.index.query.QueryBuilder; import org.opensearch.index.query.QueryBuilder;
import org.opensearch.index.query.QueryBuilders; import org.opensearch.index.query.QueryBuilders;
@ -95,7 +95,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertToXContentEquivalent;
import static org.hamcrest.Matchers.arrayContaining; import static org.hamcrest.Matchers.arrayContaining;
import static org.hamcrest.Matchers.both; import static org.hamcrest.Matchers.both;

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

@ -41,7 +41,7 @@ import org.opensearch.action.admin.cluster.snapshots.status.SnapshotsStatusRespo
import org.opensearch.action.support.master.AcknowledgedResponse; import org.opensearch.action.support.master.AcknowledgedResponse;
import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.opensearch.repositories.fs.FsRepository; import org.opensearch.repositories.fs.FsRepository;
import org.opensearch.rest.RestStatus; import org.opensearch.rest.RestStatus;
import org.opensearch.snapshots.RestoreInfo; import org.opensearch.snapshots.RestoreInfo;

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

@ -25,7 +25,7 @@ import org.opensearch.action.admin.cluster.storedscripts.GetStoredScriptRequest;
import org.opensearch.action.admin.cluster.storedscripts.GetStoredScriptResponse; import org.opensearch.action.admin.cluster.storedscripts.GetStoredScriptResponse;
import org.opensearch.action.admin.cluster.storedscripts.PutStoredScriptRequest; import org.opensearch.action.admin.cluster.storedscripts.PutStoredScriptRequest;
import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesArray;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.opensearch.rest.RestStatus; import org.opensearch.rest.RestStatus;
import org.opensearch.script.Script; import org.opensearch.script.Script;
import org.opensearch.script.StoredScriptSource; import org.opensearch.script.StoredScriptSource;

10
client/rest-high-level/src/test/java/org/opensearch/client/SyncedFlushResponseTests.java
View File

@ -25,11 +25,11 @@ import org.opensearch.cluster.routing.ShardRouting;
import org.opensearch.cluster.routing.ShardRoutingState; import org.opensearch.cluster.routing.ShardRoutingState;
import org.elasticsearch.cluster.routing.TestShardRouting; import org.elasticsearch.cluster.routing.TestShardRouting;
import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.bytes.BytesReference;
import org.elasticsearch.common.xcontent.DeprecationHandler; import org.opensearch.common.xcontent.DeprecationHandler;
import org.elasticsearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.indices.flush.ShardsSyncedFlushResult; import org.elasticsearch.indices.flush.ShardsSyncedFlushResult;
import org.elasticsearch.indices.flush.SyncedFlushService; import org.elasticsearch.indices.flush.SyncedFlushService;

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

@ -33,7 +33,7 @@ import org.opensearch.client.tasks.GetTaskResponse;
import org.opensearch.client.tasks.TaskId; import org.opensearch.client.tasks.TaskId;
import org.opensearch.client.tasks.TaskSubmissionResponse; import org.opensearch.client.tasks.TaskSubmissionResponse;
import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.elasticsearch.index.reindex.ReindexRequest; import org.elasticsearch.index.reindex.ReindexRequest;
import org.opensearch.rest.RestStatus; import org.opensearch.rest.RestStatus;

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

@ -29,7 +29,7 @@ import org.opensearch.action.index.IndexRequest;
import org.opensearch.action.support.WriteRequest; import org.opensearch.action.support.WriteRequest;
import org.opensearch.client.tasks.TaskSubmissionResponse; import org.opensearch.client.tasks.TaskSubmissionResponse;
import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.elasticsearch.index.query.IdsQueryBuilder; import org.elasticsearch.index.query.IdsQueryBuilder;
import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.index.reindex.BulkByScrollResponse;
import org.elasticsearch.index.reindex.UpdateByQueryAction; import org.elasticsearch.index.reindex.UpdateByQueryAction;

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

@ -21,8 +21,8 @@ package org.opensearch.client.cluster;
import org.opensearch.client.AbstractResponseTestCase; import org.opensearch.client.AbstractResponseTestCase;
import org.opensearch.common.unit.TimeValue; import org.opensearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.opensearch.transport.ProxyConnectionStrategy; import org.opensearch.transport.ProxyConnectionStrategy;
import org.opensearch.transport.RemoteConnectionInfo; import org.opensearch.transport.RemoteConnectionInfo;
import org.opensearch.transport.SniffConnectionStrategy; import org.opensearch.transport.SniffConnectionStrategy;

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

@ -19,8 +19,8 @@
package org.opensearch.client.core; package org.opensearch.client.core;
import org.opensearch.client.AbstractResponseTestCase; import org.opensearch.client.AbstractResponseTestCase;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import java.io.IOException; import java.io.IOException;

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

@ -21,8 +21,8 @@ package org.opensearch.client.core;
import org.opensearch.action.support.DefaultShardOperationFailedException; import org.opensearch.action.support.DefaultShardOperationFailedException;
import org.opensearch.client.AbstractResponseTestCase; import org.opensearch.client.AbstractResponseTestCase;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.elasticsearch.index.seqno.RetentionLeaseNotFoundException; import org.elasticsearch.index.seqno.RetentionLeaseNotFoundException;
import java.io.IOException; import java.io.IOException;

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

@ -23,8 +23,8 @@ import org.opensearch.action.support.IndicesOptions;
import org.opensearch.client.AbstractRequestTestCase; import org.opensearch.client.AbstractRequestTestCase;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.util.ArrayUtils; import org.opensearch.common.util.ArrayUtils;
import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.index.query.MatchAllQueryBuilder; import org.opensearch.index.query.MatchAllQueryBuilder;
import org.opensearch.index.query.MatchQueryBuilder; import org.opensearch.index.query.MatchQueryBuilder;
import org.opensearch.index.query.QueryBuilder; import org.opensearch.index.query.QueryBuilder;

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

@ -22,8 +22,8 @@ package org.opensearch.client.core;
import org.opensearch.action.search.ShardSearchFailure; import org.opensearch.action.search.ShardSearchFailure;
import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.common.ParsingException; import org.opensearch.common.ParsingException;
import org.elasticsearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.Index; import org.elasticsearch.index.Index;
import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.shard.ShardId;
import org.opensearch.rest.action.RestActions; import org.opensearch.rest.action.RestActions;

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

@ -22,11 +22,11 @@ package org.opensearch.client.core;
import org.opensearch.client.AbstractResponseTestCase; import org.opensearch.client.AbstractResponseTestCase;
import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesArray;
import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.bytes.BytesReference;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.opensearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentHelper;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;

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

@ -23,8 +23,8 @@ import org.opensearch.Build;
import org.opensearch.Version; import org.opensearch.Version;
import org.opensearch.client.AbstractResponseTestCase; import org.opensearch.client.AbstractResponseTestCase;
import org.opensearch.cluster.ClusterName; import org.opensearch.cluster.ClusterName;
import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.XContentType;
import org.elasticsearch.test.VersionUtils; import org.elasticsearch.test.VersionUtils;
import java.io.IOException; import java.io.IOException;

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

@ -19,7 +19,7 @@
package org.opensearch.client.core; package org.opensearch.client.core;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import java.io.IOException; import java.io.IOException;

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

@ -18,7 +18,7 @@
*/ */
package org.opensearch.client.core; package org.opensearch.client.core;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import java.io.IOException; import java.io.IOException;

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

@ -19,7 +19,7 @@
package org.opensearch.client.core; package org.opensearch.client.core;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import java.util.ArrayList; import java.util.ArrayList;

4
client/rest-high-level/src/test/java/org/opensearch/client/core/tasks/GetTaskResponseTests.java
View File

@ -22,8 +22,8 @@ package org.opensearch.client.core.tasks;
import org.opensearch.client.Requests; import org.opensearch.client.Requests;
import org.opensearch.client.tasks.GetTaskResponse; import org.opensearch.client.tasks.GetTaskResponse;
import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.bytes.BytesReference;
import org.elasticsearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.tasks.RawTaskStatus; import org.opensearch.tasks.RawTaskStatus;
import org.opensearch.tasks.Task; import org.opensearch.tasks.Task;
import org.opensearch.tasks.TaskId; import org.opensearch.tasks.TaskId;

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