From d65bccc25decf8f7dfdb6e10d32cd9f3bc1dd1cf Mon Sep 17 00:00:00 2001 From: Sarat Vemulapalli Date: Mon, 15 Mar 2021 16:59:39 -0700 Subject: [PATCH] Renaming server/env to OpenSearch (#314) Signed-off-by: Sarat Vemulapalli --- .../plugins/InstallPluginCommand.java | 2 +- .../elasticsearch/plugins/ListPluginsCommand.java | 2 +- .../elasticsearch/plugins/RemovePluginCommand.java | 2 +- .../plugins/ListPluginsCommandTests.java | 4 ++-- .../plugins/RemovePluginCommandTests.java | 4 ++-- .../common/ASCIIFoldingTokenFilterFactory.java | 2 +- .../AbstractCompoundWordTokenFilterFactory.java | 2 +- .../analysis/common/ArabicAnalyzerProvider.java | 2 +- .../common/ArabicNormalizationFilterFactory.java | 2 +- .../common/ArabicStemTokenFilterFactory.java | 2 +- .../analysis/common/BasqueAnalyzerProvider.java | 2 +- .../analysis/common/BengaliAnalyzerProvider.java | 2 +- .../common/BrazilianStemTokenFilterFactory.java | 2 +- .../analysis/common/BulgarianAnalyzerProvider.java | 2 +- .../analysis/common/CJKWidthFilterFactory.java | 2 +- .../analysis/common/CharGroupTokenizerFactory.java | 2 +- .../analysis/common/CjkAnalyzerProvider.java | 2 +- .../analysis/common/ClassicFilterFactory.java | 2 +- .../analysis/common/CzechAnalyzerProvider.java | 2 +- .../common/CzechStemTokenFilterFactory.java | 2 +- .../analysis/common/DanishAnalyzerProvider.java | 2 +- .../DictionaryCompoundWordTokenFilterFactory.java | 2 +- .../analysis/common/DutchAnalyzerProvider.java | 2 +- .../common/DutchStemTokenFilterFactory.java | 2 +- .../common/EdgeNGramTokenFilterFactory.java | 2 +- .../analysis/common/EdgeNGramTokenizerFactory.java | 2 +- .../analysis/common/ElisionTokenFilterFactory.java | 2 +- .../analysis/common/EstonianAnalyzerProvider.java | 2 +- .../common/FingerprintAnalyzerProvider.java | 2 +- .../common/FlattenGraphTokenFilterFactory.java | 2 +- .../analysis/common/FrenchAnalyzerProvider.java | 2 +- .../common/FrenchStemTokenFilterFactory.java | 2 +- .../analysis/common/GermanAnalyzerProvider.java | 2 +- .../common/GermanNormalizationFilterFactory.java | 2 +- .../common/GermanStemTokenFilterFactory.java | 2 +- .../common/HindiNormalizationFilterFactory.java | 2 +- .../analysis/common/HungarianAnalyzerProvider.java | 2 +- .../HyphenationCompoundWordTokenFilterFactory.java | 2 +- .../common/IndicNormalizationFilterFactory.java | 2 +- .../common/IndonesianAnalyzerProvider.java | 2 +- .../analysis/common/IrishAnalyzerProvider.java | 2 +- .../analysis/common/KeepWordFilterFactory.java | 2 +- .../common/KeywordMarkerTokenFilterFactory.java | 2 +- .../analysis/common/KeywordTokenizerFactory.java | 2 +- .../analysis/common/LetterTokenizerFactory.java | 2 +- .../common/LimitTokenCountFilterFactory.java | 2 +- .../analysis/common/NGramTokenizerFactory.java | 2 +- .../analysis/common/NorwegianAnalyzerProvider.java | 2 +- .../common/PathHierarchyTokenizerFactory.java | 2 +- .../common/PatternReplaceCharFilterFactory.java | 2 +- .../common/PatternReplaceTokenFilterFactory.java | 2 +- .../analysis/common/PatternTokenizerFactory.java | 2 +- .../analysis/common/PersianAnalyzerProvider.java | 2 +- .../common/PersianNormalizationFilterFactory.java | 2 +- .../common/PortugueseAnalyzerProvider.java | 2 +- .../common/RemoveDuplicatesTokenFilterFactory.java | 2 +- .../analysis/common/ReverseTokenFilterFactory.java | 2 +- .../analysis/common/RussianAnalyzerProvider.java | 2 +- .../common/RussianStemTokenFilterFactory.java | 2 +- .../common/ScandinavianFoldingFilterFactory.java | 2 +- .../ScandinavianNormalizationFilterFactory.java | 2 +- .../common/SerbianNormalizationFilterFactory.java | 2 +- .../common/SimplePatternSplitTokenizerFactory.java | 2 +- .../common/SimplePatternTokenizerFactory.java | 2 +- .../analysis/common/SnowballAnalyzerProvider.java | 2 +- .../common/SnowballTokenFilterFactory.java | 2 +- .../analysis/common/SoraniAnalyzerProvider.java | 2 +- .../common/StandardHtmlStripAnalyzerProvider.java | 2 +- .../analysis/common/StemmerTokenFilterFactory.java | 2 +- .../analysis/common/SwedishAnalyzerProvider.java | 2 +- .../common/SynonymGraphTokenFilterFactory.java | 2 +- .../analysis/common/TrimTokenFilterFactory.java | 2 +- .../common/TruncateTokenFilterFactory.java | 2 +- .../analysis/common/UniqueTokenFilterFactory.java | 2 +- .../common/UpperCaseTokenFilterFactory.java | 2 +- .../WordDelimiterGraphTokenFilterFactory.java | 2 +- .../common/XLowerCaseTokenizerFactory.java | 2 +- ...aseWordDelimiterTokenFilterFactoryTestCase.java | 2 +- .../analysis/common/CommonAnalysisPluginTests.java | 2 +- .../analysis/common/ElisionFilterFactoryTests.java | 2 +- .../common/KeywordMarkerFilterFactoryTests.java | 2 +- .../common/PredicateTokenScriptFilterTests.java | 4 ++-- .../StemmerOverrideTokenFilterFactoryTests.java | 2 +- .../org/opensearch/painless/PainlessPlugin.java | 4 ++-- .../opensearch/index/reindex/ReindexPlugin.java | 4 ++-- .../opensearch/index/reindex/ReindexSslConfig.java | 2 +- .../ReindexFromRemoteBuildRestClientTests.java | 4 ++-- .../reindex/ReindexFromRemoteWithAuthTests.java | 4 ++-- .../index/reindex/ReindexRestClientSslTests.java | 4 ++-- .../plugin/repository/url/URLRepositoryPlugin.java | 2 +- .../opensearch/repositories/url/URLRepository.java | 2 +- .../repositories/url/URLRepositoryTests.java | 4 ++-- .../env/Environment.java | 4 ++-- .../env/NodeEnvironment.java | 14 +++++++------- .../env/NodeMetadata.java | 2 +- .../env/NodeRepurposeCommand.java | 4 ++-- .../env/OpenSearchFileStore.java} | 12 ++++++------ .../env/OverrideNodeVersionCommand.java | 12 ++++++------ .../env/ShardLock.java | 2 +- .../env/ShardLockObtainFailedException.java | 2 +- .../snapshots/mockstore/MockRepository.java | 2 +- 101 files changed, 128 insertions(+), 128 deletions(-) rename server/src/main/java/org/{elasticsearch => opensearch}/env/Environment.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/env/NodeEnvironment.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/env/NodeMetadata.java (99%) rename server/src/main/java/org/{elasticsearch => opensearch}/env/NodeRepurposeCommand.java (99%) rename server/src/main/java/org/{elasticsearch/env/ESFileStore.java => opensearch/env/OpenSearchFileStore.java} (97%) rename server/src/main/java/org/{elasticsearch => opensearch}/env/OverrideNodeVersionCommand.java (90%) rename server/src/main/java/org/{elasticsearch => opensearch}/env/ShardLock.java (98%) rename server/src/main/java/org/{elasticsearch => opensearch}/env/ShardLockObtainFailedException.java (98%) diff --git a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java index 467328122f8..62a98d65959 100644 --- a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java +++ b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/InstallPluginCommand.java @@ -46,7 +46,7 @@ import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.hash.MessageDigests; import org.elasticsearch.core.internal.io.IOUtils; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import java.io.BufferedReader; import java.io.IOException; diff --git a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/ListPluginsCommand.java b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/ListPluginsCommand.java index f901a855a55..8f6e1d7cb01 100644 --- a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/ListPluginsCommand.java +++ b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/ListPluginsCommand.java @@ -23,7 +23,7 @@ import joptsimple.OptionSet; import org.opensearch.Version; import org.opensearch.cli.EnvironmentAwareCommand; import org.opensearch.cli.Terminal; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import java.io.IOException; import java.nio.file.DirectoryStream; diff --git a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/RemovePluginCommand.java b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/RemovePluginCommand.java index a08743cb238..1088271db40 100644 --- a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/RemovePluginCommand.java +++ b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/RemovePluginCommand.java @@ -26,7 +26,7 @@ import org.opensearch.cli.ExitCodes; import org.opensearch.cli.Terminal; import org.opensearch.cli.UserException; import org.elasticsearch.core.internal.io.IOUtils; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import java.io.IOException; import java.nio.file.FileAlreadyExistsException; diff --git a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/ListPluginsCommandTests.java b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/ListPluginsCommandTests.java index facb5540516..eee1efce731 100644 --- a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/ListPluginsCommandTests.java +++ b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/ListPluginsCommandTests.java @@ -33,8 +33,8 @@ import org.opensearch.cli.ExitCodes; import org.elasticsearch.cli.MockTerminal; import org.opensearch.cli.UserException; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.Environment; +import org.opensearch.env.TestEnvironment; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/RemovePluginCommandTests.java b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/RemovePluginCommandTests.java index f812290ed6f..a6461b374c2 100644 --- a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/RemovePluginCommandTests.java +++ b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/RemovePluginCommandTests.java @@ -25,8 +25,8 @@ import org.opensearch.cli.ExitCodes; import org.elasticsearch.cli.MockTerminal; import org.opensearch.cli.UserException; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.Environment; +import org.opensearch.env.TestEnvironment; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.VersionUtils; import org.junit.Before; 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 90677597c6c..4659031d229 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 @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilter; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; 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 7cf0bccb704..04e4e5e3919 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.compound.CompoundWordTokenFilterBase; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.Analysis; 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 9ea1930c682..ee303c5789a 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.ar.ArabicAnalyzer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; 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 330ed4b9ce4..3b6e97970af 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 @@ -21,7 +21,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.ar.ArabicNormalizationFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.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 d0c2ba03702..4552e2b449c 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.ar.ArabicStemFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.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 472993ee61f..a3fd81692a1 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.eu.BasqueAnalyzer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; 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 c6506e073b9..a39b42f7946 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.bn.BengaliAnalyzer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; 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 f4f3d0763ed..6581bb07b8a 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 @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.br.BrazilianStemFilter; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; import org.apache.lucene.analysis.CharArraySet; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.Analysis; 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 4ae6050997a..738bf6b97dd 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.bg.BulgarianAnalyzer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; 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 d7d5ec8a5cf..983ea0ce419 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.cjk.CJKWidthFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; 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 b61a837c69a..8fcfca5a198 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 @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.util.CharTokenizer; import org.apache.lucene.util.AttributeFactory; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenizerFactory; 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 e6b003b61f5..feee6ad0a11 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.cjk.CJKAnalyzer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; 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 88e932b96df..d771087750a 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 @@ -21,7 +21,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.standard.ClassicFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; 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 bd40e8d735d..7df44fd2ebb 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.cz.CzechAnalyzer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; 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 9871fff21cb..4332ddd2dd2 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 @@ -21,7 +21,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.cz.CzechStemFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.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 cd347263c40..30a20cb6b82 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.da.DanishAnalyzer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; 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 0cc1330c664..0bcce67070c 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.compound.DictionaryCompoundWordTokenFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.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 48aeba493a9..9a6e85a4b35 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.nl.DutchAnalyzer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; 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 ea5ca7364dc..e874f105d0a 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 @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; import org.apache.lucene.analysis.snowball.SnowballFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.Analysis; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactory.java index 49a64e494c6..f796bfe295b 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EdgeNGramTokenFilterFactory.java @@ -25,7 +25,7 @@ import org.apache.lucene.analysis.reverse.ReverseStringFilter; import org.opensearch.Version; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.TokenFilterFactory; 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 88238f220a9..99504b002e3 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 @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.ngram.EdgeNGramTokenizer; import org.apache.lucene.analysis.ngram.NGramTokenizer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenizerFactory; 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 fc2a55bea41..a57984152b1 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 @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.ElisionFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.Analysis; 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 4b10bcb31f5..55a8eb7a1d3 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.et.EstonianAnalyzer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; 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 52e4f9cb8ff..5efe713bf46 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 @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CharArraySet; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; 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 e2c7efa7d9e..d086b87be6b 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.FlattenGraphFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.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 8c9317ce613..e56aa57a054 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.fr.FrenchAnalyzer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; 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 26386735cc6..1178cc5eaf4 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 @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; import org.apache.lucene.analysis.snowball.SnowballFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.Analysis; 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 800b85cb9d4..ded1b4757de 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.de.GermanAnalyzer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; 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 ece4249d792..830ff5e71fc 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 @@ -21,7 +21,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.de.GermanNormalizationFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; 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 a7cc9148c08..b0e68015e9d 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 @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.de.GermanStemFilter; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.Analysis; 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 94e809fe1dd..92361087937 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 @@ -21,7 +21,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.hi.HindiNormalizationFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; 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 298e5aac39c..886a1e97b8c 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.hu.HungarianAnalyzer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; 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 3e1e06c4d24..160d8f2acb4 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 @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.compound.HyphenationCompoundWordTokenFilter; import org.apache.lucene.analysis.compound.hyphenation.HyphenationTree; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.xml.sax.InputSource; 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 ce7c543be14..f331c817912 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 @@ -21,7 +21,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.in.IndicNormalizationFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; 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 a7e054c191b..1a1271a6337 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.id.IndonesianAnalyzer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; 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 a9cd7bcc2dc..3b8d332d4e7 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.ga.IrishAnalyzer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; 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 da781ef4167..bea7e44a8c8 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 @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.KeepWordFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.Analysis; 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 fc28d0ffef2..f9edfaf38bd 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 @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.PatternKeywordMarkerFilter; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.Analysis; 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 5eb3349c3ac..fba5a195383 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenizerFactory; 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 a359480a9ef..e6b6e2b397b 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.LetterTokenizer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.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 716119cd426..1623a414d4d 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.LimitTokenCountFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; 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 d702d48b950..108ccc8e79f 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 @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.ngram.NGramTokenizer; import org.opensearch.Version; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenizerFactory; 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 2586177c0d4..e922bf29dcb 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.no.NorwegianAnalyzer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; 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 1e83b673a04..fe57c9d61a6 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 @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.path.PathHierarchyTokenizer; import org.apache.lucene.analysis.path.ReversePathHierarchyTokenizer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenizerFactory; 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 26de71fa2e2..16ed297af40 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 @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.pattern.PatternReplaceCharFilter; import org.opensearch.common.Strings; import org.elasticsearch.common.regex.Regex; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractCharFilterFactory; import org.elasticsearch.index.analysis.NormalizingCharFilterFactory; 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 2e7b9db3d9f..a1af097d8fa 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 @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.pattern.PatternReplaceFilter; import org.elasticsearch.common.regex.Regex; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; 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 c06690dc326..34570984b54 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 @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.pattern.PatternTokenizer; import org.elasticsearch.common.regex.Regex; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenizerFactory; 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 a7522c821e5..283c5a5fa97 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 @@ -21,7 +21,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.fa.PersianAnalyzer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; 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 6ce61d98944..754c731454d 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 @@ -21,7 +21,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.fa.PersianNormalizationFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; 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 a3743094a3b..593bd4191ca 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.pt.PortugueseAnalyzer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; 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 ed201bf40c9..146451cb414 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.RemoveDuplicatesTokenFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; 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 12d56de50af..f3356340120 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.reverse.ReverseStringFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; 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 26727756741..d8a3be0c7a8 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.ru.RussianAnalyzer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; 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 d8e701f28a8..cae95d69546 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.snowball.SnowballFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.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 e9e5ccce987..a4b6755583a 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 @@ -21,7 +21,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.ScandinavianFoldingFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; 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 59db5cf0a2d..93cac80606f 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 @@ -21,7 +21,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.ScandinavianNormalizationFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; 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 0b8b20892ba..ca146372c3d 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.sr.SerbianNormalizationFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.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 de723e0a20e..dc1dad92155 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.pattern.SimplePatternSplitTokenizer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.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 45c2da794e9..aa2d4bf07f4 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.pattern.SimplePatternTokenizer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.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 81be798d61b..8a1c6b82096 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 @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.en.EnglishAnalyzer; import org.apache.lucene.analysis.fr.FrenchAnalyzer; import org.apache.lucene.analysis.nl.DutchAnalyzer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; 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 bb13a4c2bea..3640d9fe0c1 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 @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.snowball.SnowballFilter; import org.opensearch.common.Strings; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; 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 5e870b1f5ca..61e888d6811 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.ckb.SoraniAnalyzer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/StandardHtmlStripAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/StandardHtmlStripAnalyzerProvider.java index 42161d1801d..e8be2680e06 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/StandardHtmlStripAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/StandardHtmlStripAnalyzerProvider.java @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.CharArraySet; import org.opensearch.Version; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; 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 2c572884560..f29c47f15f1 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 @@ -56,7 +56,7 @@ import org.apache.lucene.analysis.snowball.SnowballFilter; import org.apache.lucene.analysis.sv.SwedishLightStemFilter; import org.opensearch.common.Strings; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.tartarus.snowball.ext.ArmenianStemmer; 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 d60842cb351..8238014e5f9 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.sv.SwedishAnalyzer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractIndexAnalyzerProvider; import org.elasticsearch.index.analysis.Analysis; 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 48c7e63f4f1..9525cdcdf61 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 @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.synonym.SynonymGraphFilter; import org.apache.lucene.analysis.synonym.SynonymMap; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AnalysisMode; import org.elasticsearch.index.analysis.CharFilterFactory; 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 e5df458a0b7..ecec6b07f56 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.TrimFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.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 5cff255b93a..0ee2bae221b 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.miscellaneous.TruncateTokenFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; 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 036ecefdf4e..829b17a8900 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 @@ -21,7 +21,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.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 4de858ae902..4c97b299d72 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.UpperCaseFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.NormalizingTokenFilterFactory; diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactory.java index c77a72a4546..752548f438e 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactory.java @@ -26,7 +26,7 @@ import org.apache.lucene.analysis.miscellaneous.WordDelimiterIterator; import org.opensearch.Version; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenFilterFactory; import org.elasticsearch.index.analysis.Analysis; 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 35c77ca0811..a46d78105ca 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 @@ -21,7 +21,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.Tokenizer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AbstractTokenizerFactory; 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 6f7189dda13..b73df9c69d7 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.TokenFilterFactory; import org.elasticsearch.test.ESTestCase; 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 61fdf90418b..77c6a635339 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 @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.analysis.NamedAnalyzer; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ElisionFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ElisionFilterFactoryTests.java index 337e5bbe0a9..b2b7b660ed5 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ElisionFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ElisionFilterFactoryTests.java @@ -20,7 +20,7 @@ package org.opensearch.analysis.common; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.test.ESTokenStreamTestCase; 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 7beeffb55ca..2194d14aa86 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 @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.apache.lucene.analysis.miscellaneous.PatternKeywordMarkerFilter; import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.NamedAnalyzer; import org.elasticsearch.index.analysis.TokenFilterFactory; 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 8b9ab31a927..4c98df76c3e 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 @@ -22,8 +22,8 @@ package org.opensearch.analysis.common; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.env.TestEnvironment; +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; 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 804b9aa3257..147fe087c03 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 @@ -22,7 +22,7 @@ package org.opensearch.analysis.common; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.TokenFilterFactory; import org.elasticsearch.test.ESTestCase; diff --git a/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java index f77d400883b..22e32c5ecc7 100644 --- a/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java @@ -34,8 +34,8 @@ import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsFilter; import org.elasticsearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.env.Environment; -import org.elasticsearch.env.NodeEnvironment; +import org.opensearch.env.Environment; +import org.opensearch.env.NodeEnvironment; import org.opensearch.painless.action.PainlessContextAction; import org.opensearch.painless.action.PainlessExecuteAction; import org.opensearch.painless.spi.PainlessExtension; 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 fbb5f0a6032..211ecc7bac1 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 @@ -32,8 +32,8 @@ import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsFilter; import org.elasticsearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.env.Environment; -import org.elasticsearch.env.NodeEnvironment; +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; diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexSslConfig.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexSslConfig.java index 3d242982627..f31d7ae3f36 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexSslConfig.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexSslConfig.java @@ -30,7 +30,7 @@ import org.elasticsearch.common.settings.Settings; import org.opensearch.common.ssl.SslConfiguration; import org.opensearch.common.ssl.SslConfigurationKeys; import org.opensearch.common.ssl.SslConfigurationLoader; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.watcher.FileChangesListener; import org.elasticsearch.watcher.FileWatcher; import org.elasticsearch.watcher.ResourceWatcherService; 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 16fc0e1e3a3..269987caa24 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 @@ -24,8 +24,8 @@ import org.elasticsearch.client.RestClientBuilderTestCase; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.Environment; +import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.query.MatchAllQueryBuilder; import org.elasticsearch.index.reindex.RemoteInfo; import org.elasticsearch.watcher.ResourceWatcherService; 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 76405d1cdb5..a6d4cd446f2 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 @@ -40,8 +40,8 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.TransportAddress; import org.elasticsearch.common.util.concurrent.ThreadContext; import org.elasticsearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.env.Environment; -import org.elasticsearch.env.NodeEnvironment; +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; 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 db86f7d4705..40aed845637 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 @@ -32,8 +32,8 @@ import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.settings.Settings; import org.opensearch.common.ssl.PemKeyConfig; import org.opensearch.common.ssl.PemTrustConfig; -import org.elasticsearch.env.Environment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.Environment; +import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.reindex.RemoteInfo; import org.elasticsearch.mocksocket.MockHttpServer; import org.elasticsearch.test.ESTestCase; 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 fa7ec8926b2..d01bd8af5a4 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 @@ -22,7 +22,7 @@ package org.opensearch.plugin.repository.url; import org.opensearch.cluster.service.ClusterService; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.indices.recovery.RecoverySettings; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.plugins.RepositoryPlugin; diff --git a/modules/repository-url/src/main/java/org/opensearch/repositories/url/URLRepository.java b/modules/repository-url/src/main/java/org/opensearch/repositories/url/URLRepository.java index a370186aa08..b9c318772fc 100644 --- a/modules/repository-url/src/main/java/org/opensearch/repositories/url/URLRepository.java +++ b/modules/repository-url/src/main/java/org/opensearch/repositories/url/URLRepository.java @@ -31,7 +31,7 @@ import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Setting.Property; import org.elasticsearch.common.util.URIPattern; import org.elasticsearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.indices.recovery.RecoverySettings; import org.opensearch.repositories.RepositoryException; import org.opensearch.repositories.blobstore.BlobStoreRepository; 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 3039e5a07bd..5a8db27ece6 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 @@ -23,8 +23,8 @@ import org.opensearch.cluster.metadata.RepositoryMetadata; import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.env.Environment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.Environment; +import org.opensearch.env.TestEnvironment; import org.elasticsearch.indices.recovery.RecoverySettings; import org.opensearch.repositories.RepositoryException; import org.opensearch.repositories.blobstore.BlobStoreTestUtil; diff --git a/server/src/main/java/org/elasticsearch/env/Environment.java b/server/src/main/java/org/opensearch/env/Environment.java similarity index 99% rename from server/src/main/java/org/elasticsearch/env/Environment.java rename to server/src/main/java/org/opensearch/env/Environment.java index 1d1f6e0ade0..a01b686b96c 100644 --- a/server/src/main/java/org/elasticsearch/env/Environment.java +++ b/server/src/main/java/org/opensearch/env/Environment.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.env; +package org.opensearch.env; import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.io.PathUtils; @@ -325,7 +325,7 @@ public class Environment { } public static FileStore getFileStore(final Path path) throws IOException { - return new ESFileStore(Files.getFileStore(path)); + return new OpenSearchFileStore(Files.getFileStore(path)); } /** diff --git a/server/src/main/java/org/elasticsearch/env/NodeEnvironment.java b/server/src/main/java/org/opensearch/env/NodeEnvironment.java similarity index 99% rename from server/src/main/java/org/elasticsearch/env/NodeEnvironment.java rename to server/src/main/java/org/opensearch/env/NodeEnvironment.java index ba808af19db..d18b9b0f5b7 100644 --- a/server/src/main/java/org/elasticsearch/env/NodeEnvironment.java +++ b/server/src/main/java/org/opensearch/env/NodeEnvironment.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.env; +package org.opensearch.env; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -247,7 +247,7 @@ public final class NodeEnvironment implements Closeable { /** * Setup the environment. - * @param settings settings from elasticsearch.yml + * @param settings settings from opensearch.yml */ public NodeEnvironment(Settings settings, Environment environment) throws IOException { if (!DiscoveryNode.nodeRequiresLocalStorage(settings)) { @@ -476,7 +476,7 @@ public final class NodeEnvironment implements Closeable { /** * Acquires, then releases, all {@code write.lock} files in the given * shard paths. The "write.lock" file is assumed to be under the shard - * path's "index" directory as used by Elasticsearch. + * path's "index" directory as used by OpenSearch. * * @throws LockObtainFailedException if any of the locks could not be acquired */ @@ -821,7 +821,7 @@ public final class NodeEnvironment implements Closeable { **/ public String nodeId() { // we currently only return the ID and hide the underlying nodeMetadata implementation in order to avoid - // confusion with other "metadata" like node settings found in elasticsearch.yml. In future + // confusion with other "metadata" like node settings found in opensearch.yml. In future // we can encapsulate both (and more) in one NodeMetadata (or NodeSettings) object ala IndexSettings return nodeMetadata.nodeId(); } @@ -1068,7 +1068,7 @@ public final class NodeEnvironment implements Closeable { } catch (AtomicMoveNotSupportedException ex) { throw new IllegalStateException("atomic_move is not supported by the filesystem on path [" + nodePath.path - + "] atomic_move is required for elasticsearch to work correctly.", ex); + + "] atomic_move is required for opensearch to work correctly.", ex); } finally { try { Files.deleteIfExists(src); @@ -1084,7 +1084,7 @@ public final class NodeEnvironment implements Closeable { if (shardDataPaths.isEmpty() == false) { final String message = String.format( Locale.ROOT, - "node does not have the %s role but has shard data: %s. Use 'elasticsearch-node repurpose' tool to clean up", + "node does not have the %s role but has shard data: %s. Use 'opensearch-node repurpose' tool to clean up", DiscoveryNodeRole.DATA_ROLE.roleName(), shardDataPaths ); @@ -1097,7 +1097,7 @@ public final class NodeEnvironment implements Closeable { if (indexMetadataPaths.isEmpty() == false) { final String message = String.format( Locale.ROOT, - "node does not have the %s and %s roles but has index metadata: %s. Use 'elasticsearch-node repurpose' tool to clean up", + "node does not have the %s and %s roles but has index metadata: %s. Use 'opensearch-node repurpose' tool to clean up", DiscoveryNodeRole.DATA_ROLE.roleName(), DiscoveryNodeRole.MASTER_ROLE.roleName(), indexMetadataPaths diff --git a/server/src/main/java/org/elasticsearch/env/NodeMetadata.java b/server/src/main/java/org/opensearch/env/NodeMetadata.java similarity index 99% rename from server/src/main/java/org/elasticsearch/env/NodeMetadata.java rename to server/src/main/java/org/opensearch/env/NodeMetadata.java index 8b2db75ce39..fb237ea92b4 100644 --- a/server/src/main/java/org/elasticsearch/env/NodeMetadata.java +++ b/server/src/main/java/org/opensearch/env/NodeMetadata.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.env; +package org.opensearch.env; import org.opensearch.Version; import org.elasticsearch.common.ParseField; diff --git a/server/src/main/java/org/elasticsearch/env/NodeRepurposeCommand.java b/server/src/main/java/org/opensearch/env/NodeRepurposeCommand.java similarity index 99% rename from server/src/main/java/org/elasticsearch/env/NodeRepurposeCommand.java rename to server/src/main/java/org/opensearch/env/NodeRepurposeCommand.java index d8c2abafb38..f5b208a523a 100644 --- a/server/src/main/java/org/elasticsearch/env/NodeRepurposeCommand.java +++ b/server/src/main/java/org/opensearch/env/NodeRepurposeCommand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.env; +package org.opensearch.env; import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import joptsimple.OptionParser; @@ -44,7 +44,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import static org.elasticsearch.env.NodeEnvironment.INDICES_FOLDER; +import static org.opensearch.env.NodeEnvironment.INDICES_FOLDER; public class NodeRepurposeCommand extends OpenSearchNodeCommand { diff --git a/server/src/main/java/org/elasticsearch/env/ESFileStore.java b/server/src/main/java/org/opensearch/env/OpenSearchFileStore.java similarity index 97% rename from server/src/main/java/org/elasticsearch/env/ESFileStore.java rename to server/src/main/java/org/opensearch/env/OpenSearchFileStore.java index 52b0cea6748..3ebfdb904a7 100644 --- a/server/src/main/java/org/elasticsearch/env/ESFileStore.java +++ b/server/src/main/java/org/opensearch/env/OpenSearchFileStore.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.env; +package org.opensearch.env; import org.apache.lucene.util.Constants; import org.elasticsearch.common.SuppressForbidden; @@ -31,22 +31,22 @@ import java.nio.file.attribute.FileAttributeView; import java.nio.file.attribute.FileStoreAttributeView; import java.util.List; -/** +/** * Implementation of FileStore that supports * additional features, such as SSD detection and better * filesystem information for the root filesystem. * @see Environment#getFileStore(Path) */ -class ESFileStore extends FileStore { +class OpenSearchFileStore extends FileStore { /** Underlying filestore */ final FileStore in; private int majorDeviceNumber; private int minorDeviceNumber; - + @SuppressForbidden(reason = "tries to determine if disk is spinning") - // TODO: move PathUtils to be package-private here instead of + // TODO: move PathUtils to be package-private here instead of // public+forbidden api! - ESFileStore(final FileStore in) { + OpenSearchFileStore(final FileStore in) { this.in = in; if (Constants.LINUX) { try { diff --git a/server/src/main/java/org/elasticsearch/env/OverrideNodeVersionCommand.java b/server/src/main/java/org/opensearch/env/OverrideNodeVersionCommand.java similarity index 90% rename from server/src/main/java/org/elasticsearch/env/OverrideNodeVersionCommand.java rename to server/src/main/java/org/opensearch/env/OverrideNodeVersionCommand.java index 76addaf4387..3a170615c92 100644 --- a/server/src/main/java/org/elasticsearch/env/OverrideNodeVersionCommand.java +++ b/server/src/main/java/org/opensearch/env/OverrideNodeVersionCommand.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.env; +package org.opensearch.env; import joptsimple.OptionParser; import joptsimple.OptionSet; @@ -34,8 +34,8 @@ public class OverrideNodeVersionCommand extends OpenSearchNodeCommand { private static final String TOO_NEW_MESSAGE = DELIMITER + "\n" + - "This data path was last written by Elasticsearch version [V_NEW] and may no\n" + - "longer be compatible with Elasticsearch version [V_CUR]. This tool will bypass\n" + + "This data path was last written by OpenSearch version [V_NEW] and may no\n" + + "longer be compatible with OpenSearch version [V_CUR]. This tool will bypass\n" + "this compatibility check, allowing a version [V_CUR] node to start on this data\n" + "path, but a version [V_CUR] node may not be able to read this data or may read\n" + "it incorrectly leading to data loss.\n" + @@ -49,14 +49,14 @@ public class OverrideNodeVersionCommand extends OpenSearchNodeCommand { private static final String TOO_OLD_MESSAGE = DELIMITER + "\n" + - "This data path was last written by Elasticsearch version [V_OLD] which may be\n" + - "too old to be readable by Elasticsearch version [V_CUR]. This tool will bypass\n" + + "This data path was last written by OpenSearch version [V_OLD] which may be\n" + + "too old to be readable by OpenSearch version [V_CUR]. This tool will bypass\n" + "this compatibility check, allowing a version [V_CUR] node to start on this data\n" + "path, but this version [V_CUR] node may not be able to read this data or may\n" + "read it incorrectly leading to data loss.\n" + "\n" + "You should not use this tool. Instead, upgrade this data path from [V_OLD] to\n" + - "[V_CUR] using one or more intermediate versions of Elasticsearch.\n" + + "[V_CUR] using one or more intermediate versions of OpenSearch.\n" + "\n" + "Do you want to proceed?\n"; diff --git a/server/src/main/java/org/elasticsearch/env/ShardLock.java b/server/src/main/java/org/opensearch/env/ShardLock.java similarity index 98% rename from server/src/main/java/org/elasticsearch/env/ShardLock.java rename to server/src/main/java/org/opensearch/env/ShardLock.java index 8ea5aabde32..ad30006f147 100644 --- a/server/src/main/java/org/elasticsearch/env/ShardLock.java +++ b/server/src/main/java/org/opensearch/env/ShardLock.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.env; +package org.opensearch.env; import org.elasticsearch.index.shard.ShardId; diff --git a/server/src/main/java/org/elasticsearch/env/ShardLockObtainFailedException.java b/server/src/main/java/org/opensearch/env/ShardLockObtainFailedException.java similarity index 98% rename from server/src/main/java/org/elasticsearch/env/ShardLockObtainFailedException.java rename to server/src/main/java/org/opensearch/env/ShardLockObtainFailedException.java index 7c065a4231c..dde8883dbc8 100644 --- a/server/src/main/java/org/elasticsearch/env/ShardLockObtainFailedException.java +++ b/server/src/main/java/org/opensearch/env/ShardLockObtainFailedException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.env; +package org.opensearch.env; import org.opensearch.OpenSearchException; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/test/framework/src/main/java/org/opensearch/snapshots/mockstore/MockRepository.java b/test/framework/src/main/java/org/opensearch/snapshots/mockstore/MockRepository.java index 1193a2b92f2..09e23bf1e3b 100644 --- a/test/framework/src/main/java/org/opensearch/snapshots/mockstore/MockRepository.java +++ b/test/framework/src/main/java/org/opensearch/snapshots/mockstore/MockRepository.java @@ -38,7 +38,7 @@ import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Setting.Property; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.indices.recovery.RecoverySettings; import org.elasticsearch.plugins.RepositoryPlugin; import org.opensearch.repositories.Repository;