From da8a35f4642fd5335a487b54f5cf732ef70cb3a8 Mon Sep 17 00:00:00 2001 From: Rabi Panda Date: Thu, 18 Mar 2021 15:57:39 -0700 Subject: [PATCH] [Rename] Fix imports in the modules directory. (#386) Fix import issues in the modules directory resulting from the refactoring. Signed-off-by: Rabi Panda --- .../spi/MatrixStatsNamedXContentProvider.java | 2 +- .../stats/MatrixStatsAggregationBuilder.java | 2 +- .../matrix/stats/MatrixStatsAggregator.java | 2 +- .../stats/MatrixStatsAggregatorFactory.java | 2 +- .../support/ArrayValuesSource.java | 2 +- .../ArrayValuesSourceAggregationBuilder.java | 2 +- .../ArrayValuesSourceAggregatorFactory.java | 2 +- .../stats/MatrixStatsAggregatorTests.java | 6 +- .../ASCIIFoldingTokenFilterFactory.java | 8 +-- ...bstractCompoundWordTokenFilterFactory.java | 8 +-- .../common/ApostropheFilterFactory.java | 6 +- .../common/ArabicAnalyzerProvider.java | 6 +- .../ArabicNormalizationFilterFactory.java | 6 +- .../common/ArabicStemTokenFilterFactory.java | 4 +- .../common/BasqueAnalyzerProvider.java | 6 +- .../common/BengaliAnalyzerProvider.java | 6 +- .../BengaliNormalizationFilterFactory.java | 8 +-- .../common/BrazilianAnalyzerProvider.java | 8 +-- .../BrazilianStemTokenFilterFactory.java | 6 +- .../common/BulgarianAnalyzerProvider.java | 6 +- .../common/CJKWidthFilterFactory.java | 6 +- .../common/CatalanAnalyzerProvider.java | 8 +-- .../common/CharGroupTokenizerFactory.java | 4 +- .../common/ChineseAnalyzerProvider.java | 6 +- .../analysis/common/CjkAnalyzerProvider.java | 6 +- .../analysis/common/ClassicFilterFactory.java | 4 +- .../common/ClassicTokenizerFactory.java | 6 +- .../analysis/common/CommonAnalysisPlugin.java | 22 +++---- .../common/CzechAnalyzerProvider.java | 6 +- .../common/CzechStemTokenFilterFactory.java | 4 +- .../common/DanishAnalyzerProvider.java | 6 +- .../common/DecimalDigitFilterFactory.java | 8 +-- .../DelimitedPayloadTokenFilterFactory.java | 6 +- ...tionaryCompoundWordTokenFilterFactory.java | 2 +- .../common/DutchAnalyzerProvider.java | 6 +- .../common/DutchStemTokenFilterFactory.java | 6 +- .../common/EdgeNGramTokenizerFactory.java | 4 +- .../common/ElisionTokenFilterFactory.java | 8 +-- .../common/EnglishAnalyzerProvider.java | 8 +-- .../common/EstonianAnalyzerProvider.java | 6 +- .../common/FingerprintAnalyzerProvider.java | 6 +- .../common/FinnishAnalyzerProvider.java | 8 +-- .../FlattenGraphTokenFilterFactory.java | 4 +- .../common/FrenchAnalyzerProvider.java | 6 +- .../common/FrenchStemTokenFilterFactory.java | 6 +- .../common/GalicianAnalyzerProvider.java | 8 +-- .../common/GermanAnalyzerProvider.java | 6 +- .../GermanNormalizationFilterFactory.java | 6 +- .../common/GermanStemTokenFilterFactory.java | 6 +- .../common/GreekAnalyzerProvider.java | 8 +-- .../common/HindiAnalyzerProvider.java | 8 +-- .../HindiNormalizationFilterFactory.java | 6 +- .../common/HtmlStripCharFilterFactory.java | 6 +- .../common/HungarianAnalyzerProvider.java | 6 +- ...enationCompoundWordTokenFilterFactory.java | 2 +- .../IndicNormalizationFilterFactory.java | 6 +- .../common/IndonesianAnalyzerProvider.java | 6 +- .../common/IrishAnalyzerProvider.java | 6 +- .../common/ItalianAnalyzerProvider.java | 8 +-- .../common/KStemTokenFilterFactory.java | 6 +- .../common/KeepTypesFilterFactory.java | 8 +-- .../common/KeepWordFilterFactory.java | 10 +-- .../KeywordMarkerTokenFilterFactory.java | 6 +- .../common/KeywordTokenizerFactory.java | 4 +- .../common/LatvianAnalyzerProvider.java | 8 +-- ...acyDelimitedPayloadTokenFilterFactory.java | 2 +- .../common/LengthTokenFilterFactory.java | 6 +- .../common/LetterTokenizerFactory.java | 4 +- .../common/LimitTokenCountFilterFactory.java | 4 +- .../common/LithuanianAnalyzerProvider.java | 8 +-- .../common/LowerCaseTokenFilterFactory.java | 8 +-- .../common/MappingCharFilterFactory.java | 10 +-- .../common/MinHashTokenFilterFactory.java | 6 +- .../common/NGramTokenizerFactory.java | 4 +- .../common/NorwegianAnalyzerProvider.java | 6 +- .../common/PathHierarchyTokenizerFactory.java | 4 +- .../common/PatternAnalyzerProvider.java | 8 +-- ...PatternCaptureGroupTokenFilterFactory.java | 6 +- .../PatternReplaceCharFilterFactory.java | 6 +- .../PatternReplaceTokenFilterFactory.java | 4 +- .../common/PatternTokenizerFactory.java | 4 +- .../common/PersianAnalyzerProvider.java | 6 +- .../PersianNormalizationFilterFactory.java | 6 +- .../common/PorterStemTokenFilterFactory.java | 6 +- .../common/PortugueseAnalyzerProvider.java | 6 +- .../PredicateTokenFilterScriptFactory.java | 4 +- .../RemoveDuplicatesTokenFilterFactory.java | 4 +- .../common/ReverseTokenFilterFactory.java | 4 +- .../common/RomanianAnalyzerProvider.java | 8 +-- .../common/RussianAnalyzerProvider.java | 6 +- .../common/RussianStemTokenFilterFactory.java | 4 +- .../ScandinavianFoldingFilterFactory.java | 6 +- ...candinavianNormalizationFilterFactory.java | 6 +- .../ScriptedConditionTokenFilterFactory.java | 10 +-- .../SerbianNormalizationFilterFactory.java | 6 +- .../SimplePatternSplitTokenizerFactory.java | 4 +- .../common/SimplePatternTokenizerFactory.java | 4 +- .../common/SnowballAnalyzerProvider.java | 6 +- .../common/SnowballTokenFilterFactory.java | 4 +- .../common/SoraniAnalyzerProvider.java | 6 +- .../SoraniNormalizationFilterFactory.java | 8 +-- .../common/SpanishAnalyzerProvider.java | 8 +-- .../StemmerOverrideTokenFilterFactory.java | 8 +-- .../common/StemmerTokenFilterFactory.java | 4 +- .../common/SwedishAnalyzerProvider.java | 6 +- .../SynonymGraphTokenFilterFactory.java | 10 +-- .../analysis/common/ThaiAnalyzerProvider.java | 8 +-- .../analysis/common/ThaiTokenizerFactory.java | 6 +- .../common/TrimTokenFilterFactory.java | 6 +- .../common/TruncateTokenFilterFactory.java | 4 +- .../common/TurkishAnalyzerProvider.java | 8 +-- .../common/UAX29URLEmailTokenizerFactory.java | 6 +- .../common/UniqueTokenFilterFactory.java | 4 +- .../common/UpperCaseTokenFilterFactory.java | 6 +- .../common/WhitespaceTokenizerFactory.java | 6 +- .../common/XLowerCaseTokenizerFactory.java | 4 +- .../analysis/common/painless_whitelist.txt | 4 +- .../ASCIIFoldingTokenFilterFactoryTests.java | 4 +- ...rdDelimiterTokenFilterFactoryTestCase.java | 2 +- .../common/CJKFilterFactoryTests.java | 2 +- .../CharGroupTokenizerFactoryTests.java | 4 +- .../common/CommonAnalysisPluginTests.java | 8 +-- .../CommonGramsTokenFilterFactoryTests.java | 6 +- .../common/CompoundAnalysisTests.java | 12 ++-- .../common/DisableGraphQueryTests.java | 18 ++--- .../EdgeNGramTokenFilterFactoryTests.java | 4 +- .../common/EdgeNGramTokenizerTests.java | 12 ++-- .../FlattenGraphTokenFilterFactoryTests.java | 4 +- .../HtmlStripCharFilterFactoryTests.java | 6 +- .../common/KeepFilterFactoryTests.java | 4 +- .../common/KeepTypesFilterFactoryTests.java | 4 +- .../KeywordMarkerFilterFactoryTests.java | 4 +- .../LimitTokenCountFilterFactoryTests.java | 4 +- .../common/MinHashFilterFactoryTests.java | 4 +- .../common/MultiplexerTokenFilterTests.java | 10 +-- .../common/NGramTokenFilterFactoryTests.java | 4 +- .../common/NGramTokenizerFactoryTests.java | 4 +- .../PathHierarchyTokenizerFactoryTests.java | 2 +- .../PatternCaptureTokenFilterTests.java | 8 +-- .../PredicateTokenScriptFilterTests.java | 8 +-- .../RemoveDuplicatesFilterFactoryTests.java | 4 +- .../ScriptedConditionTokenFilterTests.java | 10 +-- .../common/ShingleTokenFilterTests.java | 4 +- ...temmerOverrideTokenFilterFactoryTests.java | 2 +- .../StemmerTokenFilterFactoryTests.java | 8 +-- .../common/SynonymsAnalysisTests.java | 12 ++-- .../analysis/common/TrimTokenFilterTests.java | 4 +- .../WhitespaceTokenizerFactoryTests.java | 4 +- ...DelimiterGraphTokenFilterFactoryTests.java | 12 ++-- .../WordDelimiterTokenFilterFactoryTests.java | 4 +- .../java/org/opensearch/geo/GeoPlugin.java | 8 +-- .../ingest/common/IngestRestartIT.java | 2 +- .../common/AbstractStringProcessor.java | 8 +-- .../ingest/common/AppendProcessor.java | 10 +-- .../ingest/common/ConvertProcessor.java | 10 +-- .../opensearch/ingest/common/CsvParser.java | 2 +- .../ingest/common/CsvProcessor.java | 12 ++-- .../ingest/common/DateIndexNameProcessor.java | 8 +-- .../ingest/common/DissectProcessor.java | 8 +-- .../ingest/common/DotExpanderProcessor.java | 8 +-- .../ingest/common/FailProcessor.java | 8 +-- .../ingest/common/FailProcessorException.java | 4 +- .../ingest/common/ForEachProcessor.java | 18 ++--- .../ingest/common/GrokProcessor.java | 10 +-- .../ingest/common/GsubProcessor.java | 4 +- .../ingest/common/IngestCommonPlugin.java | 12 ++-- .../ingest/common/JoinProcessor.java | 8 +-- .../ingest/common/JsonProcessor.java | 10 +-- .../ingest/common/KeyValueProcessor.java | 8 +-- .../ingest/common/RemoveProcessor.java | 8 +-- .../ingest/common/RenameProcessor.java | 8 +-- .../ingest/common/SetProcessor.java | 10 +-- .../ingest/common/SortProcessor.java | 8 +-- .../ingest/common/SplitProcessor.java | 8 +-- .../ingest/common/processors_whitelist.txt | 4 +- .../AbstractStringProcessorTestCase.java | 4 +- .../ingest/common/AppendProcessorTests.java | 10 +-- .../ingest/common/BytesProcessorTests.java | 4 +- .../ingest/common/ConvertProcessorTests.java | 4 +- .../ingest/common/CsvProcessorTests.java | 2 +- .../common/DateIndexNameProcessorTests.java | 2 +- .../ingest/common/DateProcessorTests.java | 2 +- .../ingest/common/DissectProcessorTests.java | 4 +- .../common/DotExpanderProcessorTests.java | 4 +- .../ingest/common/FailProcessorTests.java | 4 +- .../common/ForEachProcessorFactoryTests.java | 2 +- .../ingest/common/ForEachProcessorTests.java | 10 +-- .../common/GrokProcessorGetActionTests.java | 2 +- .../ingest/common/GrokProcessorTests.java | 2 +- .../ingest/common/JoinProcessorTests.java | 4 +- .../ingest/common/JsonProcessorTests.java | 2 +- .../ingest/common/KeyValueProcessorTests.java | 4 +- .../ingest/common/RemoveProcessorTests.java | 4 +- .../ingest/common/RenameProcessorTests.java | 4 +- .../ingest/common/ScriptProcessorTests.java | 2 +- .../ingest/common/SetProcessorTests.java | 8 +-- .../ingest/common/SortProcessorTests.java | 4 +- .../ingest/common/SplitProcessorTests.java | 4 +- .../ingest/geoip/GeoIpProcessor.java | 14 ++-- .../ingest/geoip/IngestGeoIpPlugin.java | 4 +- .../geoip/GeoIpProcessorFactoryTests.java | 4 +- .../ingest/geoip/GeoIpProcessorTests.java | 2 +- .../useragent/IngestUserAgentPlugin.java | 2 +- .../ingest/useragent/UserAgentProcessor.java | 14 ++-- .../useragent/UserAgentProcessorTests.java | 2 +- .../expression/CountMethodValueSource.java | 6 +- .../script/expression/DateField.java | 2 +- .../expression/DateMethodValueSource.java | 6 +- .../script/expression/DateObject.java | 2 +- .../expression/DateObjectValueSource.java | 6 +- .../expression/EmptyMemberValueSource.java | 6 +- .../FieldDataBasedDoubleValuesSource.java | 2 +- .../expression/FieldDataValueSource.java | 6 +- .../expression/GeoEmptyValueSource.java | 6 +- .../script/expression/GeoField.java | 2 +- .../expression/GeoLatitudeValueSource.java | 6 +- .../expression/GeoLongitudeValueSource.java | 6 +- .../script/expression/NumericField.java | 2 +- .../ExpressionFieldScriptTests.java | 10 +-- .../ExpressionNumberSortScriptTests.java | 12 ++-- .../ExpressionTermsSetQueryTests.java | 12 ++-- .../opensearch/painless/NeedsScoreTests.java | 4 +- .../painless/SimilarityScriptTests.java | 2 +- .../action/PainlessExecuteApiTests.java | 4 +- .../spi/org.elasticsearch.painless.test | 30 ++++----- .../index/mapper/TokenCountFieldMapper.java | 2 +- .../mapper/RankFeaturesFieldMapperTests.java | 2 +- .../SearchAsYouTypeFieldMapperTests.java | 8 +-- .../mapper/SearchAsYouTypeFieldTypeTests.java | 18 ++--- .../OpenSearchDashboardsSystemIndexIT.java | 2 +- .../join/aggregations/ParentIT.java | 2 +- .../org/opensearch/join/ParentJoinPlugin.java | 2 +- .../ChildrenAggregationBuilder.java | 4 +- .../ChildrenAggregatorFactory.java | 2 +- .../ParentAggregationBuilder.java | 4 +- .../aggregations/ParentAggregatorFactory.java | 2 +- .../join/mapper/MetaJoinFieldMapper.java | 18 ++--- .../join/mapper/ParentIdFieldMapper.java | 18 ++--- .../join/mapper/ParentJoinFieldMapper.java | 32 ++++----- .../join/query/HasChildQueryBuilder.java | 22 +++---- .../join/query/HasParentQueryBuilder.java | 18 ++--- .../join/query/JoinQueryBuilders.java | 2 +- .../join/query/ParentIdQueryBuilder.java | 6 +- .../spi/ParentJoinNamedXContentProvider.java | 2 +- .../join/aggregations/ChildrenTests.java | 2 +- .../ChildrenToParentAggregatorTests.java | 6 +- .../aggregations/InternalChildrenTests.java | 6 +- .../aggregations/InternalParentTests.java | 6 +- .../join/aggregations/ParentTests.java | 2 +- .../ParentToChildrenAggregatorTests.java | 4 +- .../mapper/ParentJoinFieldMapperTests.java | 14 ++-- .../join/query/HasChildQueryBuilderTests.java | 26 ++++---- .../query/HasParentQueryBuilderTests.java | 20 +++--- .../join/query/ParentIdQueryBuilderTests.java | 6 +- .../percolator/PercolatorQuerySearchIT.java | 38 +++++------ .../percolator/PercolateQueryBuilder.java | 34 +++++----- .../percolator/PercolatorPlugin.java | 8 +-- .../opensearch/percolator/QueryAnalyzer.java | 2 +- .../percolator/CandidateQueryTests.java | 16 ++--- .../PercolateQueryBuilderTests.java | 12 ++-- .../PercolateWithNestedQueryBuilderTests.java | 6 +- .../PercolatorFieldMapperTests.java | 66 +++++++++---------- ...rcolatorMatchedSlotSubFetchPhaseTests.java | 2 +- .../PercolatorQuerySearchTests.java | 26 ++++---- .../percolator/QueryAnalyzerTests.java | 4 +- .../percolator/QueryBuilderStoreTests.java | 16 ++--- .../index/rankeval/RankEvalRequestIT.java | 10 +-- .../DiscountedCumulativeGainTests.java | 4 +- .../index/rankeval/EvalQueryQualityTests.java | 2 +- .../rankeval/ExpectedReciprocalRankTests.java | 4 +- .../rankeval/MeanReciprocalRankTests.java | 2 +- .../index/rankeval/PrecisionAtKTests.java | 4 +- .../index/rankeval/RankEvalResponseTests.java | 4 +- .../index/rankeval/RankEvalSpecTests.java | 4 +- .../index/rankeval/RatedRequestsTests.java | 4 +- .../index/rankeval/RatedSearchHitTests.java | 2 +- .../index/rankeval/RecallAtKTests.java | 2 +- .../TransportRankEvalActionTests.java | 2 +- modules/reindex/build.gradle | 6 +- .../documentation/ReindexDocumentationIT.java | 28 ++++---- .../AbstractAsyncBulkByScrollAction.java | 30 ++++----- .../reindex/AsyncDeleteByQueryAction.java | 4 -- .../BulkByScrollParallelizationHelper.java | 10 +-- ...kIndexByScrollResponseContentListener.java | 3 +- .../index/reindex/ReindexPlugin.java | 5 +- .../opensearch/index/reindex/Reindexer.java | 13 +--- .../index/reindex/TransportReindexAction.java | 4 -- .../reindex/remote/RemoteResponseParsers.java | 8 +-- .../remote/RemoteScrollableHitSource.java | 4 +- ...yncBulkByScrollActionMetadataTestCase.java | 4 -- ...AsyncBulkByScrollActionScriptTestCase.java | 5 +- ...ulkByScrollParallelizationHelperTests.java | 2 +- .../BulkIndexByScrollResponseMatcher.java | 1 - .../BulkIndexByScrollResponseTests.java | 4 +- .../opensearch/index/reindex/CancelTests.java | 20 ++---- .../ClientScrollableHitSourceTests.java | 2 - .../reindex/DeleteByQueryBasicTests.java | 13 ++-- .../reindex/DeleteByQueryConcurrentTests.java | 9 ++- .../index/reindex/ReindexBasicTests.java | 5 +- .../index/reindex/ReindexFailureTests.java | 2 - ...ReindexFromRemoteBuildRestClientTests.java | 3 +- .../ReindexFromRemoteWhitelistTests.java | 1 - .../ReindexFromRemoteWithAuthTests.java | 3 - .../index/reindex/ReindexMetadataTests.java | 4 +- .../reindex/ReindexRestClientSslTests.java | 1 - .../index/reindex/ReindexSingleNodeTests.java | 4 +- .../index/reindex/ReindexTestCase.java | 7 -- .../index/reindex/ReindexVersioningTests.java | 6 +- .../index/reindex/RethrottleTests.java | 8 +-- .../opensearch/index/reindex/RetryTests.java | 12 +--- .../index/reindex/RoundTripTests.java | 8 --- .../TransportRethrottleActionTests.java | 2 - .../reindex/UpdateByQueryBasicTests.java | 5 +- .../reindex/UpdateByQueryMetadataTests.java | 4 +- .../UpdateByQueryWhileModifyingTests.java | 3 +- .../reindex/UpdateByQueryWithScriptTests.java | 2 - .../index/reindex/remote/RemoteInfoTests.java | 2 +- .../RemoteScrollableHitSourceTests.java | 6 +- .../test/resources/responses/rejection.json | 2 +- .../repository/url/URLRepositoryPlugin.java | 2 +- .../repositories/url/URLRepositoryTests.java | 2 +- .../netty4/Netty4HttpRequestSizeLimitIT.java | 2 +- ...Netty4TransportMultiPortIntegrationIT.java | 2 +- .../opensearch/transport/NettyAllocator.java | 2 +- .../http/netty4/Netty4BadRequestTests.java | 2 +- .../Netty4HttpServerPipeliningTests.java | 2 +- .../Netty4HttpServerTransportTests.java | 2 +- .../Netty4SizeHeaderFrameDecoderTests.java | 2 +- .../transport/netty4/Netty4UtilsTests.java | 2 +- .../netty4/NettyTransportMultiPortTests.java | 2 +- .../netty4/SimpleNetty4TransportTests.java | 2 +- 331 files changed, 1041 insertions(+), 1144 deletions(-) diff --git a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/spi/MatrixStatsNamedXContentProvider.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/spi/MatrixStatsNamedXContentProvider.java index 71d1f04c82d..4ea3b2bfd8e 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/spi/MatrixStatsNamedXContentProvider.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/spi/MatrixStatsNamedXContentProvider.java @@ -23,7 +23,7 @@ import org.opensearch.common.ParseField; import org.opensearch.common.xcontent.ContextParser; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.plugins.spi.NamedXContentProvider; -import org.elasticsearch.search.aggregations.Aggregation; +import org.opensearch.search.aggregations.Aggregation; import org.opensearch.search.aggregations.matrix.stats.MatrixStatsAggregationBuilder; import org.opensearch.search.aggregations.matrix.stats.ParsedMatrixStats; diff --git a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregationBuilder.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregationBuilder.java index 2aa60c994dc..f147f961118 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregationBuilder.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregationBuilder.java @@ -22,7 +22,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.index.query.QueryShardContext; +import org.opensearch.index.query.QueryShardContext; import org.opensearch.search.MultiValueMode; import org.opensearch.search.aggregations.AggregationBuilder; import org.opensearch.search.aggregations.AggregatorFactories; diff --git a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregator.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregator.java index b38b47d9f15..ce16bac4a57 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregator.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregator.java @@ -23,7 +23,7 @@ import org.apache.lucene.search.ScoreMode; import org.opensearch.common.lease.Releasables; import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.ObjectArray; -import org.elasticsearch.index.fielddata.NumericDoubleValues; +import org.opensearch.index.fielddata.NumericDoubleValues; import org.opensearch.search.MultiValueMode; import org.opensearch.search.aggregations.Aggregator; import org.opensearch.search.aggregations.InternalAggregation; diff --git a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorFactory.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorFactory.java index 223e594bb93..28bc806eca7 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorFactory.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorFactory.java @@ -18,7 +18,7 @@ */ package org.opensearch.search.aggregations.matrix.stats; -import org.elasticsearch.index.query.QueryShardContext; +import org.opensearch.index.query.QueryShardContext; import org.opensearch.search.MultiValueMode; import org.opensearch.search.aggregations.AggregationExecutionException; import org.opensearch.search.aggregations.Aggregator; diff --git a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSource.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSource.java index 85cdb1c2a5b..fa3d470db01 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSource.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSource.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.support; import org.apache.lucene.index.LeafReaderContext; -import org.elasticsearch.index.fielddata.NumericDoubleValues; +import org.opensearch.index.fielddata.NumericDoubleValues; import org.opensearch.search.MultiValueMode; import org.opensearch.search.aggregations.support.ValuesSource; diff --git a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSourceAggregationBuilder.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSourceAggregationBuilder.java index 9bcabf06517..7ac1b018ff7 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSourceAggregationBuilder.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSourceAggregationBuilder.java @@ -22,7 +22,7 @@ import org.opensearch.common.ParseField; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.index.query.QueryShardContext; +import org.opensearch.index.query.QueryShardContext; import org.opensearch.search.aggregations.AbstractAggregationBuilder; import org.opensearch.search.aggregations.AggregationInitializationException; import org.opensearch.search.aggregations.AggregatorFactories; diff --git a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSourceAggregatorFactory.java b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSourceAggregatorFactory.java index a56492b7509..e54deb108fb 100644 --- a/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSourceAggregatorFactory.java +++ b/modules/aggs-matrix-stats/src/main/java/org/opensearch/search/aggregations/support/ArrayValuesSourceAggregatorFactory.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.support; -import org.elasticsearch.index.query.QueryShardContext; +import org.opensearch.index.query.QueryShardContext; import org.opensearch.search.aggregations.Aggregator; import org.opensearch.search.aggregations.AggregatorFactories; import org.opensearch.search.aggregations.AggregatorFactory; diff --git a/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java b/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java index d9bda26e0cd..247c3515569 100644 --- a/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java +++ b/modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java @@ -28,10 +28,10 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.util.NumericUtils; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.NumberFieldMapper; import org.opensearch.plugins.SearchPlugin; -import org.elasticsearch.search.aggregations.AggregatorTestCase; +import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.matrix.MatrixAggregationPlugin; import java.util.Arrays; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactory.java index fb00e03a5db..4fa704dee22 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactory.java @@ -24,10 +24,10 @@ import org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilter; import org.opensearch.common.ParseField; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; -import org.elasticsearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.NormalizingTokenFilterFactory; +import org.opensearch.index.analysis.TokenFilterFactory; /** * Factory for ASCIIFoldingFilter. diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/AbstractCompoundWordTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/AbstractCompoundWordTokenFilterFactory.java index 2bcd872fa86..9d6572cc8cc 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/AbstractCompoundWordTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/AbstractCompoundWordTokenFilterFactory.java @@ -23,10 +23,10 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.compound.CompoundWordTokenFilterBase; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.Analysis; -import org.elasticsearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.Analysis; +import org.opensearch.index.analysis.TokenFilterFactory; /** * Contains the common configuration settings between subclasses of this class. diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ApostropheFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ApostropheFilterFactory.java index 7242d4c3518..eed7642f6f8 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ApostropheFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ApostropheFilterFactory.java @@ -21,9 +21,9 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tr.ApostropheFilter; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; /** * Factory for {@link ApostropheFilter} diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicAnalyzerProvider.java index 4b41e2d78de..1d61e11f07b 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicAnalyzerProvider.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.ar.ArabicAnalyzer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class ArabicAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicNormalizationFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicNormalizationFilterFactory.java index 6aa8ffb5e6e..8078da82f14 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicNormalizationFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicNormalizationFilterFactory.java @@ -22,9 +22,9 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.ar.ArabicNormalizationFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.NormalizingTokenFilterFactory; public class ArabicNormalizationFilterFactory extends AbstractTokenFilterFactory implements NormalizingTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicStemTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicStemTokenFilterFactory.java index d6ffdf8ff7d..d1bfa76857c 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicStemTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicStemTokenFilterFactory.java @@ -23,8 +23,8 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.ar.ArabicStemFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; public class ArabicStemTokenFilterFactory extends AbstractTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BasqueAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BasqueAnalyzerProvider.java index c33b38ce15e..c14dee604c2 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BasqueAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BasqueAnalyzerProvider.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.eu.BasqueAnalyzer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class BasqueAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BengaliAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BengaliAnalyzerProvider.java index 256bc89b121..f189299aa87 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BengaliAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BengaliAnalyzerProvider.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.bn.BengaliAnalyzer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class BengaliAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BengaliNormalizationFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BengaliNormalizationFilterFactory.java index 6c36b815b67..ffdfbe83fb9 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BengaliNormalizationFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BengaliNormalizationFilterFactory.java @@ -21,10 +21,10 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.bn.BengaliNormalizationFilter; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.NormalizingTokenFilterFactory; /** * Factory for {@link BengaliNormalizationFilter} diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BrazilianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BrazilianAnalyzerProvider.java index ee3e34bb6cb..bf15786e8c9 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BrazilianAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BrazilianAnalyzerProvider.java @@ -22,10 +22,10 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.br.BrazilianAnalyzer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class BrazilianAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BrazilianStemTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BrazilianStemTokenFilterFactory.java index dce517b8760..4c05e5cced7 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BrazilianStemTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BrazilianStemTokenFilterFactory.java @@ -25,9 +25,9 @@ import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; import org.apache.lucene.analysis.CharArraySet; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.Analysis; public class BrazilianStemTokenFilterFactory extends AbstractTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BulgarianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BulgarianAnalyzerProvider.java index 3b63db592cd..c5cf3927b36 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BulgarianAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BulgarianAnalyzerProvider.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.bg.BulgarianAnalyzer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class BulgarianAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CJKWidthFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CJKWidthFilterFactory.java index ca122ca920c..43d644161fe 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CJKWidthFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CJKWidthFilterFactory.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.cjk.CJKWidthFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.NormalizingTokenFilterFactory; public final class CJKWidthFilterFactory extends AbstractTokenFilterFactory implements NormalizingTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CatalanAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CatalanAnalyzerProvider.java index 486072d616e..139b841a159 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CatalanAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CatalanAnalyzerProvider.java @@ -22,10 +22,10 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.ca.CatalanAnalyzer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class CatalanAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CharGroupTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CharGroupTokenizerFactory.java index 42230b52399..186db70c909 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CharGroupTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CharGroupTokenizerFactory.java @@ -24,8 +24,8 @@ import org.apache.lucene.analysis.util.CharTokenizer; import org.apache.lucene.util.AttributeFactory; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenizerFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenizerFactory; import java.util.HashSet; import java.util.Set; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ChineseAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ChineseAnalyzerProvider.java index 6f755182d40..2c2e5154d23 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ChineseAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ChineseAnalyzerProvider.java @@ -22,9 +22,9 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.en.EnglishAnalyzer; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; /** * Only for old indexes diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CjkAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CjkAnalyzerProvider.java index faff604b2f8..6abda15f0e2 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CjkAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CjkAnalyzerProvider.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.cjk.CJKAnalyzer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class CjkAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ClassicFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ClassicFilterFactory.java index 65ba64f96b6..4f44d389c86 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ClassicFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ClassicFilterFactory.java @@ -22,8 +22,8 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.standard.ClassicFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; /** * Factory for {@link ClassicFilter} diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ClassicTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ClassicTokenizerFactory.java index a8a593dcfcc..2feb5d3e6e9 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ClassicTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ClassicTokenizerFactory.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.standard.ClassicTokenizer; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenizerFactory; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenizerFactory; /** * Factory for {@link ClassicTokenizer} diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java index e96d50f1316..70f09405d62 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java @@ -120,17 +120,17 @@ import org.opensearch.common.logging.DeprecationLogger; import org.opensearch.common.regex.Regex; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.env.Environment; -import org.elasticsearch.env.NodeEnvironment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AnalyzerProvider; -import org.elasticsearch.index.analysis.CharFilterFactory; -import org.elasticsearch.index.analysis.PreBuiltAnalyzerProviderFactory; -import org.elasticsearch.index.analysis.PreConfiguredCharFilter; -import org.elasticsearch.index.analysis.PreConfiguredTokenFilter; -import org.elasticsearch.index.analysis.PreConfiguredTokenizer; -import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.index.analysis.TokenizerFactory; +import org.opensearch.env.Environment; +import org.opensearch.env.NodeEnvironment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AnalyzerProvider; +import org.opensearch.index.analysis.CharFilterFactory; +import org.opensearch.index.analysis.PreBuiltAnalyzerProviderFactory; +import org.opensearch.index.analysis.PreConfiguredCharFilter; +import org.opensearch.index.analysis.PreConfiguredTokenFilter; +import org.opensearch.index.analysis.PreConfiguredTokenizer; +import org.opensearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.analysis.TokenizerFactory; import org.opensearch.indices.analysis.AnalysisModule.AnalysisProvider; import org.opensearch.indices.analysis.PreBuiltCacheFactory.CachingStrategy; import org.opensearch.plugins.AnalysisPlugin; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CzechAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CzechAnalyzerProvider.java index 1fff2e234cb..e44ecbaa01c 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CzechAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CzechAnalyzerProvider.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.cz.CzechAnalyzer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class CzechAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CzechStemTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CzechStemTokenFilterFactory.java index 16306ab7f11..608cda40b8d 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CzechStemTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CzechStemTokenFilterFactory.java @@ -22,8 +22,8 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.cz.CzechStemFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; public class CzechStemTokenFilterFactory extends AbstractTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DanishAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DanishAnalyzerProvider.java index f567e3a7558..49154f8e964 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DanishAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DanishAnalyzerProvider.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.da.DanishAnalyzer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class DanishAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DecimalDigitFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DecimalDigitFilterFactory.java index 15a160f4a00..5dbbbe0425f 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DecimalDigitFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DecimalDigitFilterFactory.java @@ -22,10 +22,10 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.DecimalDigitFilter; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.NormalizingTokenFilterFactory; /** * Factory for {@link DecimalDigitFilter} diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DelimitedPayloadTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DelimitedPayloadTokenFilterFactory.java index 15f323c1b0a..4504723980f 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DelimitedPayloadTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DelimitedPayloadTokenFilterFactory.java @@ -26,9 +26,9 @@ import org.apache.lucene.analysis.payloads.IdentityEncoder; import org.apache.lucene.analysis.payloads.IntegerEncoder; import org.apache.lucene.analysis.payloads.PayloadEncoder; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; public class DelimitedPayloadTokenFilterFactory extends AbstractTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DictionaryCompoundWordTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DictionaryCompoundWordTokenFilterFactory.java index 671838a5c53..5d559a4bb4e 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DictionaryCompoundWordTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DictionaryCompoundWordTokenFilterFactory.java @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.compound.DictionaryCompoundWordTokenFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; +import org.opensearch.index.IndexSettings; /** diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DutchAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DutchAnalyzerProvider.java index 392b7ce0aca..03642a6585b 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DutchAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DutchAnalyzerProvider.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.nl.DutchAnalyzer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class DutchAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DutchStemTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DutchStemTokenFilterFactory.java index f3e90330168..fd9660c8a7f 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DutchStemTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DutchStemTokenFilterFactory.java @@ -25,9 +25,9 @@ import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; import org.apache.lucene.analysis.snowball.SnowballFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.Analysis; import org.tartarus.snowball.ext.DutchStemmer; public class DutchStemTokenFilterFactory extends AbstractTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EdgeNGramTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EdgeNGramTokenizerFactory.java index 2de648f74ca..a9e2c9ead49 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EdgeNGramTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EdgeNGramTokenizerFactory.java @@ -24,8 +24,8 @@ import org.apache.lucene.analysis.ngram.EdgeNGramTokenizer; import org.apache.lucene.analysis.ngram.NGramTokenizer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenizerFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenizerFactory; import static org.opensearch.analysis.common.NGramTokenizerFactory.parseTokenChars; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ElisionTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ElisionTokenFilterFactory.java index b33467c482c..21a38e5a5a9 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ElisionTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ElisionTokenFilterFactory.java @@ -24,10 +24,10 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.ElisionFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.Analysis; -import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.Analysis; +import org.opensearch.index.analysis.NormalizingTokenFilterFactory; public class ElisionTokenFilterFactory extends AbstractTokenFilterFactory implements NormalizingTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EnglishAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EnglishAnalyzerProvider.java index e38c5c03f6a..4801f95e428 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EnglishAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EnglishAnalyzerProvider.java @@ -22,10 +22,10 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.en.EnglishAnalyzer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class EnglishAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EstonianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EstonianAnalyzerProvider.java index 256ba388798..fe8a536d9f4 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EstonianAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EstonianAnalyzerProvider.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.et.EstonianAnalyzer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class EstonianAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FingerprintAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FingerprintAnalyzerProvider.java index 27833ca60fc..f6ba608a211 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FingerprintAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FingerprintAnalyzerProvider.java @@ -24,9 +24,9 @@ import org.apache.lucene.analysis.CharArraySet; import org.opensearch.common.ParseField; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; /** diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FinnishAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FinnishAnalyzerProvider.java index b5f96842724..350035d7dfc 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FinnishAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FinnishAnalyzerProvider.java @@ -22,10 +22,10 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.fi.FinnishAnalyzer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class FinnishAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactory.java index 6543071dd8d..d24df393c11 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactory.java @@ -23,8 +23,8 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.FlattenGraphFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; public class FlattenGraphTokenFilterFactory extends AbstractTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FrenchAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FrenchAnalyzerProvider.java index df4b98d2956..9d213636eef 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FrenchAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FrenchAnalyzerProvider.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.fr.FrenchAnalyzer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class FrenchAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FrenchStemTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FrenchStemTokenFilterFactory.java index e6ae1b9a5c8..c00f7be2381 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FrenchStemTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FrenchStemTokenFilterFactory.java @@ -25,9 +25,9 @@ import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; import org.apache.lucene.analysis.snowball.SnowballFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.Analysis; import org.tartarus.snowball.ext.FrenchStemmer; public class FrenchStemTokenFilterFactory extends AbstractTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GalicianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GalicianAnalyzerProvider.java index 01612cad3dc..7f3289ba731 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GalicianAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GalicianAnalyzerProvider.java @@ -22,10 +22,10 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.gl.GalicianAnalyzer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class GalicianAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanAnalyzerProvider.java index 916a33141fc..55aed6a5d60 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanAnalyzerProvider.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.de.GermanAnalyzer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class GermanAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanNormalizationFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanNormalizationFilterFactory.java index 028ac614b67..81ae56fc86f 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanNormalizationFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanNormalizationFilterFactory.java @@ -22,9 +22,9 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.de.GermanNormalizationFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.NormalizingTokenFilterFactory; /** * Factory for {@link GermanNormalizationFilter} diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanStemTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanStemTokenFilterFactory.java index 50465cf7028..eb9dac22ebe 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanStemTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanStemTokenFilterFactory.java @@ -25,9 +25,9 @@ import org.apache.lucene.analysis.de.GermanStemFilter; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.Analysis; public class GermanStemTokenFilterFactory extends AbstractTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GreekAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GreekAnalyzerProvider.java index 9b0256905ce..a8b1635a58f 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GreekAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GreekAnalyzerProvider.java @@ -21,10 +21,10 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.el.GreekAnalyzer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class GreekAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HindiAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HindiAnalyzerProvider.java index 019ab43e333..bd80f07376a 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HindiAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HindiAnalyzerProvider.java @@ -22,10 +22,10 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.hi.HindiAnalyzer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class HindiAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HindiNormalizationFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HindiNormalizationFilterFactory.java index 06e4434d7b8..0fea4c55c02 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HindiNormalizationFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HindiNormalizationFilterFactory.java @@ -22,9 +22,9 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.hi.HindiNormalizationFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.NormalizingTokenFilterFactory; /** * Factory for {@link HindiNormalizationFilter} diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HtmlStripCharFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HtmlStripCharFilterFactory.java index 9b0ebce4368..31bc3f12636 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HtmlStripCharFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HtmlStripCharFilterFactory.java @@ -21,9 +21,9 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.charfilter.HTMLStripCharFilter; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractCharFilterFactory; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractCharFilterFactory; import java.io.Reader; import java.util.List; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HungarianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HungarianAnalyzerProvider.java index f6ba734691d..fbd8136a784 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HungarianAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HungarianAnalyzerProvider.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.hu.HungarianAnalyzer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class HungarianAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HyphenationCompoundWordTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HyphenationCompoundWordTokenFilterFactory.java index 082b03486e1..03481a36eb1 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HyphenationCompoundWordTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HyphenationCompoundWordTokenFilterFactory.java @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.compound.HyphenationCompoundWordTokenFilter; import org.apache.lucene.analysis.compound.hyphenation.HyphenationTree; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; +import org.opensearch.index.IndexSettings; import org.xml.sax.InputSource; import java.io.InputStream; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/IndicNormalizationFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/IndicNormalizationFilterFactory.java index bd4d7617545..21893056448 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/IndicNormalizationFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/IndicNormalizationFilterFactory.java @@ -22,9 +22,9 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.in.IndicNormalizationFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.NormalizingTokenFilterFactory; /** * Factory for {@link IndicNormalizationFilter} diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/IndonesianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/IndonesianAnalyzerProvider.java index 4b6b606b57d..05b8c70d847 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/IndonesianAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/IndonesianAnalyzerProvider.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.id.IndonesianAnalyzer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class IndonesianAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/IrishAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/IrishAnalyzerProvider.java index b04ab113bb1..235fa9d5aae 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/IrishAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/IrishAnalyzerProvider.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.ga.IrishAnalyzer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; /** * Provider for {@link IrishAnalyzer} diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ItalianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ItalianAnalyzerProvider.java index 648de4f3d10..b788733a509 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ItalianAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ItalianAnalyzerProvider.java @@ -22,10 +22,10 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.it.ItalianAnalyzer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class ItalianAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KStemTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KStemTokenFilterFactory.java index 256429c0bf0..bea2162fe47 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KStemTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KStemTokenFilterFactory.java @@ -22,9 +22,9 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.en.KStemFilter; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; public class KStemTokenFilterFactory extends AbstractTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeepTypesFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeepTypesFilterFactory.java index 5841c4a032a..79d9c1413d7 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeepTypesFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeepTypesFilterFactory.java @@ -22,10 +22,10 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.TypeTokenFilter; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.TokenFilterFactory; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.TokenFilterFactory; import java.util.HashSet; import java.util.List; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeepWordFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeepWordFilterFactory.java index c5e67d3aa21..7e245425028 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeepWordFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeepWordFilterFactory.java @@ -24,11 +24,11 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.KeepWordFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.Analysis; -import org.elasticsearch.index.analysis.StopTokenFilterFactory; -import org.elasticsearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.Analysis; +import org.opensearch.index.analysis.StopTokenFilterFactory; +import org.opensearch.index.analysis.TokenFilterFactory; import java.util.List; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeywordMarkerTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeywordMarkerTokenFilterFactory.java index a824e3b464e..1fd52429398 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeywordMarkerTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeywordMarkerTokenFilterFactory.java @@ -25,9 +25,9 @@ import org.apache.lucene.analysis.miscellaneous.PatternKeywordMarkerFilter; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.Analysis; import java.util.Set; import java.util.regex.Pattern; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeywordTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeywordTokenizerFactory.java index 9944cae740e..af68b25ac1b 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeywordTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeywordTokenizerFactory.java @@ -23,8 +23,8 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenizerFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenizerFactory; public class KeywordTokenizerFactory extends AbstractTokenizerFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LatvianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LatvianAnalyzerProvider.java index 8d4b142e792..11ba16cc4cd 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LatvianAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LatvianAnalyzerProvider.java @@ -22,10 +22,10 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.lv.LatvianAnalyzer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class LatvianAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LegacyDelimitedPayloadTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LegacyDelimitedPayloadTokenFilterFactory.java index c0cadf48c39..ec07d22b47b 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LegacyDelimitedPayloadTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LegacyDelimitedPayloadTokenFilterFactory.java @@ -21,7 +21,7 @@ package org.opensearch.analysis.common; import org.opensearch.Version; import org.opensearch.common.logging.DeprecationLogger; -import org.elasticsearch.common.settings.Settings; +import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; import org.opensearch.index.IndexSettings; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LengthTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LengthTokenFilterFactory.java index 48d29cd7d78..dde33876ae7 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LengthTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LengthTokenFilterFactory.java @@ -22,9 +22,9 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.LengthFilter; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; public class LengthTokenFilterFactory extends AbstractTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LetterTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LetterTokenizerFactory.java index c88438cf9e8..94f26ece8ac 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LetterTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LetterTokenizerFactory.java @@ -23,8 +23,8 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.LetterTokenizer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenizerFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenizerFactory; public class LetterTokenizerFactory extends AbstractTokenizerFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LimitTokenCountFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LimitTokenCountFilterFactory.java index dfba7ee30ae..2059d4652f9 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LimitTokenCountFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LimitTokenCountFilterFactory.java @@ -23,8 +23,8 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.LimitTokenCountFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; public class LimitTokenCountFilterFactory extends AbstractTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LithuanianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LithuanianAnalyzerProvider.java index 1d69db9250b..247a4c16991 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LithuanianAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LithuanianAnalyzerProvider.java @@ -22,10 +22,10 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.lt.LithuanianAnalyzer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; /** * Provider for {@link LithuanianAnalyzer} diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LowerCaseTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LowerCaseTokenFilterFactory.java index 7bafe38c575..fbff0fc0b58 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LowerCaseTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LowerCaseTokenFilterFactory.java @@ -25,10 +25,10 @@ import org.apache.lucene.analysis.el.GreekLowerCaseFilter; import org.apache.lucene.analysis.ga.IrishLowerCaseFilter; import org.apache.lucene.analysis.tr.TurkishLowerCaseFilter; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.NormalizingTokenFilterFactory; /** * Factory for {@link LowerCaseFilter} and some language-specific variants diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/MappingCharFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/MappingCharFilterFactory.java index 989591198f3..1f966036881 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/MappingCharFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/MappingCharFilterFactory.java @@ -22,11 +22,11 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.charfilter.MappingCharFilter; import org.apache.lucene.analysis.charfilter.NormalizeCharMap; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractCharFilterFactory; -import org.elasticsearch.index.analysis.Analysis; -import org.elasticsearch.index.analysis.NormalizingCharFilterFactory; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractCharFilterFactory; +import org.opensearch.index.analysis.Analysis; +import org.opensearch.index.analysis.NormalizingCharFilterFactory; import java.io.Reader; import java.util.List; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/MinHashTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/MinHashTokenFilterFactory.java index fab62aa6e99..c3a7593d4d9 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/MinHashTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/MinHashTokenFilterFactory.java @@ -22,9 +22,9 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.minhash.MinHashFilterFactory; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; import java.util.HashMap; import java.util.Map; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/NGramTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/NGramTokenizerFactory.java index 1c3a156de15..38c53a35f1d 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/NGramTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/NGramTokenizerFactory.java @@ -24,8 +24,8 @@ import org.apache.lucene.analysis.ngram.NGramTokenizer; import org.opensearch.Version; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenizerFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenizerFactory; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/NorwegianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/NorwegianAnalyzerProvider.java index c2db872de21..95f637889c6 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/NorwegianAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/NorwegianAnalyzerProvider.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.no.NorwegianAnalyzer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class NorwegianAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PathHierarchyTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PathHierarchyTokenizerFactory.java index 2219a817bc3..79ee455a1a6 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PathHierarchyTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PathHierarchyTokenizerFactory.java @@ -24,8 +24,8 @@ import org.apache.lucene.analysis.path.PathHierarchyTokenizer; import org.apache.lucene.analysis.path.ReversePathHierarchyTokenizer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenizerFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenizerFactory; public class PathHierarchyTokenizerFactory extends AbstractTokenizerFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternAnalyzerProvider.java index 382e8b77478..448727e5e6d 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternAnalyzerProvider.java @@ -23,10 +23,10 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; import org.opensearch.common.regex.Regex; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; import java.util.regex.Pattern; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternCaptureGroupTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternCaptureGroupTokenFilterFactory.java index 0a6c867dba9..1367c2cb984 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternCaptureGroupTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternCaptureGroupTokenFilterFactory.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.pattern.PatternCaptureGroupTokenFilter; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; import java.util.List; import java.util.regex.Pattern; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternReplaceCharFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternReplaceCharFilterFactory.java index 7ed3daf1c8d..9ef099ce79a 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternReplaceCharFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternReplaceCharFilterFactory.java @@ -23,9 +23,9 @@ import org.opensearch.common.Strings; import org.opensearch.common.regex.Regex; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractCharFilterFactory; -import org.elasticsearch.index.analysis.NormalizingCharFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractCharFilterFactory; +import org.opensearch.index.analysis.NormalizingCharFilterFactory; import java.io.Reader; import java.util.regex.Pattern; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternReplaceTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternReplaceTokenFilterFactory.java index 1659e79234f..05dbac2ebc8 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternReplaceTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternReplaceTokenFilterFactory.java @@ -24,8 +24,8 @@ import org.apache.lucene.analysis.pattern.PatternReplaceFilter; import org.opensearch.common.regex.Regex; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; import java.util.regex.Pattern; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternTokenizerFactory.java index e8b1b88f40f..22104b29fad 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternTokenizerFactory.java @@ -24,8 +24,8 @@ import org.apache.lucene.analysis.pattern.PatternTokenizer; import org.opensearch.common.regex.Regex; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenizerFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenizerFactory; import java.util.regex.Pattern; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PersianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PersianAnalyzerProvider.java index 51eafcb531c..25793b80408 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PersianAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PersianAnalyzerProvider.java @@ -22,9 +22,9 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.fa.PersianAnalyzer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class PersianAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PersianNormalizationFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PersianNormalizationFilterFactory.java index 61c18cb025f..095913ec38f 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PersianNormalizationFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PersianNormalizationFilterFactory.java @@ -22,9 +22,9 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.fa.PersianNormalizationFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.NormalizingTokenFilterFactory; public class PersianNormalizationFilterFactory extends AbstractTokenFilterFactory implements NormalizingTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PorterStemTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PorterStemTokenFilterFactory.java index b82a76a7155..2d66d214e87 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PorterStemTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PorterStemTokenFilterFactory.java @@ -22,9 +22,9 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.en.PorterStemFilter; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; public class PorterStemTokenFilterFactory extends AbstractTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PortugueseAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PortugueseAnalyzerProvider.java index f807bbfe065..77c65140339 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PortugueseAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PortugueseAnalyzerProvider.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.pt.PortugueseAnalyzer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class PortugueseAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PredicateTokenFilterScriptFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PredicateTokenFilterScriptFactory.java index 525f355f9d1..7d497e6df1c 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PredicateTokenFilterScriptFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PredicateTokenFilterScriptFactory.java @@ -22,8 +22,8 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.FilteringTokenFilter; import org.apache.lucene.analysis.TokenStream; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; import org.opensearch.script.Script; import org.opensearch.script.ScriptService; import org.opensearch.script.ScriptType; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RemoveDuplicatesTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RemoveDuplicatesTokenFilterFactory.java index df48395a85a..6b0a56d4140 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RemoveDuplicatesTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RemoveDuplicatesTokenFilterFactory.java @@ -23,8 +23,8 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.RemoveDuplicatesTokenFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; /** * Filter factory for the lucene RemoveDuplicatesTokenFilter diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ReverseTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ReverseTokenFilterFactory.java index 880968e9d52..f0070c5d08a 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ReverseTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ReverseTokenFilterFactory.java @@ -23,8 +23,8 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.reverse.ReverseStringFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; public class ReverseTokenFilterFactory extends AbstractTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RomanianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RomanianAnalyzerProvider.java index cac49ecf68c..3d897385df2 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RomanianAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RomanianAnalyzerProvider.java @@ -22,10 +22,10 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.ro.RomanianAnalyzer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class RomanianAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RussianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RussianAnalyzerProvider.java index a838b2299dd..bc09ab47b73 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RussianAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RussianAnalyzerProvider.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.ru.RussianAnalyzer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class RussianAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RussianStemTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RussianStemTokenFilterFactory.java index 29af8f901db..5c52215839d 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RussianStemTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RussianStemTokenFilterFactory.java @@ -23,8 +23,8 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.snowball.SnowballFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; public class RussianStemTokenFilterFactory extends AbstractTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScandinavianFoldingFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScandinavianFoldingFilterFactory.java index c299deffea7..e3f0d209106 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScandinavianFoldingFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScandinavianFoldingFilterFactory.java @@ -22,9 +22,9 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.ScandinavianFoldingFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.NormalizingTokenFilterFactory; /** * Factory for {@link ScandinavianFoldingFilter} diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScandinavianNormalizationFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScandinavianNormalizationFilterFactory.java index 2d3d4833cc3..3f4de2d6707 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScandinavianNormalizationFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScandinavianNormalizationFilterFactory.java @@ -22,9 +22,9 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.ScandinavianNormalizationFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.NormalizingTokenFilterFactory; /** * Factory for {@link ScandinavianNormalizationFilter} diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterFactory.java index 657931e2973..d8206fde38b 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterFactory.java @@ -22,11 +22,11 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.ConditionalTokenFilter; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.CharFilterFactory; -import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.index.analysis.TokenizerFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.CharFilterFactory; +import org.opensearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.analysis.TokenizerFactory; import org.opensearch.script.Script; import org.opensearch.script.ScriptService; import org.opensearch.script.ScriptType; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SerbianNormalizationFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SerbianNormalizationFilterFactory.java index 6e37ac04399..83b644f03b5 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SerbianNormalizationFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SerbianNormalizationFilterFactory.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.sr.SerbianNormalizationFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.NormalizingTokenFilterFactory; public class SerbianNormalizationFilterFactory extends AbstractTokenFilterFactory implements NormalizingTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SimplePatternSplitTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SimplePatternSplitTokenizerFactory.java index ba78c0302e5..9accffdd723 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SimplePatternSplitTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SimplePatternSplitTokenizerFactory.java @@ -23,8 +23,8 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.pattern.SimplePatternSplitTokenizer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenizerFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenizerFactory; public class SimplePatternSplitTokenizerFactory extends AbstractTokenizerFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SimplePatternTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SimplePatternTokenizerFactory.java index 183716188d2..f8db22c0734 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SimplePatternTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SimplePatternTokenizerFactory.java @@ -23,8 +23,8 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.pattern.SimplePatternTokenizer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenizerFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenizerFactory; public class SimplePatternTokenizerFactory extends AbstractTokenizerFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SnowballAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SnowballAnalyzerProvider.java index b4a94877876..10b7542f474 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SnowballAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SnowballAnalyzerProvider.java @@ -25,9 +25,9 @@ import org.apache.lucene.analysis.fr.FrenchAnalyzer; import org.apache.lucene.analysis.nl.DutchAnalyzer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; import java.util.HashMap; import java.util.Map; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SnowballTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SnowballTokenFilterFactory.java index a66894c13ac..097e9567f78 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SnowballTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SnowballTokenFilterFactory.java @@ -23,8 +23,8 @@ import org.apache.lucene.analysis.snowball.SnowballFilter; import org.opensearch.common.Strings; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; /** * Real work actually done here by Sebastian on the Elasticsearch mailing list diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SoraniAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SoraniAnalyzerProvider.java index 9dcdd6c894b..414febfd7ce 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SoraniAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SoraniAnalyzerProvider.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.ckb.SoraniAnalyzer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; /** * Provider for {@link SoraniAnalyzer} diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SoraniNormalizationFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SoraniNormalizationFilterFactory.java index 622cf1c7ff5..183613ce7d8 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SoraniNormalizationFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SoraniNormalizationFilterFactory.java @@ -21,10 +21,10 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.ckb.SoraniNormalizationFilter; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.NormalizingTokenFilterFactory; /** * Factory for {@link SoraniNormalizationFilter} diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SpanishAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SpanishAnalyzerProvider.java index 18f4303d40d..52e7af35a7b 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SpanishAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SpanishAnalyzerProvider.java @@ -22,10 +22,10 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.es.SpanishAnalyzer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class SpanishAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/StemmerOverrideTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/StemmerOverrideTokenFilterFactory.java index ce955b56404..9fa79c60674 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/StemmerOverrideTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/StemmerOverrideTokenFilterFactory.java @@ -23,10 +23,10 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.StemmerOverrideFilter; import org.apache.lucene.analysis.miscellaneous.StemmerOverrideFilter.StemmerOverrideMap; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.Analysis; import java.io.IOException; import java.util.List; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/StemmerTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/StemmerTokenFilterFactory.java index 33ed3d0b16f..60dc0d5289a 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/StemmerTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/StemmerTokenFilterFactory.java @@ -57,8 +57,8 @@ import org.apache.lucene.analysis.sv.SwedishLightStemFilter; import org.opensearch.common.Strings; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; import org.tartarus.snowball.ext.ArmenianStemmer; import org.tartarus.snowball.ext.BasqueStemmer; import org.tartarus.snowball.ext.CatalanStemmer; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SwedishAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SwedishAnalyzerProvider.java index 4a07aae6835..587252f81e3 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SwedishAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SwedishAnalyzerProvider.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.sv.SwedishAnalyzer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class SwedishAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SynonymGraphTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SynonymGraphTokenFilterFactory.java index 94d94efd017..00ca508d9dd 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SynonymGraphTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SynonymGraphTokenFilterFactory.java @@ -25,11 +25,11 @@ import org.apache.lucene.analysis.synonym.SynonymGraphFilter; import org.apache.lucene.analysis.synonym.SynonymMap; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AnalysisMode; -import org.elasticsearch.index.analysis.CharFilterFactory; -import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.index.analysis.TokenizerFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AnalysisMode; +import org.opensearch.index.analysis.CharFilterFactory; +import org.opensearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.analysis.TokenizerFactory; import java.util.List; import java.util.function.Function; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiAnalyzerProvider.java index f50ce4b97b5..3ba1e28fbd2 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiAnalyzerProvider.java @@ -21,10 +21,10 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.th.ThaiAnalyzer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class ThaiAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiTokenizerFactory.java index ef3ea08117c..c33ed67d2ef 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiTokenizerFactory.java @@ -22,9 +22,9 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.th.ThaiTokenizer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenizerFactory; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenizerFactory; /** * Factory for {@link ThaiTokenizer} diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TrimTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TrimTokenFilterFactory.java index e7b21bae8a8..9f95f317276 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TrimTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TrimTokenFilterFactory.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.TrimFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.NormalizingTokenFilterFactory; public class TrimTokenFilterFactory extends AbstractTokenFilterFactory implements NormalizingTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TruncateTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TruncateTokenFilterFactory.java index deca8c3a2c7..e5edab77eba 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TruncateTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TruncateTokenFilterFactory.java @@ -23,8 +23,8 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.TruncateTokenFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; public class TruncateTokenFilterFactory extends AbstractTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TurkishAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TurkishAnalyzerProvider.java index 225e052457d..363c786e4e4 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TurkishAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TurkishAnalyzerProvider.java @@ -22,10 +22,10 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.tr.TurkishAnalyzer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; -import org.elasticsearch.index.analysis.Analysis; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractIndexAnalyzerProvider; +import org.opensearch.index.analysis.Analysis; public class TurkishAnalyzerProvider extends AbstractIndexAnalyzerProvider { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UAX29URLEmailTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UAX29URLEmailTokenizerFactory.java index 65996889b47..4f93f0590bf 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UAX29URLEmailTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UAX29URLEmailTokenizerFactory.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.analysis.standard.UAX29URLEmailTokenizer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenizerFactory; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenizerFactory; public class UAX29URLEmailTokenizerFactory extends AbstractTokenizerFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UniqueTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UniqueTokenFilterFactory.java index fe5835016bd..257e333cc48 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UniqueTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UniqueTokenFilterFactory.java @@ -22,8 +22,8 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; public class UniqueTokenFilterFactory extends AbstractTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UpperCaseTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UpperCaseTokenFilterFactory.java index 48eaf668de1..e464e099788 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UpperCaseTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UpperCaseTokenFilterFactory.java @@ -23,9 +23,9 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.UpperCaseFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; -import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenFilterFactory; +import org.opensearch.index.analysis.NormalizingTokenFilterFactory; public class UpperCaseTokenFilterFactory extends AbstractTokenFilterFactory implements NormalizingTokenFilterFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WhitespaceTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WhitespaceTokenizerFactory.java index 7fb4b942dbf..fd82a4e8ee4 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WhitespaceTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WhitespaceTokenizerFactory.java @@ -24,9 +24,9 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenizerFactory; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenizerFactory; public class WhitespaceTokenizerFactory extends AbstractTokenizerFactory { diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/XLowerCaseTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/XLowerCaseTokenizerFactory.java index 7249fe3d21d..eb471d192d1 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/XLowerCaseTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/XLowerCaseTokenizerFactory.java @@ -22,8 +22,8 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.Tokenizer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AbstractTokenizerFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AbstractTokenizerFactory; @Deprecated // NORELEASE we should prevent the usage on indices created after 7.0 in order to be able to remove in 8 diff --git a/modules/analysis-common/src/main/resources/org/opensearch/analysis/common/painless_whitelist.txt b/modules/analysis-common/src/main/resources/org/opensearch/analysis/common/painless_whitelist.txt index 83b70be5877..12b5b027180 100644 --- a/modules/analysis-common/src/main/resources/org/opensearch/analysis/common/painless_whitelist.txt +++ b/modules/analysis-common/src/main/resources/org/opensearch/analysis/common/painless_whitelist.txt @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # -class org.elasticsearch.analysis.common.AnalysisPredicateScript$Token { +class org.opensearch.analysis.common.AnalysisPredicateScript$Token { CharSequence getTerm() int getPosition() int getPositionIncrement() @@ -25,4 +25,4 @@ class org.elasticsearch.analysis.common.AnalysisPredicateScript$Token { int getEndOffset() String getType() boolean isKeyword() -} \ No newline at end of file +} diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactoryTests.java index d28af5e6b30..18a22356847 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ASCIIFoldingTokenFilterFactoryTests.java @@ -22,9 +22,9 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.index.analysis.AnalysisTestsHelper; -import org.elasticsearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.analysis.TokenFilterFactory; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.OpenSearchTokenStreamTestCase; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/BaseWordDelimiterTokenFilterFactoryTestCase.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/BaseWordDelimiterTokenFilterFactoryTestCase.java index e5ad5722664..b9c9cd7bc47 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/BaseWordDelimiterTokenFilterFactoryTestCase.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/BaseWordDelimiterTokenFilterFactoryTestCase.java @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; import org.opensearch.index.analysis.AnalysisTestsHelper; -import org.elasticsearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.analysis.TokenFilterFactory; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.OpenSearchTokenStreamTestCase; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CJKFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CJKFilterFactoryTests.java index 8c316bd9262..9daa236a406 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CJKFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CJKFilterFactoryTests.java @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.miscellaneous.DisableGraphAttribute; import org.apache.lucene.analysis.standard.StandardTokenizer; import org.opensearch.index.analysis.AnalysisTestsHelper; -import org.elasticsearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.analysis.TokenFilterFactory; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.OpenSearchTokenStreamTestCase; import org.junit.Before; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CharGroupTokenizerFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CharGroupTokenizerFactoryTests.java index 1949bc1b7d2..c341357282f 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CharGroupTokenizerFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CharGroupTokenizerFactoryTests.java @@ -23,8 +23,8 @@ import com.carrotsearch.randomizedtesting.generators.RandomStrings; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.util.CharTokenizer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.IndexSettings; +import org.opensearch.index.Index; +import org.opensearch.index.IndexSettings; import org.opensearch.test.OpenSearchTokenStreamTestCase; import org.opensearch.test.IndexSettingsModule; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisPluginTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisPluginTests.java index 530c63f9422..012f519366b 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisPluginTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisPluginTests.java @@ -25,10 +25,10 @@ import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.IndexAnalyzers; -import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.index.analysis.TokenizerFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.IndexAnalyzers; +import org.opensearch.index.analysis.NamedAnalyzer; +import org.opensearch.index.analysis.TokenizerFactory; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.IndexSettingsModule; import org.opensearch.test.VersionUtils; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactoryTests.java index ab3b8c634d0..1b0fc130994 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactoryTests.java @@ -23,10 +23,10 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.index.analysis.AnalysisTestsHelper; -import org.elasticsearch.index.analysis.IndexAnalyzers; -import org.elasticsearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.analysis.IndexAnalyzers; +import org.opensearch.index.analysis.TokenFilterFactory; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.OpenSearchTokenStreamTestCase; import org.junit.Assert; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java index b5d54b13e7b..d9939dac748 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java @@ -25,14 +25,14 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.env.TestEnvironment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.IndexAnalyzers; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.IndexAnalyzers; import org.opensearch.index.analysis.MyFilterTokenFilterFactory; -import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.indices.analysis.AnalysisModule; -import org.elasticsearch.indices.analysis.AnalysisModule.AnalysisProvider; +import org.opensearch.index.analysis.TokenFilterFactory; +import org.opensearch.indices.analysis.AnalysisModule; +import org.opensearch.indices.analysis.AnalysisModule.AnalysisProvider; import org.opensearch.plugins.AnalysisPlugin; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.IndexSettingsModule; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/DisableGraphQueryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/DisableGraphQueryTests.java index 131bbfb136b..236d75ce91d 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/DisableGraphQueryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/DisableGraphQueryTests.java @@ -28,15 +28,15 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.PhraseQuery; import org.apache.lucene.search.MultiPhraseQuery; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.query.MatchPhraseQueryBuilder; -import org.elasticsearch.index.query.MatchQueryBuilder; -import org.elasticsearch.index.query.MultiMatchQueryBuilder; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.index.query.QueryStringQueryBuilder; -import org.elasticsearch.index.query.SimpleQueryStringBuilder; -import org.elasticsearch.index.query.SimpleQueryStringFlag; -import org.elasticsearch.index.search.MatchQuery; +import org.opensearch.index.IndexService; +import org.opensearch.index.query.MatchPhraseQueryBuilder; +import org.opensearch.index.query.MatchQueryBuilder; +import org.opensearch.index.query.MultiMatchQueryBuilder; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.index.query.QueryStringQueryBuilder; +import org.opensearch.index.query.SimpleQueryStringBuilder; +import org.opensearch.index.query.SimpleQueryStringFlag; +import org.opensearch.index.search.MatchQuery; import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.junit.After; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactoryTests.java index 88d92bd8323..2837a114f52 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactoryTests.java @@ -22,9 +22,9 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.standard.StandardTokenizer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.index.analysis.AnalysisTestsHelper; -import org.elasticsearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.analysis.TokenFilterFactory; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.OpenSearchTokenStreamTestCase; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java index 9e8d3b6665f..44015c239ff 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java @@ -23,13 +23,13 @@ import org.apache.lucene.analysis.Tokenizer; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.env.TestEnvironment; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.IndexAnalyzers; -import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.indices.analysis.AnalysisModule; +import org.opensearch.index.Index; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.IndexAnalyzers; +import org.opensearch.index.analysis.NamedAnalyzer; +import org.opensearch.indices.analysis.AnalysisModule; import org.opensearch.test.OpenSearchTokenStreamTestCase; import org.opensearch.test.IndexSettingsModule; import org.opensearch.test.VersionUtils; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactoryTests.java index b31eb5194db..d09009201cd 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactoryTests.java @@ -23,8 +23,8 @@ import org.apache.lucene.analysis.CannedTokenStream; import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.IndexSettings; +import org.opensearch.index.Index; +import org.opensearch.index.IndexSettings; import org.opensearch.test.OpenSearchTokenStreamTestCase; import org.opensearch.test.IndexSettingsModule; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HtmlStripCharFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HtmlStripCharFilterFactoryTests.java index 227501da024..5f5596a4826 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HtmlStripCharFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/HtmlStripCharFilterFactoryTests.java @@ -22,9 +22,9 @@ package org.opensearch.analysis.common; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.CharFilterFactory; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.CharFilterFactory; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.IndexSettingsModule; import org.opensearch.test.VersionUtils; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepFilterFactoryTests.java index 9f2bf4afaf0..efa306dc806 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepFilterFactoryTests.java @@ -22,9 +22,9 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.index.analysis.AnalysisTestsHelper; -import org.elasticsearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.analysis.TokenFilterFactory; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.OpenSearchTokenStreamTestCase; import org.junit.Assert; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java index 3d2436937cd..bc44145e270 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java @@ -22,9 +22,9 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.standard.StandardTokenizer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.index.analysis.AnalysisTestsHelper; -import org.elasticsearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.analysis.TokenFilterFactory; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.OpenSearchTokenStreamTestCase; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeywordMarkerFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeywordMarkerFilterFactoryTests.java index 2125e17bee4..224bfb663fd 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeywordMarkerFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeywordMarkerFilterFactoryTests.java @@ -26,8 +26,8 @@ import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; import org.opensearch.index.analysis.AnalysisTestsHelper; -import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.analysis.NamedAnalyzer; +import org.opensearch.index.analysis.TokenFilterFactory; import org.opensearch.test.OpenSearchTestCase.TestAnalysis; import org.opensearch.test.OpenSearchTokenStreamTestCase; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/LimitTokenCountFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/LimitTokenCountFilterFactoryTests.java index a148c526658..11810e6328c 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/LimitTokenCountFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/LimitTokenCountFilterFactoryTests.java @@ -22,9 +22,9 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.index.analysis.AnalysisTestsHelper; -import org.elasticsearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.analysis.TokenFilterFactory; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.OpenSearchTokenStreamTestCase; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MinHashFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MinHashFilterFactoryTests.java index 4e063439144..1e14ca3fc09 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MinHashFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MinHashFilterFactoryTests.java @@ -22,9 +22,9 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.index.analysis.AnalysisTestsHelper; -import org.elasticsearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.analysis.TokenFilterFactory; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.OpenSearchTokenStreamTestCase; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MultiplexerTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MultiplexerTokenFilterTests.java index 6514b65809a..2e237a7a934 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MultiplexerTokenFilterTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MultiplexerTokenFilterTests.java @@ -22,12 +22,12 @@ package org.opensearch.analysis.common; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.env.TestEnvironment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.IndexAnalyzers; -import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.indices.analysis.AnalysisModule; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.IndexAnalyzers; +import org.opensearch.index.analysis.NamedAnalyzer; +import org.opensearch.indices.analysis.AnalysisModule; import org.opensearch.test.OpenSearchTokenStreamTestCase; import org.opensearch.test.IndexSettingsModule; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenFilterFactoryTests.java index 5341c7b912d..21f458206ae 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenFilterFactoryTests.java @@ -22,9 +22,9 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.standard.StandardTokenizer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.index.analysis.AnalysisTestsHelper; -import org.elasticsearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.analysis.TokenFilterFactory; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.OpenSearchTokenStreamTestCase; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenizerFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenizerFactoryTests.java index ec17f0a6f31..c4dfa6d3c17 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenizerFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenizerFactoryTests.java @@ -28,8 +28,8 @@ import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; import org.opensearch.common.settings.Settings.Builder; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.IndexSettings; +import org.opensearch.index.Index; +import org.opensearch.index.IndexSettings; import org.opensearch.test.OpenSearchTokenStreamTestCase; import org.opensearch.test.IndexSettingsModule; import org.opensearch.test.VersionUtils; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PathHierarchyTokenizerFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PathHierarchyTokenizerFactoryTests.java index d1985330cc3..20151604506 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PathHierarchyTokenizerFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PathHierarchyTokenizerFactoryTests.java @@ -23,7 +23,7 @@ import com.carrotsearch.randomizedtesting.generators.RandomPicks; import org.apache.lucene.analysis.Tokenizer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.Index; +import org.opensearch.index.Index; import org.opensearch.test.OpenSearchTokenStreamTestCase; import org.opensearch.test.IndexSettingsModule; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PatternCaptureTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PatternCaptureTokenFilterTests.java index 87d08c2ec6f..e1a91ad3fd0 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PatternCaptureTokenFilterTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PatternCaptureTokenFilterTests.java @@ -22,10 +22,10 @@ package org.opensearch.analysis.common; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.IndexAnalyzers; -import org.elasticsearch.index.analysis.NamedAnalyzer; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.IndexAnalyzers; +import org.opensearch.index.analysis.NamedAnalyzer; import org.opensearch.test.OpenSearchTokenStreamTestCase; import org.opensearch.test.IndexSettingsModule; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PredicateTokenScriptFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PredicateTokenScriptFilterTests.java index a845eae4095..08c7f4d28c7 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PredicateTokenScriptFilterTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/PredicateTokenScriptFilterTests.java @@ -24,10 +24,10 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; import org.opensearch.env.TestEnvironment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.IndexAnalyzers; -import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.indices.analysis.AnalysisModule; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.IndexAnalyzers; +import org.opensearch.index.analysis.NamedAnalyzer; +import org.opensearch.indices.analysis.AnalysisModule; import org.opensearch.script.Script; import org.opensearch.script.ScriptContext; import org.opensearch.script.ScriptService; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java index d1d6c632f19..9cc88291572 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java @@ -22,9 +22,9 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CannedTokenStream; import org.apache.lucene.analysis.Token; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.index.analysis.AnalysisTestsHelper; -import org.elasticsearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.analysis.TokenFilterFactory; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.OpenSearchTokenStreamTestCase; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterTests.java index e2ad535d1a5..c521aeb1ba0 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterTests.java @@ -22,12 +22,12 @@ package org.opensearch.analysis.common; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.env.TestEnvironment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.IndexAnalyzers; -import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.indices.analysis.AnalysisModule; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.IndexAnalyzers; +import org.opensearch.index.analysis.NamedAnalyzer; +import org.opensearch.indices.analysis.AnalysisModule; import org.opensearch.script.Script; import org.opensearch.script.ScriptContext; import org.opensearch.script.ScriptService; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ShingleTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ShingleTokenFilterTests.java index b65ff694ce8..af731ec3109 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ShingleTokenFilterTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ShingleTokenFilterTests.java @@ -24,9 +24,9 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.apache.lucene.analysis.miscellaneous.DisableGraphAttribute; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.index.analysis.AnalysisTestsHelper; -import org.elasticsearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.analysis.TokenFilterFactory; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.OpenSearchTokenStreamTestCase; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerOverrideTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerOverrideTokenFilterFactoryTests.java index ba13f4a38de..d544857ad0c 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerOverrideTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerOverrideTokenFilterFactoryTests.java @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; import org.opensearch.index.analysis.AnalysisTestsHelper; -import org.elasticsearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.analysis.TokenFilterFactory; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.OpenSearchTokenStreamTestCase; import org.junit.Rule; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerTokenFilterFactoryTests.java index 7ab382964d1..35b09d91e09 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerTokenFilterFactoryTests.java @@ -25,11 +25,11 @@ import org.apache.lucene.analysis.en.PorterStemFilter; import org.apache.lucene.analysis.snowball.SnowballFilter; import org.opensearch.Version; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.index.analysis.AnalysisTestsHelper; -import org.elasticsearch.index.analysis.IndexAnalyzers; -import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.analysis.IndexAnalyzers; +import org.opensearch.index.analysis.NamedAnalyzer; +import org.opensearch.index.analysis.TokenFilterFactory; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.OpenSearchTokenStreamTestCase; import org.opensearch.test.VersionUtils; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/SynonymsAnalysisTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/SynonymsAnalysisTests.java index e7080c9e340..20d675a69ad 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/SynonymsAnalysisTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/SynonymsAnalysisTests.java @@ -27,12 +27,12 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.IndexAnalyzers; -import org.elasticsearch.index.analysis.PreConfiguredTokenFilter; -import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.index.analysis.TokenizerFactory; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.IndexAnalyzers; +import org.opensearch.index.analysis.PreConfiguredTokenFilter; +import org.opensearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.analysis.TokenizerFactory; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.IndexSettingsModule; import org.opensearch.test.VersionUtils; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/TrimTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/TrimTokenFilterTests.java index 1ab8de2467f..3649862c05a 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/TrimTokenFilterTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/TrimTokenFilterTests.java @@ -21,9 +21,9 @@ package org.opensearch.analysis.common; import org.apache.lucene.util.BytesRef; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.index.analysis.AnalysisTestsHelper; -import org.elasticsearch.index.analysis.NamedAnalyzer; +import org.opensearch.index.analysis.NamedAnalyzer; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.OpenSearchTokenStreamTestCase; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WhitespaceTokenizerFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WhitespaceTokenizerFactoryTests.java index 58ddb8212be..d0764ded4df 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WhitespaceTokenizerFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WhitespaceTokenizerFactoryTests.java @@ -25,8 +25,8 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.IndexSettings; +import org.opensearch.index.Index; +import org.opensearch.index.IndexSettings; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.IndexSettingsModule; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java index ac602a1e00a..11fdaa20378 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java @@ -23,14 +23,14 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.env.TestEnvironment; -import org.elasticsearch.index.IndexSettings; +import org.opensearch.index.IndexSettings; import org.opensearch.index.analysis.AnalysisTestsHelper; -import org.elasticsearch.index.analysis.IndexAnalyzers; -import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.index.analysis.TokenFilterFactory; -import org.elasticsearch.indices.analysis.AnalysisModule; +import org.opensearch.index.analysis.IndexAnalyzers; +import org.opensearch.index.analysis.NamedAnalyzer; +import org.opensearch.index.analysis.TokenFilterFactory; +import org.opensearch.indices.analysis.AnalysisModule; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.IndexSettingsModule; import org.opensearch.test.VersionUtils; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java index 762dcd07b4c..5fafe9e23d9 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java @@ -22,9 +22,9 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.index.analysis.AnalysisTestsHelper; -import org.elasticsearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.analysis.TokenFilterFactory; import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; diff --git a/modules/geo/src/main/java/org/opensearch/geo/GeoPlugin.java b/modules/geo/src/main/java/org/opensearch/geo/GeoPlugin.java index 4d64c18fe8c..0025e7ee310 100644 --- a/modules/geo/src/main/java/org/opensearch/geo/GeoPlugin.java +++ b/modules/geo/src/main/java/org/opensearch/geo/GeoPlugin.java @@ -19,10 +19,10 @@ package org.opensearch.geo; -import org.elasticsearch.index.mapper.GeoShapeFieldMapper; -import org.elasticsearch.index.mapper.Mapper; -import org.elasticsearch.plugins.MapperPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.index.mapper.GeoShapeFieldMapper; +import org.opensearch.index.mapper.Mapper; +import org.opensearch.plugins.MapperPlugin; +import org.opensearch.plugins.Plugin; import java.util.Collections; import java.util.Map; diff --git a/modules/ingest-common/src/internalClusterTest/java/org/opensearch/ingest/common/IngestRestartIT.java b/modules/ingest-common/src/internalClusterTest/java/org/opensearch/ingest/common/IngestRestartIT.java index cdb9684e8d8..fcfe25cbbc7 100644 --- a/modules/ingest-common/src/internalClusterTest/java/org/opensearch/ingest/common/IngestRestartIT.java +++ b/modules/ingest-common/src/internalClusterTest/java/org/opensearch/ingest/common/IngestRestartIT.java @@ -24,7 +24,7 @@ import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.ingest.IngestStats; +import org.opensearch.ingest.IngestStats; import org.opensearch.plugins.Plugin; import org.opensearch.script.MockScriptEngine; import org.opensearch.script.MockScriptPlugin; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/AbstractStringProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/AbstractStringProcessor.java index 973aef24324..b1ecaa165b0 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/AbstractStringProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/AbstractStringProcessor.java @@ -19,10 +19,10 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.AbstractProcessor; -import org.elasticsearch.ingest.ConfigurationUtils; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.AbstractProcessor; +import org.opensearch.ingest.ConfigurationUtils; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import java.util.ArrayList; import java.util.List; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/AppendProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/AppendProcessor.java index d18751422ab..dce5d577b5b 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/AppendProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/AppendProcessor.java @@ -19,11 +19,11 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.AbstractProcessor; -import org.elasticsearch.ingest.ConfigurationUtils; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; -import org.elasticsearch.ingest.ValueSource; +import org.opensearch.ingest.AbstractProcessor; +import org.opensearch.ingest.ConfigurationUtils; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; +import org.opensearch.ingest.ValueSource; import org.opensearch.script.ScriptService; import org.opensearch.script.TemplateScript; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ConvertProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ConvertProcessor.java index ba246a942a8..1fe3849bb05 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ConvertProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ConvertProcessor.java @@ -19,17 +19,17 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.AbstractProcessor; -import org.elasticsearch.ingest.ConfigurationUtils; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.AbstractProcessor; +import org.opensearch.ingest.ConfigurationUtils; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; -import static org.elasticsearch.ingest.ConfigurationUtils.newConfigurationException; +import static org.opensearch.ingest.ConfigurationUtils.newConfigurationException; /** * Processor that converts fields content to a different type. Supported types are: integer, float, boolean and string. diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/CsvParser.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/CsvParser.java index 128cbdf2ec6..8cb773acef7 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/CsvParser.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/CsvParser.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.IngestDocument; +import org.opensearch.ingest.IngestDocument; final class CsvParser { diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/CsvProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/CsvProcessor.java index 88fb71ac66a..c89e959e78c 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/CsvProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/CsvProcessor.java @@ -19,15 +19,15 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.AbstractProcessor; -import org.elasticsearch.ingest.ConfigurationUtils; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.AbstractProcessor; +import org.opensearch.ingest.ConfigurationUtils; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import java.util.List; import java.util.Map; -import static org.elasticsearch.ingest.ConfigurationUtils.newConfigurationException; +import static org.opensearch.ingest.ConfigurationUtils.newConfigurationException; /** * A processor that breaks line from CSV file into separate fields. @@ -88,7 +88,7 @@ public final class CsvProcessor extends AbstractProcessor { return TYPE; } - public static final class Factory implements org.elasticsearch.ingest.Processor.Factory { + public static final class Factory implements org.opensearch.ingest.Processor.Factory { @Override public CsvProcessor create(Map registry, String processorTag, String description, Map config) { diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateIndexNameProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateIndexNameProcessor.java index 5b4334adfdc..8edccf32cf3 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateIndexNameProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DateIndexNameProcessor.java @@ -21,10 +21,10 @@ package org.opensearch.ingest.common; import org.opensearch.ExceptionsHelper; import org.opensearch.common.time.DateFormatter; -import org.elasticsearch.ingest.AbstractProcessor; -import org.elasticsearch.ingest.ConfigurationUtils; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.AbstractProcessor; +import org.opensearch.ingest.ConfigurationUtils; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import org.opensearch.script.ScriptService; import org.opensearch.script.TemplateScript; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DissectProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DissectProcessor.java index af74d5d3d20..7aecf8247ad 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DissectProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DissectProcessor.java @@ -20,10 +20,10 @@ package org.opensearch.ingest.common; import org.opensearch.dissect.DissectParser; -import org.elasticsearch.ingest.AbstractProcessor; -import org.elasticsearch.ingest.ConfigurationUtils; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.AbstractProcessor; +import org.opensearch.ingest.ConfigurationUtils; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import java.util.Map; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DotExpanderProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DotExpanderProcessor.java index 34c6fb663a3..36d2cc8ae65 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DotExpanderProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/DotExpanderProcessor.java @@ -19,10 +19,10 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.AbstractProcessor; -import org.elasticsearch.ingest.ConfigurationUtils; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.AbstractProcessor; +import org.opensearch.ingest.ConfigurationUtils; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import java.util.Map; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/FailProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/FailProcessor.java index 4cbb12d412e..7f9c05c087a 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/FailProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/FailProcessor.java @@ -19,10 +19,10 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.AbstractProcessor; -import org.elasticsearch.ingest.ConfigurationUtils; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.AbstractProcessor; +import org.opensearch.ingest.ConfigurationUtils; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import org.opensearch.script.ScriptService; import org.opensearch.script.TemplateScript; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/FailProcessorException.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/FailProcessorException.java index df013a35b30..42452e896a0 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/FailProcessorException.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/FailProcessorException.java @@ -19,8 +19,8 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.CompoundProcessor; -import org.elasticsearch.ingest.IngestDocument; +import org.opensearch.ingest.CompoundProcessor; +import org.opensearch.ingest.IngestDocument; /** * Exception class thrown by {@link FailProcessor}. diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ForEachProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ForEachProcessor.java index 667ed021e86..387fd92a6d4 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ForEachProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ForEachProcessor.java @@ -19,11 +19,11 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.AbstractProcessor; -import org.elasticsearch.ingest.ConfigurationUtils; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; -import org.elasticsearch.ingest.WrappingProcessor; +import org.opensearch.ingest.AbstractProcessor; +import org.opensearch.ingest.ConfigurationUtils; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; +import org.opensearch.ingest.WrappingProcessor; import org.opensearch.script.ScriptService; import java.util.ArrayList; @@ -33,10 +33,10 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.BiConsumer; -import static org.elasticsearch.ingest.ConfigurationUtils.newConfigurationException; -import static org.elasticsearch.ingest.ConfigurationUtils.readBooleanProperty; -import static org.elasticsearch.ingest.ConfigurationUtils.readMap; -import static org.elasticsearch.ingest.ConfigurationUtils.readStringProperty; +import static org.opensearch.ingest.ConfigurationUtils.newConfigurationException; +import static org.opensearch.ingest.ConfigurationUtils.readBooleanProperty; +import static org.opensearch.ingest.ConfigurationUtils.readMap; +import static org.opensearch.ingest.ConfigurationUtils.readStringProperty; /** * A processor that for each value in a list executes a one or more processors. diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/GrokProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/GrokProcessor.java index 764cc358d8d..6e8c253d06b 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/GrokProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/GrokProcessor.java @@ -23,16 +23,16 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.grok.Grok; import org.opensearch.grok.MatcherWatchdog; -import org.elasticsearch.ingest.AbstractProcessor; -import org.elasticsearch.ingest.ConfigurationUtils; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.AbstractProcessor; +import org.opensearch.ingest.ConfigurationUtils; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.elasticsearch.ingest.ConfigurationUtils.newConfigurationException; +import static org.opensearch.ingest.ConfigurationUtils.newConfigurationException; public final class GrokProcessor extends AbstractProcessor { diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/GsubProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/GsubProcessor.java index 1b261be0d83..4577823904f 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/GsubProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/GsubProcessor.java @@ -22,8 +22,8 @@ package org.opensearch.ingest.common; import java.util.Map; import java.util.regex.Pattern; -import static org.elasticsearch.ingest.ConfigurationUtils.newConfigurationException; -import static org.elasticsearch.ingest.ConfigurationUtils.readStringProperty; +import static org.opensearch.ingest.ConfigurationUtils.newConfigurationException; +import static org.opensearch.ingest.ConfigurationUtils.readStringProperty; /** * Processor that allows to search for patterns in field content and replace them with corresponding string replacement. diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/IngestCommonPlugin.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/IngestCommonPlugin.java index 1099131b6d9..d77bcc05fb0 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/IngestCommonPlugin.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/IngestCommonPlugin.java @@ -31,12 +31,12 @@ import org.opensearch.common.settings.SettingsFilter; import org.opensearch.common.unit.TimeValue; import org.opensearch.grok.Grok; import org.opensearch.grok.MatcherWatchdog; -import org.elasticsearch.ingest.DropProcessor; -import org.elasticsearch.ingest.PipelineProcessor; -import org.elasticsearch.ingest.Processor; -import org.elasticsearch.plugins.ActionPlugin; -import org.elasticsearch.plugins.IngestPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.ingest.DropProcessor; +import org.opensearch.ingest.PipelineProcessor; +import org.opensearch.ingest.Processor; +import org.opensearch.plugins.ActionPlugin; +import org.opensearch.plugins.IngestPlugin; +import org.opensearch.plugins.Plugin; import org.opensearch.rest.RestController; import org.opensearch.rest.RestHandler; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/JoinProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/JoinProcessor.java index 57dd0805f65..08b7b60c517 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/JoinProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/JoinProcessor.java @@ -19,10 +19,10 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.AbstractProcessor; -import org.elasticsearch.ingest.ConfigurationUtils; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.AbstractProcessor; +import org.opensearch.ingest.ConfigurationUtils; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import java.util.List; import java.util.Map; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/JsonProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/JsonProcessor.java index 6b35105dfe8..c36edb2a319 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/JsonProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/JsonProcessor.java @@ -25,16 +25,16 @@ import org.opensearch.common.xcontent.DeprecationHandler; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.ingest.AbstractProcessor; -import org.elasticsearch.ingest.ConfigurationUtils; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.AbstractProcessor; +import org.opensearch.ingest.ConfigurationUtils; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import java.io.IOException; import java.io.InputStream; import java.util.Map; -import static org.elasticsearch.ingest.ConfigurationUtils.newConfigurationException; +import static org.opensearch.ingest.ConfigurationUtils.newConfigurationException; /** * Processor that serializes a string-valued field into a diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/KeyValueProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/KeyValueProcessor.java index 2a6acb9be16..77c5253aa4e 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/KeyValueProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/KeyValueProcessor.java @@ -20,10 +20,10 @@ package org.opensearch.ingest.common; import org.opensearch.common.util.set.Sets; -import org.elasticsearch.ingest.AbstractProcessor; -import org.elasticsearch.ingest.ConfigurationUtils; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.AbstractProcessor; +import org.opensearch.ingest.ConfigurationUtils; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import java.util.Collections; import java.util.List; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RemoveProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RemoveProcessor.java index ccd7d0b60fd..c25fd492f85 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RemoveProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RemoveProcessor.java @@ -19,10 +19,10 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.AbstractProcessor; -import org.elasticsearch.ingest.ConfigurationUtils; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.AbstractProcessor; +import org.opensearch.ingest.ConfigurationUtils; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import org.opensearch.script.ScriptService; import org.opensearch.script.TemplateScript; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RenameProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RenameProcessor.java index 152ff80fd1f..4e004ed4ed2 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RenameProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RenameProcessor.java @@ -19,10 +19,10 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.AbstractProcessor; -import org.elasticsearch.ingest.ConfigurationUtils; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.AbstractProcessor; +import org.opensearch.ingest.ConfigurationUtils; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import org.opensearch.script.ScriptService; import org.opensearch.script.TemplateScript; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/SetProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/SetProcessor.java index dce08f8b6a5..8014f7cef7f 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/SetProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/SetProcessor.java @@ -19,11 +19,11 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.AbstractProcessor; -import org.elasticsearch.ingest.ConfigurationUtils; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; -import org.elasticsearch.ingest.ValueSource; +import org.opensearch.ingest.AbstractProcessor; +import org.opensearch.ingest.ConfigurationUtils; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; +import org.opensearch.ingest.ValueSource; import org.opensearch.script.ScriptService; import org.opensearch.script.TemplateScript; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/SortProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/SortProcessor.java index 906555fb7ea..f7e7a1ef03a 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/SortProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/SortProcessor.java @@ -19,10 +19,10 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.AbstractProcessor; -import org.elasticsearch.ingest.ConfigurationUtils; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.AbstractProcessor; +import org.opensearch.ingest.ConfigurationUtils; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import java.util.ArrayList; import java.util.Collections; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/SplitProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/SplitProcessor.java index ad9a65b4085..d62e5cdbfea 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/SplitProcessor.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/SplitProcessor.java @@ -19,10 +19,10 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.AbstractProcessor; -import org.elasticsearch.ingest.ConfigurationUtils; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.AbstractProcessor; +import org.opensearch.ingest.ConfigurationUtils; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import java.util.ArrayList; import java.util.Collections; diff --git a/modules/ingest-common/src/main/resources/org/opensearch/ingest/common/processors_whitelist.txt b/modules/ingest-common/src/main/resources/org/opensearch/ingest/common/processors_whitelist.txt index 3d93b19f066..1372ef2ed03 100644 --- a/modules/ingest-common/src/main/resources/org/opensearch/ingest/common/processors_whitelist.txt +++ b/modules/ingest-common/src/main/resources/org/opensearch/ingest/common/processors_whitelist.txt @@ -19,11 +19,11 @@ # This file contains a whitelist of static processor methods that can be accessed from painless -class org.elasticsearch.ingest.common.Processors { +class org.opensearch.ingest.common.Processors { long bytes(String) String lowercase(String) String uppercase(String) Object json(Object) void json(Map, String) String urlDecode(String) -} \ No newline at end of file +} diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorTestCase.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorTestCase.java index 2db45f7dd0b..89efb2b2f27 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorTestCase.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorTestCase.java @@ -19,8 +19,8 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorTests.java index 866a3f82243..4159e43175e 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorTests.java @@ -20,12 +20,12 @@ package org.opensearch.ingest.common; import org.opensearch.common.util.set.Sets; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.IngestDocument.Metadata; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.IngestDocument.Metadata; +import org.opensearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.ingest.TestTemplateService; -import org.elasticsearch.ingest.ValueSource; +import org.opensearch.ingest.ValueSource; import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; @@ -190,7 +190,7 @@ public class AppendProcessorTests extends OpenSearchTestCase { appendProcessor.execute(ingestDocument); List list = ingestDocument.getFieldValue(field, List.class); assertThat(list.size(), equalTo(2)); - assertThat(list, equalTo(org.elasticsearch.common.collect.List.of(originalValue, newValue))); + assertThat(list, equalTo(org.opensearch.common.collect.List.of(originalValue, newValue))); } public void testAppendingToListWithDuplicatesDisallowed() throws Exception { diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/BytesProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/BytesProcessorTests.java index f602eefba96..58c6cd61e9b 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/BytesProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/BytesProcessorTests.java @@ -22,8 +22,8 @@ package org.opensearch.ingest.common; import org.opensearch.OpenSearchException; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; import org.hamcrest.CoreMatchers; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ConvertProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ConvertProcessorTests.java index 496670f75bd..de4ca4a93d4 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ConvertProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ConvertProcessorTests.java @@ -26,8 +26,8 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CsvProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CsvProcessorTests.java index 3b42d9c6f0a..a9d439938ed 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CsvProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CsvProcessorTests.java @@ -21,7 +21,7 @@ package org.opensearch.ingest.common; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; -import org.elasticsearch.ingest.IngestDocument; +import org.opensearch.ingest.IngestDocument; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameProcessorTests.java index 2d73776b5c0..f0fe8bd9838 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameProcessorTests.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.common; import org.opensearch.common.time.DateFormatter; -import org.elasticsearch.ingest.IngestDocument; +import org.opensearch.ingest.IngestDocument; import org.opensearch.ingest.TestTemplateService; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorTests.java index 4311349b4c7..7e001e9f958 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorTests.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.IngestDocument; +import org.opensearch.ingest.IngestDocument; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.ingest.TestTemplateService; import org.opensearch.script.TemplateScript; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorTests.java index fe9bca0ea27..b1b207e98ef 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorTests.java @@ -21,8 +21,8 @@ package org.opensearch.ingest.common; import org.opensearch.common.collect.MapBuilder; import org.opensearch.dissect.DissectException; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.CoreMatchers; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DotExpanderProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DotExpanderProcessorTests.java index 2af4cae9b21..5049edb3d0f 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DotExpanderProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DotExpanderProcessorTests.java @@ -19,8 +19,8 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import org.opensearch.ingest.TestTemplateService; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorTests.java index bb452b1a0fa..a88ab8a36b7 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorTests.java @@ -19,8 +19,8 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.ingest.TestTemplateService; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorFactoryTests.java index a5bda6db02d..91e2fb9b5fc 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorFactoryTests.java @@ -20,7 +20,7 @@ package org.opensearch.ingest.common; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.Processor; import org.opensearch.ingest.TestProcessor; import org.opensearch.script.ScriptService; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java index 3f7802da859..f1572af112d 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java @@ -19,9 +19,9 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.CompoundProcessor; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.CompoundProcessor; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import org.opensearch.ingest.TestProcessor; import org.opensearch.ingest.TestTemplateService; import org.opensearch.script.TemplateScript; @@ -206,9 +206,9 @@ public class ForEachProcessorTests extends OpenSearchTestCase { ForEachProcessor processor = new ForEachProcessor( "_tag", null, "values", new CompoundProcessor(false, - org.elasticsearch.common.collect.List.of( + org.opensearch.common.collect.List.of( new UppercaseProcessor("_tag_upper", null, "_ingest._value", false, "_ingest._value")), - org.elasticsearch.common.collect.List.of( + org.opensearch.common.collect.List.of( new AppendProcessor("_tag", null, template, (model) -> (Collections.singletonList("added")), true)) ), false); processor.execute(ingestDocument, (result, e) -> {}); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorGetActionTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorGetActionTests.java index 7d91a84c914..7f8bedb684c 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorGetActionTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorGetActionTests.java @@ -45,7 +45,7 @@ import static org.mockito.Mockito.mock; public class GrokProcessorGetActionTests extends OpenSearchTestCase { private static final Map TEST_PATTERNS = - org.elasticsearch.common.collect.Map.of("PATTERN2", "foo2", "PATTERN1", "foo1"); + org.opensearch.common.collect.Map.of("PATTERN2", "foo2", "PATTERN1", "foo1"); public void testRequest() throws Exception { GrokProcessorGetAction.Request request = new GrokProcessorGetAction.Request(false); diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorTests.java index de676e50f9e..de6640bc4b3 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorTests.java @@ -20,7 +20,7 @@ package org.opensearch.ingest.common; import org.opensearch.grok.MatcherWatchdog; -import org.elasticsearch.ingest.IngestDocument; +import org.opensearch.ingest.IngestDocument; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JoinProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JoinProcessorTests.java index c3fd60c51ad..8352870ece6 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JoinProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JoinProcessorTests.java @@ -19,8 +19,8 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JsonProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JsonProcessorTests.java index fa112503591..903195a319c 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JsonProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JsonProcessorTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.ingest.IngestDocument; +import org.opensearch.ingest.IngestDocument; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/KeyValueProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/KeyValueProcessorTests.java index ddddf5dc416..fa162deead6 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/KeyValueProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/KeyValueProcessorTests.java @@ -20,8 +20,8 @@ package org.opensearch.ingest.common; import org.opensearch.common.util.set.Sets; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorTests.java index 07782ef2ff4..9e44f5d5d35 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorTests.java @@ -19,8 +19,8 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.ingest.TestTemplateService; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorTests.java index d293ae2d246..bc210eaafc2 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorTests.java @@ -19,8 +19,8 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.ingest.TestTemplateService; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorTests.java index 4a37666f1f5..018670ca45e 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorTests.java @@ -20,7 +20,7 @@ package org.opensearch.ingest.common; import org.opensearch.common.settings.Settings; -import org.elasticsearch.ingest.IngestDocument; +import org.opensearch.ingest.IngestDocument; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.script.IngestScript; import org.opensearch.script.MockScriptEngine; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorTests.java index b11c5260396..b1848377877 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorTests.java @@ -19,12 +19,12 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.IngestDocument.Metadata; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.IngestDocument.Metadata; +import org.opensearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.ingest.TestTemplateService; -import org.elasticsearch.ingest.ValueSource; +import org.opensearch.ingest.ValueSource; import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorTests.java index 2b4cc4507fe..2ad4d067800 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorTests.java @@ -19,8 +19,8 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.ingest.common.SortProcessor.SortOrder; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SplitProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SplitProcessorTests.java index 0cf4a49073f..71b03caeab5 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SplitProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SplitProcessorTests.java @@ -19,8 +19,8 @@ package org.opensearch.ingest.common; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/GeoIpProcessor.java b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/GeoIpProcessor.java index 619247bbcce..01874b1d40d 100644 --- a/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/GeoIpProcessor.java +++ b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/GeoIpProcessor.java @@ -33,9 +33,9 @@ import org.opensearch.OpenSearchParseException; import org.opensearch.SpecialPermission; import org.opensearch.common.network.InetAddresses; import org.opensearch.common.network.NetworkAddress; -import org.elasticsearch.ingest.AbstractProcessor; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.AbstractProcessor; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import org.opensearch.ingest.geoip.IngestGeoIpPlugin.GeoIpCache; import java.io.IOException; @@ -52,10 +52,10 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import static org.elasticsearch.ingest.ConfigurationUtils.newConfigurationException; -import static org.elasticsearch.ingest.ConfigurationUtils.readBooleanProperty; -import static org.elasticsearch.ingest.ConfigurationUtils.readOptionalList; -import static org.elasticsearch.ingest.ConfigurationUtils.readStringProperty; +import static org.opensearch.ingest.ConfigurationUtils.newConfigurationException; +import static org.opensearch.ingest.ConfigurationUtils.readBooleanProperty; +import static org.opensearch.ingest.ConfigurationUtils.readOptionalList; +import static org.opensearch.ingest.ConfigurationUtils.readStringProperty; public final class GeoIpProcessor extends AbstractProcessor { diff --git a/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/IngestGeoIpPlugin.java b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/IngestGeoIpPlugin.java index f220adae535..361ce385fca 100644 --- a/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/IngestGeoIpPlugin.java +++ b/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/IngestGeoIpPlugin.java @@ -31,9 +31,9 @@ import org.opensearch.common.cache.CacheBuilder; import org.opensearch.common.io.PathUtils; import org.opensearch.common.settings.Setting; import org.opensearch.core.internal.io.IOUtils; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.Processor; import org.opensearch.plugins.IngestPlugin; -import org.elasticsearch.plugins.Plugin; +import org.opensearch.plugins.Plugin; import java.io.Closeable; import java.io.IOException; diff --git a/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorFactoryTests.java b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorFactoryTests.java index 9b2de91995f..a29225e4893 100644 --- a/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorFactoryTests.java +++ b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorFactoryTests.java @@ -22,8 +22,8 @@ package org.opensearch.ingest.geoip; import com.carrotsearch.randomizedtesting.generators.RandomPicks; import org.opensearch.OpenSearchParseException; import org.opensearch.common.Randomness; -import org.elasticsearch.index.VersionType; -import org.elasticsearch.ingest.IngestDocument; +import org.opensearch.index.VersionType; +import org.opensearch.ingest.IngestDocument; import org.opensearch.ingest.geoip.IngestGeoIpPlugin.GeoIpCache; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.StreamsUtils; diff --git a/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java index 8b3b9a2a819..730ab57b323 100644 --- a/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java +++ b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java @@ -22,7 +22,7 @@ package org.opensearch.ingest.geoip; import com.maxmind.geoip2.DatabaseReader; import org.opensearch.common.CheckedSupplier; import org.opensearch.common.io.PathUtils; -import org.elasticsearch.ingest.IngestDocument; +import org.opensearch.ingest.IngestDocument; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.ingest.geoip.IngestGeoIpPlugin.GeoIpCache; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/IngestUserAgentPlugin.java b/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/IngestUserAgentPlugin.java index 2fd9903f1ce..db497b24804 100644 --- a/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/IngestUserAgentPlugin.java +++ b/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/IngestUserAgentPlugin.java @@ -20,7 +20,7 @@ package org.opensearch.ingest.useragent; import org.opensearch.common.settings.Setting; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.Processor; import org.opensearch.plugins.IngestPlugin; import org.opensearch.plugins.Plugin; diff --git a/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/UserAgentProcessor.java b/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/UserAgentProcessor.java index bb62d000bd5..7e6dcc2af70 100644 --- a/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/UserAgentProcessor.java +++ b/modules/ingest-user-agent/src/main/java/org/opensearch/ingest/useragent/UserAgentProcessor.java @@ -20,9 +20,9 @@ package org.opensearch.ingest.useragent; import org.opensearch.common.logging.DeprecationLogger; -import org.elasticsearch.ingest.AbstractProcessor; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; +import org.opensearch.ingest.AbstractProcessor; +import org.opensearch.ingest.IngestDocument; +import org.opensearch.ingest.Processor; import org.opensearch.ingest.useragent.UserAgentParser.Details; import org.opensearch.ingest.useragent.UserAgentParser.VersionedName; @@ -36,10 +36,10 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import static org.elasticsearch.ingest.ConfigurationUtils.newConfigurationException; -import static org.elasticsearch.ingest.ConfigurationUtils.readBooleanProperty; -import static org.elasticsearch.ingest.ConfigurationUtils.readOptionalList; -import static org.elasticsearch.ingest.ConfigurationUtils.readStringProperty; +import static org.opensearch.ingest.ConfigurationUtils.newConfigurationException; +import static org.opensearch.ingest.ConfigurationUtils.readBooleanProperty; +import static org.opensearch.ingest.ConfigurationUtils.readOptionalList; +import static org.opensearch.ingest.ConfigurationUtils.readStringProperty; public class UserAgentProcessor extends AbstractProcessor { diff --git a/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorTests.java b/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorTests.java index 3a2337d22cb..052b9fb2c84 100644 --- a/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorTests.java +++ b/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorTests.java @@ -20,7 +20,7 @@ package org.opensearch.ingest.useragent; import org.opensearch.ingest.RandomDocumentPicks; -import org.elasticsearch.ingest.IngestDocument; +import org.opensearch.ingest.IngestDocument; import org.opensearch.test.OpenSearchTestCase; import org.junit.BeforeClass; diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/CountMethodValueSource.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/CountMethodValueSource.java index 2c17090a2f5..10fabf86008 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/CountMethodValueSource.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/CountMethodValueSource.java @@ -21,9 +21,9 @@ package org.opensearch.script.expression; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.DoubleValues; -import org.elasticsearch.index.fielddata.LeafNumericFieldData; -import org.elasticsearch.index.fielddata.IndexFieldData; -import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; +import org.opensearch.index.fielddata.LeafNumericFieldData; +import org.opensearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.SortedNumericDoubleValues; import java.io.IOException; diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/DateField.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/DateField.java index b781bed52dc..2e36f9d0380 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/DateField.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/DateField.java @@ -20,7 +20,7 @@ package org.opensearch.script.expression; import org.apache.lucene.search.DoubleValuesSource; -import org.elasticsearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.IndexFieldData; import org.opensearch.search.MultiValueMode; import java.util.Calendar; diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/DateMethodValueSource.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/DateMethodValueSource.java index e7964e15e03..baa74ffd914 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/DateMethodValueSource.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/DateMethodValueSource.java @@ -21,9 +21,9 @@ package org.opensearch.script.expression; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.DoubleValues; -import org.elasticsearch.index.fielddata.LeafNumericFieldData; -import org.elasticsearch.index.fielddata.IndexFieldData; -import org.elasticsearch.index.fielddata.NumericDoubleValues; +import org.opensearch.index.fielddata.LeafNumericFieldData; +import org.opensearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.NumericDoubleValues; import org.opensearch.search.MultiValueMode; import java.io.IOException; diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/DateObject.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/DateObject.java index ca9678cbdaa..cac06c94c8f 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/DateObject.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/DateObject.java @@ -20,7 +20,7 @@ package org.opensearch.script.expression; import org.apache.lucene.search.DoubleValuesSource; -import org.elasticsearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.IndexFieldData; import org.opensearch.search.MultiValueMode; import org.joda.time.ReadableDateTime; diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/DateObjectValueSource.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/DateObjectValueSource.java index 6aa0051407f..6716e068268 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/DateObjectValueSource.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/DateObjectValueSource.java @@ -21,9 +21,9 @@ package org.opensearch.script.expression; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.DoubleValues; -import org.elasticsearch.index.fielddata.LeafNumericFieldData; -import org.elasticsearch.index.fielddata.IndexFieldData; -import org.elasticsearch.index.fielddata.NumericDoubleValues; +import org.opensearch.index.fielddata.LeafNumericFieldData; +import org.opensearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.NumericDoubleValues; import org.opensearch.search.MultiValueMode; import org.joda.time.DateTimeZone; import org.joda.time.MutableDateTime; diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/EmptyMemberValueSource.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/EmptyMemberValueSource.java index e80648dba5a..861d262819b 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/EmptyMemberValueSource.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/EmptyMemberValueSource.java @@ -21,9 +21,9 @@ package org.opensearch.script.expression; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.DoubleValues; -import org.elasticsearch.index.fielddata.LeafNumericFieldData; -import org.elasticsearch.index.fielddata.IndexFieldData; -import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; +import org.opensearch.index.fielddata.LeafNumericFieldData; +import org.opensearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.SortedNumericDoubleValues; import java.io.IOException; diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/FieldDataBasedDoubleValuesSource.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/FieldDataBasedDoubleValuesSource.java index 72fa40d39a9..f60a3300cc0 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/FieldDataBasedDoubleValuesSource.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/FieldDataBasedDoubleValuesSource.java @@ -23,7 +23,7 @@ import org.apache.lucene.index.DocValues; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.DoubleValuesSource; import org.apache.lucene.search.IndexSearcher; -import org.elasticsearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.IndexFieldData; import java.util.Objects; diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/FieldDataValueSource.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/FieldDataValueSource.java index 7810e83950a..66b03129ba5 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/FieldDataValueSource.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/FieldDataValueSource.java @@ -22,9 +22,9 @@ package org.opensearch.script.expression; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.search.DoubleValues; -import org.elasticsearch.index.fielddata.LeafNumericFieldData; -import org.elasticsearch.index.fielddata.IndexFieldData; -import org.elasticsearch.index.fielddata.NumericDoubleValues; +import org.opensearch.index.fielddata.LeafNumericFieldData; +import org.opensearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.NumericDoubleValues; import org.opensearch.search.MultiValueMode; import java.io.IOException; diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/GeoEmptyValueSource.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/GeoEmptyValueSource.java index 8915b92d5ee..d9e4ee00e4e 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/GeoEmptyValueSource.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/GeoEmptyValueSource.java @@ -21,9 +21,9 @@ package org.opensearch.script.expression; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.DoubleValues; -import org.elasticsearch.index.fielddata.IndexFieldData; -import org.elasticsearch.index.fielddata.LeafGeoPointFieldData; -import org.elasticsearch.index.fielddata.MultiGeoPointValues; +import org.opensearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.LeafGeoPointFieldData; +import org.opensearch.index.fielddata.MultiGeoPointValues; import java.io.IOException; diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/GeoField.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/GeoField.java index 3579205bf7a..37d25b40249 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/GeoField.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/GeoField.java @@ -20,7 +20,7 @@ package org.opensearch.script.expression; import org.apache.lucene.search.DoubleValuesSource; -import org.elasticsearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.IndexFieldData; /** * Expressions API for geo_point fields. diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/GeoLatitudeValueSource.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/GeoLatitudeValueSource.java index 95aba05af8d..f6b84a08ecf 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/GeoLatitudeValueSource.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/GeoLatitudeValueSource.java @@ -21,9 +21,9 @@ package org.opensearch.script.expression; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.DoubleValues; -import org.elasticsearch.index.fielddata.LeafGeoPointFieldData; -import org.elasticsearch.index.fielddata.IndexFieldData; -import org.elasticsearch.index.fielddata.MultiGeoPointValues; +import org.opensearch.index.fielddata.LeafGeoPointFieldData; +import org.opensearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.MultiGeoPointValues; import java.io.IOException; diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/GeoLongitudeValueSource.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/GeoLongitudeValueSource.java index 1b74797940f..0df80efc9d7 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/GeoLongitudeValueSource.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/GeoLongitudeValueSource.java @@ -21,9 +21,9 @@ package org.opensearch.script.expression; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.DoubleValues; -import org.elasticsearch.index.fielddata.LeafGeoPointFieldData; -import org.elasticsearch.index.fielddata.IndexFieldData; -import org.elasticsearch.index.fielddata.MultiGeoPointValues; +import org.opensearch.index.fielddata.LeafGeoPointFieldData; +import org.opensearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.MultiGeoPointValues; import java.io.IOException; diff --git a/modules/lang-expression/src/main/java/org/opensearch/script/expression/NumericField.java b/modules/lang-expression/src/main/java/org/opensearch/script/expression/NumericField.java index aff0deb9df7..815cc3142f1 100644 --- a/modules/lang-expression/src/main/java/org/opensearch/script/expression/NumericField.java +++ b/modules/lang-expression/src/main/java/org/opensearch/script/expression/NumericField.java @@ -20,7 +20,7 @@ package org.opensearch.script.expression; import org.apache.lucene.search.DoubleValuesSource; -import org.elasticsearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.IndexFieldData; import org.opensearch.search.MultiValueMode; /** 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 14bdcee1563..c251e3a600e 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 @@ -19,11 +19,11 @@ package org.opensearch.script.expression; -import org.elasticsearch.index.fielddata.IndexNumericFieldData; -import org.elasticsearch.index.fielddata.LeafNumericFieldData; -import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.fielddata.IndexNumericFieldData; +import org.opensearch.index.fielddata.LeafNumericFieldData; +import org.opensearch.index.fielddata.SortedNumericDoubleValues; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.mapper.NumberFieldMapper; import org.opensearch.script.FieldScript; import org.opensearch.script.ScriptException; import org.opensearch.search.lookup.SearchLookup; 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 a45db6a97a1..fb468d57847 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 @@ -22,12 +22,12 @@ package org.opensearch.script.expression; import java.io.IOException; import java.text.ParseException; import java.util.Collections; -import org.elasticsearch.index.fielddata.LeafNumericFieldData; -import org.elasticsearch.index.fielddata.IndexNumericFieldData; -import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.mapper.NumberFieldMapper.NumberFieldType; -import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType; +import org.opensearch.index.fielddata.LeafNumericFieldData; +import org.opensearch.index.fielddata.IndexNumericFieldData; +import org.opensearch.index.fielddata.SortedNumericDoubleValues; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.mapper.NumberFieldMapper.NumberFieldType; +import org.opensearch.index.mapper.NumberFieldMapper.NumberType; import org.opensearch.script.NumberSortScript; import org.opensearch.script.ScriptException; import org.opensearch.search.lookup.SearchLookup; 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 57381492446..96006205461 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 @@ -22,12 +22,12 @@ package org.opensearch.script.expression; import java.io.IOException; import java.text.ParseException; import java.util.Collections; -import org.elasticsearch.index.fielddata.LeafNumericFieldData; -import org.elasticsearch.index.fielddata.IndexNumericFieldData; -import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.mapper.NumberFieldMapper.NumberFieldType; -import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType; +import org.opensearch.index.fielddata.LeafNumericFieldData; +import org.opensearch.index.fielddata.IndexNumericFieldData; +import org.opensearch.index.fielddata.SortedNumericDoubleValues; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.mapper.NumberFieldMapper.NumberFieldType; +import org.opensearch.index.mapper.NumberFieldMapper.NumberType; import org.opensearch.script.ScriptException; import org.opensearch.script.TermsSetQueryScript; import org.opensearch.search.lookup.SearchLookup; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/NeedsScoreTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/NeedsScoreTests.java index 917459383f5..94b9a908921 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/NeedsScoreTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/NeedsScoreTests.java @@ -20,8 +20,8 @@ package org.opensearch.painless; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.query.QueryShardContext; +import org.opensearch.index.IndexService; +import org.opensearch.index.query.QueryShardContext; import org.opensearch.painless.spi.Whitelist; import org.opensearch.script.NumberSortScript; import org.opensearch.script.ScriptContext; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/SimilarityScriptTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/SimilarityScriptTests.java index 7022ceb263d..edc3987d6bf 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/SimilarityScriptTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/SimilarityScriptTests.java @@ -36,7 +36,7 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; -import org.elasticsearch.index.similarity.ScriptedSimilarity; +import org.opensearch.index.similarity.ScriptedSimilarity; import org.opensearch.painless.spi.Whitelist; import org.opensearch.script.ScriptContext; import org.opensearch.script.SimilarityScript; diff --git a/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteApiTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteApiTests.java index 8f11bfdc92e..a334214fc93 100644 --- a/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteApiTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/action/PainlessExecuteApiTests.java @@ -21,8 +21,8 @@ package org.opensearch.painless.action; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.query.MatchQueryBuilder; +import org.opensearch.index.IndexService; +import org.opensearch.index.query.MatchQueryBuilder; import org.opensearch.painless.PainlessPlugin; import org.opensearch.painless.action.PainlessExecuteAction.Request; import org.opensearch.painless.action.PainlessExecuteAction.Response; diff --git a/modules/lang-painless/src/test/resources/org/elasticsearch/painless/spi/org.elasticsearch.painless.test b/modules/lang-painless/src/test/resources/org/elasticsearch/painless/spi/org.elasticsearch.painless.test index 824e6d7112f..d2329040570 100644 --- a/modules/lang-painless/src/test/resources/org/elasticsearch/painless/spi/org.elasticsearch.painless.test +++ b/modules/lang-painless/src/test/resources/org/elasticsearch/painless/spi/org.elasticsearch.painless.test @@ -6,16 +6,16 @@ class org.opensearch.script.JodaCompatibleZonedDateTime { } # for unit tests only -class org.elasticsearch.painless.api.Json { +class org.opensearch.painless.api.Json { def load(String) String dump(def) String dump(def,boolean) } -class org.elasticsearch.painless.BindingsTests$BindingsTestScript { +class org.opensearch.painless.BindingsTests$BindingsTestScript { } -class org.elasticsearch.painless.FeatureTestObject @no_import { +class org.opensearch.painless.FeatureTestObject @no_import { int z () (int,int) @@ -35,21 +35,21 @@ class org.elasticsearch.painless.FeatureTestObject @no_import { int injectTimesX(int, short) @inject_constant[1="testInject0"] int timesSupplier(Function, short, int) int injectWithLambda(int, Function, short) @inject_constant[1="testInject0"] - int org.elasticsearch.painless.FeatureTestAugmentationObject augmentInjectTimesX(int, short) @inject_constant[1="testInject0"] - int org.elasticsearch.painless.FeatureTestAugmentationObject augmentTimesSupplier(Function, short, int) - int org.elasticsearch.painless.FeatureTestAugmentationObject augmentInjectWithLambda(int, Function, short) @inject_constant[1="testInject0"] + int org.opensearch.painless.FeatureTestAugmentationObject augmentInjectTimesX(int, short) @inject_constant[1="testInject0"] + int org.opensearch.painless.FeatureTestAugmentationObject augmentTimesSupplier(Function, short, int) + int org.opensearch.painless.FeatureTestAugmentationObject augmentInjectWithLambda(int, Function, short) @inject_constant[1="testInject0"] int injectMultiTimesX(int, int, int, short) @inject_constant[1="testInject0", 2="testInject1", 3="testInject2"] int injectMultiWithLambda(int, int, int, Function, short) @inject_constant[1="testInject0", 2="testInject1", 3="testInject0"] - int org.elasticsearch.painless.FeatureTestAugmentationObject augmentInjectMultiTimesX(int, int, short) @inject_constant[1="testInject1", 2="testInject2"] - int org.elasticsearch.painless.FeatureTestAugmentationObject augmentInjectMultiWithLambda(int, int, int, int, Function, short) @inject_constant[1="testInject2", 2="testInject1", 3="testInject1", 4="testInject2"] - int org.elasticsearch.painless.FeatureTestAugmentationObject getTotal() - int org.elasticsearch.painless.FeatureTestAugmentationObject addToTotal(int) + int org.opensearch.painless.FeatureTestAugmentationObject augmentInjectMultiTimesX(int, int, short) @inject_constant[1="testInject1", 2="testInject2"] + int org.opensearch.painless.FeatureTestAugmentationObject augmentInjectMultiWithLambda(int, int, int, int, Function, short) @inject_constant[1="testInject2", 2="testInject1", 3="testInject1", 4="testInject2"] + int org.opensearch.painless.FeatureTestAugmentationObject getTotal() + int org.opensearch.painless.FeatureTestAugmentationObject addToTotal(int) } static_import { - int staticAddIntsTest(int, int) from_class org.elasticsearch.painless.StaticTestObject - float staticAddFloatsTest(float, float) from_class org.elasticsearch.painless.FeatureTestObject - int addWithState(int, int, int, double) bound_to org.elasticsearch.painless.BindingsTests$BindingTestClass - int addThisWithState(BindingsTests.BindingsTestScript, int, int, int, double) bound_to org.elasticsearch.painless.BindingsTests$ThisBindingTestClass - int addEmptyThisWithState(BindingsTests.BindingsTestScript, int) bound_to org.elasticsearch.painless.BindingsTests$EmptyThisBindingTestClass + int staticAddIntsTest(int, int) from_class org.opensearch.painless.StaticTestObject + float staticAddFloatsTest(float, float) from_class org.opensearch.painless.FeatureTestObject + int addWithState(int, int, int, double) bound_to org.opensearch.painless.BindingsTests$BindingTestClass + int addThisWithState(BindingsTests.BindingsTestScript, int, int, int, double) bound_to org.opensearch.painless.BindingsTests$ThisBindingTestClass + int addEmptyThisWithState(BindingsTests.BindingsTestScript, int) bound_to org.opensearch.painless.BindingsTests$EmptyThisBindingTestClass } diff --git a/modules/mapper-extras/src/main/java/org/opensearch/index/mapper/TokenCountFieldMapper.java b/modules/mapper-extras/src/main/java/org/opensearch/index/mapper/TokenCountFieldMapper.java index c0f3a82b535..1cdd4510ad3 100644 --- a/modules/mapper-extras/src/main/java/org/opensearch/index/mapper/TokenCountFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/opensearch/index/mapper/TokenCountFieldMapper.java @@ -94,7 +94,7 @@ public class TokenCountFieldMapper extends ParametrizedFieldMapper { @Override public ValueFetcher valueFetcher(MapperService mapperService, SearchLookup searchLookup, String format) { if (hasDocValues() == false) { - return lookup -> org.elasticsearch.common.collect.List.of(); + return lookup -> org.opensearch.common.collect.List.of(); } return new DocValueFetcher(docValueFormat(format, null), searchLookup.doc().getForField(this)); } diff --git a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeaturesFieldMapperTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeaturesFieldMapperTests.java index 25eff402440..541d1ff1ec3 100644 --- a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeaturesFieldMapperTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/RankFeaturesFieldMapperTests.java @@ -45,7 +45,7 @@ public class RankFeaturesFieldMapperTests extends MapperTestCase { @Override protected Collection getPlugins() { - return org.elasticsearch.common.collect.List.of(new MapperExtrasPlugin()); + return org.opensearch.common.collect.List.of(new MapperExtrasPlugin()); } @Override diff --git a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeFieldMapperTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeFieldMapperTests.java index 868bc4f3615..e780caadab2 100644 --- a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeFieldMapperTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeFieldMapperTests.java @@ -128,7 +128,7 @@ public class SearchAsYouTypeFieldMapperTests extends MapperTestCase { @Override protected Collection getPlugins() { - return org.elasticsearch.common.collect.List.of(new MapperExtrasPlugin()); + return org.opensearch.common.collect.List.of(new MapperExtrasPlugin()); } @Override @@ -144,11 +144,11 @@ public class SearchAsYouTypeFieldMapperTests extends MapperTestCase { NamedAnalyzer simple = new NamedAnalyzer("simple", AnalyzerScope.INDEX, new SimpleAnalyzer()); NamedAnalyzer whitespace = new NamedAnalyzer("whitespace", AnalyzerScope.INDEX, new WhitespaceAnalyzer()); return new IndexAnalyzers( - org.elasticsearch.common.collect.Map.of( + org.opensearch.common.collect.Map.of( "default", dflt, "standard", standard, "keyword", keyword, "simple", simple, "whitespace", whitespace ), - org.elasticsearch.common.collect.Map.of(), - org.elasticsearch.common.collect.Map.of() + org.opensearch.common.collect.Map.of(), + org.opensearch.common.collect.Map.of() ); } diff --git a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeFieldTypeTests.java b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeFieldTypeTests.java index 5bb92fa059e..068b99c24a4 100644 --- a/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeFieldTypeTests.java +++ b/modules/mapper-extras/src/test/java/org/opensearch/index/mapper/SearchAsYouTypeFieldTypeTests.java @@ -115,20 +115,20 @@ public class SearchAsYouTypeFieldTypeTests extends FieldTypeTestCase { SearchAsYouTypeFieldType fieldType = createFieldType(); fieldType.setIndexAnalyzer(Lucene.STANDARD_ANALYZER); - assertEquals(org.elasticsearch.common.collect.List.of("value"), fetchSourceValue(fieldType, "value")); - assertEquals(org.elasticsearch.common.collect.List.of("42"), fetchSourceValue(fieldType, 42L)); - assertEquals(org.elasticsearch.common.collect.List.of("true"), fetchSourceValue(fieldType, true)); + assertEquals(org.opensearch.common.collect.List.of("value"), fetchSourceValue(fieldType, "value")); + assertEquals(org.opensearch.common.collect.List.of("42"), fetchSourceValue(fieldType, 42L)); + assertEquals(org.opensearch.common.collect.List.of("true"), fetchSourceValue(fieldType, true)); SearchAsYouTypeFieldMapper.PrefixFieldType prefixFieldType = new SearchAsYouTypeFieldMapper.PrefixFieldType( fieldType.name(), fieldType.getTextSearchInfo(), 2, 10); - assertEquals(org.elasticsearch.common.collect.List.of("value"), fetchSourceValue(prefixFieldType, "value")); - assertEquals(org.elasticsearch.common.collect.List.of("42"), fetchSourceValue(prefixFieldType, 42L)); - assertEquals(org.elasticsearch.common.collect.List.of("true"), fetchSourceValue(prefixFieldType, true)); + assertEquals(org.opensearch.common.collect.List.of("value"), fetchSourceValue(prefixFieldType, "value")); + assertEquals(org.opensearch.common.collect.List.of("42"), fetchSourceValue(prefixFieldType, 42L)); + assertEquals(org.opensearch.common.collect.List.of("true"), fetchSourceValue(prefixFieldType, true)); SearchAsYouTypeFieldMapper.ShingleFieldType shingleFieldType = new SearchAsYouTypeFieldMapper.ShingleFieldType( fieldType.name(), 5, fieldType.getTextSearchInfo()); - assertEquals(org.elasticsearch.common.collect.List.of("value"), fetchSourceValue(shingleFieldType, "value")); - assertEquals(org.elasticsearch.common.collect.List.of("42"), fetchSourceValue(shingleFieldType, 42L)); - assertEquals(org.elasticsearch.common.collect.List.of("true"), fetchSourceValue(shingleFieldType, true)); + assertEquals(org.opensearch.common.collect.List.of("value"), fetchSourceValue(shingleFieldType, "value")); + assertEquals(org.opensearch.common.collect.List.of("42"), fetchSourceValue(shingleFieldType, 42L)); + assertEquals(org.opensearch.common.collect.List.of("true"), fetchSourceValue(shingleFieldType, true)); } } diff --git a/modules/opensearch-dashboards/src/javaRestTest/java/org/opensearch/dashboards/OpenSearchDashboardsSystemIndexIT.java b/modules/opensearch-dashboards/src/javaRestTest/java/org/opensearch/dashboards/OpenSearchDashboardsSystemIndexIT.java index eeb87f848d9..c19d0cd52b4 100644 --- a/modules/opensearch-dashboards/src/javaRestTest/java/org/opensearch/dashboards/OpenSearchDashboardsSystemIndexIT.java +++ b/modules/opensearch-dashboards/src/javaRestTest/java/org/opensearch/dashboards/OpenSearchDashboardsSystemIndexIT.java @@ -25,7 +25,7 @@ import org.apache.http.util.EntityUtils; import org.opensearch.client.Request; import org.opensearch.client.Response; import org.opensearch.common.xcontent.XContentHelper; -import org.elasticsearch.common.xcontent.json.JsonXContent; +import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.test.rest.OpenSearchRestTestCase; import java.io.IOException; diff --git a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ParentIT.java b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ParentIT.java index 6b3c3820736..e5dae4f753e 100644 --- a/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ParentIT.java +++ b/modules/parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ParentIT.java @@ -34,7 +34,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.elasticsearch.index.query.QueryBuilders.matchQuery; +import static org.opensearch.index.query.QueryBuilders.matchQuery; import static org.opensearch.join.aggregations.JoinAggregationBuilders.parent; import static org.opensearch.search.aggregations.AggregationBuilders.terms; import static org.opensearch.search.aggregations.AggregationBuilders.topHits; diff --git a/modules/parent-join/src/main/java/org/opensearch/join/ParentJoinPlugin.java b/modules/parent-join/src/main/java/org/opensearch/join/ParentJoinPlugin.java index 756c8fea856..d3b9623465c 100644 --- a/modules/parent-join/src/main/java/org/opensearch/join/ParentJoinPlugin.java +++ b/modules/parent-join/src/main/java/org/opensearch/join/ParentJoinPlugin.java @@ -19,7 +19,7 @@ package org.opensearch.join; -import org.elasticsearch.index.mapper.Mapper; +import org.opensearch.index.mapper.Mapper; import org.opensearch.join.aggregations.ChildrenAggregationBuilder; import org.opensearch.join.aggregations.InternalChildren; import org.opensearch.join.aggregations.InternalParent; diff --git a/modules/parent-join/src/main/java/org/opensearch/join/aggregations/ChildrenAggregationBuilder.java b/modules/parent-join/src/main/java/org/opensearch/join/aggregations/ChildrenAggregationBuilder.java index 037f9b30f43..b97883180a5 100644 --- a/modules/parent-join/src/main/java/org/opensearch/join/aggregations/ChildrenAggregationBuilder.java +++ b/modules/parent-join/src/main/java/org/opensearch/join/aggregations/ChildrenAggregationBuilder.java @@ -25,8 +25,8 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.query.QueryShardContext; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.query.QueryShardContext; import org.opensearch.join.mapper.ParentIdFieldMapper; import org.opensearch.join.mapper.ParentJoinFieldMapper; import org.opensearch.search.aggregations.AggregationBuilder; diff --git a/modules/parent-join/src/main/java/org/opensearch/join/aggregations/ChildrenAggregatorFactory.java b/modules/parent-join/src/main/java/org/opensearch/join/aggregations/ChildrenAggregatorFactory.java index 8ccc5fb2d9d..8943145bdb7 100644 --- a/modules/parent-join/src/main/java/org/opensearch/join/aggregations/ChildrenAggregatorFactory.java +++ b/modules/parent-join/src/main/java/org/opensearch/join/aggregations/ChildrenAggregatorFactory.java @@ -20,7 +20,7 @@ package org.opensearch.join.aggregations; import org.apache.lucene.search.Query; -import org.elasticsearch.index.query.QueryShardContext; +import org.opensearch.index.query.QueryShardContext; import org.opensearch.search.aggregations.AggregationExecutionException; import org.opensearch.search.aggregations.Aggregator; import org.opensearch.search.aggregations.AggregatorFactories; diff --git a/modules/parent-join/src/main/java/org/opensearch/join/aggregations/ParentAggregationBuilder.java b/modules/parent-join/src/main/java/org/opensearch/join/aggregations/ParentAggregationBuilder.java index 1013c2d14c2..7bc4cf84e02 100644 --- a/modules/parent-join/src/main/java/org/opensearch/join/aggregations/ParentAggregationBuilder.java +++ b/modules/parent-join/src/main/java/org/opensearch/join/aggregations/ParentAggregationBuilder.java @@ -25,8 +25,8 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.query.QueryShardContext; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.query.QueryShardContext; import org.opensearch.join.mapper.ParentIdFieldMapper; import org.opensearch.join.mapper.ParentJoinFieldMapper; import org.opensearch.search.aggregations.AggregationBuilder; diff --git a/modules/parent-join/src/main/java/org/opensearch/join/aggregations/ParentAggregatorFactory.java b/modules/parent-join/src/main/java/org/opensearch/join/aggregations/ParentAggregatorFactory.java index 2eb3faf3266..bf3403f22e8 100644 --- a/modules/parent-join/src/main/java/org/opensearch/join/aggregations/ParentAggregatorFactory.java +++ b/modules/parent-join/src/main/java/org/opensearch/join/aggregations/ParentAggregatorFactory.java @@ -20,7 +20,7 @@ package org.opensearch.join.aggregations; import org.apache.lucene.search.Query; -import org.elasticsearch.index.query.QueryShardContext; +import org.opensearch.index.query.QueryShardContext; import org.opensearch.search.aggregations.AggregationExecutionException; import org.opensearch.search.aggregations.Aggregator; import org.opensearch.search.aggregations.AggregatorFactories; 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 7e88ce33c86..e20c5af1827 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 @@ -23,15 +23,15 @@ import org.apache.lucene.document.FieldType; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.search.Query; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.index.fielddata.IndexFieldData; -import org.elasticsearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData; -import org.elasticsearch.index.mapper.FieldMapper; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.mapper.ParseContext; -import org.elasticsearch.index.mapper.StringFieldType; -import org.elasticsearch.index.mapper.TextSearchInfo; -import org.elasticsearch.index.mapper.ValueFetcher; -import org.elasticsearch.index.query.QueryShardContext; +import org.opensearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData; +import org.opensearch.index.mapper.FieldMapper; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.mapper.ParseContext; +import org.opensearch.index.mapper.StringFieldType; +import org.opensearch.index.mapper.TextSearchInfo; +import org.opensearch.index.mapper.ValueFetcher; +import org.opensearch.index.query.QueryShardContext; import org.opensearch.search.aggregations.support.CoreValuesSourceType; import org.opensearch.search.lookup.SearchLookup; 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 cc13eccdc62..6913fd43303 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 @@ -31,15 +31,15 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.util.BytesRef; import org.opensearch.common.lucene.Lucene; -import org.elasticsearch.index.fielddata.IndexFieldData; -import org.elasticsearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData; -import org.elasticsearch.index.mapper.FieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.mapper.ParseContext; -import org.elasticsearch.index.mapper.StringFieldType; -import org.elasticsearch.index.mapper.TextSearchInfo; -import org.elasticsearch.index.mapper.ValueFetcher; +import org.opensearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData; +import org.opensearch.index.mapper.FieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.mapper.ParseContext; +import org.opensearch.index.mapper.StringFieldType; +import org.opensearch.index.mapper.TextSearchInfo; +import org.opensearch.index.mapper.ValueFetcher; import org.opensearch.search.aggregations.support.CoreValuesSourceType; import org.opensearch.search.lookup.SearchLookup; 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 98cd72a563d..95f229d3a5d 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 @@ -28,22 +28,22 @@ import org.opensearch.common.lucene.Lucene; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.support.XContentMapValues; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.fielddata.IndexFieldData; -import org.elasticsearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData; -import org.elasticsearch.index.mapper.ContentPath; -import org.elasticsearch.index.mapper.DocumentMapper; -import org.elasticsearch.index.mapper.FieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.Mapper; -import org.elasticsearch.index.mapper.MapperParsingException; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.mapper.MappingLookup; -import org.elasticsearch.index.mapper.ParseContext; -import org.elasticsearch.index.mapper.SourceValueFetcher; -import org.elasticsearch.index.mapper.StringFieldType; -import org.elasticsearch.index.mapper.TextSearchInfo; -import org.elasticsearch.index.mapper.ValueFetcher; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData; +import org.opensearch.index.mapper.ContentPath; +import org.opensearch.index.mapper.DocumentMapper; +import org.opensearch.index.mapper.FieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.Mapper; +import org.opensearch.index.mapper.MapperParsingException; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.mapper.MappingLookup; +import org.opensearch.index.mapper.ParseContext; +import org.opensearch.index.mapper.SourceValueFetcher; +import org.opensearch.index.mapper.StringFieldType; +import org.opensearch.index.mapper.TextSearchInfo; +import org.opensearch.index.mapper.ValueFetcher; import org.opensearch.search.aggregations.support.CoreValuesSourceType; import org.opensearch.search.lookup.SearchLookup; diff --git a/modules/parent-join/src/main/java/org/opensearch/join/query/HasChildQueryBuilder.java b/modules/parent-join/src/main/java/org/opensearch/join/query/HasChildQueryBuilder.java index 812d106da3a..2eaab64accd 100644 --- a/modules/parent-join/src/main/java/org/opensearch/join/query/HasChildQueryBuilder.java +++ b/modules/parent-join/src/main/java/org/opensearch/join/query/HasChildQueryBuilder.java @@ -36,17 +36,17 @@ import org.opensearch.common.logging.DeprecationLogger; import org.opensearch.common.lucene.search.Queries; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.index.fielddata.IndexOrdinalsFieldData; -import org.elasticsearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.query.AbstractQueryBuilder; -import org.elasticsearch.index.query.InnerHitBuilder; -import org.elasticsearch.index.query.InnerHitContextBuilder; -import org.elasticsearch.index.query.NestedQueryBuilder; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryRewriteContext; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.index.query.QueryShardException; +import org.opensearch.index.fielddata.IndexOrdinalsFieldData; +import org.opensearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.query.AbstractQueryBuilder; +import org.opensearch.index.query.InnerHitBuilder; +import org.opensearch.index.query.InnerHitContextBuilder; +import org.opensearch.index.query.NestedQueryBuilder; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryRewriteContext; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.index.query.QueryShardException; import org.opensearch.join.mapper.ParentIdFieldMapper; import org.opensearch.join.mapper.ParentJoinFieldMapper; diff --git a/modules/parent-join/src/main/java/org/opensearch/join/query/HasParentQueryBuilder.java b/modules/parent-join/src/main/java/org/opensearch/join/query/HasParentQueryBuilder.java index 611c1b1455b..a1611f84a7e 100644 --- a/modules/parent-join/src/main/java/org/opensearch/join/query/HasParentQueryBuilder.java +++ b/modules/parent-join/src/main/java/org/opensearch/join/query/HasParentQueryBuilder.java @@ -29,15 +29,15 @@ import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.lucene.search.Queries; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.query.AbstractQueryBuilder; -import org.elasticsearch.index.query.InnerHitBuilder; -import org.elasticsearch.index.query.InnerHitContextBuilder; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryRewriteContext; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.index.query.QueryShardException; +import org.opensearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.query.AbstractQueryBuilder; +import org.opensearch.index.query.InnerHitBuilder; +import org.opensearch.index.query.InnerHitContextBuilder; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryRewriteContext; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.index.query.QueryShardException; import org.opensearch.join.mapper.ParentIdFieldMapper; import org.opensearch.join.mapper.ParentJoinFieldMapper; diff --git a/modules/parent-join/src/main/java/org/opensearch/join/query/JoinQueryBuilders.java b/modules/parent-join/src/main/java/org/opensearch/join/query/JoinQueryBuilders.java index 90903591a96..46baf2a5d2c 100644 --- a/modules/parent-join/src/main/java/org/opensearch/join/query/JoinQueryBuilders.java +++ b/modules/parent-join/src/main/java/org/opensearch/join/query/JoinQueryBuilders.java @@ -20,7 +20,7 @@ package org.opensearch.join.query; import org.apache.lucene.search.join.ScoreMode; -import org.elasticsearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryBuilder; public abstract class JoinQueryBuilders { /** diff --git a/modules/parent-join/src/main/java/org/opensearch/join/query/ParentIdQueryBuilder.java b/modules/parent-join/src/main/java/org/opensearch/join/query/ParentIdQueryBuilder.java index 7e9de2ba545..c8313660880 100644 --- a/modules/parent-join/src/main/java/org/opensearch/join/query/ParentIdQueryBuilder.java +++ b/modules/parent-join/src/main/java/org/opensearch/join/query/ParentIdQueryBuilder.java @@ -30,9 +30,9 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.StreamOutput; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.index.query.AbstractQueryBuilder; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.index.query.QueryShardException; +import org.opensearch.index.query.AbstractQueryBuilder; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.index.query.QueryShardException; import org.opensearch.join.mapper.ParentIdFieldMapper; import org.opensearch.join.mapper.ParentJoinFieldMapper; diff --git a/modules/parent-join/src/main/java/org/opensearch/join/spi/ParentJoinNamedXContentProvider.java b/modules/parent-join/src/main/java/org/opensearch/join/spi/ParentJoinNamedXContentProvider.java index 932b095b0c3..c7fd71e892f 100644 --- a/modules/parent-join/src/main/java/org/opensearch/join/spi/ParentJoinNamedXContentProvider.java +++ b/modules/parent-join/src/main/java/org/opensearch/join/spi/ParentJoinNamedXContentProvider.java @@ -27,7 +27,7 @@ import org.opensearch.join.aggregations.ParentAggregationBuilder; import org.opensearch.join.aggregations.ParsedChildren; import org.opensearch.join.aggregations.ParsedParent; import org.opensearch.plugins.spi.NamedXContentProvider; -import org.elasticsearch.search.aggregations.Aggregation; +import org.opensearch.search.aggregations.Aggregation; import java.util.Arrays; import java.util.List; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenTests.java b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenTests.java index ef5649ad76d..3dcab2383fc 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenTests.java @@ -21,7 +21,7 @@ package org.opensearch.join.aggregations; import org.opensearch.join.ParentJoinPlugin; import org.opensearch.plugins.Plugin; -import org.elasticsearch.search.aggregations.BaseAggregationTestCase; +import org.opensearch.search.aggregations.BaseAggregationTestCase; import org.opensearch.test.TestGeoShapeFieldMapperPlugin; import java.util.Arrays; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenToParentAggregatorTests.java b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenToParentAggregatorTests.java index 252ed0cd5a1..818c54a9873 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenToParentAggregatorTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenToParentAggregatorTests.java @@ -52,9 +52,9 @@ import org.opensearch.join.ParentJoinPlugin; import org.opensearch.join.mapper.MetaJoinFieldMapper; import org.opensearch.join.mapper.ParentJoinFieldMapper; import org.opensearch.plugins.SearchPlugin; -import org.elasticsearch.search.aggregations.Aggregation; -import org.elasticsearch.search.aggregations.AggregationBuilder; -import org.elasticsearch.search.aggregations.AggregatorTestCase; +import org.opensearch.search.aggregations.Aggregation; +import org.opensearch.search.aggregations.AggregationBuilder; +import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.bucket.terms.LongTerms; import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder; import org.opensearch.search.aggregations.metrics.InternalMin; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/InternalChildrenTests.java b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/InternalChildrenTests.java index 6b0ddd39796..bd89d66ad3f 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/InternalChildrenTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/InternalChildrenTests.java @@ -24,9 +24,9 @@ import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.NamedXContentRegistry.Entry; import org.opensearch.join.ParentJoinPlugin; import org.opensearch.plugins.SearchPlugin; -import org.elasticsearch.search.aggregations.Aggregation; -import org.elasticsearch.search.aggregations.InternalAggregations; -import org.elasticsearch.search.aggregations.InternalSingleBucketAggregationTestCase; +import org.opensearch.search.aggregations.Aggregation; +import org.opensearch.search.aggregations.InternalAggregations; +import org.opensearch.search.aggregations.InternalSingleBucketAggregationTestCase; import org.opensearch.search.aggregations.bucket.ParsedSingleBucketAggregation; import java.util.ArrayList; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/InternalParentTests.java b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/InternalParentTests.java index 27bc4d9162a..af85698202b 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/InternalParentTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/InternalParentTests.java @@ -23,9 +23,9 @@ import org.opensearch.common.ParseField; import org.opensearch.common.xcontent.NamedXContentRegistry.Entry; import org.opensearch.join.ParentJoinPlugin; import org.opensearch.plugins.SearchPlugin; -import org.elasticsearch.search.aggregations.Aggregation; -import org.elasticsearch.search.aggregations.InternalAggregations; -import org.elasticsearch.search.aggregations.InternalSingleBucketAggregationTestCase; +import org.opensearch.search.aggregations.Aggregation; +import org.opensearch.search.aggregations.InternalAggregations; +import org.opensearch.search.aggregations.InternalSingleBucketAggregationTestCase; import org.opensearch.search.aggregations.bucket.ParsedSingleBucketAggregation; import java.util.ArrayList; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentTests.java b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentTests.java index 83fb6d8e65a..90ed38f9dd6 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentTests.java @@ -24,7 +24,7 @@ import java.util.Collection; import org.opensearch.join.ParentJoinPlugin; import org.opensearch.plugins.Plugin; -import org.elasticsearch.search.aggregations.BaseAggregationTestCase; +import org.opensearch.search.aggregations.BaseAggregationTestCase; import org.opensearch.test.TestGeoShapeFieldMapperPlugin; public class ParentTests extends BaseAggregationTestCase { diff --git a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentToChildrenAggregatorTests.java b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentToChildrenAggregatorTests.java index 42210c6f282..fd563e74c7c 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentToChildrenAggregatorTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentToChildrenAggregatorTests.java @@ -53,8 +53,8 @@ import org.opensearch.join.ParentJoinPlugin; import org.opensearch.join.mapper.MetaJoinFieldMapper; import org.opensearch.join.mapper.ParentJoinFieldMapper; import org.opensearch.plugins.SearchPlugin; -import org.elasticsearch.search.aggregations.AggregationBuilder; -import org.elasticsearch.search.aggregations.AggregatorTestCase; +import org.opensearch.search.aggregations.AggregationBuilder; +import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.bucket.terms.StringTerms; import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder; import org.opensearch.search.aggregations.metrics.InternalMin; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/mapper/ParentJoinFieldMapperTests.java b/modules/parent-join/src/test/java/org/opensearch/join/mapper/ParentJoinFieldMapperTests.java index ca5e664e737..c9f9f0c0903 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/mapper/ParentJoinFieldMapperTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/mapper/ParentJoinFieldMapperTests.java @@ -24,13 +24,13 @@ import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.compress.CompressedXContent; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.mapper.DocumentMapper; -import org.elasticsearch.index.mapper.MapperException; -import org.elasticsearch.index.mapper.MapperParsingException; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.index.mapper.SourceToParse; +import org.opensearch.index.IndexService; +import org.opensearch.index.mapper.DocumentMapper; +import org.opensearch.index.mapper.MapperException; +import org.opensearch.index.mapper.MapperParsingException; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.mapper.ParsedDocument; +import org.opensearch.index.mapper.SourceToParse; import org.opensearch.join.ParentJoinPlugin; import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; 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 03fa19a3265..0d49c9e3eb3 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 @@ -37,19 +37,19 @@ import org.opensearch.common.Strings; import org.opensearch.common.compress.CompressedXContent; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.index.mapper.IdFieldMapper; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.mapper.Uid; -import org.elasticsearch.index.query.IdsQueryBuilder; -import org.elasticsearch.index.query.InnerHitBuilder; -import org.elasticsearch.index.query.InnerHitContextBuilder; -import org.elasticsearch.index.query.MatchAllQueryBuilder; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.index.query.QueryShardException; -import org.elasticsearch.index.query.TermQueryBuilder; -import org.elasticsearch.index.query.WrapperQueryBuilder; -import org.elasticsearch.index.similarity.SimilarityService; +import org.opensearch.index.mapper.IdFieldMapper; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.mapper.Uid; +import org.opensearch.index.query.IdsQueryBuilder; +import org.opensearch.index.query.InnerHitBuilder; +import org.opensearch.index.query.InnerHitContextBuilder; +import org.opensearch.index.query.MatchAllQueryBuilder; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.index.query.QueryShardException; +import org.opensearch.index.query.TermQueryBuilder; +import org.opensearch.index.query.WrapperQueryBuilder; +import org.opensearch.index.similarity.SimilarityService; import org.opensearch.join.ParentJoinPlugin; import org.opensearch.plugins.Plugin; import org.opensearch.search.sort.FieldSortBuilder; 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 23e2b0043ad..f00d468ac1a 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 @@ -27,16 +27,16 @@ import org.opensearch.Version; import org.opensearch.common.Strings; import org.opensearch.common.compress.CompressedXContent; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.query.IdsQueryBuilder; -import org.elasticsearch.index.query.InnerHitBuilder; -import org.elasticsearch.index.query.InnerHitContextBuilder; -import org.elasticsearch.index.query.MatchAllQueryBuilder; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.index.query.QueryShardException; -import org.elasticsearch.index.query.TermQueryBuilder; -import org.elasticsearch.index.query.WrapperQueryBuilder; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.query.IdsQueryBuilder; +import org.opensearch.index.query.InnerHitBuilder; +import org.opensearch.index.query.InnerHitContextBuilder; +import org.opensearch.index.query.MatchAllQueryBuilder; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.index.query.QueryShardException; +import org.opensearch.index.query.TermQueryBuilder; +import org.opensearch.index.query.WrapperQueryBuilder; import org.opensearch.join.ParentJoinPlugin; import org.opensearch.plugins.Plugin; import org.opensearch.search.sort.FieldSortBuilder; diff --git a/modules/parent-join/src/test/java/org/opensearch/join/query/ParentIdQueryBuilderTests.java b/modules/parent-join/src/test/java/org/opensearch/join/query/ParentIdQueryBuilderTests.java index a9bcb6734d9..e6d4ddd355f 100644 --- a/modules/parent-join/src/test/java/org/opensearch/join/query/ParentIdQueryBuilderTests.java +++ b/modules/parent-join/src/test/java/org/opensearch/join/query/ParentIdQueryBuilderTests.java @@ -29,9 +29,9 @@ import org.opensearch.OpenSearchException; import org.opensearch.common.Strings; import org.opensearch.common.compress.CompressedXContent; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.index.query.QueryShardException; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.index.query.QueryShardException; import org.opensearch.join.ParentJoinPlugin; import org.opensearch.plugins.Plugin; import org.opensearch.test.AbstractQueryTestCase; 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 12d4d86250d..f223a86859a 100644 --- a/modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java +++ b/modules/percolator/src/internalClusterTest/java/org/opensearch/percolator/PercolatorQuerySearchIT.java @@ -32,11 +32,11 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; import org.opensearch.geo.GeoPlugin; -import org.elasticsearch.index.mapper.MapperParsingException; -import org.elasticsearch.index.query.MatchPhraseQueryBuilder; -import org.elasticsearch.index.query.MultiMatchQueryBuilder; -import org.elasticsearch.index.query.Operator; -import org.elasticsearch.index.query.QueryBuilders; +import org.opensearch.index.mapper.MapperParsingException; +import org.opensearch.index.query.MatchPhraseQueryBuilder; +import org.opensearch.index.query.MultiMatchQueryBuilder; +import org.opensearch.index.query.Operator; +import org.opensearch.index.query.QueryBuilders; import org.opensearch.plugins.Plugin; import org.opensearch.search.fetch.subphase.highlight.HighlightBuilder; import org.opensearch.search.sort.SortOrder; @@ -48,20 +48,20 @@ import java.util.Collections; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; import static org.opensearch.common.xcontent.XContentFactory.yamlBuilder; -import static org.elasticsearch.index.query.QueryBuilders.boolQuery; -import static org.elasticsearch.index.query.QueryBuilders.commonTermsQuery; -import static org.elasticsearch.index.query.QueryBuilders.constantScoreQuery; -import static org.elasticsearch.index.query.QueryBuilders.geoBoundingBoxQuery; -import static org.elasticsearch.index.query.QueryBuilders.geoDistanceQuery; -import static org.elasticsearch.index.query.QueryBuilders.geoPolygonQuery; -import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; -import static org.elasticsearch.index.query.QueryBuilders.matchQuery; -import static org.elasticsearch.index.query.QueryBuilders.multiMatchQuery; -import static org.elasticsearch.index.query.QueryBuilders.rangeQuery; -import static org.elasticsearch.index.query.QueryBuilders.spanNearQuery; -import static org.elasticsearch.index.query.QueryBuilders.spanNotQuery; -import static org.elasticsearch.index.query.QueryBuilders.spanTermQuery; -import static org.elasticsearch.index.query.QueryBuilders.termQuery; +import static org.opensearch.index.query.QueryBuilders.boolQuery; +import static org.opensearch.index.query.QueryBuilders.commonTermsQuery; +import static org.opensearch.index.query.QueryBuilders.constantScoreQuery; +import static org.opensearch.index.query.QueryBuilders.geoBoundingBoxQuery; +import static org.opensearch.index.query.QueryBuilders.geoDistanceQuery; +import static org.opensearch.index.query.QueryBuilders.geoPolygonQuery; +import static org.opensearch.index.query.QueryBuilders.matchAllQuery; +import static org.opensearch.index.query.QueryBuilders.matchQuery; +import static org.opensearch.index.query.QueryBuilders.multiMatchQuery; +import static org.opensearch.index.query.QueryBuilders.rangeQuery; +import static org.opensearch.index.query.QueryBuilders.spanNearQuery; +import static org.opensearch.index.query.QueryBuilders.spanNotQuery; +import static org.opensearch.index.query.QueryBuilders.spanTermQuery; +import static org.opensearch.index.query.QueryBuilders.termQuery; import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertSearchHits; diff --git a/modules/percolator/src/main/java/org/opensearch/percolator/PercolateQueryBuilder.java b/modules/percolator/src/main/java/org/opensearch/percolator/PercolateQueryBuilder.java index f17acb9582e..00b3560fe4b 100644 --- a/modules/percolator/src/main/java/org/opensearch/percolator/PercolateQueryBuilder.java +++ b/modules/percolator/src/main/java/org/opensearch/percolator/PercolateQueryBuilder.java @@ -64,23 +64,23 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.analysis.FieldNameAnalyzer; -import org.elasticsearch.index.fielddata.IndexFieldData; -import org.elasticsearch.index.fielddata.IndexFieldDataCache; -import org.elasticsearch.index.mapper.DocumentMapper; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.mapper.ParseContext; -import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.index.mapper.SourceToParse; -import org.elasticsearch.index.query.AbstractQueryBuilder; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryRewriteContext; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.index.query.QueryShardException; -import org.elasticsearch.index.query.Rewriteable; -import org.elasticsearch.indices.breaker.CircuitBreakerService; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.index.analysis.FieldNameAnalyzer; +import org.opensearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.IndexFieldDataCache; +import org.opensearch.index.mapper.DocumentMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.mapper.ParseContext; +import org.opensearch.index.mapper.ParsedDocument; +import org.opensearch.index.mapper.SourceToParse; +import org.opensearch.index.query.AbstractQueryBuilder; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryRewriteContext; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.index.query.QueryShardException; +import org.opensearch.index.query.Rewriteable; +import org.opensearch.indices.breaker.CircuitBreakerService; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/modules/percolator/src/main/java/org/opensearch/percolator/PercolatorPlugin.java b/modules/percolator/src/main/java/org/opensearch/percolator/PercolatorPlugin.java index 420e31c8db0..e531eaaa5d0 100644 --- a/modules/percolator/src/main/java/org/opensearch/percolator/PercolatorPlugin.java +++ b/modules/percolator/src/main/java/org/opensearch/percolator/PercolatorPlugin.java @@ -20,10 +20,10 @@ package org.opensearch.percolator; import org.opensearch.common.settings.Setting; -import org.elasticsearch.index.mapper.Mapper; -import org.elasticsearch.plugins.MapperPlugin; -import org.elasticsearch.plugins.Plugin; -import org.elasticsearch.plugins.SearchPlugin; +import org.opensearch.index.mapper.Mapper; +import org.opensearch.plugins.MapperPlugin; +import org.opensearch.plugins.Plugin; +import org.opensearch.plugins.SearchPlugin; import org.opensearch.search.fetch.FetchSubPhase; import java.util.Arrays; diff --git a/modules/percolator/src/main/java/org/opensearch/percolator/QueryAnalyzer.java b/modules/percolator/src/main/java/org/opensearch/percolator/QueryAnalyzer.java index c98c23e2410..fcca6ed1cfe 100644 --- a/modules/percolator/src/main/java/org/opensearch/percolator/QueryAnalyzer.java +++ b/modules/percolator/src/main/java/org/opensearch/percolator/QueryAnalyzer.java @@ -42,7 +42,7 @@ import org.apache.lucene.util.NumericUtils; import org.apache.lucene.util.automaton.ByteRunAutomaton; import org.opensearch.Version; import org.opensearch.common.lucene.search.function.FunctionScoreQuery; -import org.elasticsearch.index.query.DateRangeIncludingNowQuery; +import org.opensearch.index.query.DateRangeIncludingNowQuery; import java.util.ArrayList; import java.util.Arrays; diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/CandidateQueryTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/CandidateQueryTests.java index 82faaf64c8f..b704817ff5a 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/CandidateQueryTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/CandidateQueryTests.java @@ -88,14 +88,14 @@ import org.opensearch.common.lucene.search.function.FunctionScoreQuery; import org.opensearch.common.geo.ShapeRelation; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentFactory; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.mapper.DocumentMapper; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.index.mapper.ParseContext; -import org.elasticsearch.index.query.QueryShardContext; +import org.opensearch.index.IndexService; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.mapper.DocumentMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.mapper.ParseContext; +import org.opensearch.index.query.QueryShardContext; import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.junit.After; diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java index 6e346705a6f..46c19ed6f03 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java @@ -34,11 +34,11 @@ import org.opensearch.common.lucene.uid.Versions; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.get.GetResult; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.index.query.Rewriteable; +import org.opensearch.index.get.GetResult; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.index.query.Rewriteable; import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.plugins.Plugin; import org.opensearch.test.AbstractQueryTestCase; @@ -57,7 +57,7 @@ import java.util.Map; import java.util.Set; import java.util.function.Supplier; -import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO; +import static org.opensearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.mockito.Mockito.mock; diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/PercolateWithNestedQueryBuilderTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/PercolateWithNestedQueryBuilderTests.java index fc0b91f4d34..3f7cac35ceb 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolateWithNestedQueryBuilderTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolateWithNestedQueryBuilderTests.java @@ -24,9 +24,9 @@ import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.compress.CompressedXContent; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryShardContext; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryShardContext; import java.io.IOException; diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java index 13ac9151bdc..7070db44027 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorFieldMapperTests.java @@ -58,30 +58,30 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.mapper.DocumentMapper; -import org.elasticsearch.index.mapper.DocumentMapperParser; -import org.elasticsearch.index.mapper.MapperParsingException; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.mapper.ParseContext; -import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.index.mapper.SourceToParse; -import org.elasticsearch.index.query.BoolQueryBuilder; -import org.elasticsearch.index.query.BoostingQueryBuilder; -import org.elasticsearch.index.query.ConstantScoreQueryBuilder; -import org.elasticsearch.index.query.DisMaxQueryBuilder; -import org.elasticsearch.index.query.MatchAllQueryBuilder; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.index.query.QueryShardException; -import org.elasticsearch.index.query.RangeQueryBuilder; -import org.elasticsearch.index.query.Rewriteable; -import org.elasticsearch.index.query.ScriptQueryBuilder; -import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder; -import org.elasticsearch.index.query.functionscore.RandomScoreFunctionBuilder; -import org.elasticsearch.index.query.functionscore.ScriptScoreFunctionBuilder; -import org.elasticsearch.indices.TermsLookup; +import org.opensearch.index.IndexService; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.mapper.DocumentMapper; +import org.opensearch.index.mapper.DocumentMapperParser; +import org.opensearch.index.mapper.MapperParsingException; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.mapper.ParseContext; +import org.opensearch.index.mapper.ParsedDocument; +import org.opensearch.index.mapper.SourceToParse; +import org.opensearch.index.query.BoolQueryBuilder; +import org.opensearch.index.query.BoostingQueryBuilder; +import org.opensearch.index.query.ConstantScoreQueryBuilder; +import org.opensearch.index.query.DisMaxQueryBuilder; +import org.opensearch.index.query.MatchAllQueryBuilder; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.index.query.QueryShardException; +import org.opensearch.index.query.RangeQueryBuilder; +import org.opensearch.index.query.Rewriteable; +import org.opensearch.index.query.ScriptQueryBuilder; +import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder; +import org.opensearch.index.query.functionscore.RandomScoreFunctionBuilder; +import org.opensearch.index.query.functionscore.ScriptScoreFunctionBuilder; +import org.opensearch.indices.TermsLookup; import org.opensearch.join.ParentJoinPlugin; import org.opensearch.join.query.HasChildQueryBuilder; import org.opensearch.join.query.HasParentQueryBuilder; @@ -107,15 +107,15 @@ import java.util.function.Function; import java.util.stream.Collectors; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.index.query.QueryBuilders.boolQuery; -import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; -import static org.elasticsearch.index.query.QueryBuilders.matchPhraseQuery; -import static org.elasticsearch.index.query.QueryBuilders.matchQuery; -import static org.elasticsearch.index.query.QueryBuilders.prefixQuery; -import static org.elasticsearch.index.query.QueryBuilders.rangeQuery; -import static org.elasticsearch.index.query.QueryBuilders.termQuery; -import static org.elasticsearch.index.query.QueryBuilders.termsLookupQuery; -import static org.elasticsearch.index.query.QueryBuilders.wildcardQuery; +import static org.opensearch.index.query.QueryBuilders.boolQuery; +import static org.opensearch.index.query.QueryBuilders.matchAllQuery; +import static org.opensearch.index.query.QueryBuilders.matchPhraseQuery; +import static org.opensearch.index.query.QueryBuilders.matchQuery; +import static org.opensearch.index.query.QueryBuilders.prefixQuery; +import static org.opensearch.index.query.QueryBuilders.rangeQuery; +import static org.opensearch.index.query.QueryBuilders.termQuery; +import static org.opensearch.index.query.QueryBuilders.termsLookupQuery; +import static org.opensearch.index.query.QueryBuilders.wildcardQuery; import static org.opensearch.percolator.PercolatorFieldMapper.EXTRACTION_COMPLETE; import static org.opensearch.percolator.PercolatorFieldMapper.EXTRACTION_FAILED; import static org.opensearch.percolator.PercolatorFieldMapper.EXTRACTION_PARTIAL; 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 8fa1b5d3e72..d84a5ff9873 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorMatchedSlotSubFetchPhaseTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorMatchedSlotSubFetchPhaseTests.java @@ -34,7 +34,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.search.TotalHits; import org.apache.lucene.store.Directory; import org.apache.lucene.util.FixedBitSet; -import org.elasticsearch.index.mapper.SeqNoFieldMapper; +import org.opensearch.index.mapper.SeqNoFieldMapper; import org.opensearch.search.SearchHit; import org.opensearch.search.fetch.FetchContext; import org.opensearch.search.fetch.FetchSubPhase.HitContext; 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 16d36177626..dc5271407b1 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorQuerySearchTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolatorQuerySearchTests.java @@ -27,14 +27,14 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.cache.bitset.BitsetFilterCache; -import org.elasticsearch.index.engine.Engine; -import org.elasticsearch.index.fielddata.ScriptDocValues; -import org.elasticsearch.index.query.Operator; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.index.query.QueryShardContext; +import org.opensearch.index.IndexService; +import org.opensearch.index.cache.bitset.BitsetFilterCache; +import org.opensearch.index.engine.Engine; +import org.opensearch.index.fielddata.ScriptDocValues; +import org.opensearch.index.query.Operator; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryBuilders; +import org.opensearch.index.query.QueryShardContext; import org.opensearch.plugins.Plugin; import org.opensearch.script.MockScriptPlugin; import org.opensearch.script.Script; @@ -52,11 +52,11 @@ import java.util.Map; import java.util.function.Function; import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder; -import static org.elasticsearch.index.query.QueryBuilders.boolQuery; -import static org.elasticsearch.index.query.QueryBuilders.matchQuery; -import static org.elasticsearch.index.query.QueryBuilders.rangeQuery; -import static org.elasticsearch.index.query.QueryBuilders.scriptQuery; -import static org.elasticsearch.index.query.QueryBuilders.termQuery; +import static org.opensearch.index.query.QueryBuilders.boolQuery; +import static org.opensearch.index.query.QueryBuilders.matchQuery; +import static org.opensearch.index.query.QueryBuilders.rangeQuery; +import static org.opensearch.index.query.QueryBuilders.scriptQuery; +import static org.opensearch.index.query.QueryBuilders.termQuery; import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertSearchHits; import static org.hamcrest.Matchers.equalTo; diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/QueryAnalyzerTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/QueryAnalyzerTests.java index 407f3156048..8ae28e6b37e 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/QueryAnalyzerTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/QueryAnalyzerTests.java @@ -61,7 +61,7 @@ import org.opensearch.common.lucene.search.function.CombineFunction; import org.opensearch.common.lucene.search.function.FunctionScoreQuery; import org.opensearch.common.lucene.search.function.RandomScoreFunction; import org.opensearch.common.network.InetAddresses; -import org.elasticsearch.index.search.ESToParentBlockJoinQuery; +import org.opensearch.index.search.OpenSearchToParentBlockJoinQuery; import org.opensearch.percolator.QueryAnalyzer.QueryExtraction; import org.opensearch.percolator.QueryAnalyzer.Result; import org.opensearch.test.OpenSearchTestCase; @@ -1202,7 +1202,7 @@ public class QueryAnalyzerTests extends OpenSearchTestCase { public void testToParentBlockJoinQuery() { TermQuery termQuery = new TermQuery(new Term("field", "value")); QueryBitSetProducer queryBitSetProducer = new QueryBitSetProducer(new TermQuery(new Term("_type", "child"))); - ESToParentBlockJoinQuery query = new ESToParentBlockJoinQuery(termQuery, queryBitSetProducer, ScoreMode.None, "child"); + OpenSearchToParentBlockJoinQuery query = new OpenSearchToParentBlockJoinQuery(termQuery, queryBitSetProducer, ScoreMode.None, "child"); Result result = analyze(query, Version.CURRENT); assertFalse(result.verified); assertThat(result.minimumShouldMatch, equalTo(1)); diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/QueryBuilderStoreTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/QueryBuilderStoreTests.java index 2efa7bd9a72..0fdf28d4932 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/QueryBuilderStoreTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/QueryBuilderStoreTests.java @@ -34,14 +34,14 @@ import org.opensearch.common.CheckedFunction; import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.index.fielddata.plain.BytesBinaryIndexFieldData; -import org.elasticsearch.index.mapper.BinaryFieldMapper; -import org.elasticsearch.index.mapper.ContentPath; -import org.elasticsearch.index.mapper.KeywordFieldMapper; -import org.elasticsearch.index.mapper.Mapper; -import org.elasticsearch.index.mapper.ParseContext; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.index.query.TermQueryBuilder; +import org.opensearch.index.fielddata.plain.BytesBinaryIndexFieldData; +import org.opensearch.index.mapper.BinaryFieldMapper; +import org.opensearch.index.mapper.ContentPath; +import org.opensearch.index.mapper.KeywordFieldMapper; +import org.opensearch.index.mapper.Mapper; +import org.opensearch.index.mapper.ParseContext; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.index.query.TermQueryBuilder; import org.elasticsearch.mock.orig.Mockito; import org.opensearch.search.SearchModule; import org.opensearch.search.aggregations.support.CoreValuesSourceType; 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 042c9e22cfa..93baf52844d 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 @@ -23,12 +23,12 @@ import org.opensearch.OpenSearchException; import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions; import org.opensearch.action.search.SearchRequest; import org.opensearch.action.support.IndicesOptions; -import org.elasticsearch.index.IndexNotFoundException; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.query.MatchAllQueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; +import org.opensearch.index.IndexNotFoundException; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.query.MatchAllQueryBuilder; +import org.opensearch.index.query.QueryBuilders; import org.opensearch.index.rankeval.PrecisionAtK.Detail; -import org.elasticsearch.indices.IndexClosedException; +import org.opensearch.indices.IndexClosedException; import org.opensearch.plugins.Plugin; import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.test.OpenSearchIntegTestCase; diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/DiscountedCumulativeGainTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/DiscountedCumulativeGainTests.java index 39d6e5df9ce..c42065a5607 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/DiscountedCumulativeGainTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/DiscountedCumulativeGainTests.java @@ -31,8 +31,8 @@ import org.opensearch.common.xcontent.XContentParseException; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.shard.ShardId; import org.opensearch.search.SearchHit; import org.opensearch.search.SearchShardTarget; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/EvalQueryQualityTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/EvalQueryQualityTests.java index 3f416ddaf5e..b7ec74427be 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/EvalQueryQualityTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/EvalQueryQualityTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import org.opensearch.search.SearchShardTarget; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/ExpectedReciprocalRankTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/ExpectedReciprocalRankTests.java index 7b98435c8ac..4559f9f0593 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/ExpectedReciprocalRankTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/ExpectedReciprocalRankTests.java @@ -30,8 +30,8 @@ import org.opensearch.common.xcontent.XContentParseException; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.shard.ShardId; import org.opensearch.search.SearchHit; import org.opensearch.search.SearchShardTarget; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/MeanReciprocalRankTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/MeanReciprocalRankTests.java index 3920fc489d0..b80a1775960 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/MeanReciprocalRankTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/MeanReciprocalRankTests.java @@ -30,7 +30,7 @@ import org.opensearch.common.xcontent.XContentParseException; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import org.opensearch.search.SearchHit; import org.opensearch.search.SearchShardTarget; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/PrecisionAtKTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/PrecisionAtKTests.java index a4ca573aae5..1602e0c5107 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/PrecisionAtKTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/PrecisionAtKTests.java @@ -30,8 +30,8 @@ import org.opensearch.common.xcontent.XContentParseException; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.shard.ShardId; import org.opensearch.search.SearchHit; import org.opensearch.search.SearchShardTarget; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalResponseTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalResponseTests.java index 592d9cabf80..0f18980ceae 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalResponseTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RankEvalResponseTests.java @@ -38,8 +38,8 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentLocation; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.shard.ShardId; import org.opensearch.search.SearchHit; import org.opensearch.search.SearchParseException; import org.opensearch.search.SearchShardTarget; 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 7965dc95992..837207d0057 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 @@ -29,8 +29,8 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.query.MatchAllQueryBuilder; -import org.elasticsearch.index.query.QueryBuilder; +import org.opensearch.index.query.MatchAllQueryBuilder; +import org.opensearch.index.query.QueryBuilder; import org.opensearch.index.rankeval.RankEvalSpec.ScriptWithId; import org.opensearch.script.Script; import org.opensearch.script.ScriptType; 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 7f41469b81d..09be149685b 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 @@ -30,8 +30,8 @@ import org.opensearch.common.xcontent.XContentParseException; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.query.MatchAllQueryBuilder; -import org.elasticsearch.index.query.QueryBuilder; +import org.opensearch.index.query.MatchAllQueryBuilder; +import org.opensearch.index.query.QueryBuilder; import org.opensearch.search.SearchModule; import org.opensearch.search.aggregations.AggregationBuilders; import org.opensearch.search.builder.SearchSourceBuilder; diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RatedSearchHitTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RatedSearchHitTests.java index 43dff2397be..3bf90d2aac3 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RatedSearchHitTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RatedSearchHitTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.text.Text; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.mapper.MapperService; +import org.opensearch.index.mapper.MapperService; import org.opensearch.search.SearchHit; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RecallAtKTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RecallAtKTests.java index c4276c43df0..8f28fc9a914 100644 --- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RecallAtKTests.java +++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/RecallAtKTests.java @@ -30,7 +30,7 @@ import org.opensearch.common.xcontent.XContentParseException; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import org.opensearch.search.SearchHit; import org.opensearch.search.SearchShardTarget; import org.opensearch.test.OpenSearchTestCase; 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 56683aa5872..f7b4b3ad9fa 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 @@ -28,7 +28,7 @@ import org.opensearch.action.support.IndicesOptions; import org.opensearch.client.node.NodeClient; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.script.ScriptService; import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/reindex/build.gradle b/modules/reindex/build.gradle index 973bfdc4da6..0207bf9879e 100644 --- a/modules/reindex/build.gradle +++ b/modules/reindex/build.gradle @@ -94,9 +94,9 @@ dependencies { /* Right now we just test against the latest version of each major we expect * reindex-from-remote to work against. We could randomize the versions but * that doesn't seem worth it at this point. */ - es2 'org.elasticsearch.distribution.zip:elasticsearch:2.4.5@zip' - es1 'org.elasticsearch:elasticsearch:1.7.6@zip' - es090 'org.elasticsearch:elasticsearch:0.90.13@zip' + es2 'org.opensearch.distribution.zip:elasticsearch:2.4.5@zip' + es1 'org.opensearch:elasticsearch:1.7.6@zip' + es090 'org.opensearch:elasticsearch:0.90.13@zip' } jdks { 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 eadff333b1c..2d042144dc5 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 @@ -23,24 +23,24 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.admin.cluster.node.tasks.get.GetTaskResponse; import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse; import org.opensearch.client.Client; -import org.elasticsearch.index.IndexModule; -import org.elasticsearch.index.engine.Engine; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.index.reindex.AbstractBulkByScrollRequestBuilder; -import org.elasticsearch.index.reindex.BulkByScrollResponse; -import org.elasticsearch.index.reindex.BulkByScrollTask; +import org.opensearch.index.IndexModule; +import org.opensearch.index.engine.Engine; +import org.opensearch.index.query.QueryBuilders; +import org.opensearch.index.reindex.AbstractBulkByScrollRequestBuilder; +import org.opensearch.index.reindex.BulkByScrollResponse; +import org.opensearch.index.reindex.BulkByScrollTask; import org.opensearch.index.reindex.CancelTests; -import org.elasticsearch.index.reindex.DeleteByQueryAction; -import org.elasticsearch.index.reindex.DeleteByQueryRequestBuilder; -import org.elasticsearch.index.reindex.ReindexAction; +import org.opensearch.index.reindex.DeleteByQueryAction; +import org.opensearch.index.reindex.DeleteByQueryRequestBuilder; +import org.opensearch.index.reindex.ReindexAction; import org.opensearch.index.reindex.ReindexPlugin; -import org.elasticsearch.index.reindex.ReindexRequestBuilder; +import org.opensearch.index.reindex.ReindexRequestBuilder; import org.opensearch.index.reindex.RethrottleAction; import org.opensearch.index.reindex.RethrottleRequestBuilder; -import org.elasticsearch.index.reindex.UpdateByQueryAction; -import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder; -import org.elasticsearch.index.shard.IndexingOperationListener; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.reindex.UpdateByQueryAction; +import org.opensearch.index.reindex.UpdateByQueryRequestBuilder; +import org.opensearch.index.shard.IndexingOperationListener; +import org.opensearch.index.shard.ShardId; import org.opensearch.plugins.Plugin; import org.opensearch.script.Script; import org.opensearch.script.ScriptType; 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 fd904e70e29..05f3e050189 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 @@ -40,20 +40,20 @@ import org.opensearch.common.Nullable; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.AbstractRunnable; -import org.elasticsearch.index.VersionType; -import org.elasticsearch.index.mapper.IdFieldMapper; -import org.elasticsearch.index.mapper.IndexFieldMapper; -import org.elasticsearch.index.mapper.RoutingFieldMapper; -import org.elasticsearch.index.mapper.SourceFieldMapper; -import org.elasticsearch.index.mapper.TypeFieldMapper; -import org.elasticsearch.index.mapper.VersionFieldMapper; -import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; -import org.elasticsearch.index.reindex.BulkByScrollResponse; -import org.elasticsearch.index.reindex.BulkByScrollTask; -import org.elasticsearch.index.reindex.ClientScrollableHitSource; -import org.elasticsearch.index.reindex.ScrollableHitSource; -import org.elasticsearch.index.reindex.ScrollableHitSource.SearchFailure; -import org.elasticsearch.index.reindex.WorkerBulkByScrollTaskState; +import org.opensearch.index.VersionType; +import org.opensearch.index.mapper.IdFieldMapper; +import org.opensearch.index.mapper.IndexFieldMapper; +import org.opensearch.index.mapper.RoutingFieldMapper; +import org.opensearch.index.mapper.SourceFieldMapper; +import org.opensearch.index.mapper.TypeFieldMapper; +import org.opensearch.index.mapper.VersionFieldMapper; +import org.opensearch.index.reindex.AbstractBulkByScrollRequest; +import org.opensearch.index.reindex.BulkByScrollResponse; +import org.opensearch.index.reindex.BulkByScrollTask; +import org.opensearch.index.reindex.ClientScrollableHitSource; +import org.opensearch.index.reindex.ScrollableHitSource; +import org.opensearch.index.reindex.ScrollableHitSource.SearchFailure; +import org.opensearch.index.reindex.WorkerBulkByScrollTaskState; import org.opensearch.script.Script; import org.opensearch.script.ScriptService; import org.opensearch.script.UpdateScript; @@ -82,7 +82,7 @@ import static java.util.Collections.emptyList; import static java.util.Collections.unmodifiableList; import static org.opensearch.action.bulk.BackoffPolicy.exponentialBackoff; import static org.opensearch.common.unit.TimeValue.timeValueNanos; -import static org.elasticsearch.index.reindex.AbstractBulkByScrollRequest.MAX_DOCS_ALL_MATCHES; +import static org.opensearch.index.reindex.AbstractBulkByScrollRequest.MAX_DOCS_ALL_MATCHES; import static org.opensearch.rest.RestStatus.CONFLICT; import static org.opensearch.search.sort.SortBuilders.fieldSort; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/AsyncDeleteByQueryAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/AsyncDeleteByQueryAction.java index 833a3198dbb..f389527860e 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/AsyncDeleteByQueryAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/AsyncDeleteByQueryAction.java @@ -23,10 +23,6 @@ import org.apache.logging.log4j.Logger; import org.opensearch.action.ActionListener; import org.opensearch.action.delete.DeleteRequest; import org.opensearch.client.ParentTaskAssigningClient; -import org.elasticsearch.index.reindex.BulkByScrollResponse; -import org.elasticsearch.index.reindex.BulkByScrollTask; -import org.elasticsearch.index.reindex.DeleteByQueryRequest; -import org.elasticsearch.index.reindex.ScrollableHitSource; import org.opensearch.script.ScriptService; import org.opensearch.threadpool.ThreadPool; 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 6938656b20f..a5dcbfa38e3 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 @@ -19,19 +19,15 @@ package org.opensearch.index.reindex; -import org.opensearch.action.ActionType; import org.opensearch.action.ActionListener; +import org.opensearch.action.ActionType; import org.opensearch.action.admin.cluster.shards.ClusterSearchShardsRequest; import org.opensearch.action.admin.cluster.shards.ClusterSearchShardsResponse; import org.opensearch.action.search.SearchRequest; import org.opensearch.client.Client; import org.opensearch.cluster.node.DiscoveryNode; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.mapper.IdFieldMapper; -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.opensearch.index.Index; +import org.opensearch.index.mapper.IdFieldMapper; import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.search.slice.SliceBuilder; import org.opensearch.tasks.TaskId; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/BulkIndexByScrollResponseContentListener.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/BulkIndexByScrollResponseContentListener.java index a1445d2ef96..1ecd30ceb05 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/BulkIndexByScrollResponseContentListener.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/BulkIndexByScrollResponseContentListener.java @@ -22,8 +22,7 @@ package org.opensearch.index.reindex; import org.opensearch.action.bulk.BulkItemResponse.Failure; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.index.reindex.BulkByScrollResponse; -import org.elasticsearch.index.reindex.ScrollableHitSource.SearchFailure; +import org.opensearch.index.reindex.ScrollableHitSource.SearchFailure; import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestChannel; import org.opensearch.rest.RestResponse; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java index fbaabb2f27c..aef34d916f3 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java @@ -19,6 +19,7 @@ package org.opensearch.index.reindex; +import org.elasticsearch.watcher.ResourceWatcherService; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionResponse; import org.opensearch.client.Client; @@ -34,10 +35,6 @@ import org.opensearch.common.settings.SettingsFilter; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.env.Environment; import org.opensearch.env.NodeEnvironment; -import org.elasticsearch.index.reindex.BulkByScrollTask; -import org.elasticsearch.index.reindex.DeleteByQueryAction; -import org.elasticsearch.index.reindex.ReindexAction; -import org.elasticsearch.index.reindex.UpdateByQueryAction; import org.opensearch.plugins.ActionPlugin; import org.opensearch.plugins.Plugin; import org.opensearch.repositories.RepositoriesService; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/Reindexer.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/Reindexer.java index 2f74680a6e7..4e99fed5c2c 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/Reindexer.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/Reindexer.java @@ -47,15 +47,8 @@ import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.VersionType; -import org.elasticsearch.index.mapper.VersionFieldMapper; -import org.elasticsearch.index.reindex.BulkByScrollResponse; -import org.elasticsearch.index.reindex.BulkByScrollTask; -import org.elasticsearch.index.reindex.ReindexAction; -import org.elasticsearch.index.reindex.ReindexRequest; -import org.elasticsearch.index.reindex.RemoteInfo; -import org.elasticsearch.index.reindex.ScrollableHitSource; -import org.elasticsearch.index.reindex.WorkerBulkByScrollTaskState; +import org.opensearch.index.VersionType; +import org.opensearch.index.mapper.VersionFieldMapper; import org.opensearch.index.reindex.remote.RemoteScrollableHitSource; import org.opensearch.script.Script; import org.opensearch.script.ScriptService; @@ -74,7 +67,7 @@ import java.util.function.BiFunction; import static java.util.Collections.emptyList; import static java.util.Collections.synchronizedList; import static java.util.Objects.requireNonNull; -import static org.elasticsearch.index.VersionType.INTERNAL; +import static org.opensearch.index.VersionType.INTERNAL; public class Reindexer { diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportReindexAction.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportReindexAction.java index aaa9ba149c0..1de474231fa 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportReindexAction.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/TransportReindexAction.java @@ -30,10 +30,6 @@ import org.opensearch.common.inject.Inject; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.reindex.BulkByScrollResponse; -import org.elasticsearch.index.reindex.BulkByScrollTask; -import org.elasticsearch.index.reindex.ReindexAction; -import org.elasticsearch.index.reindex.ReindexRequest; import org.opensearch.script.ScriptService; import org.opensearch.tasks.Task; import org.opensearch.threadpool.ThreadPool; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java index cf37ebf1380..bf2b230ad42 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteResponseParsers.java @@ -33,10 +33,10 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentLocation; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.reindex.ScrollableHitSource.BasicHit; -import org.elasticsearch.index.reindex.ScrollableHitSource.Hit; -import org.elasticsearch.index.reindex.ScrollableHitSource.Response; -import org.elasticsearch.index.reindex.ScrollableHitSource.SearchFailure; +import org.opensearch.index.reindex.ScrollableHitSource.BasicHit; +import org.opensearch.index.reindex.ScrollableHitSource.Hit; +import org.opensearch.index.reindex.ScrollableHitSource.Response; +import org.opensearch.index.reindex.ScrollableHitSource.SearchFailure; import org.opensearch.search.SearchHits; import java.io.IOException; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java index 538c1490bb6..62eeed6eb68 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java @@ -107,7 +107,7 @@ public class RemoteScrollableHitSource extends ScrollableHitSource { protected void clearScroll(String scrollId, Runnable onCompletion) { client.performRequestAsync(RemoteRequestBuilders.clearScroll(scrollId, remoteVersion), new ResponseListener() { @Override - public void onSuccess(org.elasticsearch.client.Response response) { + public void onSuccess(org.opensearch.client.Response response) { logger.debug("Successfully cleared [{}]", scrollId); onCompletion.run(); } @@ -158,7 +158,7 @@ public class RemoteScrollableHitSource extends ScrollableHitSource { try { client.performRequestAsync(request, new ResponseListener() { @Override - public void onSuccess(org.elasticsearch.client.Response response) { + public void onSuccess(org.opensearch.client.Response response) { // Restore the thread context to get the precious headers try (ThreadContext.StoredContext ctx = contextSupplier.get()) { assert ctx != null; // eliminates compiler warning diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionMetadataTestCase.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionMetadataTestCase.java index 417bc751ee2..f9406d7e7d9 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionMetadataTestCase.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionMetadataTestCase.java @@ -19,10 +19,6 @@ package org.opensearch.index.reindex; -import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; -import org.elasticsearch.index.reindex.BulkByScrollResponse; -import org.elasticsearch.index.reindex.ScrollableHitSource; - public abstract class AbstractAsyncBulkByScrollActionMetadataTestCase< Request extends AbstractBulkByScrollRequest, Response extends BulkByScrollResponse> diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java index dd9636ce160..f0f28c7275b 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/AbstractAsyncBulkByScrollActionScriptTestCase.java @@ -19,17 +19,14 @@ package org.opensearch.index.reindex; +import org.junit.Before; import org.opensearch.action.ActionRequest; import org.opensearch.action.delete.DeleteRequest; import org.opensearch.action.index.IndexRequest; -import org.elasticsearch.index.reindex.AbstractBulkIndexByScrollRequest; -import org.elasticsearch.index.reindex.BulkByScrollResponse; -import org.elasticsearch.index.reindex.ScrollableHitSource; import org.opensearch.index.reindex.AbstractAsyncBulkByScrollAction.OpType; import org.opensearch.index.reindex.AbstractAsyncBulkByScrollAction.RequestWrapper; import org.opensearch.script.ScriptService; import org.opensearch.script.UpdateScript; -import org.junit.Before; import java.util.Collections; import java.util.Map; 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 c6e7bc31de9..4872fe76b7f 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 @@ -20,7 +20,7 @@ package org.opensearch.index.reindex; import org.opensearch.action.search.SearchRequest; -import org.elasticsearch.index.mapper.IdFieldMapper; +import org.opensearch.index.mapper.IdFieldMapper; import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkIndexByScrollResponseMatcher.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkIndexByScrollResponseMatcher.java index 8ca6aea85c8..924e48a75a3 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkIndexByScrollResponseMatcher.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkIndexByScrollResponseMatcher.java @@ -19,7 +19,6 @@ package org.opensearch.index.reindex; -import org.elasticsearch.index.reindex.BulkByScrollResponse; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkIndexByScrollResponseTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkIndexByScrollResponseTests.java index 6729ad2882d..805272e935e 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkIndexByScrollResponseTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/BulkIndexByScrollResponseTests.java @@ -20,10 +20,8 @@ package org.opensearch.index.reindex; import org.opensearch.action.bulk.BulkItemResponse; -import org.elasticsearch.index.reindex.BulkByScrollResponse; -import org.elasticsearch.index.reindex.BulkByScrollTask; -import org.elasticsearch.index.reindex.ScrollableHitSource.SearchFailure; import org.opensearch.common.unit.TimeValue; +import org.opensearch.index.reindex.ScrollableHitSource.SearchFailure; import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java index 56132757777..54b866be4a3 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java @@ -29,18 +29,12 @@ import org.opensearch.action.ingest.DeletePipelineRequest; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.IndexModule; -import org.elasticsearch.index.engine.Engine; -import org.elasticsearch.index.engine.Engine.Operation.Origin; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.index.reindex.AbstractBulkByScrollRequestBuilder; -import org.elasticsearch.index.reindex.BulkByScrollResponse; -import org.elasticsearch.index.reindex.BulkByScrollTask; -import org.elasticsearch.index.reindex.DeleteByQueryAction; -import org.elasticsearch.index.reindex.ReindexAction; -import org.elasticsearch.index.reindex.UpdateByQueryAction; -import org.elasticsearch.index.shard.IndexingOperationListener; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.IndexModule; +import org.opensearch.index.engine.Engine; +import org.opensearch.index.engine.Engine.Operation.Origin; +import org.opensearch.index.query.QueryBuilders; +import org.opensearch.index.shard.IndexingOperationListener; +import org.opensearch.index.shard.ShardId; import org.opensearch.ingest.IngestTestPlugin; import org.opensearch.plugins.Plugin; import org.opensearch.tasks.TaskCancelledException; @@ -55,7 +49,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.IntStream; -import static org.elasticsearch.index.query.QueryBuilders.termQuery; +import static org.opensearch.index.query.QueryBuilders.termQuery; import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; import static org.hamcrest.Matchers.emptyIterable; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ClientScrollableHitSourceTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ClientScrollableHitSourceTests.java index 5c6b3b74b13..1089bb0376d 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ClientScrollableHitSourceTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ClientScrollableHitSourceTests.java @@ -37,8 +37,6 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.text.Text; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; -import org.elasticsearch.index.reindex.ClientScrollableHitSource; -import org.elasticsearch.index.reindex.ScrollableHitSource; import org.opensearch.search.SearchHit; import org.opensearch.search.SearchHits; import org.opensearch.search.internal.InternalSearchResponse; 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 6b47160f48a..dc33abfbb4d 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 @@ -26,11 +26,8 @@ import org.opensearch.cluster.InternalClusterInfoService; import org.opensearch.cluster.routing.allocation.DiskThresholdSettings; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.index.IndexNotFoundException; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; -import org.elasticsearch.index.reindex.BulkByScrollResponse; -import org.elasticsearch.index.reindex.DeleteByQueryRequestBuilder; +import org.opensearch.index.IndexNotFoundException; +import org.opensearch.index.query.QueryBuilders; import org.opensearch.plugins.Plugin; import org.opensearch.search.sort.SortOrder; import org.opensearch.test.InternalSettingsPlugin; @@ -46,9 +43,9 @@ import java.util.stream.Collectors; import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_READ_ONLY; import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_READ_ONLY_ALLOW_DELETE; -import static org.elasticsearch.index.query.QueryBuilders.matchQuery; -import static org.elasticsearch.index.query.QueryBuilders.rangeQuery; -import static org.elasticsearch.index.query.QueryBuilders.termQuery; +import static org.opensearch.index.query.QueryBuilders.matchQuery; +import static org.opensearch.index.query.QueryBuilders.rangeQuery; +import static org.opensearch.index.query.QueryBuilders.termQuery; import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; import static org.hamcrest.Matchers.hasSize; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryConcurrentTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryConcurrentTests.java index 4f6ba74646e..bb9f2dd8864 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryConcurrentTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/DeleteByQueryConcurrentTests.java @@ -20,17 +20,16 @@ package org.opensearch.index.reindex; import org.opensearch.action.index.IndexRequestBuilder; -import org.elasticsearch.index.query.MatchQueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.opensearch.index.query.MatchQueryBuilder; +import org.opensearch.index.query.QueryBuilders; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicLong; -import static org.elasticsearch.index.query.QueryBuilders.matchQuery; -import static org.elasticsearch.index.query.QueryBuilders.termQuery; +import static org.opensearch.index.query.QueryBuilders.matchQuery; +import static org.opensearch.index.query.QueryBuilders.termQuery; import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; import static org.hamcrest.Matchers.equalTo; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexBasicTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexBasicTests.java index 3d6207cc833..ee5a2d96c2e 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexBasicTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexBasicTests.java @@ -20,9 +20,6 @@ package org.opensearch.index.reindex; import org.opensearch.action.index.IndexRequestBuilder; -import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; -import org.elasticsearch.index.reindex.BulkByScrollResponse; -import org.elasticsearch.index.reindex.ReindexRequestBuilder; import java.util.ArrayList; import java.util.Collection; @@ -31,7 +28,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static org.elasticsearch.index.query.QueryBuilders.termQuery; +import static org.opensearch.index.query.QueryBuilders.termQuery; import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.hasSize; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFailureTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFailureTests.java index 366a2a184fa..6ad40d5376f 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFailureTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFailureTests.java @@ -21,8 +21,6 @@ package org.opensearch.index.reindex; import org.opensearch.action.bulk.BulkItemResponse.Failure; import org.opensearch.action.index.IndexRequestBuilder; -import org.elasticsearch.index.reindex.BulkByScrollResponse; -import org.elasticsearch.index.reindex.ReindexRequestBuilder; import java.util.ArrayList; import java.util.List; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteBuildRestClientTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteBuildRestClientTests.java index 973874bfced..44cfb952a75 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteBuildRestClientTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteBuildRestClientTests.java @@ -26,8 +26,7 @@ import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.settings.Settings; import org.opensearch.env.Environment; import org.opensearch.env.TestEnvironment; -import org.elasticsearch.index.query.MatchAllQueryBuilder; -import org.elasticsearch.index.reindex.RemoteInfo; +import org.opensearch.index.query.MatchAllQueryBuilder; import org.opensearch.watcher.ResourceWatcherService; import java.util.ArrayList; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWhitelistTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWhitelistTests.java index 5c329c49fdb..a1c3e81b9c2 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWhitelistTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWhitelistTests.java @@ -21,7 +21,6 @@ package org.opensearch.index.reindex; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.index.reindex.RemoteInfo; import org.opensearch.test.OpenSearchTestCase; import java.net.UnknownHostException; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java index 8c81f527e76..c472c2ee07e 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexFromRemoteWithAuthTests.java @@ -43,9 +43,6 @@ import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.env.Environment; import org.opensearch.env.NodeEnvironment; import org.opensearch.http.HttpInfo; -import org.elasticsearch.index.reindex.ReindexAction; -import org.elasticsearch.index.reindex.ReindexRequestBuilder; -import org.elasticsearch.index.reindex.RemoteInfo; import org.opensearch.plugins.ActionPlugin; import org.opensearch.plugins.Plugin; import org.opensearch.repositories.RepositoriesService; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexMetadataTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexMetadataTests.java index 8aa7d049f1d..29046a3acc0 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexMetadataTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexMetadataTests.java @@ -19,9 +19,7 @@ package org.opensearch.index.reindex; -import org.elasticsearch.index.reindex.BulkByScrollResponse; -import org.elasticsearch.index.reindex.ReindexRequest; -import org.elasticsearch.index.reindex.ScrollableHitSource.Hit; +import org.opensearch.index.reindex.ScrollableHitSource.Hit; import org.opensearch.action.index.IndexRequest; /** diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java index b38d29a87f5..96781632be0 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java @@ -34,7 +34,6 @@ import org.opensearch.common.ssl.PemKeyConfig; import org.opensearch.common.ssl.PemTrustConfig; import org.opensearch.env.Environment; import org.opensearch.env.TestEnvironment; -import org.elasticsearch.index.reindex.RemoteInfo; import org.elasticsearch.mocksocket.MockHttpServer; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.watcher.ResourceWatcherService; 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 558e5d0b6d2..95deb511fe0 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 @@ -19,9 +19,7 @@ package org.opensearch.index.reindex; -import org.elasticsearch.index.query.RangeQueryBuilder; -import org.elasticsearch.index.reindex.ReindexAction; -import org.elasticsearch.index.reindex.ReindexRequestBuilder; +import org.opensearch.index.query.RangeQueryBuilder; import org.opensearch.plugins.Plugin; import org.opensearch.search.sort.SortOrder; import org.opensearch.test.OpenSearchSingleNodeTestCase; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexTestCase.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexTestCase.java index c219d4ff4a5..5fbd7efa76a 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexTestCase.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexTestCase.java @@ -19,13 +19,6 @@ package org.opensearch.index.reindex; -import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; -import org.elasticsearch.index.reindex.DeleteByQueryAction; -import org.elasticsearch.index.reindex.DeleteByQueryRequestBuilder; -import org.elasticsearch.index.reindex.ReindexAction; -import org.elasticsearch.index.reindex.ReindexRequestBuilder; -import org.elasticsearch.index.reindex.UpdateByQueryAction; -import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder; import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexVersioningTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexVersioningTests.java index 0f78ab559f5..196d7f68cac 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexVersioningTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexVersioningTests.java @@ -20,12 +20,10 @@ package org.opensearch.index.reindex; import org.opensearch.action.get.GetResponse; -import org.elasticsearch.index.reindex.BulkByScrollResponse; -import org.elasticsearch.index.reindex.ReindexRequestBuilder; import static org.opensearch.action.DocWriteRequest.OpType.CREATE; -import static org.elasticsearch.index.VersionType.EXTERNAL; -import static org.elasticsearch.index.VersionType.INTERNAL; +import static org.opensearch.index.VersionType.EXTERNAL; +import static org.opensearch.index.VersionType.INTERNAL; public class ReindexVersioningTests extends ReindexTestCase { diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/RethrottleTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/RethrottleTests.java index d520da62467..99caa950a02 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/RethrottleTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/RethrottleTests.java @@ -25,13 +25,7 @@ import org.opensearch.action.ActionFuture; import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse; import org.opensearch.action.admin.cluster.node.tasks.list.TaskGroup; import org.opensearch.action.index.IndexRequestBuilder; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.index.reindex.AbstractBulkByScrollRequestBuilder; -import org.elasticsearch.index.reindex.BulkByScrollResponse; -import org.elasticsearch.index.reindex.BulkByScrollTask; -import org.elasticsearch.index.reindex.DeleteByQueryAction; -import org.elasticsearch.index.reindex.ReindexAction; -import org.elasticsearch.index.reindex.UpdateByQueryAction; +import org.opensearch.index.query.QueryBuilders; import org.opensearch.tasks.TaskId; import java.util.ArrayList; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java index 9e3cf83dcd8..f795cffb1aa 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/RetryTests.java @@ -32,17 +32,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; import org.opensearch.http.HttpInfo; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.index.reindex.AbstractBulkByScrollRequestBuilder; -import org.elasticsearch.index.reindex.BulkByScrollResponse; -import org.elasticsearch.index.reindex.BulkByScrollTask; -import org.elasticsearch.index.reindex.DeleteByQueryAction; -import org.elasticsearch.index.reindex.DeleteByQueryRequestBuilder; -import org.elasticsearch.index.reindex.ReindexAction; -import org.elasticsearch.index.reindex.ReindexRequestBuilder; -import org.elasticsearch.index.reindex.RemoteInfo; -import org.elasticsearch.index.reindex.UpdateByQueryAction; -import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder; +import org.opensearch.index.query.QueryBuilders; import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchIntegTestCase; import org.opensearch.threadpool.ThreadPool; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/RoundTripTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/RoundTripTests.java index 07639efa21e..46be7e194b8 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/RoundTripTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/RoundTripTests.java @@ -27,14 +27,6 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.Writeable; import org.opensearch.common.lucene.uid.Versions; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; -import org.elasticsearch.index.reindex.AbstractBulkIndexByScrollRequest; -import org.elasticsearch.index.reindex.DeleteByQueryRequest; -import org.elasticsearch.index.reindex.ReindexAction; -import org.elasticsearch.index.reindex.ReindexRequest; -import org.elasticsearch.index.reindex.RemoteInfo; -import org.elasticsearch.index.reindex.UpdateByQueryAction; -import org.elasticsearch.index.reindex.UpdateByQueryRequest; import org.opensearch.script.Script; import org.opensearch.script.ScriptType; import org.opensearch.tasks.TaskId; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/TransportRethrottleActionTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/TransportRethrottleActionTests.java index 478267b4e92..fc2c03ce208 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/TransportRethrottleActionTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/TransportRethrottleActionTests.java @@ -24,8 +24,6 @@ import org.opensearch.action.FailedNodeException; import org.opensearch.action.TaskOperationFailure; import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse; import org.opensearch.client.Client; -import org.elasticsearch.index.reindex.BulkByScrollResponse; -import org.elasticsearch.index.reindex.BulkByScrollTask; import org.opensearch.tasks.TaskId; import org.opensearch.tasks.TaskInfo; import org.opensearch.test.OpenSearchTestCase; 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 fba3b5cf7aa..82a137d3e74 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 @@ -20,9 +20,6 @@ package org.opensearch.index.reindex; import org.opensearch.action.index.IndexRequestBuilder; -import org.elasticsearch.index.reindex.AbstractBulkByScrollRequest; -import org.elasticsearch.index.reindex.BulkByScrollResponse; -import org.elasticsearch.index.reindex.UpdateByQueryRequestBuilder; import org.opensearch.search.sort.SortOrder; import java.util.ArrayList; @@ -32,7 +29,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static org.elasticsearch.index.query.QueryBuilders.termQuery; +import static org.opensearch.index.query.QueryBuilders.termQuery; import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount; import static org.hamcrest.Matchers.hasSize; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryMetadataTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryMetadataTests.java index ae3a92b5e1e..aa671a9e83a 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryMetadataTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryMetadataTests.java @@ -21,9 +21,7 @@ package org.opensearch.index.reindex; import org.opensearch.action.index.IndexRequest; import org.opensearch.cluster.ClusterState; -import org.elasticsearch.index.reindex.BulkByScrollResponse; -import org.elasticsearch.index.reindex.ScrollableHitSource.Hit; -import org.elasticsearch.index.reindex.UpdateByQueryRequest; +import org.opensearch.index.reindex.ScrollableHitSource.Hit; public class UpdateByQueryMetadataTests extends AbstractAsyncBulkByScrollActionMetadataTestCase { diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryWhileModifyingTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryWhileModifyingTests.java index 9a24c9eda65..b169e60cc82 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryWhileModifyingTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryWhileModifyingTests.java @@ -21,8 +21,7 @@ package org.opensearch.index.reindex; import org.opensearch.action.get.GetResponse; import org.opensearch.action.index.IndexRequestBuilder; -import org.elasticsearch.index.engine.VersionConflictEngineException; -import org.elasticsearch.index.reindex.BulkByScrollResponse; +import org.opensearch.index.engine.VersionConflictEngineException; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryWithScriptTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryWithScriptTests.java index c0a296c5be4..5cd00cc553a 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryWithScriptTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryWithScriptTests.java @@ -21,8 +21,6 @@ package org.opensearch.index.reindex; import org.opensearch.action.support.ActionFilters; import org.opensearch.cluster.ClusterState; -import org.elasticsearch.index.reindex.BulkByScrollResponse; -import org.elasticsearch.index.reindex.UpdateByQueryRequest; import org.opensearch.script.ScriptService; import org.opensearch.transport.TransportService; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteInfoTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteInfoTests.java index b8330adb0e1..02f25fc5922 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteInfoTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/remote/RemoteInfoTests.java @@ -20,7 +20,7 @@ package org.opensearch.index.reindex.remote; import org.opensearch.common.bytes.BytesArray; -import org.elasticsearch.index.reindex.RemoteInfo; +import org.opensearch.index.reindex.RemoteInfo; import org.opensearch.test.OpenSearchTestCase; import static java.util.Collections.emptyMap; 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 65cb678b9b3..179faf2a013 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 @@ -52,9 +52,9 @@ import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException; -import org.elasticsearch.index.reindex.RejectAwareActionListener; -import org.elasticsearch.index.reindex.ScrollableHitSource; -import org.elasticsearch.index.reindex.ScrollableHitSource.Response; +import org.opensearch.index.reindex.RejectAwareActionListener; +import org.opensearch.index.reindex.ScrollableHitSource; +import org.opensearch.index.reindex.ScrollableHitSource.Response; import org.opensearch.rest.RestStatus; import org.opensearch.search.builder.SearchSourceBuilder; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/reindex/src/test/resources/responses/rejection.json b/modules/reindex/src/test/resources/responses/rejection.json index 36120fbf888..9bdc96cd381 100644 --- a/modules/reindex/src/test/resources/responses/rejection.json +++ b/modules/reindex/src/test/resources/responses/rejection.json @@ -12,7 +12,7 @@ "node" : "87A7NvevQxSrEwMbtRCecg", "reason" : { "type" : "es_rejected_execution_exception", - "reason" : "rejected execution of org.elasticsearch.transport.TransportService$5@52d06af2 on EsThreadPoolExecutor[search, queue capacity = 1000, org.elasticsearch.common.util.concurrent.EsThreadPoolExecutor@778ea553[Running, pool size = 7, active threads = 7, queued tasks = 1000, completed tasks = 4182]]" + "reason" : "rejected execution of org.opensearch.transport.TransportService$5@52d06af2 on EsThreadPoolExecutor[search, queue capacity = 1000, org.opensearch.common.util.concurrent.EsThreadPoolExecutor@778ea553[Running, pool size = 7, active threads = 7, queued tasks = 1000, completed tasks = 4182]]" } } ] }, diff --git a/modules/repository-url/src/main/java/org/opensearch/plugin/repository/url/URLRepositoryPlugin.java b/modules/repository-url/src/main/java/org/opensearch/plugin/repository/url/URLRepositoryPlugin.java index a47d6f05919..ab07a33ef59 100644 --- a/modules/repository-url/src/main/java/org/opensearch/plugin/repository/url/URLRepositoryPlugin.java +++ b/modules/repository-url/src/main/java/org/opensearch/plugin/repository/url/URLRepositoryPlugin.java @@ -23,7 +23,7 @@ import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Setting; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.env.Environment; -import org.elasticsearch.indices.recovery.RecoverySettings; +import org.opensearch.indices.recovery.RecoverySettings; import org.opensearch.plugins.Plugin; import org.opensearch.plugins.RepositoryPlugin; import org.opensearch.repositories.Repository; diff --git a/modules/repository-url/src/test/java/org/opensearch/repositories/url/URLRepositoryTests.java b/modules/repository-url/src/test/java/org/opensearch/repositories/url/URLRepositoryTests.java index a421f11b1e5..7093c45cd56 100644 --- a/modules/repository-url/src/test/java/org/opensearch/repositories/url/URLRepositoryTests.java +++ b/modules/repository-url/src/test/java/org/opensearch/repositories/url/URLRepositoryTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.env.Environment; import org.opensearch.env.TestEnvironment; -import org.elasticsearch.indices.recovery.RecoverySettings; +import org.opensearch.indices.recovery.RecoverySettings; import org.opensearch.repositories.RepositoryException; import org.opensearch.repositories.blobstore.BlobStoreTestUtil; import org.opensearch.test.OpenSearchTestCase; diff --git a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4HttpRequestSizeLimitIT.java b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4HttpRequestSizeLimitIT.java index 9947596266e..a86f8b7b766 100644 --- a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4HttpRequestSizeLimitIT.java +++ b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/http/netty4/Netty4HttpRequestSizeLimitIT.java @@ -29,7 +29,7 @@ import org.opensearch.common.transport.TransportAddress; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.http.HttpServerTransport; -import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService; +import org.opensearch.indices.breaker.HierarchyCircuitBreakerService; import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope; import org.opensearch.test.OpenSearchIntegTestCase.Scope; diff --git a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportMultiPortIntegrationIT.java b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportMultiPortIntegrationIT.java index 72542302bfd..b89ed284b16 100644 --- a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportMultiPortIntegrationIT.java +++ b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/Netty4TransportMultiPortIntegrationIT.java @@ -29,7 +29,7 @@ import org.opensearch.common.network.NetworkModule; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.BoundTransportAddress; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope; import org.opensearch.test.OpenSearchIntegTestCase.Scope; import org.opensearch.test.junit.annotations.Network; diff --git a/modules/transport-netty4/src/main/java/org/opensearch/transport/NettyAllocator.java b/modules/transport-netty4/src/main/java/org/opensearch/transport/NettyAllocator.java index 58f3c34823b..2aecbc7e854 100644 --- a/modules/transport-netty4/src/main/java/org/opensearch/transport/NettyAllocator.java +++ b/modules/transport-netty4/src/main/java/org/opensearch/transport/NettyAllocator.java @@ -31,7 +31,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.common.Booleans; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.monitor.jvm.JvmInfo; +import org.opensearch.monitor.jvm.JvmInfo; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4BadRequestTests.java b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4BadRequestTests.java index f1acb71e1d4..72a237ff553 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4BadRequestTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4BadRequestTests.java @@ -31,7 +31,7 @@ import org.opensearch.common.util.MockPageCacheRecycler; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.http.HttpServerTransport; import org.opensearch.http.HttpTransportSettings; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestChannel; import org.opensearch.rest.RestRequest; diff --git a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerPipeliningTests.java b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerPipeliningTests.java index 17cf639d74f..01d12b592cf 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerPipeliningTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerPipeliningTests.java @@ -39,7 +39,7 @@ import org.opensearch.http.HttpPipelinedRequest; import org.opensearch.http.HttpResponse; import org.opensearch.http.HttpServerTransport; import org.opensearch.http.NullDispatcher; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.rest.RestStatus; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; diff --git a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerTransportTests.java b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerTransportTests.java index f00bccb2fcf..1ed10bb5082 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerTransportTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/http/netty4/Netty4HttpServerTransportTests.java @@ -62,7 +62,7 @@ import org.opensearch.http.CorsHandler; import org.opensearch.http.HttpServerTransport; import org.opensearch.http.HttpTransportSettings; import org.opensearch.http.NullDispatcher; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.rest.BytesRestResponse; import org.opensearch.rest.RestChannel; import org.opensearch.rest.RestRequest; diff --git a/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/Netty4SizeHeaderFrameDecoderTests.java b/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/Netty4SizeHeaderFrameDecoderTests.java index 745b5ff66d6..eb3c8b8de4f 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/Netty4SizeHeaderFrameDecoderTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/Netty4SizeHeaderFrameDecoderTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; import org.opensearch.common.util.MockPageCacheRecycler; import org.opensearch.common.util.PageCacheRecycler; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.elasticsearch.mocksocket.MockSocket; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; diff --git a/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/Netty4UtilsTests.java b/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/Netty4UtilsTests.java index 6e378875ab2..599aa10afcf 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/Netty4UtilsTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/Netty4UtilsTests.java @@ -30,7 +30,7 @@ import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.io.stream.ReleasableBytesStreamOutput; import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.PageCacheRecycler; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; diff --git a/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/NettyTransportMultiPortTests.java b/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/NettyTransportMultiPortTests.java index d865c5b0ef6..da66520e883 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/NettyTransportMultiPortTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/NettyTransportMultiPortTests.java @@ -26,7 +26,7 @@ import org.opensearch.common.network.NetworkUtils; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.MockPageCacheRecycler; import org.opensearch.common.util.PageCacheRecycler; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; diff --git a/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/SimpleNetty4TransportTests.java b/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/SimpleNetty4TransportTests.java index 4839934e28a..fa8eaf1d329 100644 --- a/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/SimpleNetty4TransportTests.java +++ b/modules/transport-netty4/src/test/java/org/opensearch/transport/netty4/SimpleNetty4TransportTests.java @@ -31,7 +31,7 @@ import org.opensearch.common.transport.TransportAddress; import org.opensearch.common.util.PageCacheRecycler; import org.opensearch.core.internal.io.IOUtils; import org.opensearch.core.internal.net.NetUtils; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.test.transport.MockTransportService; import org.opensearch.test.transport.StubbableTransport; import org.opensearch.transport.AbstractSimpleTransportTestCase;