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

[Rename] org.elasticsearch.plugins (#348) 

* Rename org.elasticsearch.gateway to org.opensearch.gateway

Signed-off-by: Harold Wang <harowang@amazon.com>

* Rename org.elasticsearch.http to org.opensearch.http

Signed-off-by: Harold Wang <harowang@amazon.com>

* Renames org.elasticsearch.plugins to org.opensearch.plugins

Signed-off-by: Harold Wang <harowang@amazon.com>
This commit is contained in:
Harold Wang 2021-03-16 23:26:23 -07:00 committed by Nick Knize
parent 4e60df913f
commit 8ee7296fea
72 changed files with 128 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/client-benchmark-noop-api-plugin/src/main/java/org/opensearch/plugin/noop/NoopPlugin.java
View File

@ -32,8 +32,8 @@ import org.elasticsearch.common.settings.SettingsFilter;
import org.opensearch.plugin.noop.action.search.NoopSearchAction; import org.opensearch.plugin.noop.action.search.NoopSearchAction;
import org.opensearch.plugin.noop.action.search.RestNoopSearchAction; import org.opensearch.plugin.noop.action.search.RestNoopSearchAction;
import org.opensearch.plugin.noop.action.search.TransportNoopSearchAction; import org.opensearch.plugin.noop.action.search.TransportNoopSearchAction;
import org.elasticsearch.plugins.ActionPlugin; import org.opensearch.plugins.ActionPlugin;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.rest.RestController; import org.opensearch.rest.RestController;
import org.opensearch.rest.RestHandler; import org.opensearch.rest.RestHandler;

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

@ -29,7 +29,7 @@ import org.elasticsearch.common.settings.Settings;
import org.opensearch.index.reindex.ReindexPlugin; import org.opensearch.index.reindex.ReindexPlugin;
import org.opensearch.join.ParentJoinPlugin; import org.opensearch.join.ParentJoinPlugin;
import org.opensearch.percolator.PercolatorPlugin; import org.opensearch.percolator.PercolatorPlugin;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.script.mustache.MustachePlugin; import org.opensearch.script.mustache.MustachePlugin;
import org.opensearch.transport.Netty4Plugin; import org.opensearch.transport.Netty4Plugin;

2
client/transport/src/test/java/org/opensearch/transport/client/PreBuiltTransportClientTests.java
View File

@ -26,7 +26,7 @@ import org.elasticsearch.common.settings.Settings;
import org.opensearch.index.reindex.ReindexPlugin; import org.opensearch.index.reindex.ReindexPlugin;
import org.opensearch.join.ParentJoinPlugin; import org.opensearch.join.ParentJoinPlugin;
import org.opensearch.percolator.PercolatorPlugin; import org.opensearch.percolator.PercolatorPlugin;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.script.mustache.MustachePlugin; import org.opensearch.script.mustache.MustachePlugin;
import org.opensearch.transport.Netty4Plugin; import org.opensearch.transport.Netty4Plugin;
import org.junit.Test; import org.junit.Test;

4
modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/MatrixAggregationPlugin.java
View File

@ -19,8 +19,8 @@
package org.opensearch.search.aggregations.matrix; package org.opensearch.search.aggregations.matrix;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.elasticsearch.plugins.SearchPlugin; import org.opensearch.plugins.SearchPlugin;
import org.opensearch.search.aggregations.matrix.stats.InternalMatrixStats; import org.opensearch.search.aggregations.matrix.stats.InternalMatrixStats;
import org.opensearch.search.aggregations.matrix.stats.MatrixStatsAggregationBuilder; import org.opensearch.search.aggregations.matrix.stats.MatrixStatsAggregationBuilder;
import org.opensearch.search.aggregations.matrix.stats.MatrixStatsParser; import org.opensearch.search.aggregations.matrix.stats.MatrixStatsParser;

4
modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/spi/MatrixStatsNamedXContentProvider.java
View File

@ -22,8 +22,8 @@ package org.opensearch.search.aggregations.matrix.spi;
import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.xcontent.ContextParser; import org.elasticsearch.common.xcontent.ContextParser;
import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.plugins.spi.NamedXContentProvider; import org.opensearch.plugins.spi.NamedXContentProvider;
import org.opensearch.search.aggregations.Aggregation; import org.elasticsearch.search.aggregations.Aggregation;
import org.opensearch.search.aggregations.matrix.stats.MatrixStatsAggregationBuilder; import org.opensearch.search.aggregations.matrix.stats.MatrixStatsAggregationBuilder;
import org.opensearch.search.aggregations.matrix.stats.ParsedMatrixStats; import org.opensearch.search.aggregations.matrix.stats.ParsedMatrixStats;

2
modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java
View File

@ -25,7 +25,7 @@ import org.elasticsearch.common.util.MockPageCacheRecycler;
import org.elasticsearch.common.xcontent.ContextParser; import org.elasticsearch.common.xcontent.ContextParser;
import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
import org.elasticsearch.plugins.SearchPlugin; import org.opensearch.plugins.SearchPlugin;
import org.opensearch.script.ScriptService; import org.opensearch.script.ScriptService;
import org.opensearch.search.aggregations.Aggregation; import org.opensearch.search.aggregations.Aggregation;
import org.opensearch.search.aggregations.InternalAggregation; import org.opensearch.search.aggregations.InternalAggregation;

4
modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java
View File

@ -30,8 +30,8 @@ import org.apache.lucene.store.Directory;
import org.apache.lucene.util.NumericUtils; import org.apache.lucene.util.NumericUtils;
import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.MappedFieldType;
import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.index.mapper.NumberFieldMapper;
import org.elasticsearch.plugins.SearchPlugin; import org.opensearch.plugins.SearchPlugin;
import org.opensearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.AggregatorTestCase;
import org.opensearch.search.aggregations.matrix.MatrixAggregationPlugin; import org.opensearch.search.aggregations.matrix.MatrixAggregationPlugin;
import java.util.Arrays; import java.util.Arrays;

2
modules/analysis-common/src/internalClusterTest/java/org/opensearch/analysis/common/QueryStringWithAnalyzersIT.java
View File

@ -22,7 +22,7 @@ package org.opensearch.analysis.common;
import org.opensearch.action.search.SearchResponse; import org.opensearch.action.search.SearchResponse;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.query.Operator; import org.elasticsearch.index.query.Operator;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESIntegTestCase;
import java.util.Arrays; import java.util.Arrays;

2
modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java
View File

@ -33,7 +33,7 @@ import org.elasticsearch.index.analysis.MyFilterTokenFilterFactory;
import org.elasticsearch.index.analysis.TokenFilterFactory; import org.elasticsearch.index.analysis.TokenFilterFactory;
import org.elasticsearch.indices.analysis.AnalysisModule; import org.elasticsearch.indices.analysis.AnalysisModule;
import org.elasticsearch.indices.analysis.AnalysisModule.AnalysisProvider; import org.elasticsearch.indices.analysis.AnalysisModule.AnalysisProvider;
import org.elasticsearch.plugins.AnalysisPlugin; import org.opensearch.plugins.AnalysisPlugin;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.test.IndexSettingsModule; import org.elasticsearch.test.IndexSettingsModule;
import org.hamcrest.MatcherAssert; import org.hamcrest.MatcherAssert;

2
modules/analysis-common/src/test/java/org/opensearch/analysis/common/DisableGraphQueryTests.java
View File

@ -37,7 +37,7 @@ import org.elasticsearch.index.query.QueryStringQueryBuilder;
import org.elasticsearch.index.query.SimpleQueryStringBuilder; import org.elasticsearch.index.query.SimpleQueryStringBuilder;
import org.elasticsearch.index.query.SimpleQueryStringFlag; import org.elasticsearch.index.query.SimpleQueryStringFlag;
import org.elasticsearch.index.search.MatchQuery; import org.elasticsearch.index.search.MatchQuery;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.test.ESSingleNodeTestCase;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;

2
modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java
View File

@ -25,7 +25,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.query.Operator; import org.elasticsearch.index.query.Operator;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.search.builder.SearchSourceBuilder;
import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder; import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder;
import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESIntegTestCase;

2
modules/analysis-common/src/test/java/org/opensearch/analysis/common/MassiveWordListTests.java
View File

@ -20,7 +20,7 @@
package org.opensearch.analysis.common; package org.opensearch.analysis.common;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.test.ESSingleNodeTestCase;
import java.util.Collection; import java.util.Collection;

2
modules/ingest-common/src/internalClusterTest/java/org/opensearch/ingest/common/IngestRestartIT.java
View File

@ -25,7 +25,7 @@ import org.opensearch.common.bytes.BytesReference;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.ingest.IngestStats; import org.elasticsearch.ingest.IngestStats;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.script.MockScriptEngine; import org.opensearch.script.MockScriptEngine;
import org.opensearch.script.MockScriptPlugin; import org.opensearch.script.MockScriptPlugin;
import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESIntegTestCase;

2
modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/IngestGeoIpPlugin.java
View File

@ -32,7 +32,7 @@ import org.elasticsearch.common.io.PathUtils;
import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.core.internal.io.IOUtils; import org.elasticsearch.core.internal.io.IOUtils;
import org.elasticsearch.ingest.Processor; import org.elasticsearch.ingest.Processor;
import org.elasticsearch.plugins.IngestPlugin; import org.opensearch.plugins.IngestPlugin;
import org.elasticsearch.plugins.Plugin; import org.elasticsearch.plugins.Plugin;
import java.io.Closeable; import java.io.Closeable;

4
modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/IngestUserAgentPlugin.java
View File

@ -21,8 +21,8 @@ package org.opensearch.ingest.useragent;
import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.ingest.Processor; import org.elasticsearch.ingest.Processor;
import org.elasticsearch.plugins.IngestPlugin; import org.opensearch.plugins.IngestPlugin;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;

4
modules/kibana/src/main/java/org/elasticsearch/kibana/KibanaPlugin.java
View File

@ -29,8 +29,8 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.settings.SettingsFilter; import org.elasticsearch.common.settings.SettingsFilter;
import org.opensearch.index.reindex.RestDeleteByQueryAction; import org.opensearch.index.reindex.RestDeleteByQueryAction;
import org.elasticsearch.indices.SystemIndexDescriptor; import org.elasticsearch.indices.SystemIndexDescriptor;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.elasticsearch.plugins.SystemIndexPlugin; import org.opensearch.plugins.SystemIndexPlugin;
import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.BaseRestHandler;
import org.opensearch.rest.RestController; import org.opensearch.rest.RestController;
import org.opensearch.rest.RestHandler; import org.opensearch.rest.RestHandler;

2
modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/StoredExpressionIT.java
View File

@ -22,7 +22,7 @@ package org.opensearch.script.expression;
import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesArray;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.script.Script; import org.opensearch.script.Script;
import org.opensearch.script.ScriptType; import org.opensearch.script.ScriptType;
import org.opensearch.search.aggregations.AggregationBuilders; import org.opensearch.search.aggregations.AggregationBuilders;

4
modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionPlugin.java
View File

@ -22,8 +22,8 @@ package org.opensearch.script.expression;
import java.util.Collection; import java.util.Collection;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.elasticsearch.plugins.ScriptPlugin; import org.opensearch.plugins.ScriptPlugin;
import org.opensearch.script.ScriptContext; import org.opensearch.script.ScriptContext;
import org.opensearch.script.ScriptEngine; import org.opensearch.script.ScriptEngine;

2
modules/lang-mustache/src/internalClusterTest/java/org/opensearch/script/mustache/SearchTemplateIT.java
View File

@ -25,7 +25,7 @@ import org.opensearch.action.search.SearchRequest;
import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesArray;
import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.common.xcontent.json.JsonXContent;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.script.ScriptType; import org.opensearch.script.ScriptType;
import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.test.ESSingleNodeTestCase;
import org.junit.Before; import org.junit.Before;

8
modules/lang-mustache/src/main/java/org/opensearch/script/mustache/MustachePlugin.java
View File

@ -27,10 +27,10 @@ import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.IndexScopedSettings; import org.elasticsearch.common.settings.IndexScopedSettings;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.settings.SettingsFilter; import org.elasticsearch.common.settings.SettingsFilter;
import org.elasticsearch.plugins.ActionPlugin; import org.opensearch.plugins.ActionPlugin;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.elasticsearch.plugins.ScriptPlugin; import org.opensearch.plugins.ScriptPlugin;
import org.elasticsearch.plugins.SearchPlugin; import org.opensearch.plugins.SearchPlugin;
import org.opensearch.rest.RestController; import org.opensearch.rest.RestController;
import org.opensearch.rest.RestHandler; import org.opensearch.rest.RestHandler;
import org.opensearch.script.ScriptContext; import org.opensearch.script.ScriptContext;

2
modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteApiTests.java
View File

@ -26,7 +26,7 @@ import org.elasticsearch.index.query.MatchQueryBuilder;
import org.opensearch.painless.PainlessPlugin; import org.opensearch.painless.PainlessPlugin;
import org.opensearch.painless.action.PainlessExecuteAction.Request; import org.opensearch.painless.action.PainlessExecuteAction.Request;
import org.opensearch.painless.action.PainlessExecuteAction.Response; import org.opensearch.painless.action.PainlessExecuteAction.Response;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.script.Script; import org.opensearch.script.Script;
import org.opensearch.script.ScriptException; import org.opensearch.script.ScriptException;
import org.opensearch.script.ScriptService; import org.opensearch.script.ScriptService;

2
modules/mapper-extras/src/test/java/org/opensearch/index/mapper/BWCTemplateTests.java
View File

@ -21,7 +21,7 @@ package org.opensearch.index.mapper;
import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.XContentType;
import org.opensearch.index.mapper.MapperExtrasPlugin; import org.opensearch.index.mapper.MapperExtrasPlugin;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.test.ESSingleNodeTestCase;
import java.util.Collection; import java.util.Collection;

2
modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeatureFieldMapperTests.java
View File

@ -28,7 +28,7 @@ import org.apache.lucene.search.TermQuery;
import org.opensearch.common.Strings; import org.opensearch.common.Strings;
import org.elasticsearch.common.collect.List; import org.elasticsearch.common.collect.List;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import java.io.IOException; import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;

6
modules/parent-join/src/main/java/org/opensearch/join/ParentJoinPlugin.java
View File

@ -28,9 +28,9 @@ import org.opensearch.join.mapper.ParentJoinFieldMapper;
import org.opensearch.join.query.HasChildQueryBuilder; import org.opensearch.join.query.HasChildQueryBuilder;
import org.opensearch.join.query.HasParentQueryBuilder; import org.opensearch.join.query.HasParentQueryBuilder;
import org.opensearch.join.query.ParentIdQueryBuilder; import org.opensearch.join.query.ParentIdQueryBuilder;
import org.elasticsearch.plugins.MapperPlugin; import org.opensearch.plugins.MapperPlugin;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.elasticsearch.plugins.SearchPlugin; import org.opensearch.plugins.SearchPlugin;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;

4
modules/parent-join/src/main/java/org/opensearch/join/spi/ParentJoinNamedXContentProvider.java
View File

@ -26,8 +26,8 @@ import org.opensearch.join.aggregations.ChildrenAggregationBuilder;
import org.opensearch.join.aggregations.ParentAggregationBuilder; import org.opensearch.join.aggregations.ParentAggregationBuilder;
import org.opensearch.join.aggregations.ParsedChildren; import org.opensearch.join.aggregations.ParsedChildren;
import org.opensearch.join.aggregations.ParsedParent; import org.opensearch.join.aggregations.ParsedParent;
import org.elasticsearch.plugins.spi.NamedXContentProvider; import org.opensearch.plugins.spi.NamedXContentProvider;
import org.opensearch.search.aggregations.Aggregation; import org.elasticsearch.search.aggregations.Aggregation;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;

4
modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenTests.java
View File

@ -20,8 +20,8 @@
package org.opensearch.join.aggregations; package org.opensearch.join.aggregations;
import org.opensearch.join.ParentJoinPlugin; import org.opensearch.join.ParentJoinPlugin;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.search.aggregations.BaseAggregationTestCase; import org.elasticsearch.search.aggregations.BaseAggregationTestCase;
import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin;
import java.util.Arrays; import java.util.Arrays;

8
modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenToParentAggregatorTests.java
View File

@ -51,10 +51,10 @@ import org.elasticsearch.index.shard.ShardId;
import org.opensearch.join.ParentJoinPlugin; import org.opensearch.join.ParentJoinPlugin;
import org.opensearch.join.mapper.MetaJoinFieldMapper; import org.opensearch.join.mapper.MetaJoinFieldMapper;
import org.opensearch.join.mapper.ParentJoinFieldMapper; import org.opensearch.join.mapper.ParentJoinFieldMapper;
import org.elasticsearch.plugins.SearchPlugin; import org.opensearch.plugins.SearchPlugin;
import org.opensearch.search.aggregations.Aggregation; import org.elasticsearch.search.aggregations.Aggregation;
import org.opensearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregationBuilder;
import org.opensearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.AggregatorTestCase;
import org.opensearch.search.aggregations.bucket.terms.LongTerms; import org.opensearch.search.aggregations.bucket.terms.LongTerms;
import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder; import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
import org.opensearch.search.aggregations.metrics.InternalMin; import org.opensearch.search.aggregations.metrics.InternalMin;

8
modules/parent-join/src/test/java/org/opensearch/join/aggregations/InternalChildrenTests.java
View File

@ -23,10 +23,10 @@ import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.NamedXContentRegistry.Entry; import org.elasticsearch.common.xcontent.NamedXContentRegistry.Entry;
import org.opensearch.join.ParentJoinPlugin; import org.opensearch.join.ParentJoinPlugin;
import org.elasticsearch.plugins.SearchPlugin; import org.opensearch.plugins.SearchPlugin;
import org.opensearch.search.aggregations.Aggregation; import org.elasticsearch.search.aggregations.Aggregation;
import org.opensearch.search.aggregations.InternalAggregations; import org.elasticsearch.search.aggregations.InternalAggregations;
import org.opensearch.search.aggregations.InternalSingleBucketAggregationTestCase; import org.elasticsearch.search.aggregations.InternalSingleBucketAggregationTestCase;
import org.opensearch.search.aggregations.bucket.ParsedSingleBucketAggregation; import org.opensearch.search.aggregations.bucket.ParsedSingleBucketAggregation;
import java.util.ArrayList; import java.util.ArrayList;

8
modules/parent-join/src/test/java/org/opensearch/join/aggregations/InternalParentTests.java
View File

@ -22,10 +22,10 @@ package org.opensearch.join.aggregations;
import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.xcontent.NamedXContentRegistry.Entry; import org.elasticsearch.common.xcontent.NamedXContentRegistry.Entry;
import org.opensearch.join.ParentJoinPlugin; import org.opensearch.join.ParentJoinPlugin;
import org.elasticsearch.plugins.SearchPlugin; import org.opensearch.plugins.SearchPlugin;
import org.opensearch.search.aggregations.Aggregation; import org.elasticsearch.search.aggregations.Aggregation;
import org.opensearch.search.aggregations.InternalAggregations; import org.elasticsearch.search.aggregations.InternalAggregations;
import org.opensearch.search.aggregations.InternalSingleBucketAggregationTestCase; import org.elasticsearch.search.aggregations.InternalSingleBucketAggregationTestCase;
import org.opensearch.search.aggregations.bucket.ParsedSingleBucketAggregation; import org.opensearch.search.aggregations.bucket.ParsedSingleBucketAggregation;
import java.util.ArrayList; import java.util.ArrayList;

4
modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentTests.java
View File

@ -23,8 +23,8 @@ import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import org.opensearch.join.ParentJoinPlugin; import org.opensearch.join.ParentJoinPlugin;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.search.aggregations.BaseAggregationTestCase; import org.elasticsearch.search.aggregations.BaseAggregationTestCase;
import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin;
public class ParentTests extends BaseAggregationTestCase<ParentAggregationBuilder> { public class ParentTests extends BaseAggregationTestCase<ParentAggregationBuilder> {

6
modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentToChildrenAggregatorTests.java
View File

@ -52,9 +52,9 @@ import org.elasticsearch.index.shard.ShardId;
import org.opensearch.join.ParentJoinPlugin; import org.opensearch.join.ParentJoinPlugin;
import org.opensearch.join.mapper.MetaJoinFieldMapper; import org.opensearch.join.mapper.MetaJoinFieldMapper;
import org.opensearch.join.mapper.ParentJoinFieldMapper; import org.opensearch.join.mapper.ParentJoinFieldMapper;
import org.elasticsearch.plugins.SearchPlugin; import org.opensearch.plugins.SearchPlugin;
import org.opensearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregationBuilder;
import org.opensearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.AggregatorTestCase;
import org.opensearch.search.aggregations.bucket.terms.StringTerms; import org.opensearch.search.aggregations.bucket.terms.StringTerms;
import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder; import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
import org.opensearch.search.aggregations.metrics.InternalMin; import org.opensearch.search.aggregations.metrics.InternalMin;

2
modules/parent-join/src/test/java/org/opensearch/join/mapper/ParentJoinFieldMapperTests.java
View File

@ -32,7 +32,7 @@ import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.index.mapper.ParsedDocument; import org.elasticsearch.index.mapper.ParsedDocument;
import org.elasticsearch.index.mapper.SourceToParse; import org.elasticsearch.index.mapper.SourceToParse;
import org.opensearch.join.ParentJoinPlugin; import org.opensearch.join.ParentJoinPlugin;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.test.ESSingleNodeTestCase;
import java.util.Collection; import java.util.Collection;

2
modules/parent-join/src/test/java/org/opensearch/join/query/HasChildQueryBuilderTests.java
View File

@ -51,7 +51,7 @@ import org.elasticsearch.index.query.TermQueryBuilder;
import org.elasticsearch.index.query.WrapperQueryBuilder; import org.elasticsearch.index.query.WrapperQueryBuilder;
import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.index.similarity.SimilarityService;
import org.opensearch.join.ParentJoinPlugin; import org.opensearch.join.ParentJoinPlugin;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.search.sort.FieldSortBuilder; import org.opensearch.search.sort.FieldSortBuilder;
import org.opensearch.search.sort.SortOrder; import org.opensearch.search.sort.SortOrder;
import org.elasticsearch.test.AbstractQueryTestCase; import org.elasticsearch.test.AbstractQueryTestCase;

2
modules/parent-join/src/test/java/org/opensearch/join/query/HasParentQueryBuilderTests.java
View File

@ -38,7 +38,7 @@ import org.elasticsearch.index.query.QueryShardException;
import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder;
import org.elasticsearch.index.query.WrapperQueryBuilder; import org.elasticsearch.index.query.WrapperQueryBuilder;
import org.opensearch.join.ParentJoinPlugin; import org.opensearch.join.ParentJoinPlugin;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.search.sort.FieldSortBuilder; import org.opensearch.search.sort.FieldSortBuilder;
import org.opensearch.search.sort.SortOrder; import org.opensearch.search.sort.SortOrder;
import org.elasticsearch.test.AbstractQueryTestCase; import org.elasticsearch.test.AbstractQueryTestCase;

2
modules/parent-join/src/test/java/org/opensearch/join/query/ParentIdQueryBuilderTests.java
View File

@ -33,7 +33,7 @@ import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.QueryShardContext;
import org.elasticsearch.index.query.QueryShardException; import org.elasticsearch.index.query.QueryShardException;
import org.opensearch.join.ParentJoinPlugin; import org.opensearch.join.ParentJoinPlugin;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.elasticsearch.test.AbstractQueryTestCase; import org.elasticsearch.test.AbstractQueryTestCase;
import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin;
import org.hamcrest.Matchers; import org.hamcrest.Matchers;

2
modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java
View File

@ -37,7 +37,7 @@ import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
import org.elasticsearch.index.query.MultiMatchQueryBuilder; import org.elasticsearch.index.query.MultiMatchQueryBuilder;
import org.elasticsearch.index.query.Operator; import org.elasticsearch.index.query.Operator;
import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder; import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder;
import org.opensearch.search.sort.SortOrder; import org.opensearch.search.sort.SortOrder;
import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESIntegTestCase;

2
modules/percolator/src/test/java/org/opensearch/percolator/CandidateQueryTests.java
View File

@ -96,7 +96,7 @@ import org.elasticsearch.index.mapper.MapperService;
import org.elasticsearch.index.mapper.NumberFieldMapper; import org.elasticsearch.index.mapper.NumberFieldMapper;
import org.elasticsearch.index.mapper.ParseContext; import org.elasticsearch.index.mapper.ParseContext;
import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.QueryShardContext;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.test.ESSingleNodeTestCase;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;

2
modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java
View File

@ -40,7 +40,7 @@ import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.QueryShardContext;
import org.elasticsearch.index.query.Rewriteable; import org.elasticsearch.index.query.Rewriteable;
import org.elasticsearch.ingest.RandomDocumentPicks; import org.elasticsearch.ingest.RandomDocumentPicks;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.elasticsearch.test.AbstractQueryTestCase; import org.elasticsearch.test.AbstractQueryTestCase;
import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin;
import org.hamcrest.Matchers; import org.hamcrest.Matchers;

2
modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java
View File

@ -85,7 +85,7 @@ import org.elasticsearch.indices.TermsLookup;
import org.opensearch.join.ParentJoinPlugin; import org.opensearch.join.ParentJoinPlugin;
import org.opensearch.join.query.HasChildQueryBuilder; import org.opensearch.join.query.HasChildQueryBuilder;
import org.opensearch.join.query.HasParentQueryBuilder; import org.opensearch.join.query.HasParentQueryBuilder;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.script.MockScriptPlugin; import org.opensearch.script.MockScriptPlugin;
import org.opensearch.script.Script; import org.opensearch.script.Script;
import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.test.ESSingleNodeTestCase;

2
modules/percolator/src/test/java/org/opensearch/percolator/PercolatorQuerySearchTests.java
View File

@ -35,7 +35,7 @@ import org.elasticsearch.index.query.Operator;
import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.QueryShardContext;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.script.MockScriptPlugin; import org.opensearch.script.MockScriptPlugin;
import org.opensearch.script.Script; import org.opensearch.script.Script;
import org.opensearch.script.ScriptType; import org.opensearch.script.ScriptType;

2
modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java
View File

@ -29,7 +29,7 @@ import org.elasticsearch.index.query.MatchAllQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.QueryBuilders;
import org.opensearch.index.rankeval.PrecisionAtK.Detail; import org.opensearch.index.rankeval.PrecisionAtK.Detail;
import org.elasticsearch.indices.IndexClosedException; import org.elasticsearch.indices.IndexClosedException;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESIntegTestCase;
import org.junit.Before; import org.junit.Before;

2
modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalNamedXContentProvider.java
View File

@ -21,7 +21,7 @@ package org.opensearch.index.rankeval;
import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.plugins.spi.NamedXContentProvider; import org.opensearch.plugins.spi.NamedXContentProvider;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

4
modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RankEvalPlugin.java
View File

@ -29,8 +29,8 @@ import org.elasticsearch.common.settings.IndexScopedSettings;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.settings.SettingsFilter; import org.elasticsearch.common.settings.SettingsFilter;
import org.elasticsearch.common.xcontent.NamedXContentRegistry.Entry; import org.elasticsearch.common.xcontent.NamedXContentRegistry.Entry;
import org.elasticsearch.plugins.ActionPlugin; import org.opensearch.plugins.ActionPlugin;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.rest.RestController; import org.opensearch.rest.RestController;
import org.opensearch.rest.RestHandler; import org.opensearch.rest.RestHandler;

2
modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java
View File

@ -41,7 +41,7 @@ import org.elasticsearch.index.reindex.UpdateByQueryAction;
import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder; import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder;
import org.elasticsearch.index.shard.IndexingOperationListener; import org.elasticsearch.index.shard.IndexingOperationListener;
import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.script.Script; import org.opensearch.script.Script;
import org.opensearch.script.ScriptType; import org.opensearch.script.ScriptType;
import org.opensearch.search.sort.SortOrder; import org.opensearch.search.sort.SortOrder;

2
modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java
View File

@ -42,7 +42,7 @@ import org.elasticsearch.index.reindex.UpdateByQueryAction;
import org.elasticsearch.index.shard.IndexingOperationListener; import org.elasticsearch.index.shard.IndexingOperationListener;
import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.ingest.IngestTestPlugin; import org.elasticsearch.ingest.IngestTestPlugin;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.tasks.TaskCancelledException; import org.opensearch.tasks.TaskCancelledException;
import org.opensearch.tasks.TaskInfo; import org.opensearch.tasks.TaskInfo;
import org.hamcrest.Matcher; import org.hamcrest.Matcher;

2
modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryBasicTests.java
View File

@ -31,7 +31,7 @@ import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest;
import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.index.reindex.BulkByScrollResponse;
import org.elasticsearch.index.reindex.DeleteByQueryRequestBuilder; import org.elasticsearch.index.reindex.DeleteByQueryRequestBuilder;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.search.sort.SortOrder; import org.opensearch.search.sort.SortOrder;
import org.elasticsearch.test.InternalSettingsPlugin; import org.elasticsearch.test.InternalSettingsPlugin;
import org.elasticsearch.test.InternalTestCluster; import org.elasticsearch.test.InternalTestCluster;

2
modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSingleNodeTests.java
View File

@ -22,7 +22,7 @@ package org.opensearch.index.reindex;
import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.RangeQueryBuilder;
import org.elasticsearch.index.reindex.ReindexAction; import org.elasticsearch.index.reindex.ReindexAction;
import org.elasticsearch.index.reindex.ReindexRequestBuilder; import org.elasticsearch.index.reindex.ReindexRequestBuilder;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.search.sort.SortOrder; import org.opensearch.search.sort.SortOrder;
import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.test.ESSingleNodeTestCase;

2
modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexTestCase.java
View File

@ -26,7 +26,7 @@ import org.elasticsearch.index.reindex.ReindexAction;
import org.elasticsearch.index.reindex.ReindexRequestBuilder; import org.elasticsearch.index.reindex.ReindexRequestBuilder;
import org.elasticsearch.index.reindex.UpdateByQueryAction; import org.elasticsearch.index.reindex.UpdateByQueryAction;
import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder; import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESIntegTestCase;
import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.ESIntegTestCase.ClusterScope;

2
modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java
View File

@ -43,7 +43,7 @@ import org.elasticsearch.index.reindex.ReindexRequestBuilder;
import org.elasticsearch.index.reindex.RemoteInfo; import org.elasticsearch.index.reindex.RemoteInfo;
import org.elasticsearch.index.reindex.UpdateByQueryAction; import org.elasticsearch.index.reindex.UpdateByQueryAction;
import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder; import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESIntegTestCase;
import org.opensearch.threadpool.ThreadPool; import org.opensearch.threadpool.ThreadPool;
import org.opensearch.transport.Netty4Plugin; import org.opensearch.transport.Netty4Plugin;

4
modules/repository-url/src/main/java/org/opensearch/plugin/repository/url/URLRepositoryPlugin.java
View File

@ -24,8 +24,8 @@ import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.opensearch.env.Environment; import org.opensearch.env.Environment;
import org.elasticsearch.indices.recovery.RecoverySettings; import org.elasticsearch.indices.recovery.RecoverySettings;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.elasticsearch.plugins.RepositoryPlugin; import org.opensearch.plugins.RepositoryPlugin;
import org.opensearch.repositories.Repository; import org.opensearch.repositories.Repository;
import org.opensearch.repositories.url.URLRepository; import org.opensearch.repositories.url.URLRepository;

2
modules/transport-netty4/src/internalClusterTest/java/org/opensearch/OpenSearchNetty4IntegTestCase.java
View File

@ -20,7 +20,7 @@ package org.opensearch;
import org.opensearch.common.network.NetworkModule; import org.opensearch.common.network.NetworkModule;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESIntegTestCase;
import org.opensearch.transport.Netty4Plugin; import org.opensearch.transport.Netty4Plugin;
import org.opensearch.transport.netty4.Netty4Transport; import org.opensearch.transport.netty4.Netty4Transport;

2
server/src/main/java/org/opensearch/action/admin/cluster/node/info/PluginsAndModules.java
View File

@ -23,7 +23,7 @@ import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.node.ReportingService; import org.elasticsearch.node.ReportingService;
import org.elasticsearch.plugins.PluginInfo; import org.opensearch.plugins.PluginInfo;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;

2
server/src/main/java/org/opensearch/action/admin/cluster/stats/ClusterStatsNodes.java
View File

@ -39,7 +39,7 @@ import org.opensearch.discovery.DiscoveryModule;
import org.elasticsearch.monitor.fs.FsInfo; import org.elasticsearch.monitor.fs.FsInfo;
import org.elasticsearch.monitor.jvm.JvmInfo; import org.elasticsearch.monitor.jvm.JvmInfo;
import org.elasticsearch.monitor.os.OsInfo; import org.elasticsearch.monitor.os.OsInfo;
import org.elasticsearch.plugins.PluginInfo; import org.opensearch.plugins.PluginInfo;
import org.opensearch.transport.TransportInfo; import org.opensearch.transport.TransportInfo;
import java.io.IOException; import java.io.IOException;

2
server/src/main/java/org/opensearch/rest/BaseRestHandler.java
View File

@ -28,7 +28,7 @@ import org.elasticsearch.common.CheckedConsumer;
import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Setting.Property; import org.elasticsearch.common.settings.Setting.Property;
import org.elasticsearch.plugins.ActionPlugin; import org.opensearch.plugins.ActionPlugin;
import org.opensearch.rest.action.admin.cluster.RestNodesUsageAction; import org.opensearch.rest.action.admin.cluster.RestNodesUsageAction;
import java.io.IOException; import java.io.IOException;

2
server/src/main/java/org/opensearch/script/ScriptModule.java
View File

@ -22,7 +22,7 @@ package org.opensearch.script;
import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.ClusterSettings;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.query.IntervalFilterScript; import org.elasticsearch.index.query.IntervalFilterScript;
import org.elasticsearch.plugins.ScriptPlugin; import org.opensearch.plugins.ScriptPlugin;
import org.opensearch.search.aggregations.pipeline.MovingFunctionScript; import org.opensearch.search.aggregations.pipeline.MovingFunctionScript;
import java.util.Collections; import java.util.Collections;

4
server/src/main/java/org/opensearch/search/SearchExtBuilder.java
View File

@ -25,8 +25,8 @@ import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.io.stream.StreamOutput;
import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.io.stream.Writeable;
import org.elasticsearch.common.xcontent.ToXContentFragment; import org.elasticsearch.common.xcontent.ToXContentFragment;
import org.elasticsearch.plugins.SearchPlugin; import org.opensearch.plugins.SearchPlugin;
import org.elasticsearch.plugins.SearchPlugin.SearchExtSpec; import org.opensearch.plugins.SearchPlugin.SearchExtSpec;
/** /**
* Intermediate serializable representation of a search ext section. To be subclassed by plugins that support * Intermediate serializable representation of a search ext section. To be subclassed by plugins that support

31
server/src/main/java/org/opensearch/search/SearchModule.java
View File

@ -89,21 +89,22 @@ import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
import org.elasticsearch.index.query.functionscore.ScriptScoreFunctionBuilder; import org.elasticsearch.index.query.functionscore.ScriptScoreFunctionBuilder;
import org.elasticsearch.index.query.functionscore.ScriptScoreQueryBuilder; import org.elasticsearch.index.query.functionscore.ScriptScoreQueryBuilder;
import org.elasticsearch.index.query.functionscore.WeightBuilder; import org.elasticsearch.index.query.functionscore.WeightBuilder;
import org.elasticsearch.plugins.SearchPlugin; <<<<<<< HEAD
import org.elasticsearch.plugins.SearchPlugin.AggregationSpec; import org.opensearch.plugins.SearchPlugin;
import org.elasticsearch.plugins.SearchPlugin.FetchPhaseConstructionContext; import org.opensearch.plugins.SearchPlugin.AggregationSpec;
import org.elasticsearch.plugins.SearchPlugin.PipelineAggregationSpec; import org.opensearch.plugins.SearchPlugin.FetchPhaseConstructionContext;
import org.elasticsearch.plugins.SearchPlugin.QuerySpec; import org.opensearch.plugins.SearchPlugin.PipelineAggregationSpec;
import org.elasticsearch.plugins.SearchPlugin.RescorerSpec; import org.opensearch.plugins.SearchPlugin.QuerySpec;
import org.elasticsearch.plugins.SearchPlugin.ScoreFunctionSpec; import org.opensearch.plugins.SearchPlugin.RescorerSpec;
import org.elasticsearch.plugins.SearchPlugin.SearchExtSpec; import org.opensearch.plugins.SearchPlugin.ScoreFunctionSpec;
import org.elasticsearch.plugins.SearchPlugin.SearchExtensionSpec; import org.opensearch.plugins.SearchPlugin.SearchExtSpec;
import org.elasticsearch.plugins.SearchPlugin.SignificanceHeuristicSpec; import org.opensearch.plugins.SearchPlugin.SearchExtensionSpec;
import org.elasticsearch.plugins.SearchPlugin.SuggesterSpec; import org.opensearch.plugins.SearchPlugin.SignificanceHeuristicSpec;
import org.opensearch.search.aggregations.AggregationBuilder; import org.opensearch.plugins.SearchPlugin.SuggesterSpec;
import org.opensearch.search.aggregations.BaseAggregationBuilder; import org.elasticsearch.search.aggregations.AggregationBuilder;
import org.opensearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.BaseAggregationBuilder;
import org.opensearch.search.aggregations.PipelineAggregationBuilder; import org.elasticsearch.search.aggregations.InternalAggregation;
import org.elasticsearch.search.aggregations.PipelineAggregationBuilder;
import org.opensearch.search.aggregations.bucket.adjacency.AdjacencyMatrixAggregationBuilder; import org.opensearch.search.aggregations.bucket.adjacency.AdjacencyMatrixAggregationBuilder;
import org.opensearch.search.aggregations.bucket.adjacency.InternalAdjacencyMatrix; import org.opensearch.search.aggregations.bucket.adjacency.InternalAdjacencyMatrix;
import org.opensearch.search.aggregations.bucket.composite.CompositeAggregationBuilder; import org.opensearch.search.aggregations.bucket.composite.CompositeAggregationBuilder;

2
server/src/main/java/org/opensearch/search/fetch/subphase/highlight/package-info.java
View File

@ -20,6 +20,6 @@
/** /**
* Fetch sub phase that extracts significant portions of string fields, marking the matches. Pluggable by implementing * Fetch sub phase that extracts significant portions of string fields, marking the matches. Pluggable by implementing
* {@link org.opensearch.search.fetch.subphase.highlight.Highlighter} and * {@link org.opensearch.search.fetch.subphase.highlight.Highlighter} and
* {@link org.elasticsearch.plugins.SearchPlugin#getHighlighters()}. * {@link org.opensearch.plugins.SearchPlugin#getHighlighters()}.
*/ */
package org.opensearch.search.fetch.subphase.highlight; package org.opensearch.search.fetch.subphase.highlight;

2
server/src/test/java/org/elasticsearch/index/mapper/DocumentParserTests.java
View File

@ -31,7 +31,7 @@ import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.mapper.ParseContext.Document; import org.elasticsearch.index.mapper.ParseContext.Document;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import java.io.IOException; import java.io.IOException;
import java.math.BigDecimal; import java.math.BigDecimal;

2
server/src/test/java/org/elasticsearch/index/mapper/IdFieldMapperTests.java
View File

@ -31,7 +31,7 @@ import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.index.IndexService; import org.elasticsearch.index.IndexService;
import org.elasticsearch.index.mapper.MapperService.MergeReason; import org.elasticsearch.index.mapper.MapperService.MergeReason;
import org.elasticsearch.indices.IndicesService; import org.elasticsearch.indices.IndicesService;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.test.ESSingleNodeTestCase;
import org.elasticsearch.test.InternalSettingsPlugin; import org.elasticsearch.test.InternalSettingsPlugin;

2
server/src/test/java/org/elasticsearch/indices/IndicesModuleTests.java
View File

@ -35,7 +35,7 @@ import org.elasticsearch.index.mapper.TextFieldMapper;
import org.elasticsearch.index.mapper.TypeFieldMapper; import org.elasticsearch.index.mapper.TypeFieldMapper;
import org.elasticsearch.index.mapper.VersionFieldMapper; import org.elasticsearch.index.mapper.VersionFieldMapper;
import org.elasticsearch.indices.mapper.MapperRegistry; import org.elasticsearch.indices.mapper.MapperRegistry;
import org.elasticsearch.plugins.MapperPlugin; import org.opensearch.plugins.MapperPlugin;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.test.VersionUtils; import org.elasticsearch.test.VersionUtils;

2
server/src/test/java/org/opensearch/repositories/RepositoriesModuleTests.java
View File

@ -24,7 +24,7 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
import org.elasticsearch.indices.recovery.RecoverySettings; import org.elasticsearch.indices.recovery.RecoverySettings;
import org.elasticsearch.plugins.RepositoryPlugin; import org.opensearch.plugins.RepositoryPlugin;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import org.opensearch.threadpool.ThreadPool; import org.opensearch.threadpool.ThreadPool;
import org.opensearch.transport.TransportService; import org.opensearch.transport.TransportService;

4
server/src/test/java/org/opensearch/search/AbstractSearchTestCase.java
View File

@ -31,8 +31,8 @@ import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.indices.IndicesModule; import org.elasticsearch.indices.IndicesModule;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.elasticsearch.plugins.SearchPlugin; import org.opensearch.plugins.SearchPlugin;
import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.search.builder.SearchSourceBuilder;
import org.opensearch.search.collapse.CollapseBuilderTests; import org.opensearch.search.collapse.CollapseBuilderTests;
import org.opensearch.search.fetch.subphase.highlight.HighlightBuilderTests; import org.opensearch.search.fetch.subphase.highlight.HighlightBuilderTests;

14
server/src/test/java/org/opensearch/search/SearchModuleTests.java
View File

@ -32,13 +32,13 @@ import org.elasticsearch.index.query.QueryRewriteContext;
import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.QueryShardContext;
import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder;
import org.elasticsearch.index.query.functionscore.GaussDecayFunctionBuilder; import org.elasticsearch.index.query.functionscore.GaussDecayFunctionBuilder;
import org.elasticsearch.plugins.SearchPlugin; import org.opensearch.plugins.SearchPlugin;
import org.opensearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregationBuilder;
import org.opensearch.search.aggregations.AggregatorFactories.Builder; import org.elasticsearch.search.aggregations.AggregatorFactories.Builder;
import org.opensearch.search.aggregations.AggregatorFactory; import org.elasticsearch.search.aggregations.AggregatorFactory;
import org.opensearch.search.aggregations.BaseAggregationBuilder; import org.elasticsearch.search.aggregations.BaseAggregationBuilder;
import org.opensearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.InternalAggregation;
import org.opensearch.search.aggregations.InternalAggregation.ReduceContext; import org.elasticsearch.search.aggregations.InternalAggregation.ReduceContext;
import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder; import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
import org.opensearch.search.aggregations.bucket.terms.heuristic.ChiSquare; import org.opensearch.search.aggregations.bucket.terms.heuristic.ChiSquare;
import org.opensearch.search.aggregations.pipeline.AbstractPipelineAggregationBuilder; import org.opensearch.search.aggregations.pipeline.AbstractPipelineAggregationBuilder;

4
server/src/test/java/org/opensearch/search/fetch/subphase/highlight/CustomHighlighterPlugin.java
View File

@ -19,8 +19,8 @@
package org.opensearch.search.fetch.subphase.highlight; package org.opensearch.search.fetch.subphase.highlight;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.elasticsearch.plugins.SearchPlugin; import org.opensearch.plugins.SearchPlugin;
import org.opensearch.search.fetch.subphase.highlight.Highlighter; import org.opensearch.search.fetch.subphase.highlight.Highlighter;
import java.util.Map; import java.util.Map;

4
server/src/test/resources/META-INF/services/org.elasticsearch.plugins.PluginsServiceTests$TestExtensionPoint
View File

@ -17,5 +17,5 @@
# under the License. # under the License.
# #
org.elasticsearch.plugins.PluginsServiceTests$TestExtension1 org.opensearch.plugins.PluginsServiceTests$TestExtension1
org.elasticsearch.plugins.PluginsServiceTests$TestExtension2 org.opensearch.plugins.PluginsServiceTests$TestExtension2

2
server/src/test/resources/META-INF/services/org.elasticsearch.plugins.spi.NamedXContentProvider
View File

@ -1 +1 @@
org.elasticsearch.plugins.spi.NamedXContentProviderTests$TestNamedXContentProvider org.opensearch.plugins.spi.NamedXContentProviderTests$TestNamedXContentProvider

4
test/framework/src/main/java/org/opensearch/script/MockScriptPlugin.java
View File

@ -20,8 +20,8 @@
package org.opensearch.script; package org.opensearch.script;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.elasticsearch.plugins.ScriptPlugin; import org.opensearch.plugins.ScriptPlugin;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;

2
test/framework/src/main/java/org/opensearch/script/MockScriptService.java
View File

@ -21,7 +21,7 @@ package org.opensearch.script;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.node.MockNode; import org.elasticsearch.node.MockNode;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;

4
test/framework/src/main/java/org/opensearch/snapshots/mockstore/MockRepository.java
View File

@ -40,7 +40,7 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.opensearch.env.Environment; import org.opensearch.env.Environment;
import org.elasticsearch.indices.recovery.RecoverySettings; import org.elasticsearch.indices.recovery.RecoverySettings;
import org.elasticsearch.plugins.RepositoryPlugin; import org.opensearch.plugins.RepositoryPlugin;
import org.opensearch.repositories.Repository; import org.opensearch.repositories.Repository;
import org.opensearch.repositories.blobstore.BlobStoreRepository; import org.opensearch.repositories.blobstore.BlobStoreRepository;
import org.opensearch.repositories.fs.FsRepository; import org.opensearch.repositories.fs.FsRepository;
@ -65,7 +65,7 @@ import java.util.stream.Collectors;
public class MockRepository extends FsRepository { public class MockRepository extends FsRepository {
private static final Logger logger = LogManager.getLogger(MockRepository.class); private static final Logger logger = LogManager.getLogger(MockRepository.class);
public static class Plugin extends org.elasticsearch.plugins.Plugin implements RepositoryPlugin { public static class Plugin extends org.opensearch.plugins.Plugin implements RepositoryPlugin {
public static final Setting<String> USERNAME_SETTING = Setting.simpleString("secret.mock.username", Property.NodeScope); public static final Setting<String> USERNAME_SETTING = Setting.simpleString("secret.mock.username", Property.NodeScope);
public static final Setting<String> PASSWORD_SETTING = public static final Setting<String> PASSWORD_SETTING =

2
test/framework/src/main/java/org/opensearch/transport/MockTransportClient.java
View File

@ -22,7 +22,7 @@ import org.opensearch.client.transport.TransportClient;
import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.io.stream.NamedWriteableRegistry;
import org.opensearch.common.network.NetworkModule; import org.opensearch.common.network.NetworkModule;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.transport.nio.MockNioTransportPlugin; import org.opensearch.transport.nio.MockNioTransportPlugin;
import java.util.ArrayList; import java.util.ArrayList;

4
test/framework/src/main/java/org/opensearch/transport/nio/MockNioTransportPlugin.java
View File

@ -24,8 +24,8 @@ import org.opensearch.common.network.NetworkService;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.opensearch.common.util.PageCacheRecycler; import org.opensearch.common.util.PageCacheRecycler;
import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.indices.breaker.CircuitBreakerService;
import org.elasticsearch.plugins.NetworkPlugin; import org.opensearch.plugins.NetworkPlugin;
import org.elasticsearch.plugins.Plugin; import org.opensearch.plugins.Plugin;
import org.opensearch.threadpool.ThreadPool; import org.opensearch.threadpool.ThreadPool;
import org.opensearch.transport.Transport; import org.opensearch.transport.Transport;