From 94e242622799a95c0cb176dd28f91deeea7a26d3 Mon Sep 17 00:00:00 2001 From: Sarat Vemulapalli Date: Wed, 10 Mar 2021 11:18:26 -0800 Subject: [PATCH 1/4] Renaming server/env Signed-off-by: Sarat Vemulapalli --- .../common/settings/AddFileKeyStoreCommand.java | 2 +- .../common/settings/AddStringKeyStoreCommand.java | 2 +- .../common/settings/CreateKeyStoreCommand.java | 2 +- .../common/settings/ListKeyStoreCommand.java | 2 +- .../settings/RemoveSettingKeyStoreCommand.java | 2 +- .../common/settings/KeyStoreCommandTestCase.java | 4 ++-- .../plugins/InstallPluginCommandTests.java | 4 ++-- .../AbstractCompoundWordTokenFilterFactory.java | 2 +- .../analysis/common/ApostropheFilterFactory.java | 2 +- .../analysis/common/ArabicAnalyzerProvider.java | 2 +- .../analysis/common/ArmenianAnalyzerProvider.java | 2 +- .../analysis/common/BasqueAnalyzerProvider.java | 2 +- .../analysis/common/CJKBigramFilterFactory.java | 2 +- .../analysis/common/CatalanAnalyzerProvider.java | 2 +- .../analysis/common/CjkAnalyzerProvider.java | 2 +- .../analysis/common/ClassicTokenizerFactory.java | 2 +- .../common/CommonGramsTokenFilterFactory.java | 2 +- .../analysis/common/DanishAnalyzerProvider.java | 2 +- .../analysis/common/DecimalDigitFilterFactory.java | 2 +- .../common/DelimitedPayloadTokenFilterFactory.java | 2 +- .../analysis/common/DutchAnalyzerProvider.java | 2 +- .../analysis/common/EdgeNGramTokenizerFactory.java | 2 +- .../analysis/common/FinnishAnalyzerProvider.java | 2 +- .../common/FlattenGraphTokenFilterFactory.java | 2 +- .../analysis/common/FrenchAnalyzerProvider.java | 2 +- .../common/FrenchStemTokenFilterFactory.java | 2 +- .../analysis/common/GalicianAnalyzerProvider.java | 2 +- .../analysis/common/GermanAnalyzerProvider.java | 2 +- .../analysis/common/GreekAnalyzerProvider.java | 2 +- .../analysis/common/HindiAnalyzerProvider.java | 2 +- .../common/HtmlStripCharFilterFactory.java | 2 +- .../common/IndonesianAnalyzerProvider.java | 2 +- .../analysis/common/ItalianAnalyzerProvider.java | 2 +- .../analysis/common/KStemTokenFilterFactory.java | 2 +- .../analysis/common/KeepTypesFilterFactory.java | 2 +- .../common/KeywordMarkerTokenFilterFactory.java | 2 +- .../analysis/common/KeywordTokenizerFactory.java | 2 +- .../analysis/common/LatvianAnalyzerProvider.java | 2 +- .../LegacyDelimitedPayloadTokenFilterFactory.java | 2 +- .../analysis/common/LetterTokenizerFactory.java | 2 +- .../common/LowerCaseTokenFilterFactory.java | 2 +- .../analysis/common/MappingCharFilterFactory.java | 2 +- .../analysis/common/NGramTokenizerFactory.java | 2 +- .../PatternCaptureGroupTokenFilterFactory.java | 2 +- .../common/PatternReplaceCharFilterFactory.java | 2 +- .../common/PersianNormalizationFilterFactory.java | 2 +- .../common/PorterStemTokenFilterFactory.java | 2 +- .../common/RemoveDuplicatesTokenFilterFactory.java | 2 +- .../common/SoraniNormalizationFilterFactory.java | 2 +- .../analysis/common/SpanishAnalyzerProvider.java | 2 +- .../common/StandardHtmlStripAnalyzerProvider.java | 2 +- .../analysis/common/StemmerTokenFilterFactory.java | 2 +- .../analysis/common/SynonymTokenFilterFactory.java | 2 +- .../analysis/common/ThaiAnalyzerProvider.java | 2 +- .../analysis/common/ThaiTokenizerFactory.java | 2 +- .../analysis/common/TrimTokenFilterFactory.java | 2 +- .../common/TruncateTokenFilterFactory.java | 2 +- .../analysis/common/TurkishAnalyzerProvider.java | 2 +- .../common/UAX29URLEmailTokenizerFactory.java | 2 +- .../common/WhitespaceTokenizerFactory.java | 2 +- .../common/WordDelimiterTokenFilterFactory.java | 2 +- .../analysis/common/CompoundAnalysisTests.java | 4 ++-- .../common/KeepTypesFilterFactoryTests.java | 2 +- .../common/LimitTokenCountFilterFactoryTests.java | 2 +- .../analysis/common/MinHashFilterFactoryTests.java | 2 +- .../common/NGramTokenFilterFactoryTests.java | 2 +- .../common/RemoveDuplicatesFilterFactoryTests.java | 2 +- .../StemmerOverrideTokenFilterFactoryTests.java | 2 +- .../common/StemmerTokenFilterFactoryTests.java | 2 +- .../WordDelimiterTokenFilterFactoryTests.java | 2 +- .../org/elasticsearch/painless/PainlessPlugin.java | 4 ++-- .../elasticsearch/index/reindex/ReindexPlugin.java | 4 ++-- .../index/reindex/ReindexSslConfig.java | 2 +- .../ReindexFromRemoteBuildRestClientTests.java | 4 ++-- .../reindex/ReindexFromRemoteWithAuthTests.java | 4 ++-- .../index/reindex/ReindexRestClientSslTests.java | 4 ++-- .../index/analysis/NoriAnalyzerProvider.java | 2 +- .../NoriPartOfSpeechStopFilterFactory.java | 2 +- .../index/analysis/NoriTokenizerFactory.java | 2 +- ...GoogleCloudStorageBlobStoreRepositoryTests.java | 2 +- .../repositories/gcs/GoogleCloudStoragePlugin.java | 2 +- .../repositories/s3/S3RepositoryPlugin.java | 2 +- .../action/admin/ReloadSecureSettingsIT.java | 2 +- .../elasticsearch/action/bulk/BulkProcessorIT.java | 2 +- .../action/ingest/AsyncIngestProcessorIT.java | 4 ++-- .../org/elasticsearch/gateway/MetadataNodesIT.java | 2 +- .../env/ESFileStore.java | 12 ++++++------ .../env/Environment.java | 4 ++-- .../env/NodeEnvironment.java | 14 +++++++------- .../env/NodeMetadata.java | 2 +- .../env/NodeRepurposeCommand.java | 4 ++-- .../env/OverrideNodeVersionCommand.java | 12 ++++++------ .../env/ShardLock.java | 2 +- .../env/ShardLockObtainFailedException.java | 2 +- .../org/elasticsearch/index/IndexModuleTests.java | 8 ++++---- .../org/elasticsearch/index/codec/CodecTests.java | 2 +- 96 files changed, 126 insertions(+), 126 deletions(-) rename server/src/main/java/org/{elasticsearch => opensearch}/env/ESFileStore.java (97%) 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 => 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/keystore-cli/src/main/java/org/elasticsearch/common/settings/AddFileKeyStoreCommand.java b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/AddFileKeyStoreCommand.java index 2217eda8cde49..96ce1eb0b3ba6 100644 --- a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/AddFileKeyStoreCommand.java +++ b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/AddFileKeyStoreCommand.java @@ -26,7 +26,7 @@ import org.elasticsearch.cli.UserException; import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.io.PathUtils; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import java.nio.file.Files; import java.nio.file.Path; diff --git a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/AddStringKeyStoreCommand.java b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/AddStringKeyStoreCommand.java index c5e760ecd1c36..0d64fa5e40153 100644 --- a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/AddStringKeyStoreCommand.java +++ b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/AddStringKeyStoreCommand.java @@ -25,7 +25,7 @@ import org.elasticsearch.cli.Terminal; import org.elasticsearch.cli.UserException; import org.elasticsearch.common.CheckedFunction; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import java.io.BufferedReader; import java.io.CharArrayWriter; diff --git a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/CreateKeyStoreCommand.java b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/CreateKeyStoreCommand.java index 8cc3bfcf9ba15..6e6bdd4b7d127 100644 --- a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/CreateKeyStoreCommand.java +++ b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/CreateKeyStoreCommand.java @@ -29,7 +29,7 @@ import org.elasticsearch.cli.KeyStoreAwareCommand; import org.elasticsearch.cli.Terminal; import org.elasticsearch.cli.UserException; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; /** * A sub-command for the keystore cli to create a new keystore. diff --git a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/ListKeyStoreCommand.java b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/ListKeyStoreCommand.java index e1ae480ef33b0..d6734b74e7052 100644 --- a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/ListKeyStoreCommand.java +++ b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/ListKeyStoreCommand.java @@ -25,7 +25,7 @@ import joptsimple.OptionSet; import org.elasticsearch.cli.Terminal; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; /** * A subcommand for the keystore cli to list all settings in the keystore. diff --git a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommand.java b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommand.java index a1c9802b22424..0453b25ed46a4 100644 --- a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommand.java +++ b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommand.java @@ -24,7 +24,7 @@ import org.elasticsearch.cli.ExitCodes; import org.elasticsearch.cli.Terminal; import org.elasticsearch.cli.UserException; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import java.util.List; diff --git a/distribution/tools/keystore-cli/src/test/java/org/elasticsearch/common/settings/KeyStoreCommandTestCase.java b/distribution/tools/keystore-cli/src/test/java/org/elasticsearch/common/settings/KeyStoreCommandTestCase.java index 0ac39e466dd04..97f051cf068ae 100644 --- a/distribution/tools/keystore-cli/src/test/java/org/elasticsearch/common/settings/KeyStoreCommandTestCase.java +++ b/distribution/tools/keystore-cli/src/test/java/org/elasticsearch/common/settings/KeyStoreCommandTestCase.java @@ -33,8 +33,8 @@ import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.cli.CommandTestCase; import org.elasticsearch.common.io.PathUtilsForTesting; -import org.elasticsearch.env.Environment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.Environment; +import org.opensearch.env.TestEnvironment; import org.junit.After; import org.junit.Before; diff --git a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java index 35b408f56ea9c..055cf4909f920 100644 --- a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java +++ b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java @@ -54,8 +54,8 @@ import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.io.PathUtilsForTesting; 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.PosixPermissionsResetter; import org.junit.After; 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 7cf0bccb7045b..04e4e5e39199e 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 @@ 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/ApostropheFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ApostropheFilterFactory.java index fe80351964b64..7bb32595160b0 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ApostropheFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ApostropheFilterFactory.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tr.ApostropheFilter; 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/ArabicAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicAnalyzerProvider.java index 9ea1930c682a4..ee303c5789ae7 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 @@ 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/ArmenianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArmenianAnalyzerProvider.java index 44b5b28a14703..ef34164c6d21f 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArmenianAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArmenianAnalyzerProvider.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.hy.ArmenianAnalyzer; 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/BasqueAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BasqueAnalyzerProvider.java index 472993ee61f12..a3fd81692a129 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 @@ 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/CJKBigramFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CJKBigramFilterFactory.java index 6cb8690e99dc3..615f7904a254e 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CJKBigramFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CJKBigramFilterFactory.java @@ -25,7 +25,7 @@ import org.elasticsearch.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/CatalanAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CatalanAnalyzerProvider.java index 099de6287ba83..c920ea3fe4432 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CatalanAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CatalanAnalyzerProvider.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.ca.CatalanAnalyzer; 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/CjkAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CjkAnalyzerProvider.java index e6b003b61f565..feee6ad0a1170 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 @@ 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/ClassicTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ClassicTokenizerFactory.java index baa975e62aa3e..2d7c6225540ee 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ClassicTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ClassicTokenizerFactory.java @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.standard.ClassicTokenizer; import org.apache.lucene.analysis.standard.StandardAnalyzer; 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/CommonGramsTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactory.java index 357d05f494cb2..4da0a3fc290be 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactory.java @@ -26,7 +26,7 @@ import org.elasticsearch.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/DanishAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DanishAnalyzerProvider.java index cd347263c4091..30a20cb6b8234 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 @@ 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/DecimalDigitFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DecimalDigitFilterFactory.java index 6caf46e5262c6..6910a7fd5b1ab 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DecimalDigitFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DecimalDigitFilterFactory.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.DecimalDigitFilter; 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/DelimitedPayloadTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DelimitedPayloadTokenFilterFactory.java index 50ce216de5d35..255351e9a17c3 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DelimitedPayloadTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DelimitedPayloadTokenFilterFactory.java @@ -26,7 +26,7 @@ import org.apache.lucene.analysis.payloads.IntegerEncoder; import org.apache.lucene.analysis.payloads.PayloadEncoder; 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/DutchAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DutchAnalyzerProvider.java index 48aeba493a94d..9a6e85a4b35dd 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 @@ 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/EdgeNGramTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EdgeNGramTokenizerFactory.java index 88238f220a988..99504b002e32a 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.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/FinnishAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FinnishAnalyzerProvider.java index 601dbc328ea3c..751626771956c 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FinnishAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FinnishAnalyzerProvider.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.fi.FinnishAnalyzer; 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 e2c7efa7d9e9c..d086b87be6bb8 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 @@ 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 8c9317ce61313..e56aa57a0541e 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 @@ 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 26386735cc6c1..1178cc5eaf4b5 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.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/GalicianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GalicianAnalyzerProvider.java index a5700be226276..207eaa785d765 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GalicianAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GalicianAnalyzerProvider.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.gl.GalicianAnalyzer; 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/GermanAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanAnalyzerProvider.java index 800b85cb9d43f..ded1b4757de6e 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 @@ 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/GreekAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GreekAnalyzerProvider.java index b9855406ae313..8cc0d10d0c7d2 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GreekAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GreekAnalyzerProvider.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.el.GreekAnalyzer; 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/HindiAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HindiAnalyzerProvider.java index c26e169a60f2e..30c8f5ca27bcb 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HindiAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HindiAnalyzerProvider.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.hi.HindiAnalyzer; 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/HtmlStripCharFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HtmlStripCharFilterFactory.java index 084a3ef11e53d..e5954f75f5171 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HtmlStripCharFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HtmlStripCharFilterFactory.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.charfilter.HTMLStripCharFilter; 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; 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 a7e054c191b89..1a1271a6337bb 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 @@ 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/ItalianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ItalianAnalyzerProvider.java index 6ea528f042eeb..46b62be1964ad 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ItalianAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ItalianAnalyzerProvider.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.it.ItalianAnalyzer; 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/KStemTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KStemTokenFilterFactory.java index f43452c3f2dac..57c85710dfea3 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KStemTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KStemTokenFilterFactory.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.en.KStemFilter; 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/KeepTypesFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeepTypesFilterFactory.java index 0428f1ea3087b..9136640a11fb1 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeepTypesFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeepTypesFilterFactory.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.TypeTokenFilter; 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/KeywordMarkerTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeywordMarkerTokenFilterFactory.java index fc28d0ffef2ef..f9edfaf38bd00 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.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 5eb3349c3ac5d..fba5a1953832d 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 @@ 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/LatvianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LatvianAnalyzerProvider.java index 50140fd5ac01a..8bc6fb0f7f9f8 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LatvianAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LatvianAnalyzerProvider.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.lv.LatvianAnalyzer; 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/LegacyDelimitedPayloadTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LegacyDelimitedPayloadTokenFilterFactory.java index 825b92b07f9a9..6d00c0bdd0854 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LegacyDelimitedPayloadTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LegacyDelimitedPayloadTokenFilterFactory.java @@ -22,7 +22,7 @@ import org.elasticsearch.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; public class LegacyDelimitedPayloadTokenFilterFactory extends DelimitedPayloadTokenFilterFactory { 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 a359480a9efed..e6b6e2b397b4c 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 @@ 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/LowerCaseTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LowerCaseTokenFilterFactory.java index d426d8c1111ba..ea2180bee7b92 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LowerCaseTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LowerCaseTokenFilterFactory.java @@ -25,7 +25,7 @@ import org.apache.lucene.analysis.ga.IrishLowerCaseFilter; import org.apache.lucene.analysis.tr.TurkishLowerCaseFilter; 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/MappingCharFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/MappingCharFilterFactory.java index 475c36f0fe851..6d466f2ea39c0 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/MappingCharFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/MappingCharFilterFactory.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.charfilter.MappingCharFilter; import org.apache.lucene.analysis.charfilter.NormalizeCharMap; 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.Analysis; 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 5b0b3f8667a73..220b101aded5f 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.ngram.NGramTokenizer; import org.elasticsearch.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/PatternCaptureGroupTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternCaptureGroupTokenFilterFactory.java index f3abb3dd28696..d43b2902c8afa 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternCaptureGroupTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternCaptureGroupTokenFilterFactory.java @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.pattern.PatternCaptureGroupTokenFilter; 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/PatternReplaceCharFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternReplaceCharFilterFactory.java index 0621a6266428a..ebc18dc0b94d4 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.elasticsearch.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/PersianNormalizationFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PersianNormalizationFilterFactory.java index 6ce61d989445f..754c731454d18 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 @@ 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/PorterStemTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PorterStemTokenFilterFactory.java index 3415384b87497..42dee12200891 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PorterStemTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PorterStemTokenFilterFactory.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.en.PorterStemFilter; 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/RemoveDuplicatesTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RemoveDuplicatesTokenFilterFactory.java index ed201bf40c98d..146451cb41481 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 @@ 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/SoraniNormalizationFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SoraniNormalizationFilterFactory.java index 32e2650fc0419..03475ecbf65f2 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SoraniNormalizationFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SoraniNormalizationFilterFactory.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.ckb.SoraniNormalizationFilter; 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/SpanishAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SpanishAnalyzerProvider.java index 7a40107daab40..e986ec433ded0 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SpanishAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SpanishAnalyzerProvider.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.es.SpanishAnalyzer; 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 a32c99c87a81f..92b2bbd005077 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.elasticsearch.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 71bcecbd90920..78b32afb8ed0c 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.sv.SwedishLightStemFilter; import org.elasticsearch.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/SynonymTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SynonymTokenFilterFactory.java index 46fd5c3859d0c..632035d350eb1 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SynonymTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SynonymTokenFilterFactory.java @@ -25,7 +25,7 @@ import org.apache.lucene.analysis.synonym.SynonymMap; 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/ThaiAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiAnalyzerProvider.java index c6299230dfea5..372601da9808f 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiAnalyzerProvider.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.th.ThaiAnalyzer; 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/ThaiTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiTokenizerFactory.java index 307c18aaabacc..2d78ee687fb18 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiTokenizerFactory.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.th.ThaiTokenizer; 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/TrimTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TrimTokenFilterFactory.java index e5df458a0b7fa..ecec6b07f56ce 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 @@ 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 5cff255b93a04..0ee2bae221b09 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 @@ 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/TurkishAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TurkishAnalyzerProvider.java index 9018e3336be78..202eae4837a82 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TurkishAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TurkishAnalyzerProvider.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.tr.TurkishAnalyzer; 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/UAX29URLEmailTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UAX29URLEmailTokenizerFactory.java index 662fdbde6d60c..fcb306ce29789 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UAX29URLEmailTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UAX29URLEmailTokenizerFactory.java @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.analysis.standard.UAX29URLEmailTokenizer; 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/WhitespaceTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WhitespaceTokenizerFactory.java index 592614e056db7..a7808aa91cb7a 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WhitespaceTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WhitespaceTokenizerFactory.java @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.apache.lucene.analysis.standard.StandardAnalyzer; 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/WordDelimiterTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactory.java index 4fe18abdb81f6..5a423cd9a591c 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactory.java @@ -26,7 +26,7 @@ import org.elasticsearch.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/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java index eb0719defc5c6..f439a869e61bf 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java @@ -25,8 +25,8 @@ import org.elasticsearch.Version; import org.elasticsearch.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.MyFilterTokenFilterFactory; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java index 7cd79482998dc..ab582abb52daa 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.standard.StandardTokenizer; 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/LimitTokenCountFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/LimitTokenCountFilterFactoryTests.java index ac062651dd4d2..03075b03b7293 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/LimitTokenCountFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/LimitTokenCountFilterFactoryTests.java @@ -22,7 +22,7 @@ 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/MinHashFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MinHashFilterFactoryTests.java index 78f02fbb88c22..3c44e4d7b57fb 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MinHashFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MinHashFilterFactoryTests.java @@ -22,7 +22,7 @@ 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/NGramTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenFilterFactoryTests.java index 26686f81094b9..3c2078d4aeb84 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenFilterFactoryTests.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.standard.StandardTokenizer; 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/RemoveDuplicatesFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java index e6b95b6458e43..11e72e54514cf 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.CannedTokenStream; import org.apache.lucene.analysis.Token; 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/StemmerOverrideTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerOverrideTokenFilterFactoryTests.java index 804b9aa32577b..147fe087c032e 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 @@ 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/StemmerTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerTokenFilterFactoryTests.java index 87d7ca49fb5f9..494e5e0c0781c 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerTokenFilterFactoryTests.java @@ -25,7 +25,7 @@ import org.apache.lucene.analysis.snowball.SnowballFilter; import org.elasticsearch.Version; 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.IndexAnalyzers; import org.elasticsearch.index.analysis.NamedAnalyzer; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java index eec66ab181e7f..655eca2a2ce5d 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java @@ -22,7 +22,7 @@ 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/elasticsearch/painless/PainlessPlugin.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java index 380f619fe614e..b11c2135bde3f 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java +++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java @@ -34,8 +34,8 @@ 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.painless.action.PainlessContextAction; import org.elasticsearch.painless.action.PainlessExecuteAction; import org.elasticsearch.painless.spi.PainlessExtension; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexPlugin.java b/modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexPlugin.java index 8d029cfe15e15..f65d4cb32fd39 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexPlugin.java +++ b/modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexPlugin.java @@ -32,8 +32,8 @@ 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.plugins.ActionPlugin; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.repositories.RepositoriesService; diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexSslConfig.java b/modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexSslConfig.java index 10be40acbc792..930a547071351 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexSslConfig.java +++ b/modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexSslConfig.java @@ -30,7 +30,7 @@ import org.elasticsearch.common.ssl.SslConfiguration; import org.elasticsearch.common.ssl.SslConfigurationKeys; import org.elasticsearch.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/elasticsearch/index/reindex/ReindexFromRemoteBuildRestClientTests.java b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFromRemoteBuildRestClientTests.java index c82c159b8c3e9..28f168bb58b74 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFromRemoteBuildRestClientTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFromRemoteBuildRestClientTests.java @@ -24,8 +24,8 @@ import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.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.watcher.ResourceWatcherService; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFromRemoteWithAuthTests.java b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFromRemoteWithAuthTests.java index 58c3dbb7b2c3e..910abb97d795d 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFromRemoteWithAuthTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexFromRemoteWithAuthTests.java @@ -40,8 +40,8 @@ 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.elasticsearch.http.HttpInfo; import org.elasticsearch.plugins.ActionPlugin; import org.elasticsearch.plugins.Plugin; diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexRestClientSslTests.java b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexRestClientSslTests.java index 6dd989ffafdb5..e5271cbd5d582 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexRestClientSslTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexRestClientSslTests.java @@ -32,8 +32,8 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.ssl.PemKeyConfig; import org.elasticsearch.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.mocksocket.MockHttpServer; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.watcher.ResourceWatcherService; diff --git a/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriAnalyzerProvider.java b/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriAnalyzerProvider.java index f85c3f94e3423..66ff2b3fca912 100644 --- a/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriAnalyzerProvider.java +++ b/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriAnalyzerProvider.java @@ -27,7 +27,7 @@ import org.apache.lucene.analysis.ko.dict.UserDictionary; import org.apache.lucene.analysis.ko.POS; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import static org.elasticsearch.index.analysis.NoriPartOfSpeechStopFilterFactory.resolvePOSList; diff --git a/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriPartOfSpeechStopFilterFactory.java b/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriPartOfSpeechStopFilterFactory.java index d893c35cefb74..dc653a6fe3771 100644 --- a/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriPartOfSpeechStopFilterFactory.java +++ b/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriPartOfSpeechStopFilterFactory.java @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.ko.KoreanPartOfSpeechStopFilter; import org.apache.lucene.analysis.ko.POS; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import java.util.HashSet; diff --git a/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriTokenizerFactory.java b/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriTokenizerFactory.java index ee766095ffae5..4afabeb49f2d9 100644 --- a/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriTokenizerFactory.java +++ b/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriTokenizerFactory.java @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.ko.dict.UserDictionary; import org.elasticsearch.OpenSearchException; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import java.io.IOException; diff --git a/plugins/repository-gcs/src/internalClusterTest/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobStoreRepositoryTests.java b/plugins/repository-gcs/src/internalClusterTest/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobStoreRepositoryTests.java index d77d84a176844..00a8ce0eb11ff 100644 --- a/plugins/repository-gcs/src/internalClusterTest/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobStoreRepositoryTests.java +++ b/plugins/repository-gcs/src/internalClusterTest/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobStoreRepositoryTests.java @@ -46,7 +46,7 @@ import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.unit.ByteSizeValue; 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.repositories.RepositoriesService; diff --git a/plugins/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStoragePlugin.java b/plugins/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStoragePlugin.java index 0c878d0fe3f77..0450c14f8a2cb 100644 --- a/plugins/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStoragePlugin.java +++ b/plugins/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStoragePlugin.java @@ -23,7 +23,7 @@ import org.elasticsearch.common.settings.Setting; 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.Plugin; import org.elasticsearch.plugins.ReloadablePlugin; diff --git a/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3RepositoryPlugin.java b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3RepositoryPlugin.java index 178b0fcd5294a..213daf6c6a6b7 100644 --- a/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3RepositoryPlugin.java +++ b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3RepositoryPlugin.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.settings.Setting; 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.Plugin; import org.elasticsearch.plugins.ReloadablePlugin; diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/ReloadSecureSettingsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/ReloadSecureSettingsIT.java index afa45894d40b5..a661f2c138ce8 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/ReloadSecureSettingsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/ReloadSecureSettingsIT.java @@ -27,7 +27,7 @@ import org.elasticsearch.common.settings.SecureSettings; import org.elasticsearch.common.settings.SecureString; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.plugins.PluginsService; import org.elasticsearch.plugins.ReloadablePlugin; diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessorIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessorIT.java index 6d770f46fc12a..bb70a1e37a5d0 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessorIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/bulk/BulkProcessorIT.java @@ -35,7 +35,7 @@ import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.transport.MockTransportClient; diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/ingest/AsyncIngestProcessorIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/ingest/AsyncIngestProcessorIT.java index a6ffab9c2847e..1c08e12f106f7 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/ingest/AsyncIngestProcessorIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/ingest/AsyncIngestProcessorIT.java @@ -31,8 +31,8 @@ import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.env.Environment; -import org.elasticsearch.env.NodeEnvironment; +import org.opensearch.env.Environment; +import org.opensearch.env.NodeEnvironment; import org.elasticsearch.ingest.AbstractProcessor; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; diff --git a/server/src/internalClusterTest/java/org/elasticsearch/gateway/MetadataNodesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/gateway/MetadataNodesIT.java index 386cd190d1dd2..a0e83de2e440b 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/gateway/MetadataNodesIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/gateway/MetadataNodesIT.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.discovery.Discovery; -import org.elasticsearch.env.NodeEnvironment; +import org.opensearch.env.NodeEnvironment; import org.elasticsearch.index.Index; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESIntegTestCase.ClusterScope; diff --git a/server/src/main/java/org/elasticsearch/env/ESFileStore.java b/server/src/main/java/org/opensearch/env/ESFileStore.java similarity index 97% rename from server/src/main/java/org/elasticsearch/env/ESFileStore.java rename to server/src/main/java/org/opensearch/env/ESFileStore.java index 52b0cea6748d8..9f8beca4483b8 100644 --- a/server/src/main/java/org/elasticsearch/env/ESFileStore.java +++ b/server/src/main/java/org/opensearch/env/ESFileStore.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.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) { + OpenSearchFileStoreFileStore(final FileStore in) { this.in = in; if (Constants.LINUX) { try { 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 1d1f6e0ade0e0..a01b686b96c54 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 void validateTmpFile() throws IOException { } 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 7afb52f53dd93..c83da80654cc0 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 void close() { /** * 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 void deleteShardDirectorySafe(ShardId shardId, IndexSettings indexSetting /** * 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 OpenSearchh. * * @throws LockObtainFailedException if any of the locks could not be acquired */ @@ -821,7 +821,7 @@ public Path sharedDataPath() { **/ 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 @@ private static void ensureAtomicMoveSupported(final NodePath[] nodePaths) throws } 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 @@ private void ensureNoShardData(final NodePath[] nodePaths) throws IOException { 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 @@ private void ensureNoIndexMetadata(final NodePath[] nodePaths) throws IOExceptio 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 5ac3a9df0ea2e..7cbe408f3acf4 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.elasticsearch.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 939e4a78313ee..a1bfabc553293 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.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/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 e21aaf877aea2..8dd4ccec00919 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 8ea5aabde322b..ad30006f147e6 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 b33a0df10ca66..6831c6f1be8c2 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.elasticsearch.OpenSearchException; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java b/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java index 00af27f9be83f..deb40f52eb239 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java @@ -50,10 +50,10 @@ import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; import org.elasticsearch.common.util.concurrent.ThreadContext; import org.elasticsearch.core.internal.io.IOUtils; -import org.elasticsearch.env.Environment; -import org.elasticsearch.env.NodeEnvironment; -import org.elasticsearch.env.ShardLock; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.Environment; +import org.opensearch.env.NodeEnvironment; +import org.opensearch.env.ShardLock; +import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.analysis.AnalysisRegistry; import org.elasticsearch.index.analysis.AnalyzerProvider; import org.elasticsearch.index.analysis.AnalyzerScope; diff --git a/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java b/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java index aa86888cdefe9..2be57f7e712b5 100644 --- a/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java +++ b/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java @@ -32,7 +32,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; 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.mapper.MapperService; From cc973c94433515e5bf9306fc035b8c221b2218da Mon Sep 17 00:00:00 2001 From: Sarat Vemulapalli Date: Wed, 10 Mar 2021 11:24:18 -0800 Subject: [PATCH 2/4] Removing typo Signed-off-by: Sarat Vemulapalli --- server/src/main/java/org/opensearch/env/NodeEnvironment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/org/opensearch/env/NodeEnvironment.java b/server/src/main/java/org/opensearch/env/NodeEnvironment.java index c83da80654cc0..ebc6168e0933b 100644 --- a/server/src/main/java/org/opensearch/env/NodeEnvironment.java +++ b/server/src/main/java/org/opensearch/env/NodeEnvironment.java @@ -476,7 +476,7 @@ public void deleteShardDirectorySafe(ShardId shardId, IndexSettings indexSetting /** * 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 OpenSearchh. + * path's "index" directory as used by OpenSearch. * * @throws LockObtainFailedException if any of the locks could not be acquired */ From 23328aa3fb237f2ca66f3fe08ce586dd4c30e5e3 Mon Sep 17 00:00:00 2001 From: Sarat Vemulapalli Date: Wed, 10 Mar 2021 13:50:10 -0800 Subject: [PATCH 3/4] Addressing comments Signed-off-by: Sarat Vemulapalli --- .../opensearch/env/{ESFileStore.java => OpenSearchFileStore.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename server/src/main/java/org/opensearch/env/{ESFileStore.java => OpenSearchFileStore.java} (100%) diff --git a/server/src/main/java/org/opensearch/env/ESFileStore.java b/server/src/main/java/org/opensearch/env/OpenSearchFileStore.java similarity index 100% rename from server/src/main/java/org/opensearch/env/ESFileStore.java rename to server/src/main/java/org/opensearch/env/OpenSearchFileStore.java From 0659daa42d490368c4122651902a936df7545dea Mon Sep 17 00:00:00 2001 From: Sarat Vemulapalli Date: Wed, 10 Mar 2021 11:18:26 -0800 Subject: [PATCH 4/4] Renaming server/env Signed-off-by: Sarat Vemulapalli --- .../common/settings/AddFileKeyStoreCommand.java | 2 +- .../common/settings/AddStringKeyStoreCommand.java | 2 +- .../common/settings/CreateKeyStoreCommand.java | 2 +- .../common/settings/ListKeyStoreCommand.java | 2 +- .../settings/RemoveSettingKeyStoreCommand.java | 2 +- .../common/settings/KeyStoreCommandTestCase.java | 4 ++-- .../plugins/InstallPluginCommandTests.java | 4 ++-- .../AbstractCompoundWordTokenFilterFactory.java | 2 +- .../analysis/common/ApostropheFilterFactory.java | 2 +- .../analysis/common/ArabicAnalyzerProvider.java | 2 +- .../analysis/common/ArmenianAnalyzerProvider.java | 2 +- .../analysis/common/BasqueAnalyzerProvider.java | 2 +- .../analysis/common/CJKBigramFilterFactory.java | 2 +- .../analysis/common/CatalanAnalyzerProvider.java | 2 +- .../analysis/common/CjkAnalyzerProvider.java | 2 +- .../analysis/common/ClassicTokenizerFactory.java | 2 +- .../common/CommonGramsTokenFilterFactory.java | 2 +- .../analysis/common/DanishAnalyzerProvider.java | 2 +- .../analysis/common/DecimalDigitFilterFactory.java | 2 +- .../common/DelimitedPayloadTokenFilterFactory.java | 2 +- .../analysis/common/DutchAnalyzerProvider.java | 2 +- .../analysis/common/EdgeNGramTokenizerFactory.java | 2 +- .../analysis/common/FinnishAnalyzerProvider.java | 2 +- .../common/FlattenGraphTokenFilterFactory.java | 2 +- .../analysis/common/FrenchAnalyzerProvider.java | 2 +- .../common/FrenchStemTokenFilterFactory.java | 2 +- .../analysis/common/GalicianAnalyzerProvider.java | 2 +- .../analysis/common/GermanAnalyzerProvider.java | 2 +- .../analysis/common/GreekAnalyzerProvider.java | 2 +- .../analysis/common/HindiAnalyzerProvider.java | 2 +- .../common/HtmlStripCharFilterFactory.java | 2 +- .../common/IndonesianAnalyzerProvider.java | 2 +- .../analysis/common/ItalianAnalyzerProvider.java | 2 +- .../analysis/common/KStemTokenFilterFactory.java | 2 +- .../analysis/common/KeepTypesFilterFactory.java | 2 +- .../common/KeywordMarkerTokenFilterFactory.java | 2 +- .../analysis/common/KeywordTokenizerFactory.java | 2 +- .../analysis/common/LatvianAnalyzerProvider.java | 2 +- .../LegacyDelimitedPayloadTokenFilterFactory.java | 2 +- .../analysis/common/LetterTokenizerFactory.java | 2 +- .../common/LowerCaseTokenFilterFactory.java | 2 +- .../analysis/common/MappingCharFilterFactory.java | 2 +- .../analysis/common/NGramTokenizerFactory.java | 2 +- .../PatternCaptureGroupTokenFilterFactory.java | 2 +- .../common/PatternReplaceCharFilterFactory.java | 2 +- .../common/PersianNormalizationFilterFactory.java | 2 +- .../common/PorterStemTokenFilterFactory.java | 2 +- .../common/RemoveDuplicatesTokenFilterFactory.java | 2 +- .../common/SoraniNormalizationFilterFactory.java | 2 +- .../analysis/common/SpanishAnalyzerProvider.java | 2 +- .../common/StandardHtmlStripAnalyzerProvider.java | 2 +- .../analysis/common/StemmerTokenFilterFactory.java | 2 +- .../analysis/common/SynonymTokenFilterFactory.java | 2 +- .../analysis/common/ThaiAnalyzerProvider.java | 2 +- .../analysis/common/ThaiTokenizerFactory.java | 2 +- .../analysis/common/TrimTokenFilterFactory.java | 2 +- .../common/TruncateTokenFilterFactory.java | 2 +- .../analysis/common/TurkishAnalyzerProvider.java | 2 +- .../common/UAX29URLEmailTokenizerFactory.java | 2 +- .../common/WhitespaceTokenizerFactory.java | 2 +- .../common/WordDelimiterTokenFilterFactory.java | 2 +- .../analysis/common/CompoundAnalysisTests.java | 4 ++-- .../common/KeepTypesFilterFactoryTests.java | 2 +- .../common/LimitTokenCountFilterFactoryTests.java | 2 +- .../analysis/common/MinHashFilterFactoryTests.java | 2 +- .../common/NGramTokenFilterFactoryTests.java | 2 +- .../common/RemoveDuplicatesFilterFactoryTests.java | 2 +- .../StemmerOverrideTokenFilterFactoryTests.java | 2 +- .../common/StemmerTokenFilterFactoryTests.java | 2 +- .../WordDelimiterTokenFilterFactoryTests.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 ++-- .../index/analysis/NoriAnalyzerProvider.java | 2 +- .../NoriPartOfSpeechStopFilterFactory.java | 2 +- .../index/analysis/NoriTokenizerFactory.java | 2 +- ...GoogleCloudStorageBlobStoreRepositoryTests.java | 2 +- .../repositories/gcs/GoogleCloudStoragePlugin.java | 2 +- .../repositories/s3/S3RepositoryPlugin.java | 2 +- .../env/ESFileStore.java | 12 ++++++------ .../env/Environment.java | 4 ++-- .../env/NodeEnvironment.java | 14 +++++++------- .../env/NodeMetadata.java | 2 +- .../env/NodeRepurposeCommand.java | 4 ++-- .../env/OverrideNodeVersionCommand.java | 12 ++++++------ .../env/ShardLock.java | 2 +- .../env/ShardLockObtainFailedException.java | 2 +- .../org/elasticsearch/index/IndexModuleTests.java | 8 ++++---- .../org/elasticsearch/index/codec/CodecTests.java | 2 +- 92 files changed, 121 insertions(+), 121 deletions(-) rename server/src/main/java/org/{elasticsearch => opensearch}/env/ESFileStore.java (97%) 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 => 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/keystore-cli/src/main/java/org/elasticsearch/common/settings/AddFileKeyStoreCommand.java b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/AddFileKeyStoreCommand.java index 2217eda8cde49..96ce1eb0b3ba6 100644 --- a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/AddFileKeyStoreCommand.java +++ b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/AddFileKeyStoreCommand.java @@ -26,7 +26,7 @@ import org.elasticsearch.cli.UserException; import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.io.PathUtils; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import java.nio.file.Files; import java.nio.file.Path; diff --git a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/AddStringKeyStoreCommand.java b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/AddStringKeyStoreCommand.java index c5e760ecd1c36..0d64fa5e40153 100644 --- a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/AddStringKeyStoreCommand.java +++ b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/AddStringKeyStoreCommand.java @@ -25,7 +25,7 @@ import org.elasticsearch.cli.Terminal; import org.elasticsearch.cli.UserException; import org.elasticsearch.common.CheckedFunction; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import java.io.BufferedReader; import java.io.CharArrayWriter; diff --git a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/CreateKeyStoreCommand.java b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/CreateKeyStoreCommand.java index 8cc3bfcf9ba15..6e6bdd4b7d127 100644 --- a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/CreateKeyStoreCommand.java +++ b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/CreateKeyStoreCommand.java @@ -29,7 +29,7 @@ import org.elasticsearch.cli.KeyStoreAwareCommand; import org.elasticsearch.cli.Terminal; import org.elasticsearch.cli.UserException; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; /** * A sub-command for the keystore cli to create a new keystore. diff --git a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/ListKeyStoreCommand.java b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/ListKeyStoreCommand.java index e1ae480ef33b0..d6734b74e7052 100644 --- a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/ListKeyStoreCommand.java +++ b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/ListKeyStoreCommand.java @@ -25,7 +25,7 @@ import joptsimple.OptionSet; import org.elasticsearch.cli.Terminal; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; /** * A subcommand for the keystore cli to list all settings in the keystore. diff --git a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommand.java b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommand.java index a1c9802b22424..0453b25ed46a4 100644 --- a/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommand.java +++ b/distribution/tools/keystore-cli/src/main/java/org/elasticsearch/common/settings/RemoveSettingKeyStoreCommand.java @@ -24,7 +24,7 @@ import org.elasticsearch.cli.ExitCodes; import org.elasticsearch.cli.Terminal; import org.elasticsearch.cli.UserException; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import java.util.List; diff --git a/distribution/tools/keystore-cli/src/test/java/org/elasticsearch/common/settings/KeyStoreCommandTestCase.java b/distribution/tools/keystore-cli/src/test/java/org/elasticsearch/common/settings/KeyStoreCommandTestCase.java index 0ac39e466dd04..97f051cf068ae 100644 --- a/distribution/tools/keystore-cli/src/test/java/org/elasticsearch/common/settings/KeyStoreCommandTestCase.java +++ b/distribution/tools/keystore-cli/src/test/java/org/elasticsearch/common/settings/KeyStoreCommandTestCase.java @@ -33,8 +33,8 @@ import org.apache.lucene.util.LuceneTestCase; import org.elasticsearch.cli.CommandTestCase; import org.elasticsearch.common.io.PathUtilsForTesting; -import org.elasticsearch.env.Environment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.Environment; +import org.opensearch.env.TestEnvironment; import org.junit.After; import org.junit.Before; diff --git a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java index 35b408f56ea9c..055cf4909f920 100644 --- a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java +++ b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/InstallPluginCommandTests.java @@ -54,8 +54,8 @@ import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.io.PathUtilsForTesting; 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.PosixPermissionsResetter; import org.junit.After; 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 7cf0bccb7045b..04e4e5e39199e 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 @@ 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/ApostropheFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ApostropheFilterFactory.java index fe80351964b64..7bb32595160b0 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ApostropheFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ApostropheFilterFactory.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tr.ApostropheFilter; 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/ArabicAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArabicAnalyzerProvider.java index 9ea1930c682a4..ee303c5789ae7 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 @@ 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/ArmenianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArmenianAnalyzerProvider.java index 44b5b28a14703..ef34164c6d21f 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArmenianAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ArmenianAnalyzerProvider.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.hy.ArmenianAnalyzer; 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/BasqueAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/BasqueAnalyzerProvider.java index 472993ee61f12..a3fd81692a129 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 @@ 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/CJKBigramFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CJKBigramFilterFactory.java index 6cb8690e99dc3..615f7904a254e 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CJKBigramFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CJKBigramFilterFactory.java @@ -25,7 +25,7 @@ import org.elasticsearch.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/CatalanAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CatalanAnalyzerProvider.java index 099de6287ba83..c920ea3fe4432 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CatalanAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CatalanAnalyzerProvider.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.ca.CatalanAnalyzer; 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/CjkAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CjkAnalyzerProvider.java index e6b003b61f565..feee6ad0a1170 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 @@ 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/ClassicTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ClassicTokenizerFactory.java index baa975e62aa3e..2d7c6225540ee 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ClassicTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ClassicTokenizerFactory.java @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.standard.ClassicTokenizer; import org.apache.lucene.analysis.standard.StandardAnalyzer; 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/CommonGramsTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactory.java index 357d05f494cb2..4da0a3fc290be 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonGramsTokenFilterFactory.java @@ -26,7 +26,7 @@ import org.elasticsearch.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/DanishAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DanishAnalyzerProvider.java index cd347263c4091..30a20cb6b8234 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 @@ 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/DecimalDigitFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DecimalDigitFilterFactory.java index 6caf46e5262c6..6910a7fd5b1ab 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DecimalDigitFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DecimalDigitFilterFactory.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.DecimalDigitFilter; 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/DelimitedPayloadTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DelimitedPayloadTokenFilterFactory.java index 50ce216de5d35..255351e9a17c3 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DelimitedPayloadTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DelimitedPayloadTokenFilterFactory.java @@ -26,7 +26,7 @@ import org.apache.lucene.analysis.payloads.IntegerEncoder; import org.apache.lucene.analysis.payloads.PayloadEncoder; 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/DutchAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/DutchAnalyzerProvider.java index 48aeba493a94d..9a6e85a4b35dd 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 @@ 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/EdgeNGramTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/EdgeNGramTokenizerFactory.java index 88238f220a988..99504b002e32a 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.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/FinnishAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FinnishAnalyzerProvider.java index 601dbc328ea3c..751626771956c 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FinnishAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/FinnishAnalyzerProvider.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.fi.FinnishAnalyzer; 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 e2c7efa7d9e9c..d086b87be6bb8 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 @@ 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 8c9317ce61313..e56aa57a0541e 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 @@ 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 26386735cc6c1..1178cc5eaf4b5 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.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/GalicianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GalicianAnalyzerProvider.java index a5700be226276..207eaa785d765 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GalicianAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GalicianAnalyzerProvider.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.gl.GalicianAnalyzer; 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/GermanAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GermanAnalyzerProvider.java index 800b85cb9d43f..ded1b4757de6e 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 @@ 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/GreekAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GreekAnalyzerProvider.java index b9855406ae313..8cc0d10d0c7d2 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GreekAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/GreekAnalyzerProvider.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.el.GreekAnalyzer; 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/HindiAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HindiAnalyzerProvider.java index c26e169a60f2e..30c8f5ca27bcb 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HindiAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HindiAnalyzerProvider.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.hi.HindiAnalyzer; 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/HtmlStripCharFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HtmlStripCharFilterFactory.java index 084a3ef11e53d..e5954f75f5171 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HtmlStripCharFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/HtmlStripCharFilterFactory.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.charfilter.HTMLStripCharFilter; 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; 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 a7e054c191b89..1a1271a6337bb 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 @@ 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/ItalianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ItalianAnalyzerProvider.java index 6ea528f042eeb..46b62be1964ad 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ItalianAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ItalianAnalyzerProvider.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.it.ItalianAnalyzer; 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/KStemTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KStemTokenFilterFactory.java index f43452c3f2dac..57c85710dfea3 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KStemTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KStemTokenFilterFactory.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.en.KStemFilter; 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/KeepTypesFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeepTypesFilterFactory.java index 0428f1ea3087b..9136640a11fb1 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeepTypesFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeepTypesFilterFactory.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.TypeTokenFilter; 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/KeywordMarkerTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/KeywordMarkerTokenFilterFactory.java index fc28d0ffef2ef..f9edfaf38bd00 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.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 5eb3349c3ac5d..fba5a1953832d 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 @@ 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/LatvianAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LatvianAnalyzerProvider.java index 50140fd5ac01a..8bc6fb0f7f9f8 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LatvianAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LatvianAnalyzerProvider.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.lv.LatvianAnalyzer; 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/LegacyDelimitedPayloadTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LegacyDelimitedPayloadTokenFilterFactory.java index 825b92b07f9a9..6d00c0bdd0854 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LegacyDelimitedPayloadTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LegacyDelimitedPayloadTokenFilterFactory.java @@ -22,7 +22,7 @@ import org.elasticsearch.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; public class LegacyDelimitedPayloadTokenFilterFactory extends DelimitedPayloadTokenFilterFactory { 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 a359480a9efed..e6b6e2b397b4c 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 @@ 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/LowerCaseTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LowerCaseTokenFilterFactory.java index d426d8c1111ba..ea2180bee7b92 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LowerCaseTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/LowerCaseTokenFilterFactory.java @@ -25,7 +25,7 @@ import org.apache.lucene.analysis.ga.IrishLowerCaseFilter; import org.apache.lucene.analysis.tr.TurkishLowerCaseFilter; 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/MappingCharFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/MappingCharFilterFactory.java index 475c36f0fe851..6d466f2ea39c0 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/MappingCharFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/MappingCharFilterFactory.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.charfilter.MappingCharFilter; import org.apache.lucene.analysis.charfilter.NormalizeCharMap; 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.Analysis; 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 5b0b3f8667a73..220b101aded5f 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.ngram.NGramTokenizer; import org.elasticsearch.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/PatternCaptureGroupTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternCaptureGroupTokenFilterFactory.java index f3abb3dd28696..d43b2902c8afa 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternCaptureGroupTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternCaptureGroupTokenFilterFactory.java @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.pattern.PatternCaptureGroupTokenFilter; 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/PatternReplaceCharFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PatternReplaceCharFilterFactory.java index 0621a6266428a..ebc18dc0b94d4 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.elasticsearch.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/PersianNormalizationFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PersianNormalizationFilterFactory.java index 6ce61d989445f..754c731454d18 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 @@ 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/PorterStemTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PorterStemTokenFilterFactory.java index 3415384b87497..42dee12200891 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PorterStemTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/PorterStemTokenFilterFactory.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.en.PorterStemFilter; 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/RemoveDuplicatesTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/RemoveDuplicatesTokenFilterFactory.java index ed201bf40c98d..146451cb41481 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 @@ 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/SoraniNormalizationFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SoraniNormalizationFilterFactory.java index 32e2650fc0419..03475ecbf65f2 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SoraniNormalizationFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SoraniNormalizationFilterFactory.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.ckb.SoraniNormalizationFilter; 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/SpanishAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SpanishAnalyzerProvider.java index 7a40107daab40..e986ec433ded0 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SpanishAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SpanishAnalyzerProvider.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.es.SpanishAnalyzer; 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 a32c99c87a81f..92b2bbd005077 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.elasticsearch.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 71bcecbd90920..78b32afb8ed0c 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.sv.SwedishLightStemFilter; import org.elasticsearch.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/SynonymTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SynonymTokenFilterFactory.java index 46fd5c3859d0c..632035d350eb1 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SynonymTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/SynonymTokenFilterFactory.java @@ -25,7 +25,7 @@ import org.apache.lucene.analysis.synonym.SynonymMap; 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/ThaiAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiAnalyzerProvider.java index c6299230dfea5..372601da9808f 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiAnalyzerProvider.java @@ -21,7 +21,7 @@ import org.apache.lucene.analysis.th.ThaiAnalyzer; 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/ThaiTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiTokenizerFactory.java index 307c18aaabacc..2d78ee687fb18 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/ThaiTokenizerFactory.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.th.ThaiTokenizer; 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/TrimTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TrimTokenFilterFactory.java index e5df458a0b7fa..ecec6b07f56ce 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 @@ 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 5cff255b93a04..0ee2bae221b09 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 @@ 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/TurkishAnalyzerProvider.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TurkishAnalyzerProvider.java index 9018e3336be78..202eae4837a82 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TurkishAnalyzerProvider.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/TurkishAnalyzerProvider.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.CharArraySet; import org.apache.lucene.analysis.tr.TurkishAnalyzer; 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/UAX29URLEmailTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UAX29URLEmailTokenizerFactory.java index 662fdbde6d60c..fcb306ce29789 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UAX29URLEmailTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/UAX29URLEmailTokenizerFactory.java @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.analysis.standard.UAX29URLEmailTokenizer; 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/WhitespaceTokenizerFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WhitespaceTokenizerFactory.java index 592614e056db7..a7808aa91cb7a 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WhitespaceTokenizerFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WhitespaceTokenizerFactory.java @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.apache.lucene.analysis.standard.StandardAnalyzer; 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/WordDelimiterTokenFilterFactory.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactory.java index 4fe18abdb81f6..5a423cd9a591c 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactory.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactory.java @@ -26,7 +26,7 @@ import org.elasticsearch.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/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java index eb0719defc5c6..f439a869e61bf 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java @@ -25,8 +25,8 @@ import org.elasticsearch.Version; import org.elasticsearch.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.MyFilterTokenFilterFactory; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java index 7cd79482998dc..ab582abb52daa 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/KeepTypesFilterFactoryTests.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.standard.StandardTokenizer; 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/LimitTokenCountFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/LimitTokenCountFilterFactoryTests.java index ac062651dd4d2..03075b03b7293 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/LimitTokenCountFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/LimitTokenCountFilterFactoryTests.java @@ -22,7 +22,7 @@ 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/MinHashFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MinHashFilterFactoryTests.java index 78f02fbb88c22..3c44e4d7b57fb 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MinHashFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MinHashFilterFactoryTests.java @@ -22,7 +22,7 @@ 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/NGramTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenFilterFactoryTests.java index 26686f81094b9..3c2078d4aeb84 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenFilterFactoryTests.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.standard.StandardTokenizer; 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/RemoveDuplicatesFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java index e6b95b6458e43..11e72e54514cf 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java @@ -22,7 +22,7 @@ import org.apache.lucene.analysis.CannedTokenStream; import org.apache.lucene.analysis.Token; 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/StemmerOverrideTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerOverrideTokenFilterFactoryTests.java index 804b9aa32577b..147fe087c032e 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 @@ 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/StemmerTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerTokenFilterFactoryTests.java index 87d7ca49fb5f9..494e5e0c0781c 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/StemmerTokenFilterFactoryTests.java @@ -25,7 +25,7 @@ import org.apache.lucene.analysis.snowball.SnowballFilter; import org.elasticsearch.Version; 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.IndexAnalyzers; import org.elasticsearch.index.analysis.NamedAnalyzer; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java index eec66ab181e7f..655eca2a2ce5d 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterTokenFilterFactoryTests.java @@ -22,7 +22,7 @@ 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 13b49296dc7ef..62c5d3eccb2db 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.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 9f24ac2f0b3ec..d221ec82567df 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.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 29a0d26f997cc..26b72a4276eb4 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.ssl.SslConfiguration; import org.elasticsearch.common.ssl.SslConfigurationKeys; import org.elasticsearch.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 cfd80c9e16218..11551674bb5cf 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.common.bytes.BytesArray; import org.elasticsearch.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 9ad069115c6e2..0bd8a13ecaa82 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.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.elasticsearch.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 05c1d7904c599..62150f34a7ed8 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.settings.Settings; import org.elasticsearch.common.ssl.PemKeyConfig; import org.elasticsearch.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/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriAnalyzerProvider.java b/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriAnalyzerProvider.java index f85c3f94e3423..66ff2b3fca912 100644 --- a/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriAnalyzerProvider.java +++ b/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriAnalyzerProvider.java @@ -27,7 +27,7 @@ import org.apache.lucene.analysis.ko.dict.UserDictionary; import org.apache.lucene.analysis.ko.POS; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import static org.elasticsearch.index.analysis.NoriPartOfSpeechStopFilterFactory.resolvePOSList; diff --git a/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriPartOfSpeechStopFilterFactory.java b/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriPartOfSpeechStopFilterFactory.java index d893c35cefb74..dc653a6fe3771 100644 --- a/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriPartOfSpeechStopFilterFactory.java +++ b/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriPartOfSpeechStopFilterFactory.java @@ -23,7 +23,7 @@ import org.apache.lucene.analysis.ko.KoreanPartOfSpeechStopFilter; import org.apache.lucene.analysis.ko.POS; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import java.util.HashSet; diff --git a/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriTokenizerFactory.java b/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriTokenizerFactory.java index ee766095ffae5..4afabeb49f2d9 100644 --- a/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriTokenizerFactory.java +++ b/plugins/analysis-nori/src/main/java/org/elasticsearch/index/analysis/NoriTokenizerFactory.java @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.ko.dict.UserDictionary; import org.elasticsearch.OpenSearchException; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.elasticsearch.index.IndexSettings; import java.io.IOException; diff --git a/plugins/repository-gcs/src/internalClusterTest/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobStoreRepositoryTests.java b/plugins/repository-gcs/src/internalClusterTest/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobStoreRepositoryTests.java index b70f4342d539f..2adf969a8749a 100644 --- a/plugins/repository-gcs/src/internalClusterTest/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobStoreRepositoryTests.java +++ b/plugins/repository-gcs/src/internalClusterTest/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobStoreRepositoryTests.java @@ -46,7 +46,7 @@ import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.unit.ByteSizeValue; 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.repositories.RepositoriesService; diff --git a/plugins/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStoragePlugin.java b/plugins/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStoragePlugin.java index 0c878d0fe3f77..0450c14f8a2cb 100644 --- a/plugins/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStoragePlugin.java +++ b/plugins/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStoragePlugin.java @@ -23,7 +23,7 @@ import org.elasticsearch.common.settings.Setting; 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.Plugin; import org.elasticsearch.plugins.ReloadablePlugin; diff --git a/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3RepositoryPlugin.java b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3RepositoryPlugin.java index 178b0fcd5294a..213daf6c6a6b7 100644 --- a/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3RepositoryPlugin.java +++ b/plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3RepositoryPlugin.java @@ -26,7 +26,7 @@ import org.elasticsearch.common.settings.Setting; 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.Plugin; import org.elasticsearch.plugins.ReloadablePlugin; diff --git a/server/src/main/java/org/elasticsearch/env/ESFileStore.java b/server/src/main/java/org/opensearch/env/ESFileStore.java similarity index 97% rename from server/src/main/java/org/elasticsearch/env/ESFileStore.java rename to server/src/main/java/org/opensearch/env/ESFileStore.java index 52b0cea6748d8..9f8beca4483b8 100644 --- a/server/src/main/java/org/elasticsearch/env/ESFileStore.java +++ b/server/src/main/java/org/opensearch/env/ESFileStore.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.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) { + OpenSearchFileStoreFileStore(final FileStore in) { this.in = in; if (Constants.LINUX) { try { 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 1d1f6e0ade0e0..a01b686b96c54 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 void validateTmpFile() throws IOException { } 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 7afb52f53dd93..c83da80654cc0 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 void close() { /** * 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 void deleteShardDirectorySafe(ShardId shardId, IndexSettings indexSetting /** * 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 OpenSearchh. * * @throws LockObtainFailedException if any of the locks could not be acquired */ @@ -821,7 +821,7 @@ public Path sharedDataPath() { **/ 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 @@ private static void ensureAtomicMoveSupported(final NodePath[] nodePaths) throws } 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 @@ private void ensureNoShardData(final NodePath[] nodePaths) throws IOException { 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 @@ private void ensureNoIndexMetadata(final NodePath[] nodePaths) throws IOExceptio 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 5ac3a9df0ea2e..7cbe408f3acf4 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.elasticsearch.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 939e4a78313ee..a1bfabc553293 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.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/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 e21aaf877aea2..8dd4ccec00919 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 8ea5aabde322b..ad30006f147e6 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 b33a0df10ca66..6831c6f1be8c2 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.elasticsearch.OpenSearchException; import org.elasticsearch.common.io.stream.StreamInput; diff --git a/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java b/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java index 00af27f9be83f..deb40f52eb239 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java @@ -50,10 +50,10 @@ import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; import org.elasticsearch.common.util.concurrent.ThreadContext; import org.elasticsearch.core.internal.io.IOUtils; -import org.elasticsearch.env.Environment; -import org.elasticsearch.env.NodeEnvironment; -import org.elasticsearch.env.ShardLock; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.Environment; +import org.opensearch.env.NodeEnvironment; +import org.opensearch.env.ShardLock; +import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.analysis.AnalysisRegistry; import org.elasticsearch.index.analysis.AnalyzerProvider; import org.elasticsearch.index.analysis.AnalyzerScope; diff --git a/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java b/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java index aa86888cdefe9..2be57f7e712b5 100644 --- a/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java +++ b/server/src/test/java/org/elasticsearch/index/codec/CodecTests.java @@ -32,7 +32,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; 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.mapper.MapperService;