diff --git a/client/benchmark/src/main/java/org/opensearch/client/benchmark/transport/TransportClientBenchmark.java b/client/benchmark/src/main/java/org/opensearch/client/benchmark/transport/TransportClientBenchmark.java index ccbbf8c1113..d86b2507253 100644 --- a/client/benchmark/src/main/java/org/opensearch/client/benchmark/transport/TransportClientBenchmark.java +++ b/client/benchmark/src/main/java/org/opensearch/client/benchmark/transport/TransportClientBenchmark.java @@ -36,7 +36,7 @@ import org.opensearch.plugin.noop.NoopPlugin; import org.opensearch.plugin.noop.action.bulk.NoopBulkAction; import org.opensearch.plugin.noop.action.search.NoopSearchAction; import org.opensearch.rest.RestStatus; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.transport.client.PreBuiltTransportClient; import java.net.InetAddress; diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/core/CountRequest.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/core/CountRequest.java index 0dfe96d59bd..8059f185417 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/core/CountRequest.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/core/CountRequest.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.Strings; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.internal.SearchContext; import java.io.IOException; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/RankEvalIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/RankEvalIT.java index 4b5958673ff..434a209e183 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/RankEvalIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/RankEvalIT.java @@ -35,7 +35,7 @@ import org.opensearch.index.rankeval.RankEvalSpec; import org.opensearch.index.rankeval.RatedDocument; import org.opensearch.index.rankeval.RatedRequest; import org.opensearch.index.rankeval.RatedSearchHit; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.junit.Before; import java.io.IOException; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java index 5e28d09ecdb..ed4d2e0f5c6 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java @@ -95,11 +95,11 @@ import org.opensearch.script.mustache.SearchTemplateRequest; import org.elasticsearch.search.Scroll; import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder; import org.elasticsearch.search.aggregations.support.ValueType; -import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.search.collapse.CollapseBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.collapse.CollapseBuilder; import org.elasticsearch.search.fetch.subphase.FetchSourceContext; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder; -import org.elasticsearch.search.rescore.QueryRescorerBuilder; +import org.opensearch.search.rescore.QueryRescorerBuilder; import org.elasticsearch.search.suggest.SuggestBuilder; import org.elasticsearch.search.suggest.completion.CompletionSuggestionBuilder; import org.opensearch.tasks.TaskId; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java index 1a890e07086..0351860808b 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/SearchIT.java @@ -77,10 +77,10 @@ import org.elasticsearch.search.aggregations.metrics.WeightedAvg; import org.elasticsearch.search.aggregations.metrics.WeightedAvgAggregationBuilder; import org.elasticsearch.search.aggregations.support.MultiValuesSourceFieldConfig; import org.elasticsearch.search.aggregations.support.ValueType; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.fetch.subphase.FetchSourceContext; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import org.elasticsearch.search.suggest.Suggest; import org.elasticsearch.search.suggest.SuggestBuilder; import org.elasticsearch.search.suggest.phrase.PhraseSuggestionBuilder; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/core/CountRequestTests.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/core/CountRequestTests.java index 1bad89810e8..f3a01c88f34 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/core/CountRequestTests.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/core/CountRequestTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.index.query.MatchQueryBuilder; import org.elasticsearch.index.query.QueryBuilder; import org.opensearch.rest.action.RestActions; import org.elasticsearch.search.SearchModule; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import java.io.IOException; import java.util.ArrayList; diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchDocumentationIT.java index 10ca7de5b12..d89726d0bdc 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SearchDocumentationIT.java @@ -91,7 +91,7 @@ import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.bucket.terms.Terms.Bucket; import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder; import org.elasticsearch.search.aggregations.metrics.Avg; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.fetch.subphase.FetchSourceContext; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder; import org.elasticsearch.search.fetch.subphase.highlight.HighlightField; @@ -100,9 +100,9 @@ import org.elasticsearch.search.profile.ProfileShardResult; import org.elasticsearch.search.profile.aggregation.AggregationProfileShardResult; import org.elasticsearch.search.profile.query.CollectorResult; import org.elasticsearch.search.profile.query.QueryProfileShardResult; -import org.elasticsearch.search.sort.FieldSortBuilder; -import org.elasticsearch.search.sort.ScoreSortBuilder; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.FieldSortBuilder; +import org.opensearch.search.sort.ScoreSortBuilder; +import org.opensearch.search.sort.SortOrder; import org.elasticsearch.search.suggest.Suggest; import org.elasticsearch.search.suggest.SuggestBuilder; import org.elasticsearch.search.suggest.SuggestBuilders; diff --git a/distribution/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/NodeRestUsageIT.java b/distribution/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/NodeRestUsageIT.java index ff327d554d1..2b22b6b9df6 100644 --- a/distribution/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/NodeRestUsageIT.java +++ b/distribution/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/NodeRestUsageIT.java @@ -24,7 +24,7 @@ import org.elasticsearch.client.Response; import org.elasticsearch.client.ResponseException; import org.elasticsearch.common.Strings; import org.elasticsearch.search.aggregations.AggregationBuilders; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import java.io.IOException; import java.util.Collections; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java index bc2a23923ce..b0adcfe3553 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.query.Operator; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder; import org.elasticsearch.test.ESIntegTestCase; @@ -41,8 +41,8 @@ import static org.elasticsearch.index.query.QueryBuilders.matchPhrasePrefixQuery import static org.elasticsearch.index.query.QueryBuilders.matchPhraseQuery; import static org.elasticsearch.index.query.QueryBuilders.matchQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery; -import static org.elasticsearch.search.builder.SearchSourceBuilder.highlight; -import static org.elasticsearch.search.builder.SearchSourceBuilder.searchSource; +import static org.opensearch.search.builder.SearchSourceBuilder.highlight; +import static org.opensearch.search.builder.SearchSourceBuilder.searchSource; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHighlight; import static org.hamcrest.Matchers.anyOf; diff --git a/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/MoreExpressionIT.java b/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/MoreExpressionIT.java index 9bd31b652dc..7240e75683b 100644 --- a/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/MoreExpressionIT.java +++ b/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/MoreExpressionIT.java @@ -38,8 +38,8 @@ import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.bucket.histogram.Histogram; import org.elasticsearch.search.aggregations.metrics.Stats; import org.elasticsearch.search.aggregations.pipeline.SimpleValue; -import org.elasticsearch.search.sort.SortBuilders; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortBuilders; +import org.opensearch.search.sort.SortOrder; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.hamcrest.ElasticsearchAssertions; diff --git a/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/StoredExpressionIT.java b/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/StoredExpressionIT.java index e7a8fe9851c..81905ee4c5e 100644 --- a/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/StoredExpressionIT.java +++ b/modules/lang-expression/src/internalClusterTest/java/org/opensearch/script/expression/StoredExpressionIT.java @@ -26,7 +26,7 @@ import org.elasticsearch.plugins.Plugin; import org.opensearch.script.Script; import org.opensearch.script.ScriptType; import org.elasticsearch.search.aggregations.AggregationBuilders; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.ESIntegTestCase; import java.io.IOException; diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionScriptEngine.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionScriptEngine.java index 111666bcb2e..c6d4216aa8c 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionScriptEngine.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/ExpressionScriptEngine.java @@ -44,7 +44,7 @@ import org.opensearch.script.ScriptContext; import org.opensearch.script.ScriptEngine; import org.opensearch.script.ScriptException; import org.opensearch.script.TermsSetQueryScript; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.security.AccessControlContext; import java.security.AccessController; diff --git a/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionFieldScriptTests.java b/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionFieldScriptTests.java index 98cae12a2d7..00f948767bc 100644 --- a/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionFieldScriptTests.java +++ b/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionFieldScriptTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.NumberFieldMapper; import org.opensearch.script.FieldScript; import org.opensearch.script.ScriptException; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import org.elasticsearch.test.ESTestCase; import java.io.IOException; diff --git a/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionNumberSortScriptTests.java b/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionNumberSortScriptTests.java index 0aea0e0af75..75db24a551a 100644 --- a/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionNumberSortScriptTests.java +++ b/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionNumberSortScriptTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.index.mapper.NumberFieldMapper.NumberFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType; import org.opensearch.script.NumberSortScript; import org.opensearch.script.ScriptException; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import org.elasticsearch.test.ESTestCase; import static org.mockito.Matchers.anyInt; diff --git a/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionTermsSetQueryTests.java b/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionTermsSetQueryTests.java index 7b3f5628bd0..4ec86fc9fb1 100644 --- a/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionTermsSetQueryTests.java +++ b/modules/lang-expression/src/test/java/org/opensearch/script/expression/ExpressionTermsSetQueryTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.index.mapper.NumberFieldMapper.NumberFieldType; import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType; import org.opensearch.script.ScriptException; import org.opensearch.script.TermsSetQueryScript; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import org.elasticsearch.test.ESTestCase; import static org.mockito.Matchers.anyInt; diff --git a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportSearchTemplateAction.java b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportSearchTemplateAction.java index c3bb7d235f7..1a13557b4a6 100644 --- a/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportSearchTemplateAction.java +++ b/modules/lang-mustache/src/main/java/org/opensearch/script/mustache/TransportSearchTemplateAction.java @@ -37,7 +37,7 @@ import org.opensearch.script.Script; import org.opensearch.script.ScriptService; import org.opensearch.script.ScriptType; import org.opensearch.script.TemplateScript; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.internal.SearchContext; import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; diff --git a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateRequestTests.java b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateRequestTests.java index 8823cab1f7d..78d6eada547 100644 --- a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateRequestTests.java +++ b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/MultiSearchTemplateRequestTests.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.rest.RestRequest; import org.opensearch.script.ScriptType; import org.elasticsearch.search.Scroll; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.StreamsUtils; import org.elasticsearch.test.rest.FakeRestRequest; diff --git a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestTests.java b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestTests.java index ca3fdd6026f..0cb41eab1da 100644 --- a/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestTests.java +++ b/modules/lang-mustache/src/test/java/org/opensearch/script/mustache/SearchTemplateRequestTests.java @@ -22,7 +22,7 @@ package org.opensearch.script.mustache; import org.elasticsearch.common.io.stream.Writeable; import org.opensearch.script.ScriptType; import org.elasticsearch.search.RandomSearchRequestGenerator; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.AbstractWireSerializingTestCase; import java.io.IOException; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/ScriptedMetricAggContextsTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/ScriptedMetricAggContextsTests.java index 9fd251c1cba..993662584e7 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/ScriptedMetricAggContextsTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/ScriptedMetricAggContextsTests.java @@ -25,9 +25,9 @@ import org.apache.lucene.search.Scorable; import org.opensearch.painless.spi.Whitelist; import org.opensearch.script.ScriptContext; import org.opensearch.script.ScriptedMetricAggContexts; -import org.elasticsearch.search.lookup.LeafSearchLookup; -import org.elasticsearch.search.lookup.SearchLookup; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.LeafSearchLookup; +import org.opensearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; import java.util.ArrayList; diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureFieldMapper.java index a64e5ae1901..4eb4e0f2e6c 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureFieldMapper.java @@ -29,7 +29,7 @@ import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.xcontent.XContentParser.Token; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.util.Arrays; diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureMetaFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureMetaFieldMapper.java index 1227c498130..677ee3b3b1f 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureMetaFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeatureMetaFieldMapper.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.mapper; import org.apache.lucene.search.Query; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.util.Collections; diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeaturesFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeaturesFieldMapper.java index 6b850b30a06..0de8bf3834d 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeaturesFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/RankFeaturesFieldMapper.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.common.xcontent.XContentParser.Token; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.util.Collections; diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java index 9718cde1a18..3880f75cd9d 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java @@ -45,7 +45,7 @@ import org.elasticsearch.index.fielddata.plain.SortedNumericIndexFieldData; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.math.BigDecimal; diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldMapper.java index 7b674170730..150975b3083 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/SearchAsYouTypeFieldMapper.java @@ -52,7 +52,7 @@ import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.similarity.SimilarityProvider; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.util.ArrayList; diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/TokenCountFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/TokenCountFieldMapper.java index 0413ed50a3e..0f96511dccb 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/TokenCountFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/TokenCountFieldMapper.java @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.util.Arrays; diff --git a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ChildrenIT.java b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ChildrenIT.java index ba753ddd4a8..a6f7d6d0474 100644 --- a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ChildrenIT.java +++ b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ChildrenIT.java @@ -31,7 +31,7 @@ import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.metrics.Sum; import org.elasticsearch.search.aggregations.metrics.TopHits; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import java.util.ArrayList; import java.util.List; diff --git a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ChildQuerySearchIT.java b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ChildQuerySearchIT.java index e0d64d06083..db3704ddf49 100644 --- a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ChildQuerySearchIT.java +++ b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/ChildQuerySearchIT.java @@ -46,8 +46,8 @@ import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder.Field; import org.elasticsearch.search.fetch.subphase.highlight.HighlightField; -import org.elasticsearch.search.sort.SortBuilders; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortBuilders; +import org.opensearch.search.sort.SortOrder; import org.hamcrest.Matchers; import java.io.IOException; diff --git a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/InnerHitsIT.java b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/InnerHitsIT.java index cb087455050..b564176a457 100644 --- a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/InnerHitsIT.java +++ b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/query/InnerHitsIT.java @@ -36,9 +36,9 @@ import org.opensearch.script.ScriptType; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder; -import org.elasticsearch.search.sort.FieldSortBuilder; -import org.elasticsearch.search.sort.SortBuilders; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.FieldSortBuilder; +import org.opensearch.search.sort.SortBuilders; +import org.opensearch.search.sort.SortOrder; import java.util.ArrayList; import java.util.Collection; diff --git a/modules/parent-join/src/main/java/org/opensearch/join/mapper/MetaJoinFieldMapper.java b/modules/parent-join/src/main/java/org/opensearch/join/mapper/MetaJoinFieldMapper.java index 20b7ad663a2..e206a767aa1 100644 --- a/modules/parent-join/src/main/java/org/opensearch/join/mapper/MetaJoinFieldMapper.java +++ b/modules/parent-join/src/main/java/org/opensearch/join/mapper/MetaJoinFieldMapper.java @@ -33,7 +33,7 @@ import org.elasticsearch.index.mapper.TextSearchInfo; import org.elasticsearch.index.mapper.ValueFetcher; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.util.Collections; diff --git a/modules/parent-join/src/main/java/org/opensearch/join/mapper/ParentIdFieldMapper.java b/modules/parent-join/src/main/java/org/opensearch/join/mapper/ParentIdFieldMapper.java index 274a1e96b15..3218e7847b6 100644 --- a/modules/parent-join/src/main/java/org/opensearch/join/mapper/ParentIdFieldMapper.java +++ b/modules/parent-join/src/main/java/org/opensearch/join/mapper/ParentIdFieldMapper.java @@ -41,7 +41,7 @@ import org.elasticsearch.index.mapper.StringFieldType; import org.elasticsearch.index.mapper.TextSearchInfo; import org.elasticsearch.index.mapper.ValueFetcher; import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.util.Collection; diff --git a/modules/parent-join/src/main/java/org/opensearch/join/mapper/ParentJoinFieldMapper.java b/modules/parent-join/src/main/java/org/opensearch/join/mapper/ParentJoinFieldMapper.java index b935645f296..b89dc226a41 100644 --- a/modules/parent-join/src/main/java/org/opensearch/join/mapper/ParentJoinFieldMapper.java +++ b/modules/parent-join/src/main/java/org/opensearch/join/mapper/ParentJoinFieldMapper.java @@ -45,7 +45,7 @@ import org.elasticsearch.index.mapper.StringFieldType; import org.elasticsearch.index.mapper.TextSearchInfo; import org.elasticsearch.index.mapper.ValueFetcher; import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.util.ArrayList; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/query/HasChildQueryBuilderTests.java b/modules/parent-join/src/test/java/org/opensearch/join/query/HasChildQueryBuilderTests.java index 144891d9aad..3535555e99c 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/query/HasChildQueryBuilderTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/query/HasChildQueryBuilderTests.java @@ -52,8 +52,8 @@ import org.elasticsearch.index.query.WrapperQueryBuilder; import org.elasticsearch.index.similarity.SimilarityService; import org.opensearch.join.ParentJoinPlugin; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.search.sort.FieldSortBuilder; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.FieldSortBuilder; +import org.opensearch.search.sort.SortOrder; import org.elasticsearch.test.AbstractQueryTestCase; import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; import org.elasticsearch.test.VersionUtils; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/query/HasParentQueryBuilderTests.java b/modules/parent-join/src/test/java/org/opensearch/join/query/HasParentQueryBuilderTests.java index 9b6a629855b..f4a201efccb 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/query/HasParentQueryBuilderTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/query/HasParentQueryBuilderTests.java @@ -39,8 +39,8 @@ import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.query.WrapperQueryBuilder; import org.opensearch.join.ParentJoinPlugin; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.search.sort.FieldSortBuilder; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.FieldSortBuilder; +import org.opensearch.search.sort.SortOrder; import org.elasticsearch.test.AbstractQueryTestCase; import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; import org.elasticsearch.test.VersionUtils; diff --git a/modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java b/modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java index a7cda0bf55f..1e4f090a501 100644 --- a/modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java +++ b/modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java @@ -39,7 +39,7 @@ import org.elasticsearch.index.query.Operator; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import org.elasticsearch.test.ESIntegTestCase; import java.io.IOException; import java.util.Arrays; diff --git a/modules/percolator/src/main/java/org/opensearch/percolator/PercolatorFieldMapper.java b/modules/percolator/src/main/java/org/opensearch/percolator/PercolatorFieldMapper.java index f78e168943c..9d89946b527 100644 --- a/modules/percolator/src/main/java/org/opensearch/percolator/PercolatorFieldMapper.java +++ b/modules/percolator/src/main/java/org/opensearch/percolator/PercolatorFieldMapper.java @@ -81,7 +81,7 @@ import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.QueryShardException; import org.elasticsearch.index.query.Rewriteable; import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/modules/percolator/src/main/java/org/opensearch/percolator/PercolatorHighlightSubFetchPhase.java b/modules/percolator/src/main/java/org/opensearch/percolator/PercolatorHighlightSubFetchPhase.java index bed71ffac25..e7e5cf6c5cd 100644 --- a/modules/percolator/src/main/java/org/opensearch/percolator/PercolatorHighlightSubFetchPhase.java +++ b/modules/percolator/src/main/java/org/opensearch/percolator/PercolatorHighlightSubFetchPhase.java @@ -34,7 +34,7 @@ import org.elasticsearch.search.fetch.subphase.highlight.HighlightField; import org.elasticsearch.search.fetch.subphase.highlight.HighlightPhase; import org.elasticsearch.search.fetch.subphase.highlight.Highlighter; import org.elasticsearch.search.fetch.subphase.highlight.SearchHighlightContext; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; import java.util.ArrayList; diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorMatchedSlotSubFetchPhaseTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorMatchedSlotSubFetchPhaseTests.java index a60f902c920..4b5c8723f96 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorMatchedSlotSubFetchPhaseTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorMatchedSlotSubFetchPhaseTests.java @@ -39,7 +39,7 @@ import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.fetch.FetchContext; import org.elasticsearch.search.fetch.FetchSubPhase.HitContext; import org.elasticsearch.search.fetch.FetchSubPhaseProcessor; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SourceLookup; import org.elasticsearch.test.ESTestCase; import java.util.Collections; diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorQuerySearchTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorQuerySearchTests.java index 95edbb95648..a114b5d07a8 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorQuerySearchTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorQuerySearchTests.java @@ -39,8 +39,8 @@ import org.elasticsearch.plugins.Plugin; import org.opensearch.script.MockScriptPlugin; import org.opensearch.script.Script; import org.opensearch.script.ScriptType; -import org.elasticsearch.search.lookup.LeafDocLookup; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.lookup.LeafDocLookup; +import org.opensearch.search.sort.SortOrder; import org.elasticsearch.test.ESSingleNodeTestCase; import java.io.IOException; diff --git a/modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java b/modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java index 3e512af27e4..6d9bc2f3a4a 100644 --- a/modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java +++ b/modules/rank-eval/src/internalClusterTest/java/org/opensearch/index/rankeval/RankEvalRequestIT.java @@ -30,7 +30,7 @@ import org.elasticsearch.index.query.QueryBuilders; import org.opensearch.index.rankeval.PrecisionAtK.Detail; import org.elasticsearch.indices.IndexClosedException; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.ESIntegTestCase; import org.junit.Before; diff --git a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RatedRequest.java b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RatedRequest.java index fab657b8c07..976b2409c7b 100644 --- a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RatedRequest.java +++ b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/RatedRequest.java @@ -30,7 +30,7 @@ import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.index.rankeval.RatedDocument.DocumentKey; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import java.io.IOException; import java.util.ArrayList; diff --git a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/TransportRankEvalAction.java b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/TransportRankEvalAction.java index 5e4be3f8a82..edbab856f6d 100644 --- a/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/TransportRankEvalAction.java +++ b/modules/rank-eval/src/main/java/org/opensearch/index/rankeval/TransportRankEvalAction.java @@ -38,7 +38,7 @@ import org.opensearch.script.Script; import org.opensearch.script.ScriptService; import org.opensearch.script.TemplateScript; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.tasks.Task; import org.opensearch.transport.TransportService; diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalSpecTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalSpecTests.java index fde329fa97b..a71cabfe7ff 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalSpecTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalSpecTests.java @@ -34,7 +34,7 @@ import org.elasticsearch.index.query.QueryBuilder; import org.opensearch.index.rankeval.RankEvalSpec.ScriptWithId; import org.opensearch.script.Script; import org.opensearch.script.ScriptType; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.ESTestCase; import java.io.IOException; diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RatedRequestsTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RatedRequestsTests.java index 9b961ac4357..bde6a07e15a 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RatedRequestsTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RatedRequestsTests.java @@ -34,7 +34,7 @@ import org.elasticsearch.index.query.MatchAllQueryBuilder; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.search.SearchModule; import org.elasticsearch.search.aggregations.AggregationBuilders; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder; import org.elasticsearch.search.suggest.SuggestBuilder; import org.elasticsearch.search.suggest.SuggestBuilders; diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/TransportRankEvalActionTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/TransportRankEvalActionTests.java index 999bc143fab..e06287f7b01 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/TransportRankEvalActionTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/TransportRankEvalActionTests.java @@ -30,7 +30,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.env.Environment; import org.opensearch.script.ScriptService; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.ESTestCase; import org.opensearch.transport.TransportService; diff --git a/modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java b/modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java index 2b1301e612d..d8cb43b3553 100644 --- a/modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java +++ b/modules/reindex/src/internalClusterTest/java/org/opensearch/client/documentation/ReindexDocumentationIT.java @@ -44,7 +44,7 @@ import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.plugins.Plugin; import org.opensearch.script.Script; import org.opensearch.script.ScriptType; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import org.opensearch.tasks.TaskId; import org.opensearch.tasks.TaskInfo; import org.elasticsearch.test.ESIntegTestCase; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java index 37de59ac0e1..2a4ce321669 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollAction.java @@ -57,8 +57,8 @@ import org.elasticsearch.index.reindex.WorkerBulkByScrollTaskState; import org.opensearch.script.Script; import org.opensearch.script.ScriptService; import org.opensearch.script.UpdateScript; -import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.search.sort.SortBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.sort.SortBuilder; import org.opensearch.threadpool.ThreadPool; import java.util.ArrayList; @@ -84,7 +84,7 @@ import static org.opensearch.action.bulk.BackoffPolicy.exponentialBackoff; import static org.elasticsearch.common.unit.TimeValue.timeValueNanos; import static org.elasticsearch.index.reindex.AbstractBulkByScrollRequest.MAX_DOCS_ALL_MATCHES; import static org.opensearch.rest.RestStatus.CONFLICT; -import static org.elasticsearch.search.sort.SortBuilders.fieldSort; +import static org.opensearch.search.sort.SortBuilders.fieldSort; /** * Abstract base for scrolling across a search and executing bulk actions on all results. All package private methods are package private so diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/BulkByScrollParallelizationHelper.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/BulkByScrollParallelizationHelper.java index 4a5c8f5cac9..7ee21adb7ff 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/BulkByScrollParallelizationHelper.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/BulkByScrollParallelizationHelper.java @@ -34,8 +34,8 @@ import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.index.reindex.BulkByScrollTask; import org.elasticsearch.index.reindex.LeaderBulkByScrollTaskState; -import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.search.slice.SliceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.slice.SliceBuilder; import org.opensearch.tasks.TaskId; import java.util.Arrays; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexValidator.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexValidator.java index a29b0af8cb6..0b3a9fd5979 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexValidator.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexValidator.java @@ -39,7 +39,7 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.IndexNotFoundException; import org.elasticsearch.index.reindex.ReindexRequest; import org.elasticsearch.index.reindex.RemoteInfo; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import java.util.List; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteRequestBuilders.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteRequestBuilders.java index cd18824207a..ae992191472 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteRequestBuilders.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteRequestBuilders.java @@ -35,8 +35,8 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentHelper; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.search.sort.FieldSortBuilder; -import org.elasticsearch.search.sort.SortBuilder; +import org.opensearch.search.sort.FieldSortBuilder; +import org.opensearch.search.sort.SortBuilder; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkByScrollParallelizationHelperTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkByScrollParallelizationHelperTests.java index 500ac247aef..4d8e9c171f6 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkByScrollParallelizationHelperTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkByScrollParallelizationHelperTests.java @@ -21,7 +21,7 @@ package org.opensearch.index.reindex; import org.elasticsearch.action.search.SearchRequest; import org.elasticsearch.index.mapper.IdFieldMapper; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.ESTestCase; import java.io.IOException; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryBasicTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryBasicTests.java index 03826ba7a92..2ef9e82ae44 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryBasicTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryBasicTests.java @@ -32,7 +32,7 @@ import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.index.reindex.DeleteByQueryRequestBuilder; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import org.elasticsearch.test.InternalSettingsPlugin; import org.elasticsearch.test.InternalTestCluster; import org.opensearch.threadpool.ThreadPool; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSingleNodeTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSingleNodeTests.java index 0ea361e8e50..b5a7ebfef2a 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSingleNodeTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexSingleNodeTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.reindex.ReindexAction; import org.elasticsearch.index.reindex.ReindexRequestBuilder; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import org.elasticsearch.test.ESSingleNodeTestCase; import java.util.Arrays; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryBasicTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryBasicTests.java index 5a9853fc748..7ed6339f766 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryBasicTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryBasicTests.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import java.util.ArrayList; import java.util.Collection; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteRequestBuildersTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteRequestBuildersTests.java index ba0339d14f0..9ec3d6c18fa 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteRequestBuildersTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteRequestBuildersTests.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.io.Streams; import org.elasticsearch.common.unit.TimeValue; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.ESTestCase; import java.io.IOException; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java index 67f35d22ded..d4d2957f337 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSourceTests.java @@ -56,7 +56,7 @@ import org.elasticsearch.index.reindex.RejectAwareActionListener; import org.elasticsearch.index.reindex.ScrollableHitSource; import org.elasticsearch.index.reindex.ScrollableHitSource.Response; import org.opensearch.rest.RestStatus; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.test.ESTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java b/server/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java index 9a8e4d0e101..7fd3bfea9ce 100644 --- a/server/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java +++ b/server/src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java @@ -46,8 +46,8 @@ import org.elasticsearch.search.SearchService; import org.elasticsearch.search.internal.AliasFilter; import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.ShardSearchRequest; -import org.elasticsearch.search.rescore.RescoreContext; -import org.elasticsearch.search.rescore.Rescorer; +import org.opensearch.search.rescore.RescoreContext; +import org.opensearch.search.rescore.Rescorer; import org.opensearch.tasks.Task; import org.opensearch.threadpool.ThreadPool; import org.opensearch.transport.TransportService; diff --git a/server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesIndexAction.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesIndexAction.java index 0a9f5318ec6..dd96d22860f 100644 --- a/server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesIndexAction.java +++ b/server/src/main/java/org/elasticsearch/action/fieldcaps/TransportFieldCapabilitiesIndexAction.java @@ -50,7 +50,7 @@ import org.elasticsearch.index.query.MatchAllQueryBuilder; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.search.SearchService; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.internal.AliasFilter; import org.elasticsearch.search.internal.ShardSearchRequest; import org.opensearch.tasks.Task; diff --git a/server/src/main/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhase.java b/server/src/main/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhase.java index 4a6831b388f..b4b73ea3b9a 100644 --- a/server/src/main/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhase.java +++ b/server/src/main/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhase.java @@ -26,11 +26,11 @@ import org.elasticsearch.cluster.routing.GroupShardsIterator; import org.elasticsearch.common.lease.Releasable; import org.elasticsearch.search.SearchService.CanMatchResponse; import org.elasticsearch.search.SearchShardTarget; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.internal.AliasFilter; -import org.elasticsearch.search.sort.FieldSortBuilder; -import org.elasticsearch.search.sort.MinAndMax; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.FieldSortBuilder; +import org.opensearch.search.sort.MinAndMax; +import org.opensearch.search.sort.SortOrder; import org.opensearch.transport.Transport; import java.util.Comparator; diff --git a/server/src/main/java/org/elasticsearch/action/search/DfsQueryPhase.java b/server/src/main/java/org/elasticsearch/action/search/DfsQueryPhase.java index db75d0ee7ce..51d887093dd 100644 --- a/server/src/main/java/org/elasticsearch/action/search/DfsQueryPhase.java +++ b/server/src/main/java/org/elasticsearch/action/search/DfsQueryPhase.java @@ -21,8 +21,8 @@ package org.elasticsearch.action.search; import org.apache.logging.log4j.message.ParameterizedMessage; import org.elasticsearch.search.SearchPhaseResult; import org.elasticsearch.search.SearchShardTarget; -import org.elasticsearch.search.dfs.AggregatedDfs; -import org.elasticsearch.search.dfs.DfsSearchResult; +import org.opensearch.search.dfs.AggregatedDfs; +import org.opensearch.search.dfs.DfsSearchResult; import org.elasticsearch.search.query.QuerySearchRequest; import org.elasticsearch.search.query.QuerySearchResult; import org.opensearch.transport.Transport; diff --git a/server/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java b/server/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java index 573e2e18e22..0d45deb05e9 100644 --- a/server/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java +++ b/server/src/main/java/org/elasticsearch/action/search/ExpandSearchPhase.java @@ -28,8 +28,8 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.SearchPhaseResult; -import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.search.collapse.CollapseBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.collapse.CollapseBuilder; import org.elasticsearch.search.internal.InternalSearchResponse; import java.util.HashMap; diff --git a/server/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java b/server/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java index fc215b99d10..60ff45b8820 100644 --- a/server/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java +++ b/server/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.util.concurrent.AtomicArray; import org.elasticsearch.search.RescoreDocIds; import org.elasticsearch.search.SearchPhaseResult; import org.elasticsearch.search.SearchShardTarget; -import org.elasticsearch.search.dfs.AggregatedDfs; +import org.opensearch.search.dfs.AggregatedDfs; import org.elasticsearch.search.fetch.FetchSearchResult; import org.elasticsearch.search.fetch.ShardFetchSearchRequest; import org.elasticsearch.search.internal.InternalSearchResponse; diff --git a/server/src/main/java/org/elasticsearch/action/search/QueryPhaseResultConsumer.java b/server/src/main/java/org/elasticsearch/action/search/QueryPhaseResultConsumer.java index 24531f90b6f..df3ff67515f 100644 --- a/server/src/main/java/org/elasticsearch/action/search/QueryPhaseResultConsumer.java +++ b/server/src/main/java/org/elasticsearch/action/search/QueryPhaseResultConsumer.java @@ -34,7 +34,7 @@ import org.elasticsearch.search.SearchPhaseResult; import org.elasticsearch.search.SearchShardTarget; import org.elasticsearch.search.aggregations.InternalAggregation.ReduceContextBuilder; import org.elasticsearch.search.aggregations.InternalAggregations; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.query.QuerySearchResult; import java.util.ArrayDeque; diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchDfsQueryThenFetchAsyncAction.java b/server/src/main/java/org/elasticsearch/action/search/SearchDfsQueryThenFetchAsyncAction.java index b8edad6cca3..82ab87f1660 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchDfsQueryThenFetchAsyncAction.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchDfsQueryThenFetchAsyncAction.java @@ -24,9 +24,9 @@ import org.opensearch.action.ActionListener; import org.opensearch.cluster.ClusterState; import org.elasticsearch.cluster.routing.GroupShardsIterator; import org.elasticsearch.search.SearchShardTarget; -import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.search.dfs.AggregatedDfs; -import org.elasticsearch.search.dfs.DfsSearchResult; +import org.opensearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.dfs.AggregatedDfs; +import org.opensearch.search.dfs.DfsSearchResult; import org.elasticsearch.search.internal.AliasFilter; import org.opensearch.transport.Transport; diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java b/server/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java index a6c5964c947..74f2f4cbe67 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchPhaseController.java @@ -46,9 +46,9 @@ import org.elasticsearch.search.SearchService; import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.InternalAggregation.ReduceContext; import org.elasticsearch.search.aggregations.InternalAggregations; -import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.search.dfs.AggregatedDfs; -import org.elasticsearch.search.dfs.DfsSearchResult; +import org.opensearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.dfs.AggregatedDfs; +import org.opensearch.search.dfs.DfsSearchResult; import org.elasticsearch.search.fetch.FetchSearchResult; import org.elasticsearch.search.internal.InternalSearchResponse; import org.elasticsearch.search.internal.SearchContext; diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java b/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java index 0cabc2de1a7..fbbd106be7a 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java @@ -31,8 +31,8 @@ import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.search.Scroll; -import org.elasticsearch.search.builder.PointInTimeBuilder; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.PointInTimeBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.internal.SearchContext; import org.opensearch.tasks.TaskId; @@ -48,7 +48,7 @@ import static org.opensearch.action.ValidateActions.addValidationError; * A request to execute search against one or more indices (or all). Best created using * {@link org.opensearch.client.Requests#searchRequest(String...)}. *

- * Note, the search {@link #source(org.elasticsearch.search.builder.SearchSourceBuilder)} + * Note, the search {@link #source(org.opensearch.search.builder.SearchSourceBuilder)} * is required. The search source is the different search options, including aggregations and such. *

* diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java b/server/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java index 7d52f2b0e92..d2432e8c7bc 100644 --- a/server/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java +++ b/server/src/main/java/org/elasticsearch/action/search/SearchRequestBuilder.java @@ -29,14 +29,14 @@ import org.opensearch.script.Script; import org.elasticsearch.search.Scroll; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.PipelineAggregationBuilder; -import org.elasticsearch.search.builder.PointInTimeBuilder; -import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.search.collapse.CollapseBuilder; +import org.opensearch.search.builder.PointInTimeBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.collapse.CollapseBuilder; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder; -import org.elasticsearch.search.rescore.RescorerBuilder; -import org.elasticsearch.search.slice.SliceBuilder; -import org.elasticsearch.search.sort.SortBuilder; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.rescore.RescorerBuilder; +import org.opensearch.search.slice.SliceBuilder; +import org.opensearch.search.sort.SortBuilder; +import org.opensearch.search.sort.SortOrder; import org.elasticsearch.search.suggest.SuggestBuilder; import java.util.Arrays; @@ -370,7 +370,7 @@ public class SearchRequestBuilder extends ActionRequestBuilder sort) { sourceBuilder().sort(sort); @@ -457,7 +457,7 @@ public class SearchRequestBuilder extends ActionRequestBuilder { diff --git a/server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java b/server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java index 4b80e463084..b316dbb12bc 100644 --- a/server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java +++ b/server/src/main/java/org/elasticsearch/action/update/UpdateHelper.java @@ -44,7 +44,7 @@ import org.elasticsearch.index.shard.ShardId; import org.opensearch.script.Script; import org.opensearch.script.ScriptService; import org.opensearch.script.UpdateScript; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; import java.util.Collections; diff --git a/server/src/main/java/org/elasticsearch/search/DefaultSearchContext.java b/server/src/main/java/org/elasticsearch/search/DefaultSearchContext.java index 444c28ced50..e10c8c230d0 100644 --- a/server/src/main/java/org/elasticsearch/search/DefaultSearchContext.java +++ b/server/src/main/java/org/elasticsearch/search/DefaultSearchContext.java @@ -51,8 +51,8 @@ import org.elasticsearch.index.search.NestedHelper; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.search.aggregations.SearchContextAggregations; -import org.elasticsearch.search.collapse.CollapseContext; -import org.elasticsearch.search.dfs.DfsSearchResult; +import org.opensearch.search.collapse.CollapseContext; +import org.opensearch.search.dfs.DfsSearchResult; import org.elasticsearch.search.fetch.FetchPhase; import org.elasticsearch.search.fetch.FetchSearchResult; import org.elasticsearch.search.fetch.StoredFieldsContext; @@ -70,9 +70,9 @@ import org.elasticsearch.search.internal.ShardSearchRequest; import org.elasticsearch.search.profile.Profilers; import org.elasticsearch.search.query.QueryPhaseExecutionException; import org.elasticsearch.search.query.QuerySearchResult; -import org.elasticsearch.search.rescore.RescoreContext; -import org.elasticsearch.search.slice.SliceBuilder; -import org.elasticsearch.search.sort.SortAndFormats; +import org.opensearch.search.rescore.RescoreContext; +import org.opensearch.search.slice.SliceBuilder; +import org.opensearch.search.sort.SortAndFormats; import org.elasticsearch.search.suggest.SuggestionSearchContext; import java.io.IOException; diff --git a/server/src/main/java/org/elasticsearch/search/SearchHit.java b/server/src/main/java/org/elasticsearch/search/SearchHit.java index 8ea08c91ea7..7cd771c39cd 100644 --- a/server/src/main/java/org/elasticsearch/search/SearchHit.java +++ b/server/src/main/java/org/elasticsearch/search/SearchHit.java @@ -49,7 +49,7 @@ import org.elasticsearch.index.mapper.SourceFieldMapper; import org.elasticsearch.index.seqno.SequenceNumbers; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.search.fetch.subphase.highlight.HighlightField; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SourceLookup; import org.opensearch.transport.RemoteClusterAware; import java.io.IOException; diff --git a/server/src/main/java/org/elasticsearch/search/SearchModule.java b/server/src/main/java/org/elasticsearch/search/SearchModule.java index 184548a86b1..684a4009e3a 100644 --- a/server/src/main/java/org/elasticsearch/search/SearchModule.java +++ b/server/src/main/java/org/elasticsearch/search/SearchModule.java @@ -261,14 +261,14 @@ import org.elasticsearch.search.fetch.subphase.highlight.HighlightPhase; import org.elasticsearch.search.fetch.subphase.highlight.Highlighter; import org.elasticsearch.search.fetch.subphase.highlight.PlainHighlighter; import org.elasticsearch.search.fetch.subphase.highlight.UnifiedHighlighter; -import org.elasticsearch.search.rescore.QueryRescorerBuilder; -import org.elasticsearch.search.rescore.RescorerBuilder; -import org.elasticsearch.search.sort.FieldSortBuilder; -import org.elasticsearch.search.sort.GeoDistanceSortBuilder; -import org.elasticsearch.search.sort.ScoreSortBuilder; -import org.elasticsearch.search.sort.ScriptSortBuilder; -import org.elasticsearch.search.sort.SortBuilder; -import org.elasticsearch.search.sort.SortValue; +import org.opensearch.search.rescore.QueryRescorerBuilder; +import org.opensearch.search.rescore.RescorerBuilder; +import org.opensearch.search.sort.FieldSortBuilder; +import org.opensearch.search.sort.GeoDistanceSortBuilder; +import org.opensearch.search.sort.ScoreSortBuilder; +import org.opensearch.search.sort.ScriptSortBuilder; +import org.opensearch.search.sort.SortBuilder; +import org.opensearch.search.sort.SortValue; import org.elasticsearch.search.suggest.Suggest; import org.elasticsearch.search.suggest.SuggestionBuilder; import org.elasticsearch.search.suggest.completion.CompletionSuggestion; diff --git a/server/src/main/java/org/elasticsearch/search/SearchService.java b/server/src/main/java/org/elasticsearch/search/SearchService.java index 8e1f6eabaef..4625686fec0 100644 --- a/server/src/main/java/org/elasticsearch/search/SearchService.java +++ b/server/src/main/java/org/elasticsearch/search/SearchService.java @@ -82,10 +82,10 @@ import org.elasticsearch.search.aggregations.InternalAggregation.ReduceContext; import org.elasticsearch.search.aggregations.MultiBucketConsumerService; import org.elasticsearch.search.aggregations.SearchContextAggregations; import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator.PipelineTree; -import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.search.collapse.CollapseContext; -import org.elasticsearch.search.dfs.DfsPhase; -import org.elasticsearch.search.dfs.DfsSearchResult; +import org.opensearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.collapse.CollapseContext; +import org.opensearch.search.dfs.DfsPhase; +import org.opensearch.search.dfs.DfsSearchResult; import org.elasticsearch.search.fetch.FetchPhase; import org.elasticsearch.search.fetch.FetchSearchResult; import org.elasticsearch.search.fetch.QueryFetchSearchResult; @@ -102,18 +102,18 @@ import org.elasticsearch.search.internal.ReaderContext; import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.ShardSearchContextId; import org.elasticsearch.search.internal.ShardSearchRequest; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import org.elasticsearch.search.profile.Profilers; import org.elasticsearch.search.query.QueryPhase; import org.elasticsearch.search.query.QuerySearchRequest; import org.elasticsearch.search.query.QuerySearchResult; import org.elasticsearch.search.query.ScrollQuerySearchResult; -import org.elasticsearch.search.rescore.RescorerBuilder; -import org.elasticsearch.search.searchafter.SearchAfterBuilder; -import org.elasticsearch.search.sort.FieldSortBuilder; -import org.elasticsearch.search.sort.MinAndMax; -import org.elasticsearch.search.sort.SortAndFormats; -import org.elasticsearch.search.sort.SortBuilder; +import org.opensearch.search.rescore.RescorerBuilder; +import org.opensearch.search.searchafter.SearchAfterBuilder; +import org.opensearch.search.sort.FieldSortBuilder; +import org.opensearch.search.sort.MinAndMax; +import org.opensearch.search.sort.SortAndFormats; +import org.opensearch.search.sort.SortBuilder; import org.elasticsearch.search.suggest.Suggest; import org.elasticsearch.search.suggest.completion.CompletionSuggestion; import org.opensearch.threadpool.Scheduler.Cancellable; @@ -984,7 +984,7 @@ public class SearchService extends AbstractLifecycleComponent implements IndexEv + "] but was [" + source.scriptFields().size() + "]. This limit can be set by changing the [" + IndexSettings.MAX_SCRIPT_FIELDS_SETTING.getKey() + "] index level setting."); } - for (org.elasticsearch.search.builder.SearchSourceBuilder.ScriptField field : source.scriptFields()) { + for (org.opensearch.search.builder.SearchSourceBuilder.ScriptField field : source.scriptFields()) { FieldScript.Factory factory = scriptService.compile(field.script(), FieldScript.CONTEXT); SearchLookup lookup = context.getQueryShardContext().lookup(); FieldScript.LeafFactory searchScript = factory.newFactory(field.script().getParams(), lookup); diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java index aa0be809e35..745bed99fa8 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java @@ -30,7 +30,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.search.aggregations.support.AggregationPath; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; import java.util.Iterator; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/InternalOrder.java b/server/src/main/java/org/elasticsearch/search/aggregations/InternalOrder.java index 770c72b26e0..383b0a71e0e 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/InternalOrder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/InternalOrder.java @@ -30,7 +30,7 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.search.aggregations.Aggregator.BucketComparator; import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation.Bucket; import org.elasticsearch.search.aggregations.support.AggregationPath; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/PipelineAggregatorBuilders.java b/server/src/main/java/org/elasticsearch/search/aggregations/PipelineAggregatorBuilders.java index 8a4727d6ff1..585782be6b2 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/PipelineAggregatorBuilders.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/PipelineAggregatorBuilders.java @@ -35,7 +35,7 @@ import org.elasticsearch.search.aggregations.pipeline.PercentilesBucketPipelineA import org.elasticsearch.search.aggregations.pipeline.SerialDiffPipelineAggregationBuilder; import org.elasticsearch.search.aggregations.pipeline.StatsBucketPipelineAggregationBuilder; import org.elasticsearch.search.aggregations.pipeline.SumBucketPipelineAggregationBuilder; -import org.elasticsearch.search.sort.FieldSortBuilder; +import org.opensearch.search.sort.FieldSortBuilder; import java.util.List; import java.util.Map; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketsAggregator.java index cffcb61aa06..7fb1652c46b 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketsAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/BucketsAggregator.java @@ -33,7 +33,7 @@ import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregator; import org.elasticsearch.search.aggregations.bucket.terms.LongKeyedBucketOrds; import org.elasticsearch.search.aggregations.support.AggregationPath; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; import java.util.AbstractList; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java index bc6ab0b746f..a1e48363bfb 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/DeferringBucketCollector.java @@ -27,7 +27,7 @@ import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.LeafBucketCollector; import org.elasticsearch.search.aggregations.support.AggregationPath.PathElement; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; import java.util.Iterator; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java index 2791e1edd72..96a8b50adf3 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java @@ -58,8 +58,8 @@ import org.elasticsearch.search.aggregations.MultiBucketCollector; import org.elasticsearch.search.aggregations.MultiBucketConsumerService; import org.elasticsearch.search.aggregations.bucket.BucketsAggregator; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.search.searchafter.SearchAfterBuilder; -import org.elasticsearch.search.sort.SortAndFormats; +import org.opensearch.search.searchafter.SearchAfterBuilder; +import org.opensearch.search.sort.SortAndFormats; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java index a6e42b64a70..68c09ae9e6d 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java @@ -31,7 +31,7 @@ import org.elasticsearch.search.aggregations.support.ValueType; import org.elasticsearch.search.aggregations.support.ValuesSource; import org.elasticsearch.search.aggregations.support.ValuesSourceConfig; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; import java.time.ZoneId; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceConfig.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceConfig.java index c57f01a25a6..4e33ffef4a3 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceConfig.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceConfig.java @@ -25,7 +25,7 @@ import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.aggregations.support.ValuesSource; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import java.util.function.LongConsumer; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java index 1afe3452b64..af27e25ad2d 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DateHistogramValuesSourceBuilder.java @@ -44,7 +44,7 @@ import org.elasticsearch.search.aggregations.support.ValuesSource; import org.elasticsearch.search.aggregations.support.ValuesSourceConfig; import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; import java.time.ZoneId; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/GeoTileGridValuesSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/GeoTileGridValuesSourceBuilder.java index de9af152ba6..711ce058d51 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/GeoTileGridValuesSourceBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/GeoTileGridValuesSourceBuilder.java @@ -41,7 +41,7 @@ import org.elasticsearch.search.aggregations.support.ValuesSource; import org.elasticsearch.search.aggregations.support.ValuesSourceConfig; import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; import java.util.Objects; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSourceBuilder.java index 8adf7ac90de..147a75ca9f9 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSourceBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSourceBuilder.java @@ -34,7 +34,7 @@ import org.elasticsearch.search.aggregations.support.ValuesSource; import org.elasticsearch.search.aggregations.support.ValuesSourceConfig; import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; import java.util.Objects; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/SingleDimensionValuesSource.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/SingleDimensionValuesSource.java index a212987f298..04a26e0894e 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/SingleDimensionValuesSource.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/SingleDimensionValuesSource.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.aggregations.LeafBucketCollector; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java index 987066629d0..2651046efad 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/TermsValuesSourceBuilder.java @@ -35,7 +35,7 @@ import org.elasticsearch.search.aggregations.support.ValuesSource; import org.elasticsearch.search.aggregations.support.ValuesSourceConfig; import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; import java.util.function.LongConsumer; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTextAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTextAggregatorFactory.java index 26e1cfba193..703727dea7b 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTextAggregatorFactory.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantTextAggregatorFactory.java @@ -48,7 +48,7 @@ import org.elasticsearch.search.aggregations.bucket.terms.MapStringTermsAggregat import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregator.BucketCountThresholds; import org.elasticsearch.search.aggregations.bucket.terms.heuristic.SignificanceHeuristic; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; import java.util.Iterator; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java index 6a2e36ba203..7865cb73c1f 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java @@ -21,7 +21,7 @@ package org.elasticsearch.search.aggregations.metrics; import org.elasticsearch.common.util.Comparators; import org.elasticsearch.search.aggregations.Aggregator; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; import java.util.Map; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregator.java index 6f203196370..7dfdf69d6cc 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregator.java @@ -35,7 +35,7 @@ import org.elasticsearch.search.aggregations.InternalAggregation; import org.elasticsearch.search.aggregations.LeafBucketCollector; import org.elasticsearch.search.aggregations.LeafBucketCollectorBase; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.util.HashMap; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregatorFactory.java index ced797814c3..e77608594cd 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregatorFactory.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregatorFactory.java @@ -29,7 +29,7 @@ import org.elasticsearch.search.aggregations.AggregatorFactories; import org.elasticsearch.search.aggregations.AggregatorFactory; import org.elasticsearch.search.aggregations.CardinalityUpperBound; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregationBuilder.java index cb59d2a56aa..012d30eb3f9 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregationBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregationBuilder.java @@ -36,18 +36,18 @@ import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregationInitializationException; import org.elasticsearch.search.aggregations.AggregatorFactories.Builder; import org.elasticsearch.search.aggregations.AggregatorFactory; -import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.search.builder.SearchSourceBuilder.ScriptField; +import org.opensearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder.ScriptField; import org.elasticsearch.search.fetch.StoredFieldsContext; import org.elasticsearch.search.fetch.subphase.FetchSourceContext; import org.elasticsearch.search.fetch.subphase.FieldAndFormat; import org.elasticsearch.search.fetch.subphase.ScriptFieldsContext; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder; -import org.elasticsearch.search.sort.ScoreSortBuilder; -import org.elasticsearch.search.sort.SortAndFormats; -import org.elasticsearch.search.sort.SortBuilder; -import org.elasticsearch.search.sort.SortBuilders; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.ScoreSortBuilder; +import org.opensearch.search.sort.SortAndFormats; +import org.opensearch.search.sort.SortBuilder; +import org.opensearch.search.sort.SortBuilders; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregator.java index 3ea565f65d7..8258726d0d6 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregator.java @@ -52,8 +52,8 @@ import org.elasticsearch.search.fetch.FetchPhase; import org.elasticsearch.search.fetch.FetchSearchResult; import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SubSearchContext; -import org.elasticsearch.search.rescore.RescoreContext; -import org.elasticsearch.search.sort.SortAndFormats; +import org.opensearch.search.rescore.RescoreContext; +import org.opensearch.search.sort.SortAndFormats; import java.io.IOException; import java.util.Map; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregatorFactory.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregatorFactory.java index 42197d4277e..3149620a676 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregatorFactory.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregatorFactory.java @@ -33,7 +33,7 @@ import org.elasticsearch.search.fetch.subphase.ScriptFieldsContext; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder; import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SubSearchContext; -import org.elasticsearch.search.sort.SortAndFormats; +import org.opensearch.search.sort.SortAndFormats; import java.io.IOException; import java.util.List; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketSortPipelineAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketSortPipelineAggregationBuilder.java index 665fa773975..6cdd4a6eab8 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketSortPipelineAggregationBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketSortPipelineAggregationBuilder.java @@ -26,9 +26,9 @@ import org.elasticsearch.common.xcontent.ObjectParser; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.search.aggregations.pipeline.BucketHelpers.GapPolicy; -import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.search.sort.FieldSortBuilder; -import org.elasticsearch.search.sort.SortBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.sort.FieldSortBuilder; +import org.opensearch.search.sort.SortBuilder; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketSortPipelineAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketSortPipelineAggregator.java index b639a384c76..420b586742c 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketSortPipelineAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/pipeline/BucketSortPipelineAggregator.java @@ -26,8 +26,8 @@ import org.elasticsearch.search.aggregations.InternalAggregation.ReduceContext; import org.elasticsearch.search.aggregations.InternalMultiBucketAggregation; import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation; import org.elasticsearch.search.aggregations.pipeline.BucketHelpers.GapPolicy; -import org.elasticsearch.search.sort.FieldSortBuilder; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.FieldSortBuilder; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java index 7e947b20a79..31dfa93a955 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/support/AggregationPath.java @@ -27,7 +27,7 @@ import org.elasticsearch.search.aggregations.InternalAggregations; import org.elasticsearch.search.aggregations.bucket.SingleBucketAggregator; import org.elasticsearch.search.aggregations.metrics.NumericMetricsAggregator; import org.elasticsearch.search.profile.aggregation.ProfilingAggregator; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import java.util.ArrayList; import java.util.Iterator; diff --git a/server/src/main/java/org/elasticsearch/search/fetch/FetchContext.java b/server/src/main/java/org/elasticsearch/search/fetch/FetchContext.java index e804abe3e6d..f705c155c44 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/FetchContext.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/FetchContext.java @@ -34,9 +34,9 @@ import org.elasticsearch.search.fetch.subphase.ScriptFieldsContext; import org.elasticsearch.search.fetch.subphase.highlight.SearchHighlightContext; import org.elasticsearch.search.internal.ContextIndexSearcher; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.search.lookup.SearchLookup; -import org.elasticsearch.search.lookup.SourceLookup; -import org.elasticsearch.search.rescore.RescoreContext; +import org.opensearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SourceLookup; +import org.opensearch.search.rescore.RescoreContext; import java.util.Collections; import java.util.List; diff --git a/server/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java index 956fc566b98..17d6957976a 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java @@ -58,8 +58,8 @@ import org.elasticsearch.search.fetch.subphase.FetchSourceContext; import org.elasticsearch.search.fetch.subphase.InnerHitsContext; import org.elasticsearch.search.fetch.subphase.InnerHitsPhase; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.search.lookup.SearchLookup; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SourceLookup; import org.opensearch.tasks.TaskCancelledException; import java.io.IOException; diff --git a/server/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java index 70653f8b8dc..98e4717ad8b 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/FetchSubPhase.java @@ -23,7 +23,7 @@ import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.ReaderUtil; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; diff --git a/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchRequest.java b/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchRequest.java index bccab0321ed..d85527e4249 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchRequest.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchRequest.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.lucene.Lucene; import org.elasticsearch.search.RescoreDocIds; -import org.elasticsearch.search.dfs.AggregatedDfs; +import org.opensearch.search.dfs.AggregatedDfs; import org.elasticsearch.search.internal.ShardSearchRequest; import org.elasticsearch.search.internal.ShardSearchContextId; import org.opensearch.tasks.Task; diff --git a/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java b/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java index 0f9b92b6f63..b6bf4892182 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/ShardFetchSearchRequest.java @@ -29,7 +29,7 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.search.internal.ShardSearchContextId; import org.elasticsearch.search.RescoreDocIds; -import org.elasticsearch.search.dfs.AggregatedDfs; +import org.opensearch.search.dfs.AggregatedDfs; import org.elasticsearch.search.internal.ShardSearchRequest; import java.io.IOException; diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/ExplainPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/ExplainPhase.java index 760a32d7e02..afaa1f8fab3 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/subphase/ExplainPhase.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/subphase/ExplainPhase.java @@ -23,7 +23,7 @@ import org.apache.lucene.search.Explanation; import org.elasticsearch.search.fetch.FetchContext; import org.elasticsearch.search.fetch.FetchSubPhase; import org.elasticsearch.search.fetch.FetchSubPhaseProcessor; -import org.elasticsearch.search.rescore.RescoreContext; +import org.opensearch.search.rescore.RescoreContext; import java.io.IOException; diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchFieldsPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchFieldsPhase.java index cd593605693..34dd5d539a6 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchFieldsPhase.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchFieldsPhase.java @@ -27,8 +27,8 @@ import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.fetch.FetchContext; import org.elasticsearch.search.fetch.FetchSubPhase; import org.elasticsearch.search.fetch.FetchSubPhaseProcessor; -import org.elasticsearch.search.lookup.SearchLookup; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; import java.util.HashSet; diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourcePhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourcePhase.java index 6852e550ea3..b9d7f2371d5 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourcePhase.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourcePhase.java @@ -28,7 +28,7 @@ import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.fetch.FetchContext; import org.elasticsearch.search.fetch.FetchSubPhase; import org.elasticsearch.search.fetch.FetchSubPhaseProcessor; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; import java.util.Map; diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/FieldFetcher.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/FieldFetcher.java index 4e3a0dbebcd..0ab0a3316c3 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/subphase/FieldFetcher.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/subphase/FieldFetcher.java @@ -24,8 +24,8 @@ import org.elasticsearch.common.document.DocumentField; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.ValueFetcher; -import org.elasticsearch.search.lookup.SearchLookup; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsContext.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsContext.java index ef4f61719ec..075166acdce 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsContext.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsContext.java @@ -36,7 +36,7 @@ import org.elasticsearch.index.mapper.Uid; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.SubSearchContext; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; import java.util.Arrays; diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsPhase.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsPhase.java index ded7f5a32fc..3e33942826c 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsPhase.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/subphase/InnerHitsPhase.java @@ -31,7 +31,7 @@ import org.elasticsearch.search.fetch.FetchPhase; import org.elasticsearch.search.fetch.FetchSearchResult; import org.elasticsearch.search.fetch.FetchSubPhase; import org.elasticsearch.search.fetch.FetchSubPhaseProcessor; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; import java.util.HashMap; diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FastVectorHighlighter.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FastVectorHighlighter.java index 3cfaa88126a..34b5404cafc 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FastVectorHighlighter.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/FastVectorHighlighter.java @@ -41,7 +41,7 @@ import org.elasticsearch.index.mapper.TextSearchInfo; import org.elasticsearch.search.fetch.FetchSubPhase; import org.elasticsearch.search.fetch.subphase.highlight.SearchHighlightContext.Field; import org.elasticsearch.search.fetch.subphase.highlight.SearchHighlightContext.FieldOptions; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; import java.text.BreakIterator; diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java index aee55be955c..801861ffe44 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilder.java @@ -53,7 +53,7 @@ import static org.elasticsearch.common.xcontent.ObjectParser.fromList; * A builder for search highlighting. Settings can control how large fields * are summarized to show only selected snippets ("fragments") containing search terms. * - * @see org.elasticsearch.search.builder.SearchSourceBuilder#highlight() + * @see org.opensearch.search.builder.SearchSourceBuilder#highlight() */ public class HighlightBuilder extends AbstractHighlighterBuilder { /** default for whether to highlight fields based on the source even if stored separately */ diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightUtils.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightUtils.java index 49f5fd9a8c4..6219acee695 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightUtils.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightUtils.java @@ -24,7 +24,7 @@ import org.apache.lucene.search.highlight.SimpleHTMLEncoder; import org.elasticsearch.index.fieldvisitor.CustomFieldsVisitor; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.search.fetch.FetchSubPhase; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; import java.util.Collections; diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceScoreOrderFragmentsBuilder.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceScoreOrderFragmentsBuilder.java index dd8df92a867..b14c7f7562c 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceScoreOrderFragmentsBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceScoreOrderFragmentsBuilder.java @@ -26,7 +26,7 @@ import org.apache.lucene.search.vectorhighlight.BoundaryScanner; import org.apache.lucene.search.vectorhighlight.FieldFragList.WeightedFragInfo; import org.apache.lucene.search.vectorhighlight.ScoreOrderFragmentsBuilder; import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; import java.util.List; diff --git a/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceSimpleFragmentsBuilder.java b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceSimpleFragmentsBuilder.java index 59a90c07495..d49742fd20c 100644 --- a/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceSimpleFragmentsBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/SourceSimpleFragmentsBuilder.java @@ -23,7 +23,7 @@ import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.vectorhighlight.BoundaryScanner; import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; import java.util.List; diff --git a/server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java b/server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java index 043753e1389..d7c6194afe8 100644 --- a/server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java +++ b/server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java @@ -52,7 +52,7 @@ import org.apache.lucene.util.SparseFixedBitSet; import org.elasticsearch.common.lease.Releasable; import org.elasticsearch.common.lucene.search.TopDocsAndMaxScore; import org.elasticsearch.search.DocValueFormat; -import org.elasticsearch.search.dfs.AggregatedDfs; +import org.opensearch.search.dfs.AggregatedDfs; import org.elasticsearch.search.profile.Timer; import org.elasticsearch.search.profile.query.ProfileWeight; import org.elasticsearch.search.profile.query.QueryProfileBreakdown; diff --git a/server/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java b/server/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java index 3ee4878a4e5..40228f0b402 100644 --- a/server/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java +++ b/server/src/main/java/org/elasticsearch/search/internal/FilteredSearchContext.java @@ -37,8 +37,8 @@ import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.search.SearchExtBuilder; import org.elasticsearch.search.SearchShardTarget; import org.elasticsearch.search.aggregations.SearchContextAggregations; -import org.elasticsearch.search.collapse.CollapseContext; -import org.elasticsearch.search.dfs.DfsSearchResult; +import org.opensearch.search.collapse.CollapseContext; +import org.opensearch.search.dfs.DfsSearchResult; import org.elasticsearch.search.fetch.FetchPhase; import org.elasticsearch.search.fetch.FetchSearchResult; import org.elasticsearch.search.fetch.StoredFieldsContext; @@ -48,8 +48,8 @@ import org.elasticsearch.search.fetch.subphase.ScriptFieldsContext; import org.elasticsearch.search.fetch.subphase.highlight.SearchHighlightContext; import org.elasticsearch.search.profile.Profilers; import org.elasticsearch.search.query.QuerySearchResult; -import org.elasticsearch.search.rescore.RescoreContext; -import org.elasticsearch.search.sort.SortAndFormats; +import org.opensearch.search.rescore.RescoreContext; +import org.opensearch.search.sort.SortAndFormats; import org.elasticsearch.search.suggest.SuggestionSearchContext; import java.util.List; diff --git a/server/src/main/java/org/elasticsearch/search/internal/LegacyReaderContext.java b/server/src/main/java/org/elasticsearch/search/internal/LegacyReaderContext.java index d40bdcfbed8..fdbafea2256 100644 --- a/server/src/main/java/org/elasticsearch/search/internal/LegacyReaderContext.java +++ b/server/src/main/java/org/elasticsearch/search/internal/LegacyReaderContext.java @@ -23,7 +23,7 @@ import org.elasticsearch.index.IndexService; import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.search.RescoreDocIds; -import org.elasticsearch.search.dfs.AggregatedDfs; +import org.opensearch.search.dfs.AggregatedDfs; import java.util.Objects; diff --git a/server/src/main/java/org/elasticsearch/search/internal/SearchContext.java b/server/src/main/java/org/elasticsearch/search/internal/SearchContext.java index 11a477d3ebf..0e1254a6bfa 100644 --- a/server/src/main/java/org/elasticsearch/search/internal/SearchContext.java +++ b/server/src/main/java/org/elasticsearch/search/internal/SearchContext.java @@ -41,8 +41,8 @@ import org.elasticsearch.search.RescoreDocIds; import org.elasticsearch.search.SearchExtBuilder; import org.elasticsearch.search.SearchShardTarget; import org.elasticsearch.search.aggregations.SearchContextAggregations; -import org.elasticsearch.search.collapse.CollapseContext; -import org.elasticsearch.search.dfs.DfsSearchResult; +import org.opensearch.search.collapse.CollapseContext; +import org.opensearch.search.dfs.DfsSearchResult; import org.elasticsearch.search.fetch.FetchPhase; import org.elasticsearch.search.fetch.FetchSearchResult; import org.elasticsearch.search.fetch.StoredFieldsContext; @@ -54,8 +54,8 @@ import org.elasticsearch.search.fetch.subphase.ScriptFieldsContext; import org.elasticsearch.search.fetch.subphase.highlight.SearchHighlightContext; import org.elasticsearch.search.profile.Profilers; import org.elasticsearch.search.query.QuerySearchResult; -import org.elasticsearch.search.rescore.RescoreContext; -import org.elasticsearch.search.sort.SortAndFormats; +import org.opensearch.search.rescore.RescoreContext; +import org.opensearch.search.sort.SortAndFormats; import org.elasticsearch.search.suggest.SuggestionSearchContext; import java.util.HashMap; diff --git a/server/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java b/server/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java index c00486dbe4a..1f9fb8711ac 100644 --- a/server/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java +++ b/server/src/main/java/org/elasticsearch/search/internal/ShardSearchRequest.java @@ -49,9 +49,9 @@ import org.elasticsearch.indices.AliasFilterParsingException; import org.elasticsearch.indices.InvalidAliasNameException; import org.elasticsearch.search.SearchSortValuesAndFormats; import org.elasticsearch.search.Scroll; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.query.QuerySearchResult; -import org.elasticsearch.search.sort.FieldSortBuilder; +import org.opensearch.search.sort.FieldSortBuilder; import org.opensearch.tasks.Task; import org.opensearch.tasks.TaskId; import org.opensearch.transport.TransportRequest; diff --git a/server/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java b/server/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java index 03024966f71..f7fdaac0204 100644 --- a/server/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java +++ b/server/src/main/java/org/elasticsearch/search/internal/SubSearchContext.java @@ -22,7 +22,7 @@ import org.apache.lucene.search.Query; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.index.query.ParsedQuery; import org.elasticsearch.search.aggregations.SearchContextAggregations; -import org.elasticsearch.search.collapse.CollapseContext; +import org.opensearch.search.collapse.CollapseContext; import org.elasticsearch.search.fetch.FetchSearchResult; import org.elasticsearch.search.fetch.StoredFieldsContext; import org.elasticsearch.search.fetch.subphase.FetchDocValuesContext; @@ -31,7 +31,7 @@ import org.elasticsearch.search.fetch.subphase.FetchSourceContext; import org.elasticsearch.search.fetch.subphase.ScriptFieldsContext; import org.elasticsearch.search.fetch.subphase.highlight.SearchHighlightContext; import org.elasticsearch.search.query.QuerySearchResult; -import org.elasticsearch.search.sort.SortAndFormats; +import org.opensearch.search.sort.SortAndFormats; import org.elasticsearch.search.suggest.SuggestionSearchContext; import java.util.List; diff --git a/server/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingAggregator.java b/server/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingAggregator.java index 1944904dfd1..bf446e20894 100644 --- a/server/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/profile/aggregation/ProfilingAggregator.java @@ -27,7 +27,7 @@ import org.elasticsearch.search.aggregations.LeafBucketCollector; import org.elasticsearch.search.aggregations.support.AggregationPath.PathElement; import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.profile.Timer; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; import java.util.Iterator; diff --git a/server/src/main/java/org/elasticsearch/search/query/QueryPhase.java b/server/src/main/java/org/elasticsearch/search/query/QueryPhase.java index c3606c559bf..75fed46ea62 100644 --- a/server/src/main/java/org/elasticsearch/search/query/QueryPhase.java +++ b/server/src/main/java/org/elasticsearch/search/query/QueryPhase.java @@ -65,8 +65,8 @@ import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.profile.ProfileShardResult; import org.elasticsearch.search.profile.SearchProfileShardResults; import org.elasticsearch.search.profile.query.InternalProfileCollector; -import org.elasticsearch.search.rescore.RescorePhase; -import org.elasticsearch.search.sort.SortAndFormats; +import org.opensearch.search.rescore.RescorePhase; +import org.opensearch.search.sort.SortAndFormats; import org.elasticsearch.search.suggest.SuggestPhase; import org.opensearch.tasks.TaskCancelledException; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java b/server/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java index 99fea9eb5fb..a7a5c100c08 100644 --- a/server/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java +++ b/server/src/main/java/org/elasticsearch/search/query/QuerySearchRequest.java @@ -28,7 +28,7 @@ import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; -import org.elasticsearch.search.dfs.AggregatedDfs; +import org.opensearch.search.dfs.AggregatedDfs; import org.elasticsearch.search.internal.ShardSearchContextId; import org.elasticsearch.search.internal.ShardSearchRequest; import org.opensearch.tasks.Task; diff --git a/server/src/main/java/org/elasticsearch/search/query/TopDocsCollectorContext.java b/server/src/main/java/org/elasticsearch/search/query/TopDocsCollectorContext.java index 3f8ef308635..1a4bc2e954d 100644 --- a/server/src/main/java/org/elasticsearch/search/query/TopDocsCollectorContext.java +++ b/server/src/main/java/org/elasticsearch/search/query/TopDocsCollectorContext.java @@ -60,11 +60,11 @@ import org.elasticsearch.common.lucene.search.function.ScriptScoreQuery; import org.elasticsearch.common.util.CachedSupplier; import org.elasticsearch.index.search.ESToParentBlockJoinQuery; import org.elasticsearch.search.DocValueFormat; -import org.elasticsearch.search.collapse.CollapseContext; +import org.opensearch.search.collapse.CollapseContext; import org.elasticsearch.search.internal.ScrollContext; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.search.rescore.RescoreContext; -import org.elasticsearch.search.sort.SortAndFormats; +import org.opensearch.search.rescore.RescoreContext; +import org.opensearch.search.sort.SortAndFormats; import java.io.IOException; import java.util.Objects; diff --git a/server/src/main/java/org/opensearch/OpenSearchException.java b/server/src/main/java/org/opensearch/OpenSearchException.java index 3245759018d..949a4050f8d 100644 --- a/server/src/main/java/org/opensearch/OpenSearchException.java +++ b/server/src/main/java/org/opensearch/OpenSearchException.java @@ -734,8 +734,8 @@ public class OpenSearchException extends RuntimeException implements ToXContentF private enum OpenSearchExceptionHandle { INDEX_SHARD_SNAPSHOT_FAILED_EXCEPTION(org.elasticsearch.index.snapshots.IndexShardSnapshotFailedException.class, org.elasticsearch.index.snapshots.IndexShardSnapshotFailedException::new, 0, UNKNOWN_VERSION_ADDED), - DFS_PHASE_EXECUTION_EXCEPTION(org.elasticsearch.search.dfs.DfsPhaseExecutionException.class, - org.elasticsearch.search.dfs.DfsPhaseExecutionException::new, 1, UNKNOWN_VERSION_ADDED), + DFS_PHASE_EXECUTION_EXCEPTION(org.opensearch.search.dfs.DfsPhaseExecutionException.class, + org.opensearch.search.dfs.DfsPhaseExecutionException::new, 1, UNKNOWN_VERSION_ADDED), EXECUTION_CANCELLED_EXCEPTION(org.elasticsearch.common.util.CancellableThreads.ExecutionCancelledException.class, org.elasticsearch.common.util.CancellableThreads.ExecutionCancelledException::new, 2, UNKNOWN_VERSION_ADDED), MASTER_NOT_DISCOVERED_EXCEPTION(org.elasticsearch.discovery.MasterNotDiscoveredException.class, @@ -963,8 +963,8 @@ public class OpenSearchException extends RuntimeException implements ToXContentF MAPPER_PARSING_EXCEPTION(org.elasticsearch.index.mapper.MapperParsingException.class, org.elasticsearch.index.mapper.MapperParsingException::new, 126, UNKNOWN_VERSION_ADDED), // 127 used to be org.elasticsearch.search.SearchContextException - SEARCH_SOURCE_BUILDER_EXCEPTION(org.elasticsearch.search.builder.SearchSourceBuilderException.class, - org.elasticsearch.search.builder.SearchSourceBuilderException::new, 128, UNKNOWN_VERSION_ADDED), + SEARCH_SOURCE_BUILDER_EXCEPTION(org.opensearch.search.builder.SearchSourceBuilderException.class, + org.opensearch.search.builder.SearchSourceBuilderException::new, 128, UNKNOWN_VERSION_ADDED), // 129 was EngineClosedException NO_SHARD_AVAILABLE_ACTION_EXCEPTION(org.opensearch.action.NoShardAvailableActionException.class, org.opensearch.action.NoShardAvailableActionException::new, 130, UNKNOWN_VERSION_ADDED), diff --git a/server/src/main/java/org/opensearch/client/Requests.java b/server/src/main/java/org/opensearch/client/Requests.java index ffd7c4d66de..9bacea1eb96 100644 --- a/server/src/main/java/org/opensearch/client/Requests.java +++ b/server/src/main/java/org/opensearch/client/Requests.java @@ -129,7 +129,7 @@ public class Requests { /** * Creates a search request against one or more indices. Note, the search source must be set either using the - * actual JSON search source, or the {@link org.elasticsearch.search.builder.SearchSourceBuilder}. + * actual JSON search source, or the {@link org.opensearch.search.builder.SearchSourceBuilder}. * * @param indices The indices to search against. Use {@code null} or {@code _all} to execute against all indices * @return The search request diff --git a/server/src/main/java/org/opensearch/index/IndexSortConfig.java b/server/src/main/java/org/opensearch/index/IndexSortConfig.java index 392e9c2b5ec..a92e0baf249 100644 --- a/server/src/main/java/org/opensearch/index/IndexSortConfig.java +++ b/server/src/main/java/org/opensearch/index/IndexSortConfig.java @@ -29,8 +29,8 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.search.MultiValueMode; -import org.elasticsearch.search.lookup.SearchLookup; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.lookup.SearchLookup; +import org.opensearch.search.sort.SortOrder; import java.util.Collections; import java.util.EnumSet; diff --git a/server/src/main/java/org/opensearch/index/fielddata/IndexFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/IndexFieldData.java index ef0b03ae958..65255daffb5 100644 --- a/server/src/main/java/org/opensearch/index/fielddata/IndexFieldData.java +++ b/server/src/main/java/org/opensearch/index/fielddata/IndexFieldData.java @@ -41,9 +41,9 @@ import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.sort.BucketedSort; -import org.elasticsearch.search.sort.NestedSortBuilder; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.BucketedSort; +import org.opensearch.search.sort.NestedSortBuilder; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/index/fielddata/IndexFieldDataService.java b/server/src/main/java/org/opensearch/index/fielddata/IndexFieldDataService.java index 7550ad67767..391433d97f3 100644 --- a/server/src/main/java/org/opensearch/index/fielddata/IndexFieldDataService.java +++ b/server/src/main/java/org/opensearch/index/fielddata/IndexFieldDataService.java @@ -30,7 +30,7 @@ import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.shard.ShardId; import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.indices.fielddata.cache.IndicesFieldDataCache; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.Closeable; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/index/fielddata/IndexNumericFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/IndexNumericFieldData.java index 8f2776de1a8..1921cc24381 100644 --- a/server/src/main/java/org/opensearch/index/fielddata/IndexNumericFieldData.java +++ b/server/src/main/java/org/opensearch/index/fielddata/IndexNumericFieldData.java @@ -34,8 +34,8 @@ import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.sort.BucketedSort; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.BucketedSort; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; import java.util.function.LongUnaryOperator; diff --git a/server/src/main/java/org/opensearch/index/fielddata/fieldcomparator/BytesRefFieldComparatorSource.java b/server/src/main/java/org/opensearch/index/fielddata/fieldcomparator/BytesRefFieldComparatorSource.java index 51cfeafc959..33c1828af5c 100644 --- a/server/src/main/java/org/opensearch/index/fielddata/fieldcomparator/BytesRefFieldComparatorSource.java +++ b/server/src/main/java/org/opensearch/index/fielddata/fieldcomparator/BytesRefFieldComparatorSource.java @@ -36,8 +36,8 @@ import org.elasticsearch.index.fielddata.IndexOrdinalsFieldData; import org.elasticsearch.index.fielddata.SortedBinaryDocValues; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; -import org.elasticsearch.search.sort.BucketedSort; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.BucketedSort; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java b/server/src/main/java/org/opensearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java index 09e4f6e060b..e33feed522f 100644 --- a/server/src/main/java/org/opensearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java +++ b/server/src/main/java/org/opensearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java @@ -37,8 +37,8 @@ import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; -import org.elasticsearch.search.sort.BucketedSort; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.BucketedSort; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java b/server/src/main/java/org/opensearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java index 265002be7aa..0398e35e5a4 100644 --- a/server/src/main/java/org/opensearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java +++ b/server/src/main/java/org/opensearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java @@ -36,8 +36,8 @@ import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; -import org.elasticsearch.search.sort.BucketedSort; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.BucketedSort; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java b/server/src/main/java/org/opensearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java index 9b843c6db56..4293e997c20 100644 --- a/server/src/main/java/org/opensearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java +++ b/server/src/main/java/org/opensearch/index/fielddata/fieldcomparator/LongValuesComparatorSource.java @@ -36,8 +36,8 @@ import org.elasticsearch.index.fielddata.IndexNumericFieldData; import org.elasticsearch.index.fielddata.plain.SortedNumericIndexFieldData; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; -import org.elasticsearch.search.sort.BucketedSort; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.BucketedSort; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; import java.util.function.Function; diff --git a/server/src/main/java/org/opensearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java index 4a0e8071b6f..8ae2aee0cbc 100644 --- a/server/src/main/java/org/opensearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java +++ b/server/src/main/java/org/opensearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java @@ -35,8 +35,8 @@ import org.elasticsearch.index.fielddata.plain.AbstractLeafOrdinalsFieldData; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.sort.BucketedSort; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.BucketedSort; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/server/src/main/java/org/opensearch/index/fielddata/plain/AbstractLatLonPointIndexFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/plain/AbstractLatLonPointIndexFieldData.java index 0df7ffb30a2..3a0761c33d1 100644 --- a/server/src/main/java/org/opensearch/index/fielddata/plain/AbstractLatLonPointIndexFieldData.java +++ b/server/src/main/java/org/opensearch/index/fielddata/plain/AbstractLatLonPointIndexFieldData.java @@ -35,8 +35,8 @@ import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.sort.BucketedSort; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.BucketedSort; +import org.opensearch.search.sort.SortOrder; public abstract class AbstractLatLonPointIndexFieldData implements IndexGeoPointFieldData { diff --git a/server/src/main/java/org/opensearch/index/fielddata/plain/BinaryIndexFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/plain/BinaryIndexFieldData.java index 1ddaf395bec..d26c77979aa 100644 --- a/server/src/main/java/org/opensearch/index/fielddata/plain/BinaryIndexFieldData.java +++ b/server/src/main/java/org/opensearch/index/fielddata/plain/BinaryIndexFieldData.java @@ -31,8 +31,8 @@ import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.sort.BucketedSort; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.BucketedSort; +import org.opensearch.search.sort.SortOrder; public class BinaryIndexFieldData implements IndexFieldData { diff --git a/server/src/main/java/org/opensearch/index/fielddata/plain/BytesBinaryIndexFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/plain/BytesBinaryIndexFieldData.java index 3ffd998a563..ef2d7bea011 100644 --- a/server/src/main/java/org/opensearch/index/fielddata/plain/BytesBinaryIndexFieldData.java +++ b/server/src/main/java/org/opensearch/index/fielddata/plain/BytesBinaryIndexFieldData.java @@ -31,8 +31,8 @@ import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.sort.BucketedSort; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.BucketedSort; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/index/fielddata/plain/ConstantIndexFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/plain/ConstantIndexFieldData.java index 6d720f6191f..4b31606fa88 100644 --- a/server/src/main/java/org/opensearch/index/fielddata/plain/ConstantIndexFieldData.java +++ b/server/src/main/java/org/opensearch/index/fielddata/plain/ConstantIndexFieldData.java @@ -40,8 +40,8 @@ import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.sort.BucketedSort; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.BucketedSort; +import org.opensearch.search.sort.SortOrder; import java.util.Collection; import java.util.Collections; diff --git a/server/src/main/java/org/opensearch/index/fielddata/plain/PagedBytesIndexFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/plain/PagedBytesIndexFieldData.java index 47e4142263d..95545ef159b 100644 --- a/server/src/main/java/org/opensearch/index/fielddata/plain/PagedBytesIndexFieldData.java +++ b/server/src/main/java/org/opensearch/index/fielddata/plain/PagedBytesIndexFieldData.java @@ -50,8 +50,8 @@ import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.sort.BucketedSort; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.BucketedSort; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/index/fielddata/plain/SortedSetOrdinalsIndexFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/plain/SortedSetOrdinalsIndexFieldData.java index 8cf28854891..d4d35bf0cef 100644 --- a/server/src/main/java/org/opensearch/index/fielddata/plain/SortedSetOrdinalsIndexFieldData.java +++ b/server/src/main/java/org/opensearch/index/fielddata/plain/SortedSetOrdinalsIndexFieldData.java @@ -37,8 +37,8 @@ import org.elasticsearch.indices.breaker.CircuitBreakerService; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.sort.BucketedSort; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.BucketedSort; +import org.opensearch.search.sort.SortOrder; import java.util.function.Function; diff --git a/server/src/main/java/org/opensearch/index/fielddata/plain/StringBinaryIndexFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/plain/StringBinaryIndexFieldData.java index 8ba00cfa9be..1751f9dcf31 100644 --- a/server/src/main/java/org/opensearch/index/fielddata/plain/StringBinaryIndexFieldData.java +++ b/server/src/main/java/org/opensearch/index/fielddata/plain/StringBinaryIndexFieldData.java @@ -29,8 +29,8 @@ import org.elasticsearch.index.fielddata.fieldcomparator.BytesRefFieldComparator import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.sort.BucketedSort; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.BucketedSort; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/index/get/GetResult.java b/server/src/main/java/org/opensearch/index/get/GetResult.java index 727b582e916..88ae3fb536c 100644 --- a/server/src/main/java/org/opensearch/index/get/GetResult.java +++ b/server/src/main/java/org/opensearch/index/get/GetResult.java @@ -35,7 +35,7 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.mapper.IgnoredFieldMapper; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.SourceFieldMapper; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; import java.util.Collections; diff --git a/server/src/main/java/org/opensearch/index/mapper/AbstractGeometryFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/AbstractGeometryFieldMapper.java index 7bf454dad1b..55c147dfb16 100644 --- a/server/src/main/java/org/opensearch/index/mapper/AbstractGeometryFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/AbstractGeometryFieldMapper.java @@ -34,7 +34,7 @@ import org.elasticsearch.common.xcontent.support.MapXContentParser; import org.elasticsearch.common.xcontent.support.XContentMapValues; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.QueryShardException; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/server/src/main/java/org/opensearch/index/mapper/AllFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/AllFieldMapper.java index 709bbbcfa58..45c3d3fc323 100644 --- a/server/src/main/java/org/opensearch/index/mapper/AllFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/AllFieldMapper.java @@ -25,7 +25,7 @@ import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; import org.elasticsearch.common.Explicit; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.util.Collections; import java.util.List; diff --git a/server/src/main/java/org/opensearch/index/mapper/ArraySourceValueFetcher.java b/server/src/main/java/org/opensearch/index/mapper/ArraySourceValueFetcher.java index dab9656662d..108825ef35c 100644 --- a/server/src/main/java/org/opensearch/index/mapper/ArraySourceValueFetcher.java +++ b/server/src/main/java/org/opensearch/index/mapper/ArraySourceValueFetcher.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.mapper; import org.elasticsearch.common.Nullable; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SourceLookup; import java.util.ArrayList; import java.util.List; diff --git a/server/src/main/java/org/opensearch/index/mapper/BinaryFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/BinaryFieldMapper.java index 9ea733aeff9..c8950e40ae4 100644 --- a/server/src/main/java/org/opensearch/index/mapper/BinaryFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/BinaryFieldMapper.java @@ -35,7 +35,7 @@ import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.QueryShardException; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.time.ZoneId; diff --git a/server/src/main/java/org/opensearch/index/mapper/BooleanFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/BooleanFieldMapper.java index 0cbb287cfd0..f892dd0bcb9 100644 --- a/server/src/main/java/org/opensearch/index/mapper/BooleanFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/BooleanFieldMapper.java @@ -36,7 +36,7 @@ import org.elasticsearch.index.fielddata.IndexNumericFieldData.NumericType; import org.elasticsearch.index.fielddata.plain.SortedNumericIndexFieldData; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.search.DocValueFormat; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.time.ZoneId; diff --git a/server/src/main/java/org/opensearch/index/mapper/CompletionFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/CompletionFieldMapper.java index 21c4d086d5f..c1fe6f47ce1 100644 --- a/server/src/main/java/org/opensearch/index/mapper/CompletionFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/CompletionFieldMapper.java @@ -41,7 +41,7 @@ import org.elasticsearch.common.xcontent.XContentParser.NumberType; import org.elasticsearch.common.xcontent.XContentParser.Token; import org.elasticsearch.index.analysis.AnalyzerScope; import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import org.elasticsearch.search.suggest.completion.CompletionSuggester; import org.elasticsearch.search.suggest.completion.context.ContextMapping; import org.elasticsearch.search.suggest.completion.context.ContextMappings; diff --git a/server/src/main/java/org/opensearch/index/mapper/DateFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/DateFieldMapper.java index 9cc5d20e71d..2b1bb36269d 100644 --- a/server/src/main/java/org/opensearch/index/mapper/DateFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/DateFieldMapper.java @@ -48,7 +48,7 @@ import org.elasticsearch.index.query.DateRangeIncludingNowQuery; import org.elasticsearch.index.query.QueryRewriteContext; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.search.DocValueFormat; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.time.DateTimeException; diff --git a/server/src/main/java/org/opensearch/index/mapper/DocValueFetcher.java b/server/src/main/java/org/opensearch/index/mapper/DocValueFetcher.java index 6dfa4021a68..44ad9421cf0 100644 --- a/server/src/main/java/org/opensearch/index/mapper/DocValueFetcher.java +++ b/server/src/main/java/org/opensearch/index/mapper/DocValueFetcher.java @@ -22,7 +22,7 @@ package org.elasticsearch.index.mapper; import org.apache.lucene.index.LeafReaderContext; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.search.DocValueFormat; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/main/java/org/opensearch/index/mapper/FieldNamesFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/FieldNamesFieldMapper.java index 9119de88e61..8255dc4904a 100644 --- a/server/src/main/java/org/opensearch/index/mapper/FieldNamesFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/FieldNamesFieldMapper.java @@ -28,7 +28,7 @@ import org.elasticsearch.Version; import org.elasticsearch.common.Explicit; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/main/java/org/opensearch/index/mapper/GeoPointFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/GeoPointFieldMapper.java index 910f944c0dd..f024cb0856d 100644 --- a/server/src/main/java/org/opensearch/index/mapper/GeoPointFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/GeoPointFieldMapper.java @@ -39,7 +39,7 @@ import org.elasticsearch.index.mapper.GeoPointFieldMapper.ParsedGeoPoint; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.VectorGeoPointShapeQueryProcessor; import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/main/java/org/opensearch/index/mapper/IdFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/IdFieldMapper.java index 572aa7cd3c1..3555b6c10dc 100644 --- a/server/src/main/java/org/opensearch/index/mapper/IdFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/IdFieldMapper.java @@ -46,9 +46,9 @@ import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.lookup.SearchLookup; -import org.elasticsearch.search.sort.BucketedSort; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.lookup.SearchLookup; +import org.opensearch.search.sort.BucketedSort; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; import java.util.Arrays; diff --git a/server/src/main/java/org/opensearch/index/mapper/IgnoredFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/IgnoredFieldMapper.java index 612944e6047..be8464da6ec 100644 --- a/server/src/main/java/org/opensearch/index/mapper/IgnoredFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/IgnoredFieldMapper.java @@ -25,7 +25,7 @@ import org.apache.lucene.index.IndexOptions; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermRangeQuery; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.util.Collections; diff --git a/server/src/main/java/org/opensearch/index/mapper/IndexFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/IndexFieldMapper.java index af594c30e7f..6c6a2df18d4 100644 --- a/server/src/main/java/org/opensearch/index/mapper/IndexFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/IndexFieldMapper.java @@ -26,7 +26,7 @@ import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.plain.ConstantIndexFieldData; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.util.Collections; import java.util.function.Supplier; diff --git a/server/src/main/java/org/opensearch/index/mapper/IpFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/IpFieldMapper.java index 270f82b0a6e..cd8aadc3609 100644 --- a/server/src/main/java/org/opensearch/index/mapper/IpFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/IpFieldMapper.java @@ -38,7 +38,7 @@ import org.elasticsearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.net.InetAddress; diff --git a/server/src/main/java/org/opensearch/index/mapper/KeywordFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/KeywordFieldMapper.java index 4d2e55d97d6..d2929987939 100644 --- a/server/src/main/java/org/opensearch/index/mapper/KeywordFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/KeywordFieldMapper.java @@ -34,7 +34,7 @@ import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData; import org.elasticsearch.index.similarity.SimilarityProvider; import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/server/src/main/java/org/opensearch/index/mapper/MappedFieldType.java b/server/src/main/java/org/opensearch/index/mapper/MappedFieldType.java index 2faea43ee02..9eb36f1bf9f 100644 --- a/server/src/main/java/org/opensearch/index/mapper/MappedFieldType.java +++ b/server/src/main/java/org/opensearch/index/mapper/MappedFieldType.java @@ -51,7 +51,7 @@ import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.QueryShardException; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.fetch.subphase.FetchFieldsPhase; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.time.ZoneId; diff --git a/server/src/main/java/org/opensearch/index/mapper/NumberFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/NumberFieldMapper.java index bf9d82b7e62..9aa5b4390ec 100644 --- a/server/src/main/java/org/opensearch/index/mapper/NumberFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/NumberFieldMapper.java @@ -50,7 +50,7 @@ import org.elasticsearch.index.fielddata.IndexNumericFieldData.NumericType; import org.elasticsearch.index.fielddata.plain.SortedNumericIndexFieldData; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.search.DocValueFormat; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.time.ZoneId; diff --git a/server/src/main/java/org/opensearch/index/mapper/RangeFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/RangeFieldMapper.java index 1226b4ddd9b..6334dc86f39 100644 --- a/server/src/main/java/org/opensearch/index/mapper/RangeFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/RangeFieldMapper.java @@ -40,7 +40,7 @@ import org.elasticsearch.index.fielddata.plain.BinaryIndexFieldData; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.net.InetAddress; diff --git a/server/src/main/java/org/opensearch/index/mapper/RoutingFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/RoutingFieldMapper.java index 95670ef6a23..630cb6f2037 100644 --- a/server/src/main/java/org/opensearch/index/mapper/RoutingFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/RoutingFieldMapper.java @@ -23,7 +23,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.index.IndexOptions; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.util.Collections; import java.util.List; diff --git a/server/src/main/java/org/opensearch/index/mapper/SeqNoFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/SeqNoFieldMapper.java index cfcb8a6a8f0..3580a5c6c58 100644 --- a/server/src/main/java/org/opensearch/index/mapper/SeqNoFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/SeqNoFieldMapper.java @@ -33,7 +33,7 @@ import org.elasticsearch.index.fielddata.plain.SortedNumericIndexFieldData; import org.elasticsearch.index.mapper.ParseContext.Document; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.seqno.SequenceNumbers; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.util.Collections; diff --git a/server/src/main/java/org/opensearch/index/mapper/SourceFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/SourceFieldMapper.java index 383b7ebdb95..138d04f4408 100644 --- a/server/src/main/java/org/opensearch/index/mapper/SourceFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/SourceFieldMapper.java @@ -38,7 +38,7 @@ import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.support.XContentMapValues; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.QueryShardException; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.util.Arrays; diff --git a/server/src/main/java/org/opensearch/index/mapper/SourceValueFetcher.java b/server/src/main/java/org/opensearch/index/mapper/SourceValueFetcher.java index 54d78044077..ddd4c1225a8 100644 --- a/server/src/main/java/org/opensearch/index/mapper/SourceValueFetcher.java +++ b/server/src/main/java/org/opensearch/index/mapper/SourceValueFetcher.java @@ -20,7 +20,7 @@ package org.elasticsearch.index.mapper; import org.elasticsearch.common.Nullable; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SourceLookup; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/server/src/main/java/org/opensearch/index/mapper/TextFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/TextFieldMapper.java index 6448f6e57a7..1460ed16c3a 100644 --- a/server/src/main/java/org/opensearch/index/mapper/TextFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/TextFieldMapper.java @@ -74,7 +74,7 @@ import org.elasticsearch.index.query.IntervalBuilder; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.similarity.SimilarityProvider; import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/main/java/org/opensearch/index/mapper/TypeFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/TypeFieldMapper.java index 73a7979239e..0e25da93cf1 100644 --- a/server/src/main/java/org/opensearch/index/mapper/TypeFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/TypeFieldMapper.java @@ -35,7 +35,7 @@ import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.plain.ConstantIndexFieldData; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.time.ZoneId; import java.util.Collections; diff --git a/server/src/main/java/org/opensearch/index/mapper/ValueFetcher.java b/server/src/main/java/org/opensearch/index/mapper/ValueFetcher.java index 980fc6b7a6d..490c54b579f 100644 --- a/server/src/main/java/org/opensearch/index/mapper/ValueFetcher.java +++ b/server/src/main/java/org/opensearch/index/mapper/ValueFetcher.java @@ -21,7 +21,7 @@ package org.elasticsearch.index.mapper; import org.apache.lucene.index.LeafReaderContext; import org.elasticsearch.search.fetch.subphase.FetchFieldsPhase; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; import java.util.List; diff --git a/server/src/main/java/org/opensearch/index/mapper/VersionFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/VersionFieldMapper.java index 563e25b0c2f..c494acc120d 100644 --- a/server/src/main/java/org/opensearch/index/mapper/VersionFieldMapper.java +++ b/server/src/main/java/org/opensearch/index/mapper/VersionFieldMapper.java @@ -25,7 +25,7 @@ import org.apache.lucene.search.Query; import org.elasticsearch.index.mapper.ParseContext.Document; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.QueryShardException; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.util.Collections; diff --git a/server/src/main/java/org/opensearch/index/query/InnerHitBuilder.java b/server/src/main/java/org/opensearch/index/query/InnerHitBuilder.java index 63656effd9c..8198ddabd41 100644 --- a/server/src/main/java/org/opensearch/index/query/InnerHitBuilder.java +++ b/server/src/main/java/org/opensearch/index/query/InnerHitBuilder.java @@ -31,14 +31,14 @@ import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; import org.opensearch.script.Script; -import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.search.builder.SearchSourceBuilder.ScriptField; -import org.elasticsearch.search.collapse.CollapseBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder.ScriptField; +import org.opensearch.search.collapse.CollapseBuilder; import org.elasticsearch.search.fetch.StoredFieldsContext; import org.elasticsearch.search.fetch.subphase.FetchSourceContext; import org.elasticsearch.search.fetch.subphase.FieldAndFormat; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder; -import org.elasticsearch.search.sort.SortBuilder; +import org.opensearch.search.sort.SortBuilder; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/main/java/org/opensearch/index/query/InnerHitContextBuilder.java b/server/src/main/java/org/opensearch/index/query/InnerHitContextBuilder.java index 6c2efb84384..ff74aa28b30 100644 --- a/server/src/main/java/org/opensearch/index/query/InnerHitContextBuilder.java +++ b/server/src/main/java/org/opensearch/index/query/InnerHitContextBuilder.java @@ -21,13 +21,13 @@ package org.elasticsearch.index.query; import org.elasticsearch.index.IndexSettings; import org.opensearch.script.FieldScript; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.fetch.subphase.FetchDocValuesContext; import org.elasticsearch.search.fetch.subphase.FetchFieldsContext; import org.elasticsearch.search.fetch.subphase.InnerHitsContext; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.search.sort.SortAndFormats; -import org.elasticsearch.search.sort.SortBuilder; +import org.opensearch.search.sort.SortAndFormats; +import org.opensearch.search.sort.SortBuilder; import java.io.IOException; import java.util.HashMap; diff --git a/server/src/main/java/org/opensearch/index/query/QueryShardContext.java b/server/src/main/java/org/opensearch/index/query/QueryShardContext.java index 5def359d763..2829148cff6 100644 --- a/server/src/main/java/org/opensearch/index/query/QueryShardContext.java +++ b/server/src/main/java/org/opensearch/index/query/QueryShardContext.java @@ -59,7 +59,7 @@ import org.opensearch.script.ScriptFactory; import org.opensearch.script.ScriptService; import org.elasticsearch.search.aggregations.support.AggregationUsageService; import org.elasticsearch.search.aggregations.support.ValuesSourceRegistry; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import org.opensearch.transport.RemoteClusterAware; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/index/reindex/AbstractBulkByScrollRequest.java b/server/src/main/java/org/opensearch/index/reindex/AbstractBulkByScrollRequest.java index 12f9b8dedc3..1352e2af0bf 100644 --- a/server/src/main/java/org/opensearch/index/reindex/AbstractBulkByScrollRequest.java +++ b/server/src/main/java/org/opensearch/index/reindex/AbstractBulkByScrollRequest.java @@ -29,7 +29,7 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.search.Scroll; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.tasks.Task; import org.opensearch.tasks.TaskId; diff --git a/server/src/main/java/org/opensearch/index/reindex/ReindexRequest.java b/server/src/main/java/org/opensearch/index/reindex/ReindexRequest.java index 7c3db78c45e..c7d15f08ae0 100644 --- a/server/src/main/java/org/opensearch/index/reindex/ReindexRequest.java +++ b/server/src/main/java/org/opensearch/index/reindex/ReindexRequest.java @@ -40,7 +40,7 @@ import org.elasticsearch.index.VersionType; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.query.QueryBuilder; import org.opensearch.script.Script; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import org.opensearch.tasks.TaskId; import java.io.IOException; diff --git a/server/src/main/java/org/opensearch/rest/action/cat/RestCountAction.java b/server/src/main/java/org/opensearch/rest/action/cat/RestCountAction.java index 025a8ae7f73..a10fab889e4 100644 --- a/server/src/main/java/org/opensearch/rest/action/cat/RestCountAction.java +++ b/server/src/main/java/org/opensearch/rest/action/cat/RestCountAction.java @@ -31,7 +31,7 @@ import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestResponse; import org.opensearch.rest.action.RestActions; import org.opensearch.rest.action.RestResponseListener; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import java.io.IOException; import java.util.List; diff --git a/server/src/main/java/org/opensearch/rest/action/search/RestCountAction.java b/server/src/main/java/org/opensearch/rest/action/search/RestCountAction.java index d9585b9e97c..6ac39ab3c40 100644 --- a/server/src/main/java/org/opensearch/rest/action/search/RestCountAction.java +++ b/server/src/main/java/org/opensearch/rest/action/search/RestCountAction.java @@ -33,7 +33,7 @@ import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestResponse; import org.opensearch.rest.action.RestActions; import org.opensearch.rest.action.RestBuilderListener; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import java.io.IOException; import java.util.List; diff --git a/server/src/main/java/org/opensearch/rest/action/search/RestMultiSearchAction.java b/server/src/main/java/org/opensearch/rest/action/search/RestMultiSearchAction.java index 12341b73204..8827dd2c4fa 100644 --- a/server/src/main/java/org/opensearch/rest/action/search/RestMultiSearchAction.java +++ b/server/src/main/java/org/opensearch/rest/action/search/RestMultiSearchAction.java @@ -38,7 +38,7 @@ import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestCancellableNodeClient; import org.opensearch.rest.action.RestToXContentListener; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import java.io.IOException; import java.util.Arrays; diff --git a/server/src/main/java/org/opensearch/rest/action/search/RestSearchAction.java b/server/src/main/java/org/opensearch/rest/action/search/RestSearchAction.java index 76187712b4a..595473f7c12 100644 --- a/server/src/main/java/org/opensearch/rest/action/search/RestSearchAction.java +++ b/server/src/main/java/org/opensearch/rest/action/search/RestSearchAction.java @@ -38,11 +38,11 @@ import org.opensearch.rest.action.RestActions; import org.opensearch.rest.action.RestCancellableNodeClient; import org.opensearch.rest.action.RestStatusToXContentListener; import org.elasticsearch.search.Scroll; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.fetch.StoredFieldsContext; import org.elasticsearch.search.fetch.subphase.FetchSourceContext; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import org.elasticsearch.search.suggest.SuggestBuilder; import org.elasticsearch.search.suggest.term.TermSuggestionBuilder.SuggestMode; diff --git a/server/src/main/java/org/opensearch/script/AbstractSortScript.java b/server/src/main/java/org/opensearch/script/AbstractSortScript.java index 0a582fa18f0..1f2030db3d2 100644 --- a/server/src/main/java/org/opensearch/script/AbstractSortScript.java +++ b/server/src/main/java/org/opensearch/script/AbstractSortScript.java @@ -24,9 +24,9 @@ import org.elasticsearch.OpenSearchException; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.lucene.ScorerAware; import org.elasticsearch.index.fielddata.ScriptDocValues; -import org.elasticsearch.search.lookup.LeafSearchLookup; -import org.elasticsearch.search.lookup.SearchLookup; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.LeafSearchLookup; +import org.opensearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; import java.util.HashMap; diff --git a/server/src/main/java/org/opensearch/script/AggregationScript.java b/server/src/main/java/org/opensearch/script/AggregationScript.java index d1aa6297482..a973a341c7a 100644 --- a/server/src/main/java/org/opensearch/script/AggregationScript.java +++ b/server/src/main/java/org/opensearch/script/AggregationScript.java @@ -24,9 +24,9 @@ import org.elasticsearch.OpenSearchException; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.lucene.ScorerAware; import org.elasticsearch.index.fielddata.ScriptDocValues; -import org.elasticsearch.search.lookup.LeafSearchLookup; -import org.elasticsearch.search.lookup.SearchLookup; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.LeafSearchLookup; +import org.opensearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; import java.util.HashMap; diff --git a/server/src/main/java/org/opensearch/script/FieldScript.java b/server/src/main/java/org/opensearch/script/FieldScript.java index a01fdb975da..98a731515cb 100644 --- a/server/src/main/java/org/opensearch/script/FieldScript.java +++ b/server/src/main/java/org/opensearch/script/FieldScript.java @@ -22,9 +22,9 @@ package org.opensearch.script; import org.apache.lucene.index.LeafReaderContext; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.index.fielddata.ScriptDocValues; -import org.elasticsearch.search.lookup.LeafSearchLookup; -import org.elasticsearch.search.lookup.SearchLookup; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.LeafSearchLookup; +import org.opensearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; import java.util.HashMap; diff --git a/server/src/main/java/org/opensearch/script/FilterScript.java b/server/src/main/java/org/opensearch/script/FilterScript.java index df570113cef..b57f5c86064 100644 --- a/server/src/main/java/org/opensearch/script/FilterScript.java +++ b/server/src/main/java/org/opensearch/script/FilterScript.java @@ -23,8 +23,8 @@ import java.util.Map; import org.apache.lucene.index.LeafReaderContext; import org.elasticsearch.index.fielddata.ScriptDocValues; -import org.elasticsearch.search.lookup.LeafSearchLookup; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.LeafSearchLookup; +import org.opensearch.search.lookup.SearchLookup; /** * A script implementation of a query filter. diff --git a/server/src/main/java/org/opensearch/script/NumberSortScript.java b/server/src/main/java/org/opensearch/script/NumberSortScript.java index 0a5f96bc63b..0b6bba84eba 100644 --- a/server/src/main/java/org/opensearch/script/NumberSortScript.java +++ b/server/src/main/java/org/opensearch/script/NumberSortScript.java @@ -21,7 +21,7 @@ package org.opensearch.script; import java.io.IOException; import java.util.Map; import org.apache.lucene.index.LeafReaderContext; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; public abstract class NumberSortScript extends AbstractSortScript { diff --git a/server/src/main/java/org/opensearch/script/ScoreScript.java b/server/src/main/java/org/opensearch/script/ScoreScript.java index 3f1edb974f5..a2812e8ad6b 100644 --- a/server/src/main/java/org/opensearch/script/ScoreScript.java +++ b/server/src/main/java/org/opensearch/script/ScoreScript.java @@ -24,9 +24,9 @@ import org.apache.lucene.search.Scorable; import org.opensearch.Version; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.index.fielddata.ScriptDocValues; -import org.elasticsearch.search.lookup.LeafSearchLookup; -import org.elasticsearch.search.lookup.SearchLookup; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.LeafSearchLookup; +import org.opensearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/server/src/main/java/org/opensearch/script/ScriptedMetricAggContexts.java b/server/src/main/java/org/opensearch/script/ScriptedMetricAggContexts.java index cee74670e2f..76778725758 100644 --- a/server/src/main/java/org/opensearch/script/ScriptedMetricAggContexts.java +++ b/server/src/main/java/org/opensearch/script/ScriptedMetricAggContexts.java @@ -24,9 +24,9 @@ import org.apache.lucene.search.Scorable; import org.elasticsearch.OpenSearchException; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.index.fielddata.ScriptDocValues; -import org.elasticsearch.search.lookup.LeafSearchLookup; -import org.elasticsearch.search.lookup.SearchLookup; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.LeafSearchLookup; +import org.opensearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; import java.util.HashMap; diff --git a/server/src/main/java/org/opensearch/script/StringSortScript.java b/server/src/main/java/org/opensearch/script/StringSortScript.java index 3fa64feb66d..2e02aad7431 100644 --- a/server/src/main/java/org/opensearch/script/StringSortScript.java +++ b/server/src/main/java/org/opensearch/script/StringSortScript.java @@ -21,7 +21,7 @@ package org.opensearch.script; import java.io.IOException; import java.util.Map; import org.apache.lucene.index.LeafReaderContext; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; public abstract class StringSortScript extends AbstractSortScript { diff --git a/server/src/main/java/org/opensearch/script/TermsSetQueryScript.java b/server/src/main/java/org/opensearch/script/TermsSetQueryScript.java index c5a8bfcd6f9..935f5b83274 100644 --- a/server/src/main/java/org/opensearch/script/TermsSetQueryScript.java +++ b/server/src/main/java/org/opensearch/script/TermsSetQueryScript.java @@ -21,9 +21,9 @@ package org.opensearch.script; import org.apache.lucene.index.LeafReaderContext; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.index.fielddata.ScriptDocValues; -import org.elasticsearch.search.lookup.LeafSearchLookup; -import org.elasticsearch.search.lookup.SearchLookup; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.LeafSearchLookup; +import org.opensearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SourceLookup; import java.io.IOException; import java.util.HashMap; diff --git a/server/src/main/java/org/elasticsearch/search/builder/PointInTimeBuilder.java b/server/src/main/java/org/opensearch/search/builder/PointInTimeBuilder.java similarity index 99% rename from server/src/main/java/org/elasticsearch/search/builder/PointInTimeBuilder.java rename to server/src/main/java/org/opensearch/search/builder/PointInTimeBuilder.java index dfa8f45e237..d456cdf3e44 100644 --- a/server/src/main/java/org/elasticsearch/search/builder/PointInTimeBuilder.java +++ b/server/src/main/java/org/opensearch/search/builder/PointInTimeBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.builder; +package org.opensearch.search.builder; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; diff --git a/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/server/src/main/java/org/opensearch/search/builder/SearchSourceBuilder.java similarity index 99% rename from server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java rename to server/src/main/java/org/opensearch/search/builder/SearchSourceBuilder.java index 5ba0d66a7f5..73acdb16803 100644 --- a/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java +++ b/server/src/main/java/org/opensearch/search/builder/SearchSourceBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.builder; +package org.opensearch.search.builder; import org.elasticsearch.OpenSearchException; import org.opensearch.Version; @@ -45,19 +45,19 @@ import org.elasticsearch.search.SearchExtBuilder; import org.elasticsearch.search.aggregations.AggregationBuilder; import org.elasticsearch.search.aggregations.AggregatorFactories; import org.elasticsearch.search.aggregations.PipelineAggregationBuilder; -import org.elasticsearch.search.collapse.CollapseBuilder; +import org.opensearch.search.collapse.CollapseBuilder; import org.elasticsearch.search.fetch.StoredFieldsContext; import org.elasticsearch.search.fetch.subphase.FetchSourceContext; import org.elasticsearch.search.fetch.subphase.FieldAndFormat; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.search.rescore.RescorerBuilder; -import org.elasticsearch.search.searchafter.SearchAfterBuilder; -import org.elasticsearch.search.slice.SliceBuilder; -import org.elasticsearch.search.sort.ScoreSortBuilder; -import org.elasticsearch.search.sort.SortBuilder; -import org.elasticsearch.search.sort.SortBuilders; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.rescore.RescorerBuilder; +import org.opensearch.search.searchafter.SearchAfterBuilder; +import org.opensearch.search.slice.SliceBuilder; +import org.opensearch.search.sort.ScoreSortBuilder; +import org.opensearch.search.sort.SortBuilder; +import org.opensearch.search.sort.SortBuilders; +import org.opensearch.search.sort.SortOrder; import org.elasticsearch.search.suggest.SuggestBuilder; import java.io.IOException; @@ -74,7 +74,7 @@ import static org.elasticsearch.search.internal.SearchContext.TRACK_TOTAL_HITS_D /** * A search source builder allowing to easily build search source. Simple * construction using - * {@link org.elasticsearch.search.builder.SearchSourceBuilder#searchSource()}. + * {@link org.opensearch.search.builder.SearchSourceBuilder#searchSource()}. * * @see org.elasticsearch.action.search.SearchRequest#source(SearchSourceBuilder) */ diff --git a/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java b/server/src/main/java/org/opensearch/search/builder/SearchSourceBuilderException.java similarity index 96% rename from server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java rename to server/src/main/java/org/opensearch/search/builder/SearchSourceBuilderException.java index 6c0fd6f6080..39d99b5c650 100644 --- a/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilderException.java +++ b/server/src/main/java/org/opensearch/search/builder/SearchSourceBuilderException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.builder; +package org.opensearch.search.builder; import org.elasticsearch.OpenSearchException; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/server/src/main/java/org/elasticsearch/search/collapse/CollapseBuilder.java b/server/src/main/java/org/opensearch/search/collapse/CollapseBuilder.java similarity index 99% rename from server/src/main/java/org/elasticsearch/search/collapse/CollapseBuilder.java rename to server/src/main/java/org/opensearch/search/collapse/CollapseBuilder.java index a471230cd99..c0a02c484f4 100644 --- a/server/src/main/java/org/elasticsearch/search/collapse/CollapseBuilder.java +++ b/server/src/main/java/org/opensearch/search/collapse/CollapseBuilder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.collapse; +package org.opensearch.search.collapse; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParsingException; diff --git a/server/src/main/java/org/elasticsearch/search/collapse/CollapseContext.java b/server/src/main/java/org/opensearch/search/collapse/CollapseContext.java similarity index 98% rename from server/src/main/java/org/elasticsearch/search/collapse/CollapseContext.java rename to server/src/main/java/org/opensearch/search/collapse/CollapseContext.java index b197d547913..8ca8f8ce5ac 100644 --- a/server/src/main/java/org/elasticsearch/search/collapse/CollapseContext.java +++ b/server/src/main/java/org/opensearch/search/collapse/CollapseContext.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.collapse; +package org.opensearch.search.collapse; import org.apache.lucene.search.Sort; import org.apache.lucene.search.grouping.CollapsingTopDocsCollector; diff --git a/server/src/main/java/org/elasticsearch/search/dfs/AggregatedDfs.java b/server/src/main/java/org/opensearch/search/dfs/AggregatedDfs.java similarity index 98% rename from server/src/main/java/org/elasticsearch/search/dfs/AggregatedDfs.java rename to server/src/main/java/org/opensearch/search/dfs/AggregatedDfs.java index b8321b0acd7..ec3fa9acf28 100644 --- a/server/src/main/java/org/elasticsearch/search/dfs/AggregatedDfs.java +++ b/server/src/main/java/org/opensearch/search/dfs/AggregatedDfs.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.dfs; +package org.opensearch.search.dfs; import com.carrotsearch.hppc.ObjectObjectHashMap; diff --git a/server/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java b/server/src/main/java/org/opensearch/search/dfs/DfsPhase.java similarity index 97% rename from server/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java rename to server/src/main/java/org/opensearch/search/dfs/DfsPhase.java index 2d857562a25..eb3b1166037 100644 --- a/server/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java +++ b/server/src/main/java/org/opensearch/search/dfs/DfsPhase.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.dfs; +package org.opensearch.search.dfs; import com.carrotsearch.hppc.ObjectObjectHashMap; import org.apache.lucene.index.Term; @@ -28,7 +28,7 @@ import org.apache.lucene.search.ScoreMode; import org.apache.lucene.search.TermStatistics; import org.elasticsearch.common.collect.HppcMaps; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.search.rescore.RescoreContext; +import org.opensearch.search.rescore.RescoreContext; import org.opensearch.tasks.TaskCancelledException; import java.io.IOException; diff --git a/server/src/main/java/org/elasticsearch/search/dfs/DfsPhaseExecutionException.java b/server/src/main/java/org/opensearch/search/dfs/DfsPhaseExecutionException.java similarity index 97% rename from server/src/main/java/org/elasticsearch/search/dfs/DfsPhaseExecutionException.java rename to server/src/main/java/org/opensearch/search/dfs/DfsPhaseExecutionException.java index 2a9bd4a8f11..e7525fbb558 100644 --- a/server/src/main/java/org/elasticsearch/search/dfs/DfsPhaseExecutionException.java +++ b/server/src/main/java/org/opensearch/search/dfs/DfsPhaseExecutionException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.dfs; +package org.opensearch.search.dfs; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.search.SearchException; diff --git a/server/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java b/server/src/main/java/org/opensearch/search/dfs/DfsSearchResult.java similarity index 99% rename from server/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java rename to server/src/main/java/org/opensearch/search/dfs/DfsSearchResult.java index 90024a76622..5e8f71321fa 100644 --- a/server/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java +++ b/server/src/main/java/org/opensearch/search/dfs/DfsSearchResult.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.dfs; +package org.opensearch.search.dfs; import com.carrotsearch.hppc.ObjectObjectHashMap; import com.carrotsearch.hppc.cursors.ObjectObjectCursor; diff --git a/server/src/main/java/org/elasticsearch/search/lookup/DocLookup.java b/server/src/main/java/org/opensearch/search/lookup/DocLookup.java similarity index 97% rename from server/src/main/java/org/elasticsearch/search/lookup/DocLookup.java rename to server/src/main/java/org/opensearch/search/lookup/DocLookup.java index c2a40f1d1f8..541dd416283 100644 --- a/server/src/main/java/org/elasticsearch/search/lookup/DocLookup.java +++ b/server/src/main/java/org/opensearch/search/lookup/DocLookup.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.lookup; +package org.opensearch.search.lookup; import org.apache.lucene.index.LeafReaderContext; import org.elasticsearch.common.Nullable; diff --git a/server/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java b/server/src/main/java/org/opensearch/search/lookup/FieldLookup.java similarity index 98% rename from server/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java rename to server/src/main/java/org/opensearch/search/lookup/FieldLookup.java index 2e3817d7684..50ae0a9eca2 100644 --- a/server/src/main/java/org/elasticsearch/search/lookup/FieldLookup.java +++ b/server/src/main/java/org/opensearch/search/lookup/FieldLookup.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.lookup; +package org.opensearch.search.lookup; import org.elasticsearch.index.mapper.MappedFieldType; diff --git a/server/src/main/java/org/elasticsearch/search/lookup/FieldsLookup.java b/server/src/main/java/org/opensearch/search/lookup/FieldsLookup.java similarity index 97% rename from server/src/main/java/org/elasticsearch/search/lookup/FieldsLookup.java rename to server/src/main/java/org/opensearch/search/lookup/FieldsLookup.java index feefb1fcb30..2bbd5e6dfa3 100644 --- a/server/src/main/java/org/elasticsearch/search/lookup/FieldsLookup.java +++ b/server/src/main/java/org/opensearch/search/lookup/FieldsLookup.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.lookup; +package org.opensearch.search.lookup; import org.apache.lucene.index.LeafReaderContext; import org.elasticsearch.common.Nullable; diff --git a/server/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java b/server/src/main/java/org/opensearch/search/lookup/LeafDocLookup.java similarity index 99% rename from server/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java rename to server/src/main/java/org/opensearch/search/lookup/LeafDocLookup.java index ec6e8e09f5f..d70162053a1 100644 --- a/server/src/main/java/org/elasticsearch/search/lookup/LeafDocLookup.java +++ b/server/src/main/java/org/opensearch/search/lookup/LeafDocLookup.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.lookup; +package org.opensearch.search.lookup; import org.apache.lucene.index.LeafReaderContext; import org.elasticsearch.ExceptionsHelper; diff --git a/server/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java b/server/src/main/java/org/opensearch/search/lookup/LeafFieldsLookup.java similarity index 99% rename from server/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java rename to server/src/main/java/org/opensearch/search/lookup/LeafFieldsLookup.java index 8fe878be857..d1705d0bd33 100644 --- a/server/src/main/java/org/elasticsearch/search/lookup/LeafFieldsLookup.java +++ b/server/src/main/java/org/opensearch/search/lookup/LeafFieldsLookup.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.lookup; +package org.opensearch.search.lookup; import org.apache.lucene.index.LeafReader; import org.elasticsearch.OpenSearchParseException; diff --git a/server/src/main/java/org/elasticsearch/search/lookup/LeafSearchLookup.java b/server/src/main/java/org/opensearch/search/lookup/LeafSearchLookup.java similarity index 98% rename from server/src/main/java/org/elasticsearch/search/lookup/LeafSearchLookup.java rename to server/src/main/java/org/opensearch/search/lookup/LeafSearchLookup.java index e76206d6cba..23da2f4ed8e 100644 --- a/server/src/main/java/org/elasticsearch/search/lookup/LeafSearchLookup.java +++ b/server/src/main/java/org/opensearch/search/lookup/LeafSearchLookup.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.lookup; +package org.opensearch.search.lookup; import org.apache.lucene.index.LeafReaderContext; diff --git a/server/src/main/java/org/elasticsearch/search/lookup/SearchLookup.java b/server/src/main/java/org/opensearch/search/lookup/SearchLookup.java similarity index 99% rename from server/src/main/java/org/elasticsearch/search/lookup/SearchLookup.java rename to server/src/main/java/org/opensearch/search/lookup/SearchLookup.java index 4de8ef8fc13..5ac2c59efb9 100644 --- a/server/src/main/java/org/elasticsearch/search/lookup/SearchLookup.java +++ b/server/src/main/java/org/opensearch/search/lookup/SearchLookup.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.lookup; +package org.opensearch.search.lookup; import org.apache.lucene.index.LeafReaderContext; import org.elasticsearch.common.Nullable; diff --git a/server/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java b/server/src/main/java/org/opensearch/search/lookup/SourceLookup.java similarity index 99% rename from server/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java rename to server/src/main/java/org/opensearch/search/lookup/SourceLookup.java index b5f7a74513e..e8b89068d8a 100644 --- a/server/src/main/java/org/elasticsearch/search/lookup/SourceLookup.java +++ b/server/src/main/java/org/opensearch/search/lookup/SourceLookup.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.lookup; +package org.opensearch.search.lookup; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; diff --git a/server/src/main/java/org/elasticsearch/search/rescore/QueryRescoreMode.java b/server/src/main/java/org/opensearch/search/rescore/QueryRescoreMode.java similarity index 98% rename from server/src/main/java/org/elasticsearch/search/rescore/QueryRescoreMode.java rename to server/src/main/java/org/opensearch/search/rescore/QueryRescoreMode.java index 51db82652fc..a25128d1bcd 100644 --- a/server/src/main/java/org/elasticsearch/search/rescore/QueryRescoreMode.java +++ b/server/src/main/java/org/opensearch/search/rescore/QueryRescoreMode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.rescore; +package org.opensearch.search.rescore; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java b/server/src/main/java/org/opensearch/search/rescore/QueryRescorer.java similarity index 99% rename from server/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java rename to server/src/main/java/org/opensearch/search/rescore/QueryRescorer.java index 6e236d3e814..c2f702d246b 100644 --- a/server/src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java +++ b/server/src/main/java/org/opensearch/search/rescore/QueryRescorer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.rescore; +package org.opensearch.search.rescore; import org.apache.lucene.search.Explanation; import org.apache.lucene.search.IndexSearcher; diff --git a/server/src/main/java/org/elasticsearch/search/rescore/QueryRescorerBuilder.java b/server/src/main/java/org/opensearch/search/rescore/QueryRescorerBuilder.java similarity index 98% rename from server/src/main/java/org/elasticsearch/search/rescore/QueryRescorerBuilder.java rename to server/src/main/java/org/opensearch/search/rescore/QueryRescorerBuilder.java index 684b44a5ed7..2382dae6552 100644 --- a/server/src/main/java/org/elasticsearch/search/rescore/QueryRescorerBuilder.java +++ b/server/src/main/java/org/opensearch/search/rescore/QueryRescorerBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.rescore; +package org.opensearch.search.rescore; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParsingException; @@ -29,7 +29,7 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryRewriteContext; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.search.rescore.QueryRescorer.QueryRescoreContext; +import org.opensearch.search.rescore.QueryRescorer.QueryRescoreContext; import java.io.IOException; import java.util.Locale; diff --git a/server/src/main/java/org/elasticsearch/search/rescore/RescoreContext.java b/server/src/main/java/org/opensearch/search/rescore/RescoreContext.java similarity index 98% rename from server/src/main/java/org/elasticsearch/search/rescore/RescoreContext.java rename to server/src/main/java/org/opensearch/search/rescore/RescoreContext.java index ffdb2bd854c..88a45fba644 100644 --- a/server/src/main/java/org/elasticsearch/search/rescore/RescoreContext.java +++ b/server/src/main/java/org/opensearch/search/rescore/RescoreContext.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.rescore; +package org.opensearch.search.rescore; import org.apache.lucene.search.Query; diff --git a/server/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java b/server/src/main/java/org/opensearch/search/rescore/RescorePhase.java similarity index 98% rename from server/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java rename to server/src/main/java/org/opensearch/search/rescore/RescorePhase.java index bb4cdd328e3..3a242ad691e 100644 --- a/server/src/main/java/org/elasticsearch/search/rescore/RescorePhase.java +++ b/server/src/main/java/org/opensearch/search/rescore/RescorePhase.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.rescore; +package org.opensearch.search.rescore; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; diff --git a/server/src/main/java/org/elasticsearch/search/rescore/Rescorer.java b/server/src/main/java/org/opensearch/search/rescore/Rescorer.java similarity index 96% rename from server/src/main/java/org/elasticsearch/search/rescore/Rescorer.java rename to server/src/main/java/org/opensearch/search/rescore/Rescorer.java index 36c77d2df41..9ecb74a8ebb 100644 --- a/server/src/main/java/org/elasticsearch/search/rescore/Rescorer.java +++ b/server/src/main/java/org/opensearch/search/rescore/Rescorer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.rescore; +package org.opensearch.search.rescore; import org.apache.lucene.search.Explanation; import org.apache.lucene.search.IndexSearcher; @@ -31,7 +31,7 @@ import java.io.IOException; * * Subclasses should borrow heavily from {@link QueryRescorer} because it is * fairly well behaved and documents that tradeoffs that it is making. There - * is also an {@code ExampleRescorer} that is worth looking at. + * is also an {@code ExampleRescorer} that is worth looking at. */ public interface Rescorer { /** diff --git a/server/src/main/java/org/elasticsearch/search/rescore/RescorerBuilder.java b/server/src/main/java/org/opensearch/search/rescore/RescorerBuilder.java similarity index 99% rename from server/src/main/java/org/elasticsearch/search/rescore/RescorerBuilder.java rename to server/src/main/java/org/opensearch/search/rescore/RescorerBuilder.java index f991e9f14f0..eb4af1486d0 100644 --- a/server/src/main/java/org/elasticsearch/search/rescore/RescorerBuilder.java +++ b/server/src/main/java/org/opensearch/search/rescore/RescorerBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.rescore; +package org.opensearch.search.rescore; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParsingException; diff --git a/server/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java b/server/src/main/java/org/opensearch/search/searchafter/SearchAfterBuilder.java similarity index 99% rename from server/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java rename to server/src/main/java/org/opensearch/search/searchafter/SearchAfterBuilder.java index 29c957bb6e4..7a41c45683d 100644 --- a/server/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java +++ b/server/src/main/java/org/opensearch/search/searchafter/SearchAfterBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.searchafter; +package org.opensearch.search.searchafter; import org.apache.lucene.search.FieldDoc; import org.apache.lucene.search.SortField; @@ -37,7 +37,7 @@ import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.search.DocValueFormat; -import org.elasticsearch.search.sort.SortAndFormats; +import org.opensearch.search.sort.SortAndFormats; import java.io.IOException; import java.math.BigInteger; diff --git a/server/src/main/java/org/elasticsearch/search/slice/DocValuesSliceQuery.java b/server/src/main/java/org/opensearch/search/slice/DocValuesSliceQuery.java similarity index 98% rename from server/src/main/java/org/elasticsearch/search/slice/DocValuesSliceQuery.java rename to server/src/main/java/org/opensearch/search/slice/DocValuesSliceQuery.java index 86d778625a2..2b3f0f55057 100644 --- a/server/src/main/java/org/elasticsearch/search/slice/DocValuesSliceQuery.java +++ b/server/src/main/java/org/opensearch/search/slice/DocValuesSliceQuery.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.slice; +package org.opensearch.search.slice; import com.carrotsearch.hppc.BitMixer; import org.apache.lucene.index.LeafReaderContext; diff --git a/server/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java b/server/src/main/java/org/opensearch/search/slice/SliceBuilder.java similarity index 98% rename from server/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java rename to server/src/main/java/org/opensearch/search/slice/SliceBuilder.java index bbcb2d09491..fa044cdf8b6 100644 --- a/server/src/main/java/org/elasticsearch/search/slice/SliceBuilder.java +++ b/server/src/main/java/org/opensearch/search/slice/SliceBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.slice; +package org.opensearch.search.slice; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.MatchNoDocsQuery; @@ -53,14 +53,14 @@ import java.util.Set; /** * A slice builder allowing to split a scroll in multiple partitions. - * If the provided field is the "_uid" it uses a {@link org.elasticsearch.search.slice.TermsSliceQuery} + * If the provided field is the "_uid" it uses a {@link org.opensearch.search.slice.TermsSliceQuery} * to do the slicing. The slicing is done at the shard level first and then each shard is split into multiple slices. * For instance if the number of shards is equal to 2 and the user requested 4 slices * then the slices 0 and 2 are assigned to the first shard and the slices 1 and 3 are assigned to the second shard. * This way the total number of bitsets that we need to build on each shard is bounded by the number of slices * (instead of {@code numShards*numSlices}). * Otherwise the provided field must be a numeric and doc_values must be enabled. In that case a - * {@link org.elasticsearch.search.slice.DocValuesSliceQuery} is used to filter the results. + * {@link org.opensearch.search.slice.DocValuesSliceQuery} is used to filter the results. */ public class SliceBuilder implements Writeable, ToXContentObject { diff --git a/server/src/main/java/org/elasticsearch/search/slice/SliceQuery.java b/server/src/main/java/org/opensearch/search/slice/SliceQuery.java similarity index 98% rename from server/src/main/java/org/elasticsearch/search/slice/SliceQuery.java rename to server/src/main/java/org/opensearch/search/slice/SliceQuery.java index 2b8040ebd28..adc30c9ae85 100644 --- a/server/src/main/java/org/elasticsearch/search/slice/SliceQuery.java +++ b/server/src/main/java/org/opensearch/search/slice/SliceQuery.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.slice; +package org.opensearch.search.slice; import org.apache.lucene.search.Query; diff --git a/server/src/main/java/org/elasticsearch/search/slice/TermsSliceQuery.java b/server/src/main/java/org/opensearch/search/slice/TermsSliceQuery.java similarity index 99% rename from server/src/main/java/org/elasticsearch/search/slice/TermsSliceQuery.java rename to server/src/main/java/org/opensearch/search/slice/TermsSliceQuery.java index 1ec34794241..b9f4414564b 100644 --- a/server/src/main/java/org/elasticsearch/search/slice/TermsSliceQuery.java +++ b/server/src/main/java/org/opensearch/search/slice/TermsSliceQuery.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.slice; +package org.opensearch.search.slice; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.LeafReader; diff --git a/server/src/main/java/org/elasticsearch/search/sort/BucketedSort.java b/server/src/main/java/org/opensearch/search/sort/BucketedSort.java similarity index 98% rename from server/src/main/java/org/elasticsearch/search/sort/BucketedSort.java rename to server/src/main/java/org/opensearch/search/sort/BucketedSort.java index 5e0e8b3d489..a8e64b64cab 100644 --- a/server/src/main/java/org/elasticsearch/search/sort/BucketedSort.java +++ b/server/src/main/java/org/opensearch/search/sort/BucketedSort.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.Scorable; @@ -66,7 +66,7 @@ import static java.util.Collections.emptyList; * worst case. Critically, it is a very fast {@code O(1)} to check if a value * is competitive at all which, so long as buckets aren't hit in reverse * order, they mostly won't be. Extracting results in sorted order is still - * {@code O(n * log n)}. + * {@code O(n * log n)}. *

*

* When we first collect a bucket we make sure that we've allocated enough @@ -90,7 +90,7 @@ public abstract class BucketedSort implements Releasable { *

* Both parameters will have previously been loaded by * {@link Loader#loadFromDoc(long, int)} so the implementer shouldn't - * need to grow the underlying storage to implement this. + * need to grow the underlying storage to implement this. *

*/ void swap(long lhs, long rhs); @@ -206,7 +206,7 @@ public abstract class BucketedSort implements Releasable { } /** - * Is this bucket a min heap {@code true} or in gathering mode {@code false}? + * Is this bucket a min heap {@code true} or in gathering mode {@code false}? */ private boolean inHeapMode(long bucket) { return heapMode.get(bucket); @@ -254,7 +254,7 @@ public abstract class BucketedSort implements Releasable { /** * {@code true} if the entry at index {@code lhs} is "better" than * the entry at {@code rhs}. "Better" in this means "lower" for - * {@link SortOrder#ASC} and "higher" for {@link SortOrder#DESC}. + * {@link SortOrder#ASC} and "higher" for {@link SortOrder#DESC}. */ protected abstract boolean betterThan(long lhs, long rhs); @@ -283,7 +283,7 @@ public abstract class BucketedSort implements Releasable { /** * Initialize the gather offsets after setting up values. Subclasses - * should call this once, after setting up their {@link #values()}. + * should call this once, after setting up their {@link #values()}. */ protected final void initGatherOffsets() { setNextGatherOffsets(0); @@ -325,12 +325,12 @@ public abstract class BucketedSort implements Releasable { * case. *

* - * @param rootIndex the index the start of the bucket + * @param rootIndex the index the start of the bucket */ private void heapify(long rootIndex) { int maxParent = bucketSize / 2 - 1; @@ -344,7 +344,7 @@ public abstract class BucketedSort implements Releasable { * runs in {@code O(log n)} time. * @param rootIndex index of the start of the bucket * @param parent Index within the bucket of the parent to check. - * For example, 0 is the "root". + * For example, 0 is the "root". */ private void downHeap(long rootIndex, int parent) { while (true) { @@ -443,7 +443,7 @@ public abstract class BucketedSort implements Releasable { /** * {@code true} if the sort value for the doc is "better" than the * entry at {@code index}. "Better" in means is "lower" for - * {@link SortOrder#ASC} and "higher" for {@link SortOrder#DESC}. + * {@link SortOrder#ASC} and "higher" for {@link SortOrder#DESC}. */ protected abstract boolean docBetterThan(long index); @@ -545,7 +545,7 @@ public abstract class BucketedSort implements Releasable { * The maximum size of buckets this can store. This is because we * store the next offset to write to in a float and floats only have * {@code 23} bits of mantissa so they can't accurate store values - * higher than {@code 2 ^ 24}. + * higher than {@code 2 ^ 24}. */ public static final int MAX_BUCKET_SIZE = (int) Math.pow(2, 24); diff --git a/server/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java b/server/src/main/java/org/opensearch/search/sort/FieldSortBuilder.java similarity index 98% rename from server/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java rename to server/src/main/java/org/opensearch/search/sort/FieldSortBuilder.java index 5c3a9b35ff9..b8d4cc0c36d 100644 --- a/server/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java +++ b/server/src/main/java/org/opensearch/search/sort/FieldSortBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.apache.lucene.document.LongPoint; import org.apache.lucene.index.IndexReader; @@ -53,7 +53,7 @@ import org.elasticsearch.index.query.QueryShardException; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; import org.elasticsearch.search.SearchSortValuesAndFormats; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import java.io.IOException; import java.util.Collections; @@ -63,7 +63,7 @@ import java.util.function.Function; import static org.elasticsearch.index.mapper.DateFieldMapper.Resolution.MILLISECONDS; import static org.elasticsearch.index.mapper.DateFieldMapper.Resolution.NANOSECONDS; -import static org.elasticsearch.search.sort.NestedSortBuilder.NESTED_FIELD; +import static org.opensearch.search.sort.NestedSortBuilder.NESTED_FIELD; /** * A sort builder to sort based on a document field. @@ -189,7 +189,7 @@ public class FieldSortBuilder extends SortBuilder { /** * Set the type to use in case the current field is not mapped in an index. - * Specifying a type tells Elasticsearch what type the sort values should + * Specifying a type tells OpenSearch what type the sort values should * have, which is important for cross-index search, if there are sort fields * that exist on some indices only. If the unmapped type is {@code null} * then query execution will fail if one or more indices don't have a @@ -314,7 +314,7 @@ public class FieldSortBuilder extends SortBuilder { /** * Forces the numeric type to use for the field. The query will fail if this option * is set on a field that is not mapped as a numeric in some indices. - * Specifying a numeric type tells Elasticsearch what type the sort values should + * Specifying a numeric type tells OpenSearch what type the sort values should * have, which is important for cross-index search, if a field does not have * the same type on all indices. * Allowed values are long, double, date and date_nanos. diff --git a/server/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java b/server/src/main/java/org/opensearch/search/sort/GeoDistanceSortBuilder.java similarity index 99% rename from server/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java rename to server/src/main/java/org/opensearch/search/sort/GeoDistanceSortBuilder.java index c68dd828187..8a6e562730c 100644 --- a/server/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java +++ b/server/src/main/java/org/opensearch/search/sort/GeoDistanceSortBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.apache.lucene.document.LatLonDocValuesField; import org.apache.lucene.index.LeafReaderContext; @@ -68,8 +68,8 @@ import java.util.Locale; import java.util.Objects; import static org.elasticsearch.index.query.AbstractQueryBuilder.parseInnerQueryBuilder; -import static org.elasticsearch.search.sort.FieldSortBuilder.validateMaxChildrenExistOnlyInTopLevelNestedSort; -import static org.elasticsearch.search.sort.NestedSortBuilder.NESTED_FIELD; +import static org.opensearch.search.sort.FieldSortBuilder.validateMaxChildrenExistOnlyInTopLevelNestedSort; +import static org.opensearch.search.sort.NestedSortBuilder.NESTED_FIELD; /** * A geo distance based sorting on a geo point like field. diff --git a/server/src/main/java/org/elasticsearch/search/sort/MinAndMax.java b/server/src/main/java/org/opensearch/search/sort/MinAndMax.java similarity index 98% rename from server/src/main/java/org/elasticsearch/search/sort/MinAndMax.java rename to server/src/main/java/org/opensearch/search/sort/MinAndMax.java index 703ae6939aa..eadea063d3b 100644 --- a/server/src/main/java/org/elasticsearch/search/sort/MinAndMax.java +++ b/server/src/main/java/org/opensearch/search/sort/MinAndMax.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/elasticsearch/search/sort/NestedSortBuilder.java b/server/src/main/java/org/opensearch/search/sort/NestedSortBuilder.java similarity index 98% rename from server/src/main/java/org/elasticsearch/search/sort/NestedSortBuilder.java rename to server/src/main/java/org/opensearch/search/sort/NestedSortBuilder.java index 0ec2223ffd3..c5374a75bd5 100644 --- a/server/src/main/java/org/elasticsearch/search/sort/NestedSortBuilder.java +++ b/server/src/main/java/org/opensearch/search/sort/NestedSortBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.opensearch.Version; import org.elasticsearch.common.ParseField; @@ -33,7 +33,7 @@ import org.elasticsearch.index.query.QueryRewriteContext; import java.io.IOException; import java.util.Objects; -import static org.elasticsearch.search.sort.SortBuilder.parseNestedFilter; +import static org.opensearch.search.sort.SortBuilder.parseNestedFilter; public class NestedSortBuilder implements Writeable, ToXContentObject { public static final ParseField NESTED_FIELD = new ParseField("nested"); diff --git a/server/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java b/server/src/main/java/org/opensearch/search/sort/ScoreSortBuilder.java similarity index 99% rename from server/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java rename to server/src/main/java/org/opensearch/search/sort/ScoreSortBuilder.java index 59c43ab6035..01d2683a7f9 100644 --- a/server/src/main/java/org/elasticsearch/search/sort/ScoreSortBuilder.java +++ b/server/src/main/java/org/opensearch/search/sort/ScoreSortBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.Scorable; diff --git a/server/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java b/server/src/main/java/org/opensearch/search/sort/ScriptSortBuilder.java similarity index 98% rename from server/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java rename to server/src/main/java/org/opensearch/search/sort/ScriptSortBuilder.java index 48090abce10..d82262de3dc 100644 --- a/server/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java +++ b/server/src/main/java/org/opensearch/search/sort/ScriptSortBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.apache.lucene.index.BinaryDocValues; import org.apache.lucene.index.LeafReaderContext; @@ -60,8 +60,8 @@ import java.util.Locale; import java.util.Objects; import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg; -import static org.elasticsearch.search.sort.FieldSortBuilder.validateMaxChildrenExistOnlyInTopLevelNestedSort; -import static org.elasticsearch.search.sort.NestedSortBuilder.NESTED_FIELD; +import static org.opensearch.search.sort.FieldSortBuilder.validateMaxChildrenExistOnlyInTopLevelNestedSort; +import static org.opensearch.search.sort.NestedSortBuilder.NESTED_FIELD; /** * Script sort builder allows to sort based on a custom script expression. diff --git a/server/src/main/java/org/elasticsearch/search/sort/SortAndFormats.java b/server/src/main/java/org/opensearch/search/sort/SortAndFormats.java similarity index 97% rename from server/src/main/java/org/elasticsearch/search/sort/SortAndFormats.java rename to server/src/main/java/org/opensearch/search/sort/SortAndFormats.java index 21a9d112fea..e580ac6088d 100644 --- a/server/src/main/java/org/elasticsearch/search/sort/SortAndFormats.java +++ b/server/src/main/java/org/opensearch/search/sort/SortAndFormats.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.apache.lucene.search.Sort; import org.elasticsearch.search.DocValueFormat; diff --git a/server/src/main/java/org/elasticsearch/search/sort/SortBuilder.java b/server/src/main/java/org/opensearch/search/sort/SortBuilder.java similarity index 99% rename from server/src/main/java/org/elasticsearch/search/sort/SortBuilder.java rename to server/src/main/java/org/opensearch/search/sort/SortBuilder.java index e8515ac1441..c2fe614aedc 100644 --- a/server/src/main/java/org/elasticsearch/search/sort/SortBuilder.java +++ b/server/src/main/java/org/opensearch/search/sort/SortBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.apache.lucene.search.Query; import org.apache.lucene.search.Sort; diff --git a/server/src/main/java/org/elasticsearch/search/sort/SortBuilders.java b/server/src/main/java/org/opensearch/search/sort/SortBuilders.java similarity index 96% rename from server/src/main/java/org/elasticsearch/search/sort/SortBuilders.java rename to server/src/main/java/org/opensearch/search/sort/SortBuilders.java index 8d472b86e4d..df48a976b39 100644 --- a/server/src/main/java/org/elasticsearch/search/sort/SortBuilders.java +++ b/server/src/main/java/org/opensearch/search/sort/SortBuilders.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.elasticsearch.common.geo.GeoPoint; import org.opensearch.script.Script; -import org.elasticsearch.search.sort.ScriptSortBuilder.ScriptSortType; +import org.opensearch.search.sort.ScriptSortBuilder.ScriptSortType; /** * A set of static factory methods for {@link SortBuilder}s. diff --git a/server/src/main/java/org/elasticsearch/search/sort/SortFieldAndFormat.java b/server/src/main/java/org/opensearch/search/sort/SortFieldAndFormat.java similarity index 96% rename from server/src/main/java/org/elasticsearch/search/sort/SortFieldAndFormat.java rename to server/src/main/java/org/opensearch/search/sort/SortFieldAndFormat.java index f9756b79068..e8d8b56d813 100644 --- a/server/src/main/java/org/elasticsearch/search/sort/SortFieldAndFormat.java +++ b/server/src/main/java/org/opensearch/search/sort/SortFieldAndFormat.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import java.util.Objects; diff --git a/server/src/main/java/org/elasticsearch/search/sort/SortMode.java b/server/src/main/java/org/opensearch/search/sort/SortMode.java similarity index 94% rename from server/src/main/java/org/elasticsearch/search/sort/SortMode.java rename to server/src/main/java/org/opensearch/search/sort/SortMode.java index 07b5bfa98c2..cbb007732cd 100644 --- a/server/src/main/java/org/elasticsearch/search/sort/SortMode.java +++ b/server/src/main/java/org/opensearch/search/sort/SortMode.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -28,7 +28,7 @@ import java.util.Locale; import java.util.Objects; /** - * Elasticsearch supports sorting by array or multi-valued fields. The SortMode option controls what array value is picked + * OpenSearch supports sorting by array or multi-valued fields. The SortMode option controls what array value is picked * for sorting the document it belongs to. The mode option can have the following values: *
    *
  • min - Pick the lowest value.
    • diff --git a/server/src/main/java/org/elasticsearch/search/sort/SortOrder.java b/server/src/main/java/org/opensearch/search/sort/SortOrder.java similarity index 98% rename from server/src/main/java/org/elasticsearch/search/sort/SortOrder.java rename to server/src/main/java/org/opensearch/search/sort/SortOrder.java index 2de578d612a..dec061c45f4 100644 --- a/server/src/main/java/org/elasticsearch/search/sort/SortOrder.java +++ b/server/src/main/java/org/opensearch/search/sort/SortOrder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; diff --git a/server/src/main/java/org/elasticsearch/search/sort/SortValue.java b/server/src/main/java/org/opensearch/search/sort/SortValue.java similarity index 98% rename from server/src/main/java/org/elasticsearch/search/sort/SortValue.java rename to server/src/main/java/org/opensearch/search/sort/SortValue.java index 92fbe3cfc48..cfe6a6aa8d6 100644 --- a/server/src/main/java/org/elasticsearch/search/sort/SortValue.java +++ b/server/src/main/java/org/opensearch/search/sort/SortValue.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.elasticsearch.common.io.stream.NamedWriteable; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; @@ -66,7 +66,7 @@ public abstract class SortValue implements NamedWriteable, Comparable /* * It might make sense to try and compare doubles to longs * *carefully* to get a real sort. but it might not. For now - * we sort all doubles before all longs. + * we sort all doubles before all longs. */ int typeCompare = getWriteableName().compareTo(other.getWriteableName()); if (typeCompare != 0) { diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java index 2c405d419f0..3334cbdb7f7 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java @@ -66,7 +66,7 @@ import org.elasticsearch.indices.InvalidIndexTemplateException; import org.elasticsearch.indices.SystemIndices; import org.elasticsearch.plugins.MapperPlugin; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import org.elasticsearch.test.ESSingleNodeTestCase; import org.opensearch.cluster.metadata.Template; diff --git a/server/src/test/java/org/elasticsearch/index/IndexSortSettingsTests.java b/server/src/test/java/org/elasticsearch/index/IndexSortSettingsTests.java index ffc08f9e1d6..de9be2fa59e 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexSortSettingsTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexSortSettingsTests.java @@ -21,7 +21,7 @@ package org.elasticsearch.index; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.search.MultiValueMode; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import org.elasticsearch.test.ESTestCase; import static org.elasticsearch.common.settings.Settings.Builder.EMPTY_SETTINGS; diff --git a/server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java b/server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java index c38394d82ff..cd2d8631e83 100644 --- a/server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java +++ b/server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java @@ -33,7 +33,7 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.internal.SearchContext; import org.elasticsearch.search.internal.ShardSearchRequest; import org.opensearch.tasks.Task; diff --git a/server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java index 7a8fafe6b6b..d1d609f836e 100644 --- a/server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java +++ b/server/src/test/java/org/elasticsearch/index/fielddata/IndexFieldDataServiceTests.java @@ -47,7 +47,7 @@ import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.indices.IndicesService; import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache; import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import org.elasticsearch.test.ESSingleNodeTestCase; import org.elasticsearch.test.IndexSettingsModule; import org.elasticsearch.test.InternalSettingsPlugin; diff --git a/server/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java index 99ef863e37e..aad8fdd2c69 100644 --- a/server/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java +++ b/server/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java @@ -28,8 +28,8 @@ import org.elasticsearch.index.fielddata.fieldcomparator.BytesRefFieldComparator import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.sort.BucketedSort; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.BucketedSort; +import org.opensearch.search.sort.SortOrder; /** Returns an implementation based on paged bytes which doesn't implement WithOrdinals in order to visit different paths in the code, * eg. BytesRefFieldComparatorSource makes decisions based on whether the field data implements WithOrdinals. */ diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java index 4c90806e941..939cdec56ff 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DocumentFieldMapperTests.java @@ -26,7 +26,7 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.index.analysis.AnalyzerScope; import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.io.StringReader; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java b/server/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java index c9305d76311..16bd7a34540 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/ExternalMapper.java @@ -28,7 +28,7 @@ import org.opensearch.geometry.Point; import org.elasticsearch.index.analysis.AnalyzerScope; import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.nio.charset.Charset; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/FakeStringFieldMapper.java b/server/src/test/java/org/elasticsearch/index/mapper/FakeStringFieldMapper.java index 855f4f2775d..6438fa20e9d 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/FakeStringFieldMapper.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/FakeStringFieldMapper.java @@ -23,7 +23,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; import org.apache.lucene.index.IndexOptions; import org.elasticsearch.common.lucene.Lucene; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java index 20a422274c5..bbc9694aa44 100644 --- a/server/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/InnerHitBuilderTests.java @@ -31,14 +31,14 @@ import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.script.Script; import org.opensearch.script.ScriptType; import org.elasticsearch.search.SearchModule; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.fetch.subphase.FetchSourceContext; import org.elasticsearch.search.fetch.subphase.FieldAndFormat; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilderTests; import org.elasticsearch.search.internal.ShardSearchRequest; -import org.elasticsearch.search.sort.SortBuilder; -import org.elasticsearch.search.sort.SortBuilders; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortBuilder; +import org.opensearch.search.sort.SortBuilders; +import org.opensearch.search.sort.SortOrder; import org.elasticsearch.test.ESTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -100,7 +100,7 @@ public class InnerHitBuilderTests extends ESTestCase { * This is necessary to ensure because we use the serialized BytesReference * of this builder as part of the cacheKey in * {@link ShardSearchRequest} (via - * {@link SearchSourceBuilder#collapse(org.elasticsearch.search.collapse.CollapseBuilder)}) + * {@link SearchSourceBuilder#collapse(org.opensearch.search.collapse.CollapseBuilder)}) */ public void testSerializationOrder() throws Exception { for (int runs = 0; runs < NUMBER_OF_TESTBUILDERS; runs++) { diff --git a/server/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java index 635142d5391..850434fa424 100644 --- a/server/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/NestedQueryBuilderTests.java @@ -36,8 +36,8 @@ import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder; import org.elasticsearch.index.search.ESToParentBlockJoinQuery; import org.elasticsearch.search.fetch.subphase.InnerHitsContext; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.search.sort.FieldSortBuilder; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.FieldSortBuilder; +import org.opensearch.search.sort.SortOrder; import org.elasticsearch.test.AbstractQueryTestCase; import org.elasticsearch.test.VersionUtils; import org.hamcrest.Matchers; diff --git a/server/src/test/java/org/elasticsearch/index/query/QueryShardContextTests.java b/server/src/test/java/org/elasticsearch/index/query/QueryShardContextTests.java index c000b3cb10e..2a16720573f 100644 --- a/server/src/test/java/org/elasticsearch/index/query/QueryShardContextTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/QueryShardContextTests.java @@ -54,9 +54,9 @@ import org.elasticsearch.index.mapper.IndexFieldMapper; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.mapper.TextFieldMapper; -import org.elasticsearch.search.lookup.LeafDocLookup; -import org.elasticsearch.search.lookup.LeafSearchLookup; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.LeafDocLookup; +import org.opensearch.search.lookup.LeafSearchLookup; +import org.opensearch.search.lookup.SearchLookup; import org.elasticsearch.test.ESTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java index fb4da0c892b..8c52e06c5ba 100644 --- a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java @@ -64,8 +64,8 @@ import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.sort.BucketedSort; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.BucketedSort; +import org.opensearch.search.sort.SortOrder; import org.elasticsearch.test.ESTestCase; import org.junit.After; import org.junit.Before; diff --git a/server/src/test/java/org/elasticsearch/index/reindex/ReindexRequestTests.java b/server/src/test/java/org/elasticsearch/index/reindex/ReindexRequestTests.java index 4226a18e745..e44c5f078cc 100644 --- a/server/src/test/java/org/elasticsearch/index/reindex/ReindexRequestTests.java +++ b/server/src/test/java/org/elasticsearch/index/reindex/ReindexRequestTests.java @@ -31,7 +31,7 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.search.SearchModule; -import org.elasticsearch.search.slice.SliceBuilder; +import org.opensearch.search.slice.SliceBuilder; import java.io.IOException; import java.util.Collections; diff --git a/server/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java b/server/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java index 3a960ef1096..7e0f92c8806 100644 --- a/server/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java +++ b/server/src/test/java/org/elasticsearch/index/search/nested/NestedSortingTests.java @@ -64,9 +64,9 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.index.query.TermQueryBuilder; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.search.MultiValueMode; -import org.elasticsearch.search.sort.FieldSortBuilder; -import org.elasticsearch.search.sort.NestedSortBuilder; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.FieldSortBuilder; +import org.opensearch.search.sort.NestedSortBuilder; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/elasticsearch/search/AbstractSearchTestCase.java b/server/src/test/java/org/elasticsearch/search/AbstractSearchTestCase.java index 2144ce057a5..b05786bd3c4 100644 --- a/server/src/test/java/org/elasticsearch/search/AbstractSearchTestCase.java +++ b/server/src/test/java/org/elasticsearch/search/AbstractSearchTestCase.java @@ -32,10 +32,10 @@ import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.indices.IndicesModule; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.plugins.SearchPlugin; -import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.search.collapse.CollapseBuilderTests; +import org.opensearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.collapse.CollapseBuilderTests; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilderTests; -import org.elasticsearch.search.rescore.QueryRescorerBuilderTests; +import org.opensearch.search.rescore.QueryRescorerBuilderTests; import org.elasticsearch.search.suggest.SuggestBuilderTests; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/search/DefaultSearchContextTests.java b/server/src/test/java/org/elasticsearch/search/DefaultSearchContextTests.java index 167dd2f7a3d..9dd05129a1f 100644 --- a/server/src/test/java/org/elasticsearch/search/DefaultSearchContextTests.java +++ b/server/src/test/java/org/elasticsearch/search/DefaultSearchContextTests.java @@ -55,9 +55,9 @@ import org.elasticsearch.search.internal.LegacyReaderContext; import org.elasticsearch.search.internal.ReaderContext; import org.elasticsearch.search.internal.ShardSearchContextId; import org.elasticsearch.search.internal.ShardSearchRequest; -import org.elasticsearch.search.rescore.RescoreContext; -import org.elasticsearch.search.slice.SliceBuilder; -import org.elasticsearch.search.sort.SortAndFormats; +import org.opensearch.search.rescore.RescoreContext; +import org.opensearch.search.slice.SliceBuilder; +import org.opensearch.search.sort.SortAndFormats; import org.elasticsearch.test.ESTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/test/java/org/elasticsearch/search/SearchModuleTests.java b/server/src/test/java/org/elasticsearch/search/SearchModuleTests.java index 5f1f45ce77d..be9189edfb9 100644 --- a/server/src/test/java/org/elasticsearch/search/SearchModuleTests.java +++ b/server/src/test/java/org/elasticsearch/search/SearchModuleTests.java @@ -61,9 +61,9 @@ import org.elasticsearch.search.fetch.subphase.highlight.FastVectorHighlighter; import org.elasticsearch.search.fetch.subphase.highlight.Highlighter; import org.elasticsearch.search.fetch.subphase.highlight.PlainHighlighter; import org.elasticsearch.search.fetch.subphase.highlight.UnifiedHighlighter; -import org.elasticsearch.search.rescore.QueryRescorerBuilder; -import org.elasticsearch.search.rescore.RescoreContext; -import org.elasticsearch.search.rescore.RescorerBuilder; +import org.opensearch.search.rescore.QueryRescorerBuilder; +import org.opensearch.search.rescore.RescoreContext; +import org.opensearch.search.rescore.RescorerBuilder; import org.elasticsearch.search.suggest.Suggest.Suggestion; import org.elasticsearch.search.suggest.Suggest.Suggestion.Entry; import org.elasticsearch.search.suggest.Suggest.Suggestion.Entry.Option; diff --git a/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java b/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java index b004548acc5..e7bace147cd 100644 --- a/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java +++ b/server/src/test/java/org/elasticsearch/search/SearchServiceTests.java @@ -76,7 +76,7 @@ import org.elasticsearch.search.aggregations.MultiBucketConsumerService; import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder; import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder; import org.elasticsearch.search.aggregations.support.ValueType; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.fetch.FetchSearchResult; import org.elasticsearch.search.fetch.ShardFetchRequest; import org.elasticsearch.search.internal.AliasFilter; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateScriptMocksPlugin.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateScriptMocksPlugin.java index 167cbd033ca..c453ce502d5 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateScriptMocksPlugin.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/DateScriptMocksPlugin.java @@ -20,7 +20,7 @@ package org.elasticsearch.search.aggregations.bucket; import org.opensearch.script.MockScriptPlugin; -import org.elasticsearch.search.lookup.LeafDocLookup; +import org.opensearch.search.lookup.LeafDocLookup; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilderTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilderTests.java index e834f307511..a3cf22ab726 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilderTests.java @@ -24,7 +24,7 @@ import org.opensearch.script.Script; import org.elasticsearch.search.aggregations.BaseAggregationTestCase; import org.elasticsearch.search.aggregations.bucket.geogrid.GeoTileUtils; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import java.util.ArrayList; import java.util.List; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java index 4daa865a35a..8cb9891c874 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java @@ -76,7 +76,7 @@ import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder; import org.elasticsearch.search.aggregations.metrics.TopHits; import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder; import org.elasticsearch.search.aggregations.support.ValueType; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import org.elasticsearch.test.IndexSettingsModule; import org.junit.After; import org.junit.Before; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/LegacyIntervalCompositeAggBuilderTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/LegacyIntervalCompositeAggBuilderTests.java index 6c435449db4..45cbdbe7077 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/LegacyIntervalCompositeAggBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/composite/LegacyIntervalCompositeAggBuilderTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.search.aggregations.bucket.composite; import org.opensearch.script.Script; import org.elasticsearch.search.aggregations.BaseAggregationTestCase; import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorTests.java index e1b1e951df4..2b2ced357dd 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/filter/FilterAggregatorTests.java @@ -35,7 +35,7 @@ import org.elasticsearch.search.aggregations.Aggregator.BucketComparator; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.LeafBucketCollector; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import org.junit.Before; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java index 84086c38a57..1690edebb52 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/missing/MissingAggregatorTests.java @@ -47,7 +47,7 @@ import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.lookup.LeafDocLookup; +import org.opensearch.search.lookup.LeafDocLookup; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/RareTermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/RareTermsAggregatorTests.java index 8edb2f956ee..f7facaef48e 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/RareTermsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/RareTermsAggregatorTests.java @@ -71,8 +71,8 @@ import org.elasticsearch.search.aggregations.metrics.InternalTopHits; import org.elasticsearch.search.aggregations.metrics.Max; import org.elasticsearch.search.aggregations.metrics.MaxAggregationBuilder; import org.elasticsearch.search.aggregations.metrics.TopHitsAggregationBuilder; -import org.elasticsearch.search.sort.FieldSortBuilder; -import org.elasticsearch.search.sort.ScoreSortBuilder; +import org.opensearch.search.sort.FieldSortBuilder; +import org.opensearch.search.sort.ScoreSortBuilder; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java index 2877f0bf57e..3561b91de14 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorTests.java @@ -94,8 +94,8 @@ import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; import org.elasticsearch.search.aggregations.support.ValueType; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.sort.FieldSortBuilder; -import org.elasticsearch.search.sort.ScoreSortBuilder; +import org.opensearch.search.sort.FieldSortBuilder; +import org.opensearch.search.sort.ScoreSortBuilder; import org.elasticsearch.test.geo.RandomGeoGenerator; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractGeoTestCase.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractGeoTestCase.java index 5904f754d43..bcaf6eeb8c6 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractGeoTestCase.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/AbstractGeoTestCase.java @@ -35,8 +35,8 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.opensearch.geometry.utils.Geohash; import org.elasticsearch.search.SearchHit; -import org.elasticsearch.search.sort.SortBuilders; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortBuilders; +import org.opensearch.search.sort.SortOrder; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.geo.RandomGeoGenerator; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgAggregatorTests.java index 4e9608253de..e3da18bd90d 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/AvgAggregatorTests.java @@ -55,7 +55,7 @@ import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; import org.elasticsearch.search.aggregations.support.ValueType; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.lookup.LeafDocLookup; +import org.opensearch.search.lookup.LeafDocLookup; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxAggregatorTests.java index 12b4cb7c409..98c4eb9b554 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MaxAggregatorTests.java @@ -74,7 +74,7 @@ import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; import org.elasticsearch.search.aggregations.support.ValueType; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.lookup.LeafDocLookup; +import org.opensearch.search.lookup.LeafDocLookup; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MetricAggScriptPlugin.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MetricAggScriptPlugin.java index 8874e3454fd..4e555eef14b 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MetricAggScriptPlugin.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MetricAggScriptPlugin.java @@ -27,7 +27,7 @@ import java.util.function.BiFunction; import java.util.function.Function; import org.opensearch.script.MockScriptPlugin; -import org.elasticsearch.search.lookup.LeafDocLookup; +import org.opensearch.search.lookup.LeafDocLookup; import org.elasticsearch.test.ESTestCase; /** diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java index e38918dff22..50d2e5da98b 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/MinAggregatorTests.java @@ -79,7 +79,7 @@ import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilde import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.lookup.LeafDocLookup; +import org.opensearch.search.lookup.LeafDocLookup; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsAggregatorTests.java index 9790cede89d..5431609ab4a 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/StatsAggregatorTests.java @@ -45,7 +45,7 @@ import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.lookup.LeafDocLookup; +import org.opensearch.search.lookup.LeafDocLookup; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumAggregatorTests.java index 36ffdc2233b..0271b2a043c 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/SumAggregatorTests.java @@ -54,7 +54,7 @@ import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; import org.elasticsearch.search.aggregations.support.CoreValuesSourceType; import org.elasticsearch.search.aggregations.support.ValuesSourceType; -import org.elasticsearch.search.lookup.LeafDocLookup; +import org.opensearch.search.lookup.LeafDocLookup; import java.io.IOException; import java.util.ArrayList; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregatorTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregatorTests.java index b595ac5762b..b8e9f37b0c9 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregatorTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsAggregatorTests.java @@ -53,7 +53,7 @@ import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.AggregatorTestCase; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.SortOrder; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java index 5d352e2187d..c158c05a10c 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/TopHitsTests.java @@ -26,9 +26,9 @@ import org.elasticsearch.search.aggregations.AggregatorFactories; import org.elasticsearch.search.aggregations.BaseAggregationTestCase; import org.elasticsearch.search.fetch.subphase.FetchSourceContext; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilderTests; -import org.elasticsearch.search.sort.ScriptSortBuilder.ScriptSortType; -import org.elasticsearch.search.sort.SortBuilders; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.ScriptSortBuilder.ScriptSortType; +import org.opensearch.search.sort.SortBuilders; +import org.opensearch.search.sort.SortOrder; import org.elasticsearch.test.AbstractQueryTestCase; import java.util.ArrayList; diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSortTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSortTests.java index 8d512984095..dbabd8f5b2b 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSortTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/BucketSortTests.java @@ -19,8 +19,8 @@ package org.elasticsearch.search.aggregations.pipeline; import org.elasticsearch.search.aggregations.BasePipelineAggregationTestCase; -import org.elasticsearch.search.sort.FieldSortBuilder; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.FieldSortBuilder; +import org.opensearch.search.sort.SortOrder; import java.util.ArrayList; import java.util.Collections; @@ -88,7 +88,7 @@ public class BucketSortTests extends BasePipelineAggregationTestCase sorts = singletonList(new FieldSortBuilder("bar")); - assertThat(validate(emptyList(), new BucketSortPipelineAggregationBuilder("foo", sorts)), + assertThat(validate(emptyList(), new BucketSortPipelineAggregationBuilder("foo", sorts)), equalTo("Validation Failed: 1: bucket_sort aggregation [foo] must be declared inside of another aggregation;")); } } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java index 5333a0e2f56..0970b5a56e2 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/support/ScriptValuesTests.java @@ -29,8 +29,8 @@ import org.opensearch.script.AggregationScript; import org.elasticsearch.search.aggregations.support.values.ScriptBytesValues; import org.elasticsearch.search.aggregations.support.values.ScriptDoubleValues; import org.elasticsearch.search.aggregations.support.values.ScriptLongValues; -import org.elasticsearch.search.lookup.LeafSearchLookup; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.LeafSearchLookup; +import org.opensearch.search.lookup.SearchLookup; import org.elasticsearch.test.ESTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/search/fetch/subphase/FetchSourcePhaseTests.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/FetchSourcePhaseTests.java index 273c669b215..50a5c2765c3 100644 --- a/server/src/test/java/org/elasticsearch/search/fetch/subphase/FetchSourcePhaseTests.java +++ b/server/src/test/java/org/elasticsearch/search/fetch/subphase/FetchSourcePhaseTests.java @@ -29,7 +29,7 @@ import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.fetch.FetchContext; import org.elasticsearch.search.fetch.FetchSubPhase.HitContext; import org.elasticsearch.search.fetch.FetchSubPhaseProcessor; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SourceLookup; import org.elasticsearch.test.ESTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/search/fetch/subphase/FieldFetcherTests.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/FieldFetcherTests.java index c3d8f83c2bf..c66b4cf450e 100644 --- a/server/src/test/java/org/elasticsearch/search/fetch/subphase/FieldFetcherTests.java +++ b/server/src/test/java/org/elasticsearch/search/fetch/subphase/FieldFetcherTests.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentFactory; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SourceLookup; import org.elasticsearch.test.ESSingleNodeTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java b/server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java index 4a79bb2468e..49854cda8d7 100644 --- a/server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java +++ b/server/src/test/java/org/elasticsearch/search/query/QueryPhaseTests.java @@ -92,7 +92,7 @@ import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.internal.ContextIndexSearcher; import org.elasticsearch.search.internal.ScrollContext; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.search.sort.SortAndFormats; +import org.opensearch.search.sort.SortAndFormats; import org.opensearch.tasks.TaskCancelledException; import org.elasticsearch.test.TestSearchContext; diff --git a/server/src/test/java/org/elasticsearch/search/query/ScriptScoreQueryTests.java b/server/src/test/java/org/elasticsearch/search/query/ScriptScoreQueryTests.java index 705d04bc855..e27ebf3caad 100644 --- a/server/src/test/java/org/elasticsearch/search/query/ScriptScoreQueryTests.java +++ b/server/src/test/java/org/elasticsearch/search/query/ScriptScoreQueryTests.java @@ -36,8 +36,8 @@ import org.elasticsearch.common.lucene.search.Queries; import org.elasticsearch.common.lucene.search.function.ScriptScoreQuery; import org.opensearch.script.ScoreScript; import org.opensearch.script.Script; -import org.elasticsearch.search.lookup.LeafSearchLookup; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.LeafSearchLookup; +import org.opensearch.search.lookup.SearchLookup; import org.elasticsearch.test.ESTestCase; import org.junit.After; import org.junit.Before; diff --git a/server/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java b/server/src/test/java/org/opensearch/search/builder/SearchSourceBuilderTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java rename to server/src/test/java/org/opensearch/search/builder/SearchSourceBuilderTests.java index 08791571801..35418f515da 100644 --- a/server/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/builder/SearchSourceBuilderTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.builder; +package org.opensearch.search.builder; import com.fasterxml.jackson.core.JsonParseException; import org.elasticsearch.common.ParsingException; @@ -40,10 +40,10 @@ import org.elasticsearch.index.query.QueryRewriteContext; import org.elasticsearch.index.query.RandomQueryBuilder; import org.elasticsearch.index.query.Rewriteable; import org.elasticsearch.search.AbstractSearchTestCase; -import org.elasticsearch.search.rescore.QueryRescorerBuilder; -import org.elasticsearch.search.sort.FieldSortBuilder; -import org.elasticsearch.search.sort.ScoreSortBuilder; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.rescore.QueryRescorerBuilder; +import org.opensearch.search.sort.FieldSortBuilder; +import org.opensearch.search.sort.ScoreSortBuilder; +import org.opensearch.search.sort.SortOrder; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.EqualsHashCodeTestUtils; diff --git a/server/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java b/server/src/test/java/org/opensearch/search/collapse/CollapseBuilderTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java rename to server/src/test/java/org/opensearch/search/collapse/CollapseBuilderTests.java index 72e728db065..f56dc197c6c 100644 --- a/server/src/test/java/org/elasticsearch/search/collapse/CollapseBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/collapse/CollapseBuilderTests.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.collapse; +package org.opensearch.search.collapse; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.index.DirectoryReader; @@ -40,7 +40,7 @@ import org.elasticsearch.index.query.InnerHitBuilder; import org.elasticsearch.index.query.InnerHitBuilderTests; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.search.SearchModule; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import org.elasticsearch.test.AbstractSerializingTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/server/src/test/java/org/elasticsearch/search/lookup/LeafDocLookupTests.java b/server/src/test/java/org/opensearch/search/lookup/LeafDocLookupTests.java similarity index 96% rename from server/src/test/java/org/elasticsearch/search/lookup/LeafDocLookupTests.java rename to server/src/test/java/org/opensearch/search/lookup/LeafDocLookupTests.java index af553c5190a..5f366b0d5d1 100644 --- a/server/src/test/java/org/elasticsearch/search/lookup/LeafDocLookupTests.java +++ b/server/src/test/java/org/opensearch/search/lookup/LeafDocLookupTests.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.lookup; +package org.opensearch.search.lookup; import org.elasticsearch.index.fielddata.LeafFieldData; import org.elasticsearch.index.fielddata.IndexFieldData; @@ -26,7 +26,7 @@ import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.test.ESTestCase; import org.junit.Before; -import static org.elasticsearch.search.lookup.LeafDocLookup.TYPES_DEPRECATION_MESSAGE; +import static org.opensearch.search.lookup.LeafDocLookup.TYPES_DEPRECATION_MESSAGE; import static org.mockito.AdditionalAnswers.returnsFirstArg; import static org.mockito.Matchers.anyObject; import static org.mockito.Mockito.doReturn; diff --git a/server/src/test/java/org/elasticsearch/search/lookup/LeafFieldsLookupTests.java b/server/src/test/java/org/opensearch/search/lookup/LeafFieldsLookupTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/search/lookup/LeafFieldsLookupTests.java rename to server/src/test/java/org/opensearch/search/lookup/LeafFieldsLookupTests.java index b2908405eb4..69fcbd41bcd 100644 --- a/server/src/test/java/org/elasticsearch/search/lookup/LeafFieldsLookupTests.java +++ b/server/src/test/java/org/opensearch/search/lookup/LeafFieldsLookupTests.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.search.lookup; +package org.opensearch.search.lookup; import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.FieldInfo; diff --git a/server/src/test/java/org/elasticsearch/search/rescore/QueryRescoreModeTests.java b/server/src/test/java/org/opensearch/search/rescore/QueryRescoreModeTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/search/rescore/QueryRescoreModeTests.java rename to server/src/test/java/org/opensearch/search/rescore/QueryRescoreModeTests.java index 8254c7b8f1f..eaa7a38ee86 100644 --- a/server/src/test/java/org/elasticsearch/search/rescore/QueryRescoreModeTests.java +++ b/server/src/test/java/org/opensearch/search/rescore/QueryRescoreModeTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.rescore; +package org.opensearch.search.rescore; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/search/rescore/QueryRescorerBuilderTests.java b/server/src/test/java/org/opensearch/search/rescore/QueryRescorerBuilderTests.java similarity index 97% rename from server/src/test/java/org/elasticsearch/search/rescore/QueryRescorerBuilderTests.java rename to server/src/test/java/org/opensearch/search/rescore/QueryRescorerBuilderTests.java index ae1f549e044..6d0e9ee590b 100644 --- a/server/src/test/java/org/elasticsearch/search/rescore/QueryRescorerBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/rescore/QueryRescorerBuilderTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.rescore; +package org.opensearch.search.rescore; import org.apache.lucene.search.Query; import org.opensearch.OpenSearchParseException; @@ -47,7 +47,7 @@ import org.elasticsearch.index.query.QueryRewriteContext; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.Rewriteable; import org.elasticsearch.search.SearchModule; -import org.elasticsearch.search.rescore.QueryRescorer.QueryRescoreContext; +import org.opensearch.search.rescore.QueryRescorer.QueryRescoreContext; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.IndexSettingsModule; import org.junit.AfterClass; @@ -197,8 +197,8 @@ public class QueryRescorerBuilderTests extends ESTestCase { }; QueryBuilder rewriteQb = new AlwaysRewriteQueryBuilder(); - org.elasticsearch.search.rescore.QueryRescorerBuilder rescoreBuilder = new - org.elasticsearch.search.rescore.QueryRescorerBuilder(rewriteQb); + org.opensearch.search.rescore.QueryRescorerBuilder rescoreBuilder = new + org.opensearch.search.rescore.QueryRescorerBuilder(rewriteQb); rescoreBuilder.setQueryWeight(randomFloat()); rescoreBuilder.setRescoreQueryWeight(randomFloat()); @@ -332,8 +332,8 @@ public class QueryRescorerBuilderTests extends ESTestCase { public static QueryRescorerBuilder randomRescoreBuilder() { QueryBuilder queryBuilder = new MatchAllQueryBuilder().boost(randomFloat()) .queryName(randomAlphaOfLength(20)); - org.elasticsearch.search.rescore.QueryRescorerBuilder rescorer = new - org.elasticsearch.search.rescore.QueryRescorerBuilder(queryBuilder); + org.opensearch.search.rescore.QueryRescorerBuilder rescorer = new + org.opensearch.search.rescore.QueryRescorerBuilder(queryBuilder); if (randomBoolean()) { rescorer.setQueryWeight(randomFloat()); } diff --git a/server/src/test/java/org/elasticsearch/search/searchafter/SearchAfterBuilderTests.java b/server/src/test/java/org/opensearch/search/searchafter/SearchAfterBuilderTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/search/searchafter/SearchAfterBuilderTests.java rename to server/src/test/java/org/opensearch/search/searchafter/SearchAfterBuilderTests.java index 45da49e5f4c..4f9c3be01a5 100644 --- a/server/src/test/java/org/elasticsearch/search/searchafter/SearchAfterBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/searchafter/SearchAfterBuilderTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.searchafter; +package org.opensearch.search.searchafter; import org.apache.lucene.document.LatLonDocValuesField; import org.apache.lucene.search.FieldComparator; @@ -37,15 +37,15 @@ import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; -import org.elasticsearch.search.sort.BucketedSort; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.sort.BucketedSort; +import org.opensearch.search.sort.SortOrder; import org.elasticsearch.test.ESTestCase; import java.io.IOException; import java.math.BigDecimal; import java.util.Collections; -import static org.elasticsearch.search.searchafter.SearchAfterBuilder.extractSortType; +import static org.opensearch.search.searchafter.SearchAfterBuilder.extractSortType; import static org.elasticsearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; diff --git a/server/src/test/java/org/elasticsearch/search/slice/DocValuesSliceQueryTests.java b/server/src/test/java/org/opensearch/search/slice/DocValuesSliceQueryTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/search/slice/DocValuesSliceQueryTests.java rename to server/src/test/java/org/opensearch/search/slice/DocValuesSliceQueryTests.java index 76807f4722a..7b342da83d1 100644 --- a/server/src/test/java/org/elasticsearch/search/slice/DocValuesSliceQueryTests.java +++ b/server/src/test/java/org/opensearch/search/slice/DocValuesSliceQueryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.slice; +package org.opensearch.search.slice; import com.carrotsearch.hppc.BitMixer; import org.apache.lucene.document.Document; diff --git a/server/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java b/server/src/test/java/org/opensearch/search/slice/SliceBuilderTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java rename to server/src/test/java/org/opensearch/search/slice/SliceBuilderTests.java index f2146d74b00..e4896abfc12 100644 --- a/server/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/slice/SliceBuilderTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.slice; +package org.opensearch.search.slice; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.index.DirectoryReader; @@ -58,7 +58,7 @@ import org.elasticsearch.index.mapper.ValueFetcher; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.shard.ShardId; import org.elasticsearch.search.internal.ShardSearchRequest; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import org.elasticsearch.test.ESTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/elasticsearch/search/slice/TermsSliceQueryTests.java b/server/src/test/java/org/opensearch/search/slice/TermsSliceQueryTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/search/slice/TermsSliceQueryTests.java rename to server/src/test/java/org/opensearch/search/slice/TermsSliceQueryTests.java index 9093e3e87a6..e3ae690aa30 100644 --- a/server/src/test/java/org/elasticsearch/search/slice/TermsSliceQueryTests.java +++ b/server/src/test/java/org/opensearch/search/slice/TermsSliceQueryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.slice; +package org.opensearch.search.slice; import org.apache.lucene.analysis.core.KeywordAnalyzer; import org.apache.lucene.document.Document; diff --git a/server/src/test/java/org/elasticsearch/search/sort/AbstractSortTestCase.java b/server/src/test/java/org/opensearch/search/sort/AbstractSortTestCase.java similarity index 99% rename from server/src/test/java/org/elasticsearch/search/sort/AbstractSortTestCase.java rename to server/src/test/java/org/opensearch/search/sort/AbstractSortTestCase.java index 43253fc8ab1..13dba70c688 100644 --- a/server/src/test/java/org/elasticsearch/search/sort/AbstractSortTestCase.java +++ b/server/src/test/java/org/opensearch/search/sort/AbstractSortTestCase.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.SortField; @@ -57,7 +57,7 @@ import org.opensearch.script.ScriptModule; import org.opensearch.script.ScriptService; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.SearchModule; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.IndexSettingsModule; import org.junit.AfterClass; diff --git a/server/src/test/java/org/elasticsearch/search/sort/BucketedSortForDoublesTests.java b/server/src/test/java/org/opensearch/search/sort/BucketedSortForDoublesTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/search/sort/BucketedSortForDoublesTests.java rename to server/src/test/java/org/opensearch/search/sort/BucketedSortForDoublesTests.java index 41ca9659fef..eac31d9e338 100644 --- a/server/src/test/java/org/elasticsearch/search/sort/BucketedSortForDoublesTests.java +++ b/server/src/test/java/org/opensearch/search/sort/BucketedSortForDoublesTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.apache.lucene.index.LeafReaderContext; import org.elasticsearch.search.DocValueFormat; diff --git a/server/src/test/java/org/elasticsearch/search/sort/BucketedSortForFloatsTests.java b/server/src/test/java/org/opensearch/search/sort/BucketedSortForFloatsTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/search/sort/BucketedSortForFloatsTests.java rename to server/src/test/java/org/opensearch/search/sort/BucketedSortForFloatsTests.java index 250eaf047f3..bd79dca8369 100644 --- a/server/src/test/java/org/elasticsearch/search/sort/BucketedSortForFloatsTests.java +++ b/server/src/test/java/org/opensearch/search/sort/BucketedSortForFloatsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.Scorable; @@ -99,7 +99,7 @@ public class BucketedSortForFloatsTests extends BucketedSortTestCase extends ESTes assertThat(sort.getValues(0, extra.valueBuilder()), contains(extraValue(3000, 3), extraValue(200, 2))); } } - + public void testTwoHitsAsc() throws IOException { try (T sort = build(SortOrder.ASC, 2, new double[] {1, 2, 3})) { BucketedSort.Leaf leaf = sort.forLeaf(null); diff --git a/server/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java b/server/src/test/java/org/opensearch/search/sort/FieldSortBuilderTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java rename to server/src/test/java/org/opensearch/search/sort/FieldSortBuilderTests.java index 4c46094be28..5f84530a066 100644 --- a/server/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/sort/FieldSortBuilderTests.java @@ -17,7 +17,7 @@ x * Licensed to Elasticsearch under one or more contributor * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.apache.lucene.analysis.core.KeywordAnalyzer; import org.apache.lucene.document.Document; @@ -62,7 +62,7 @@ import org.elasticsearch.index.query.RangeQueryBuilder; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; import org.elasticsearch.search.SearchSortValuesAndFormats; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import java.io.IOException; import java.util.ArrayList; @@ -70,9 +70,9 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; -import static org.elasticsearch.search.sort.FieldSortBuilder.getMinMaxOrNull; -import static org.elasticsearch.search.sort.FieldSortBuilder.getPrimaryFieldSortOrNull; -import static org.elasticsearch.search.sort.NestedSortBuilderTests.createRandomNestedSort; +import static org.opensearch.search.sort.FieldSortBuilder.getMinMaxOrNull; +import static org.opensearch.search.sort.FieldSortBuilder.getPrimaryFieldSortOrNull; +import static org.opensearch.search.sort.NestedSortBuilderTests.createRandomNestedSort; import static org.hamcrest.Matchers.instanceOf; public class FieldSortBuilderTests extends AbstractSortTestCase { diff --git a/server/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java b/server/src/test/java/org/opensearch/search/sort/GeoDistanceSortBuilderTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java rename to server/src/test/java/org/opensearch/search/sort/GeoDistanceSortBuilderTests.java index 2dccf6a9e5a..1319a2597b0 100644 --- a/server/src/test/java/org/elasticsearch/search/sort/GeoDistanceSortBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/sort/GeoDistanceSortBuilderTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.apache.lucene.document.LatLonDocValuesField; diff --git a/server/src/test/java/org/elasticsearch/search/sort/NestedSortBuilderTests.java b/server/src/test/java/org/opensearch/search/sort/NestedSortBuilderTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/search/sort/NestedSortBuilderTests.java rename to server/src/test/java/org/opensearch/search/sort/NestedSortBuilderTests.java index e644a070fae..d21dc42d4cf 100644 --- a/server/src/test/java/org/elasticsearch/search/sort/NestedSortBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/sort/NestedSortBuilderTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.settings.Settings; diff --git a/server/src/test/java/org/elasticsearch/search/sort/ScoreSortBuilderTests.java b/server/src/test/java/org/opensearch/search/sort/ScoreSortBuilderTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/search/sort/ScoreSortBuilderTests.java rename to server/src/test/java/org/opensearch/search/sort/ScoreSortBuilderTests.java index 5e6d49f5e14..3cfcccc4448 100644 --- a/server/src/test/java/org/elasticsearch/search/sort/ScoreSortBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/sort/ScoreSortBuilderTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.apache.lucene.search.SortField; diff --git a/server/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java b/server/src/test/java/org/opensearch/search/sort/ScriptSortBuilderTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java rename to server/src/test/java/org/opensearch/search/sort/ScriptSortBuilderTests.java index 03574b061f4..d6418a6d0ff 100644 --- a/server/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/sort/ScriptSortBuilderTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.apache.lucene.index.Term; @@ -42,14 +42,14 @@ import org.opensearch.script.Script; import org.opensearch.script.ScriptType; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; -import org.elasticsearch.search.sort.ScriptSortBuilder.ScriptSortType; +import org.opensearch.search.sort.ScriptSortBuilder.ScriptSortType; import java.io.IOException; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import static org.elasticsearch.search.sort.NestedSortBuilderTests.createRandomNestedSort; +import static org.opensearch.search.sort.NestedSortBuilderTests.createRandomNestedSort; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.instanceOf; diff --git a/server/src/test/java/org/elasticsearch/search/sort/SortBuilderTests.java b/server/src/test/java/org/opensearch/search/sort/SortBuilderTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/search/sort/SortBuilderTests.java rename to server/src/test/java/org/opensearch/search/sort/SortBuilderTests.java index 5f5ea5e8694..36f84409abf 100644 --- a/server/src/test/java/org/elasticsearch/search/sort/SortBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/sort/SortBuilderTests.java @@ -17,7 +17,7 @@ x * Licensed to Elasticsearch under one or more contributor * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.elasticsearch.common.Strings; import org.elasticsearch.common.geo.GeoPoint; diff --git a/server/src/test/java/org/elasticsearch/search/sort/SortModeTests.java b/server/src/test/java/org/opensearch/search/sort/SortModeTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/search/sort/SortModeTests.java rename to server/src/test/java/org/opensearch/search/sort/SortModeTests.java index e0329347dba..fcbf758a5db 100644 --- a/server/src/test/java/org/elasticsearch/search/sort/SortModeTests.java +++ b/server/src/test/java/org/opensearch/search/sort/SortModeTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/elasticsearch/search/sort/SortOrderTests.java b/server/src/test/java/org/opensearch/search/sort/SortOrderTests.java similarity index 98% rename from server/src/test/java/org/elasticsearch/search/sort/SortOrderTests.java rename to server/src/test/java/org/opensearch/search/sort/SortOrderTests.java index 208b4ed1b53..574cb6bd202 100644 --- a/server/src/test/java/org/elasticsearch/search/sort/SortOrderTests.java +++ b/server/src/test/java/org/opensearch/search/sort/SortOrderTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/server/src/test/java/org/elasticsearch/search/sort/SortValueTests.java b/server/src/test/java/org/opensearch/search/sort/SortValueTests.java similarity index 99% rename from server/src/test/java/org/elasticsearch/search/sort/SortValueTests.java rename to server/src/test/java/org/opensearch/search/sort/SortValueTests.java index 6287490dc5c..d024c532439 100644 --- a/server/src/test/java/org/elasticsearch/search/sort/SortValueTests.java +++ b/server/src/test/java/org/opensearch/search/sort/SortValueTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.search.sort; +package org.opensearch.search.sort; import org.elasticsearch.common.Strings; import org.elasticsearch.common.io.stream.NamedWriteableRegistry; diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java index b408162547c..54aadd1d277 100644 --- a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java +++ b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java @@ -182,7 +182,7 @@ import org.opensearch.repositories.blobstore.BlobStoreTestUtil; import org.opensearch.repositories.fs.FsRepository; import org.opensearch.script.ScriptService; import org.elasticsearch.search.SearchService; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.fetch.FetchPhase; import org.opensearch.snapshots.mockstore.MockEventuallyConsistentRepository; import org.elasticsearch.test.ESTestCase; diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/FieldTypeTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/FieldTypeTestCase.java index b837b2095d3..d2990e8f4c3 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/FieldTypeTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/FieldTypeTestCase.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.mapper; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.search.lookup.SourceLookup; +import org.opensearch.search.lookup.SourceLookup; import org.elasticsearch.test.ESTestCase; import java.io.IOException; diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java index 7f0ad7e744f..0575281d67d 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java @@ -49,7 +49,7 @@ import org.elasticsearch.plugins.Plugin; import org.elasticsearch.plugins.ScriptPlugin; import org.opensearch.script.ScriptModule; import org.opensearch.script.ScriptService; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import org.elasticsearch.test.ESTestCase; import java.io.IOException; diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java index 054158a74c7..73e826d535c 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java @@ -42,7 +42,7 @@ import org.elasticsearch.index.fielddata.IndexFieldDataCache; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; import org.elasticsearch.search.DocValueFormat; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.util.ArrayList; diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MockFieldMapper.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/MockFieldMapper.java index 886f8887d69..4484b963b7f 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MockFieldMapper.java +++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/MockFieldMapper.java @@ -22,7 +22,7 @@ package org.elasticsearch.index.mapper; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.util.Collections; import java.util.List; diff --git a/test/framework/src/main/java/org/elasticsearch/search/RandomSearchRequestGenerator.java b/test/framework/src/main/java/org/elasticsearch/search/RandomSearchRequestGenerator.java index 11e0de0dcdf..772985c3ee9 100644 --- a/test/framework/src/main/java/org/elasticsearch/search/RandomSearchRequestGenerator.java +++ b/test/framework/src/main/java/org/elasticsearch/search/RandomSearchRequestGenerator.java @@ -35,18 +35,18 @@ import org.elasticsearch.index.query.QueryBuilders; import org.opensearch.script.Script; import org.opensearch.script.ScriptType; import org.elasticsearch.search.aggregations.AggregationBuilders; -import org.elasticsearch.search.builder.PointInTimeBuilder; -import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.search.collapse.CollapseBuilder; +import org.opensearch.search.builder.PointInTimeBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.collapse.CollapseBuilder; import org.elasticsearch.search.fetch.subphase.FetchSourceContext; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.search.rescore.RescorerBuilder; -import org.elasticsearch.search.searchafter.SearchAfterBuilder; -import org.elasticsearch.search.slice.SliceBuilder; -import org.elasticsearch.search.sort.ScriptSortBuilder; -import org.elasticsearch.search.sort.SortBuilders; -import org.elasticsearch.search.sort.SortOrder; +import org.opensearch.search.rescore.RescorerBuilder; +import org.opensearch.search.searchafter.SearchAfterBuilder; +import org.opensearch.search.slice.SliceBuilder; +import org.opensearch.search.sort.ScriptSortBuilder; +import org.opensearch.search.sort.SortBuilders; +import org.opensearch.search.sort.SortOrder; import org.elasticsearch.search.suggest.SuggestBuilder; import org.elasticsearch.test.AbstractQueryTestCase; diff --git a/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java b/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java index 9ac5df45549..1bfb10072ff 100644 --- a/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/search/aggregations/AggregatorTestCase.java @@ -118,7 +118,7 @@ import org.elasticsearch.search.fetch.subphase.FetchDocValuesPhase; import org.elasticsearch.search.fetch.subphase.FetchSourcePhase; import org.elasticsearch.search.internal.ContextIndexSearcher; import org.elasticsearch.search.internal.SearchContext; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.SearchLookup; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.InternalAggregationTestCase; import org.junit.After; diff --git a/test/framework/src/main/java/org/elasticsearch/test/TestSearchContext.java b/test/framework/src/main/java/org/elasticsearch/test/TestSearchContext.java index b28fd09cc20..57184a5ea87 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/TestSearchContext.java +++ b/test/framework/src/main/java/org/elasticsearch/test/TestSearchContext.java @@ -39,8 +39,8 @@ import org.elasticsearch.index.similarity.SimilarityService; import org.elasticsearch.search.SearchExtBuilder; import org.elasticsearch.search.SearchShardTarget; import org.elasticsearch.search.aggregations.SearchContextAggregations; -import org.elasticsearch.search.collapse.CollapseContext; -import org.elasticsearch.search.dfs.DfsSearchResult; +import org.opensearch.search.collapse.CollapseContext; +import org.opensearch.search.dfs.DfsSearchResult; import org.elasticsearch.search.fetch.FetchPhase; import org.elasticsearch.search.fetch.FetchSearchResult; import org.elasticsearch.search.fetch.StoredFieldsContext; @@ -57,8 +57,8 @@ import org.elasticsearch.search.internal.ShardSearchContextId; import org.elasticsearch.search.internal.ShardSearchRequest; import org.elasticsearch.search.profile.Profilers; import org.elasticsearch.search.query.QuerySearchResult; -import org.elasticsearch.search.rescore.RescoreContext; -import org.elasticsearch.search.sort.SortAndFormats; +import org.opensearch.search.rescore.RescoreContext; +import org.opensearch.search.sort.SortAndFormats; import org.elasticsearch.search.suggest.SuggestionSearchContext; import java.util.Collections; diff --git a/test/framework/src/main/java/org/opensearch/script/MockScriptEngine.java b/test/framework/src/main/java/org/opensearch/script/MockScriptEngine.java index d2de13eaaa7..b702e96ef19 100644 --- a/test/framework/src/main/java/org/opensearch/script/MockScriptEngine.java +++ b/test/framework/src/main/java/org/opensearch/script/MockScriptEngine.java @@ -27,8 +27,8 @@ import org.elasticsearch.index.similarity.ScriptedSimilarity.Field; import org.elasticsearch.index.similarity.ScriptedSimilarity.Query; import org.elasticsearch.index.similarity.ScriptedSimilarity.Term; import org.elasticsearch.search.aggregations.pipeline.MovingFunctionScript; -import org.elasticsearch.search.lookup.LeafSearchLookup; -import org.elasticsearch.search.lookup.SearchLookup; +import org.opensearch.search.lookup.LeafSearchLookup; +import org.opensearch.search.lookup.SearchLookup; import java.io.IOException; import java.util.Collections; diff --git a/test/framework/src/main/java/org/opensearch/script/ScoreAccessor.java b/test/framework/src/main/java/org/opensearch/script/ScoreAccessor.java index 23da28cbc4f..7486c9e2db7 100644 --- a/test/framework/src/main/java/org/opensearch/script/ScoreAccessor.java +++ b/test/framework/src/main/java/org/opensearch/script/ScoreAccessor.java @@ -20,7 +20,7 @@ package org.opensearch.script; import org.apache.lucene.search.Scorable; -import org.elasticsearch.search.lookup.DocLookup; +import org.opensearch.search.lookup.DocLookup; import java.io.IOException; diff --git a/test/framework/src/main/java/org/opensearch/snapshots/AbstractSnapshotIntegTestCase.java b/test/framework/src/main/java/org/opensearch/snapshots/AbstractSnapshotIntegTestCase.java index 196621d96d3..57259a437cb 100644 --- a/test/framework/src/main/java/org/opensearch/snapshots/AbstractSnapshotIntegTestCase.java +++ b/test/framework/src/main/java/org/opensearch/snapshots/AbstractSnapshotIntegTestCase.java @@ -55,7 +55,7 @@ import org.opensearch.repositories.RepositoryData; import org.opensearch.repositories.ShardGenerations; import org.opensearch.repositories.blobstore.BlobStoreRepository; import org.opensearch.repositories.blobstore.BlobStoreTestUtil; -import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.snapshots.mockstore.MockRepository; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.VersionUtils;