From d1e070c92b5ea2e188c79ca7151a7bf74b92cbdb Mon Sep 17 00:00:00 2001 From: Rabi Panda Date: Fri, 19 Mar 2021 00:27:42 -0700 Subject: [PATCH] [Rename] Fix import issues in tests. (#414) This commit fixes the import issues in already refactored test packages. Signed-off-by: Rabi Panda --- .../analysis/common/CommonAnalysisPlugin.java | 16 +++---- .../index/reindex/ReindexPlugin.java | 2 +- .../test/indices.validate_query/10_basic.yml | 2 +- .../common/geo/BaseGeoParsingTestCase.java | 2 +- .../common/geo/GeoJsonShapeParserTests.java | 8 ++-- .../common/geo/GeoWKTShapeParserTests.java | 10 ++--- .../common/geo/GeometryIOTests.java | 2 +- .../common/geo/GeometryIndexerTests.java | 2 +- .../common/geo/ShapeBuilderTests.java | 2 +- .../ReleasableBytesStreamOutputTests.java | 2 +- .../JsonThrowablePatternConverterTests.java | 2 - .../opensearch/common/lucene/LuceneTests.java | 10 ++--- .../common/lucene/ShardCoreKeyMapTests.java | 2 +- .../index/OpenSearchDirectoryReaderTests.java | 2 +- .../common/lucene/search/QueriesTests.java | 2 +- .../store/ByteArrayIndexInputTests.java | 1 - .../common/lucene/uid/VersionLookupTests.java | 6 +-- .../common/lucene/uid/VersionsTests.java | 8 ++-- .../common/network/NetworkModuleTests.java | 2 +- .../ConsistentSettingsServiceTests.java | 2 +- .../settings/MemorySizeSettingsTests.java | 12 +++--- .../common/settings/ScopedSettingsTests.java | 1 - .../common/settings/SettingTests.java | 1 - .../common/settings/SettingsTests.java | 2 +- .../common/util/BigArraysTests.java | 10 ++--- .../common/util/BinarySearcherTests.java | 4 +- .../opensearch/common/util/BitArrayTests.java | 2 +- .../common/util/BytesRefHashTests.java | 4 +- .../opensearch/common/util/LongHashTests.java | 4 +- .../common/util/LongLongHashTests.java | 4 +- .../common/util/LongObjectHashMapTests.java | 4 +- .../common/xcontent/BaseXContentTestCase.java | 12 ------ .../common/xcontent/XContentFactoryTests.java | 3 -- .../xcontent/XContentParserUtilsTests.java | 7 ---- .../common/xcontent/XContentTypeTests.java | 1 - .../cbor/CborXContentParserTests.java | 1 - .../common/xcontent/cbor/JsonVsCborTests.java | 1 - .../xcontent/smile/JsonVsSmileTests.java | 1 - .../FilterPathGeneratorFilteringTests.java | 1 - .../support/filtering/FilterPathTests.java | 1 - .../IndexingMemoryControllerTests.java | 12 +++--- ...dicesLifecycleListenerSingleNodeTests.java | 20 ++++----- .../indices/IndicesModuleTests.java | 30 ++++++------- .../indices/IndicesQueryCacheTests.java | 4 +- .../indices/IndicesServiceCloseTests.java | 16 +++---- .../indices/IndicesServiceTests.java | 42 +++++++++---------- .../indices/ShardLimitValidatorTests.java | 4 +- .../indices/analysis/AnalysisModuleTests.java | 38 ++++++++--------- .../indices/analyze/HunspellServiceTests.java | 8 ++-- .../HierarchyCircuitBreakerServiceTests.java | 2 +- ...actIndicesClusterStateServiceTestCase.java | 30 ++++++------- .../indices/cluster/ClusterStateChanges.java | 2 +- .../flush/SyncedFlushSingleNodeTests.java | 10 ++--- .../indices/flush/SyncedFlushUtil.java | 2 +- .../breaker/CircuitBreakerUnitTests.java | 4 +- .../PeerRecoverySourceServiceTests.java | 8 ++-- .../PeerRecoveryTargetServiceTests.java | 18 ++++---- .../RecoverySettingsDynamicUpdateTests.java | 2 +- .../recovery/RecoverySourceHandlerTests.java | 10 ++--- .../indices/recovery/RecoveryStatusTests.java | 6 +-- .../indices/recovery/RecoveryTargetTests.java | 14 +++---- .../recovery/StartRecoveryRequestTests.java | 8 ++-- .../indices/store/IndicesStoreTests.java | 2 +- .../monitor/fs/FsHealthServiceTests.java | 6 +-- .../opensearch/monitor/fs/FsProbeTests.java | 4 +- .../monitor/process/ProcessProbeTests.java | 2 +- .../java/org/opensearch/node/NodeTests.java | 14 +++---- .../plugins/IndexStorePluginTests.java | 6 +-- .../recovery/RecoveriesCollectionTests.java | 6 +-- .../repositories/RepositoriesModuleTests.java | 4 +- .../RepositoriesServiceTests.java | 22 +++++----- .../BlobStoreRepositoryRestoreTests.java | 20 ++++----- .../blobstore/BlobStoreRepositoryTests.java | 2 +- .../opensearch/rest/RestControllerTests.java | 2 +- .../rest/action/RestActionsTests.java | 8 ++-- .../admin/indices/RestAnalyzeActionTests.java | 2 +- .../action/cat/RestIndicesActionTests.java | 6 +-- .../action/cat/RestRecoveryActionTests.java | 6 +-- .../action/cat/RestShardsActionTests.java | 2 +- .../document/RestGetSourceActionTests.java | 4 +- .../document/RestUpdateActionTests.java | 2 +- .../JodaCompatibleZonedDateTimeTests.java | 2 +- .../script/ScriptContextInfoTests.java | 8 ++-- .../opensearch/script/ScriptServiceTests.java | 2 +- .../search/AbstractSearchTestCase.java | 2 +- .../search/DefaultSearchContextTests.java | 26 ++++++------ .../search/DocValueFormatTests.java | 2 +- .../search/MultiValueModeTests.java | 18 ++++---- .../org/opensearch/search/SearchHitTests.java | 4 +- .../opensearch/search/SearchHitsTests.java | 4 +- .../AggregationCollectorTests.java | 2 +- .../AggregationTestScriptsPlugin.java | 2 +- .../AggregatorFactoriesTests.java | 12 +++--- .../bucket/BucketsAggregatorTests.java | 4 +- .../aggregations/bucket/FilterTests.java | 2 +- .../aggregations/bucket/FiltersTests.java | 12 +++--- .../bucket/GlobalAggregatorTests.java | 4 +- ...MergingBucketsDeferringCollectorTests.java | 24 +++++------ .../bucket/SignificantTermsTests.java | 2 +- .../bucket/SignificantTextTests.java | 2 +- ...djacencyMatrixAggregationBuilderTests.java | 8 ++-- .../composite/CompositeAggregatorTests.java | 20 ++++----- .../CompositeValuesCollectorQueueTests.java | 12 +++--- .../composite/InternalCompositeTests.java | 2 +- .../SingleDimensionValuesSourceTests.java | 8 ++-- .../bucket/filter/FilterAggregatorTests.java | 10 ++--- .../bucket/filter/FiltersAggregatorTests.java | 8 ++-- .../bucket/filter/InternalFilterTests.java | 2 +- .../bucket/filter/InternalFiltersTests.java | 2 +- .../geogrid/GeoGridAggregatorTestCase.java | 4 +- .../AutoDateHistogramAggregatorTests.java | 12 +++--- .../DateHistogramAggregatorTestCase.java | 18 ++++---- .../DateHistogramAggregatorTests.java | 12 +++--- .../DateRangeHistogramAggregatorTests.java | 8 ++-- .../InternalAutoDateHistogramTests.java | 2 +- .../InternalVariableWidthHistogramTests.java | 2 +- .../bucket/histogram/LongBoundsTests.java | 6 +-- .../NumericHistogramAggregatorTests.java | 6 +-- .../RangeHistogramAggregatorTests.java | 4 +- ...VariableWidthHistogramAggregatorTests.java | 6 +-- .../missing/MissingAggregatorTests.java | 10 ++--- .../nested/ReverseNestedAggregatorTests.java | 12 +++--- .../range/BinaryRangeAggregatorTests.java | 4 +- .../range/DateRangeAggregatorTests.java | 8 ++-- .../bucket/range/IpRangeAggregatorTests.java | 4 +- .../range/RangeAggregationBuilderTests.java | 2 +- .../bucket/range/RangeAggregatorTests.java | 8 ++-- .../BestDocsDeferringCollectorTests.java | 2 +- .../sampler/DiversifiedSamplerTests.java | 10 ++--- .../sampler/SamplerAggregatorTests.java | 14 +++---- .../terms/BinaryTermsAggregatorTests.java | 4 +- .../terms/BytesKeyedBucketOrdsTests.java | 2 +- .../terms/KeywordTermsAggregatorTests.java | 4 +- .../terms/LongKeyedBucketOrdsTests.java | 2 +- .../terms/NumericTermsAggregatorTests.java | 4 +- .../terms/RareTermsAggregatorTests.java | 34 +++++++-------- .../SignificantTermsAggregatorTests.java | 26 ++++++------ .../terms/SignificantTextAggregatorTests.java | 14 +++---- .../bucket/terms/TermsAggregatorTests.java | 34 +++++++-------- .../metrics/AdjacencyMatrixTests.java | 6 +-- .../metrics/AvgAggregatorTests.java | 6 +-- .../metrics/CardinalityAggregatorTests.java | 8 ++-- .../metrics/ExtendedStatsAggregatorTests.java | 4 +- .../metrics/GeoBoundsAggregatorTests.java | 4 +- .../metrics/GeoCentroidAggregatorTests.java | 4 +- .../HDRPercentileRanksAggregatorTests.java | 4 +- .../HDRPercentilesAggregatorTests.java | 10 ++--- .../HyperLogLogPlusPlusSparseTests.java | 2 +- .../metrics/HyperLogLogPlusPlusTests.java | 2 +- .../metrics/InternalCardinalityTests.java | 2 +- .../metrics/InternalScriptedMetricTests.java | 4 +- .../metrics/MaxAggregatorTests.java | 6 +-- ...edianAbsoluteDeviationAggregatorTests.java | 4 +- .../metrics/MinAggregatorTests.java | 2 +- .../metrics/StatsAggregatorTests.java | 6 +-- .../metrics/SumAggregatorTests.java | 6 +-- ...TDigestPercentileRanksAggregatorTests.java | 4 +- .../TDigestPercentilesAggregatorTests.java | 4 +- .../metrics/TopHitsAggregatorTests.java | 12 +++--- .../metrics/ValueCountAggregatorTests.java | 18 ++++---- .../metrics/WeightedAvgAggregatorTests.java | 4 +- .../pipeline/AvgBucketAggregatorTests.java | 6 +-- .../pipeline/BucketScriptAggregatorTests.java | 8 ++-- .../CumulativeSumAggregatorTests.java | 6 +-- .../pipeline/DerivativeAggregatorTests.java | 8 ++-- .../pipeline/MovFnAggrgatorTests.java | 6 +-- .../support/IncludeExcludeTests.java | 2 +- .../support/MissingValuesTests.java | 10 ++--- .../MultiValuesSourceFieldConfigTests.java | 4 +- .../support/ValuesSourceConfigTests.java | 10 ++--- .../support/ValuesSourceRegistryTests.java | 2 +- .../builder/SearchSourceBuilderTests.java | 10 ++--- .../search/collapse/CollapseBuilderTests.java | 16 +++---- .../fetch/subphase/FieldFetcherTests.java | 14 +++---- .../subphase/highlight/CustomHighlighter.java | 2 +- .../search/geo/GeoPointShapeQueryTests.java | 4 +- .../search/internal/AliasFilterTests.java | 6 +-- .../internal/ShardSearchRequestTests.java | 12 +++--- .../search/lookup/LeafDocLookupTests.java | 10 ++--- .../search/lookup/LeafFieldsLookupTests.java | 4 +- .../search/profile/ProfileResultTests.java | 24 +++++------ .../AggregationProfileShardResultTests.java | 2 +- .../profile/query/RandomQueryGenerator.java | 14 +++---- .../search/query/QuerySearchResultTests.java | 2 +- .../searchafter/SearchAfterBuilderTests.java | 2 +- .../search/slice/SliceBuilderTests.java | 18 ++++---- .../search/sort/FieldSortBuilderTests.java | 28 ++++++------- .../sort/GeoDistanceSortBuilderTests.java | 26 ++++++------ .../search/sort/NestedSortBuilderTests.java | 12 +++--- .../search/sort/ScriptSortBuilderTests.java | 22 +++++----- .../search/sort/SortValueTests.java | 2 +- .../CategoryContextMappingTests.java | 20 ++++----- .../CompletionSuggesterBuilderTests.java | 8 ++-- .../completion/GeoContextMappingTests.java | 8 ++-- .../suggest/completion/RegexOptionsTests.java | 2 +- .../snapshots/BlobStoreFormatTests.java | 2 +- .../InternalSnapshotsInfoServiceTests.java | 6 +-- .../snapshots/RestoreServiceTests.java | 2 +- .../snapshots/SnapshotInfoTests.java | 2 +- .../snapshots/SnapshotResiliencyTests.java | 4 +- .../snapshots/SnapshotShardsServiceTests.java | 2 +- ...SnapshotsInProgressSerializationTests.java | 4 +- .../snapshots/SnapshotsServiceTests.java | 4 +- .../MockEventuallyConsistentRepository.java | 2 +- ...ckEventuallyConsistentRepositoryTests.java | 2 +- .../opensearch/tasks/TaskManagerTests.java | 2 +- .../RemoteClusterConnectionTests.java | 2 +- .../transport/RemoteClusterSettingsTests.java | 6 +-- .../transport/TcpTransportTests.java | 2 +- .../DelayedShardAggregationIT.java | 2 +- .../ClusterStateCreationUtils.java | 2 +- .../TransportWriteActionTestHelper.java | 4 +- .../bootstrap/BootstrapForTesting.java | 6 +-- .../cluster/DataStreamTestHelper.java | 2 +- .../cluster/routing/TestShardRouting.java | 2 +- .../bytes/AbstractBytesReferenceTestCase.java | 2 +- .../org/opensearch/index/MapperTestUtils.java | 18 ++++---- .../index/MockEngineFactoryPlugin.java | 2 +- .../index/analysis/AnalysisTestsHelper.java | 6 +-- .../analysis/MyFilterTokenFilterFactory.java | 4 +- .../index/engine/InternalTestEngine.java | 4 +- .../index/engine/TranslogHandler.java | 36 ++++++++-------- .../index/mapper/FieldMapperTestCase.java | 6 +-- .../index/mapper/FieldMapperTestCase2.java | 4 +- .../index/mapper/FieldTypeTestCase.java | 4 +- .../index/mapper/MapperServiceTestCase.java | 16 +++---- .../index/mapper/MapperTestCase.java | 8 ++-- ...enSearchIndexLevelReplicationTestCase.java | 34 +++++++-------- .../index/shard/RestoreOnlyRepository.java | 6 +-- .../translog/TranslogDeletionPolicies.java | 2 +- .../analysis/AnalysisFactoryTestCase.java | 8 ++-- .../indices/recovery/AsyncRecoveryTarget.java | 10 ++--- .../ingest/RandomDocumentPicks.java | 2 +- .../java/org/opensearch/node/MockNode.java | 8 ++-- .../node/RecoverySettingsChunkSizePlugin.java | 2 +- .../opensearch/script/MockScriptEngine.java | 10 ++--- .../opensearch/script/MockScriptService.java | 8 ++-- .../opensearch/search/MockSearchService.java | 4 +- .../search/RandomSearchRequestGenerator.java | 2 +- .../BasePipelineAggregationTestCase.java | 4 +- .../snapshots/mockstore/MockRepository.java | 2 +- .../test/AbstractBootstrapCheckTestCase.java | 2 +- .../AbstractBroadcastResponseTestCase.java | 4 +- .../opensearch/test/ClusterServiceUtils.java | 4 +- .../org/opensearch/test/DummyShardLock.java | 4 +- .../opensearch/test/ExternalTestCluster.java | 2 +- .../test/InternalSettingsPlugin.java | 8 ++-- .../opensearch/test/InternalTestCluster.java | 36 ++++++++-------- .../test/MockIndexEventListener.java | 18 ++++---- .../opensearch/test/MockKeywordPlugin.java | 4 +- .../org/opensearch/test/MockLogAppender.java | 6 +-- .../java/org/opensearch/test/NodeRoles.java | 2 +- .../test/OpenSearchSingleNodeTestCase.java | 14 +++---- .../opensearch/test/OpenSearchTestCase.java | 4 +- .../org/opensearch/test/RandomObjects.java | 10 ++--- .../java/org/opensearch/test/TestCluster.java | 2 +- .../test/TestGeoShapeFieldMapperPlugin.java | 6 +-- .../opensearch/test/TestSearchContext.java | 20 ++++----- .../test/engine/MockEngineFactory.java | 6 +-- .../test/engine/MockEngineSupport.java | 8 ++-- .../test/engine/MockInternalEngine.java | 8 ++-- .../junit/annotations/TestIssueLogging.java | 2 +- .../test/junit/annotations/TestLogging.java | 2 +- .../test/rest/RestActionTestCase.java | 2 +- .../opensearch/test/rest/yaml/ObjectPath.java | 4 +- .../AbstractSimpleTransportTestCase.java | 22 +++++----- .../transport/nio/MockNioTransport.java | 2 +- .../test/test/InternalTestClusterTests.java | 4 +- .../nio/SimpleMockNioTransportTests.java | 2 +- 269 files changed, 972 insertions(+), 1015 deletions(-) diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java index 70f09405d62..e3f94f6f4e0 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java @@ -411,7 +411,7 @@ public class CommonAnalysisPlugin extends Plugin implements AnalysisPlugin, Scri public List getPreConfiguredCharFilters() { List filters = new ArrayList<>(); filters.add(PreConfiguredCharFilter.singleton("html_strip", false, HTMLStripCharFilter::new)); - filters.add(PreConfiguredCharFilter.elasticsearchVersion("htmlStrip", false, (reader, version) -> { + filters.add(PreConfiguredCharFilter.openSearchVersion("htmlStrip", false, (reader, version) -> { if (version.onOrAfter(org.opensearch.Version.V_6_3_0)) { deprecationLogger.deprecate("htmlStrip_deprecation", "The [htmpStrip] char filter name is deprecated and will be removed in a future version. " @@ -438,7 +438,7 @@ public class CommonAnalysisPlugin extends Plugin implements AnalysisPlugin, Scri input -> new CommonGramsFilter(input, CharArraySet.EMPTY_SET))); filters.add(PreConfiguredTokenFilter.singleton("czech_stem", false, CzechStemFilter::new)); filters.add(PreConfiguredTokenFilter.singleton("decimal_digit", true, DecimalDigitFilter::new)); - filters.add(PreConfiguredTokenFilter.elasticsearchVersion("delimited_payload_filter", false, (input, version) -> { + filters.add(PreConfiguredTokenFilter.openSearchVersion("delimited_payload_filter", false, (input, version) -> { if (version.onOrAfter(Version.V_7_0_0)) { throw new IllegalArgumentException( "[delimited_payload_filter] is not supported for new indices, use [delimited_payload] instead"); @@ -458,7 +458,7 @@ public class CommonAnalysisPlugin extends Plugin implements AnalysisPlugin, Scri filters.add(PreConfiguredTokenFilter.singleton("dutch_stem", false, input -> new SnowballFilter(input, new DutchStemmer()))); filters.add(PreConfiguredTokenFilter.singleton("edge_ngram", false, false, input -> new EdgeNGramTokenFilter(input, 1))); - filters.add(PreConfiguredTokenFilter.elasticsearchVersion("edgeNGram", false, false, (reader, version) -> { + filters.add(PreConfiguredTokenFilter.openSearchVersion("edgeNGram", false, false, (reader, version) -> { if (version.onOrAfter(org.opensearch.Version.V_7_0_0)) { throw new IllegalArgumentException( "The [edgeNGram] token filter name was deprecated in 6.4 and cannot be used in new indices. " @@ -486,7 +486,7 @@ public class CommonAnalysisPlugin extends Plugin implements AnalysisPlugin, Scri LimitTokenCountFilterFactory.DEFAULT_MAX_TOKEN_COUNT, LimitTokenCountFilterFactory.DEFAULT_CONSUME_ALL_TOKENS))); filters.add(PreConfiguredTokenFilter.singleton("ngram", false, false, reader -> new NGramTokenFilter(reader, 1, 2, false))); - filters.add(PreConfiguredTokenFilter.elasticsearchVersion("nGram", false, false, (reader, version) -> { + filters.add(PreConfiguredTokenFilter.openSearchVersion("nGram", false, false, (reader, version) -> { if (version.onOrAfter(org.opensearch.Version.V_7_0_0)) { throw new IllegalArgumentException("The [nGram] token filter name was deprecated in 6.4 and cannot be used in new indices. " + "Please change the filter name to [ngram] instead."); @@ -532,7 +532,7 @@ public class CommonAnalysisPlugin extends Plugin implements AnalysisPlugin, Scri | WordDelimiterFilter.SPLIT_ON_CASE_CHANGE | WordDelimiterFilter.SPLIT_ON_NUMERICS | WordDelimiterFilter.STEM_ENGLISH_POSSESSIVE, null))); - filters.add(PreConfiguredTokenFilter.elasticsearchVersion("word_delimiter_graph", false, false, (input, version) -> { + filters.add(PreConfiguredTokenFilter.openSearchVersion("word_delimiter_graph", false, false, (input, version) -> { boolean adjustOffsets = version.onOrAfter(Version.V_7_3_0); return new WordDelimiterGraphFilter(input, adjustOffsets, WordDelimiterIterator.DEFAULT_WORD_DELIM_TABLE, WordDelimiterGraphFilter.GENERATE_WORD_PARTS @@ -554,7 +554,7 @@ public class CommonAnalysisPlugin extends Plugin implements AnalysisPlugin, Scri tokenizers.add(PreConfiguredTokenizer.singleton("letter", LetterTokenizer::new)); tokenizers.add(PreConfiguredTokenizer.singleton("whitespace", WhitespaceTokenizer::new)); tokenizers.add(PreConfiguredTokenizer.singleton("ngram", NGramTokenizer::new)); - tokenizers.add(PreConfiguredTokenizer.elasticsearchVersion("edge_ngram", (version) -> { + tokenizers.add(PreConfiguredTokenizer.openSearchVersion("edge_ngram", (version) -> { if (version.onOrAfter(Version.V_7_3_0)) { return new EdgeNGramTokenizer(NGramTokenizer.DEFAULT_MIN_NGRAM_SIZE, NGramTokenizer.DEFAULT_MAX_NGRAM_SIZE); } @@ -567,7 +567,7 @@ public class CommonAnalysisPlugin extends Plugin implements AnalysisPlugin, Scri tokenizers.add(PreConfiguredTokenizer.singleton("lowercase", XLowerCaseTokenizer::new)); // Temporary shim for aliases. TODO deprecate after they are moved - tokenizers.add(PreConfiguredTokenizer.elasticsearchVersion("nGram", (version) -> { + tokenizers.add(PreConfiguredTokenizer.openSearchVersion("nGram", (version) -> { if (version.onOrAfter(org.opensearch.Version.V_7_6_0)) { deprecationLogger.deprecate("nGram_tokenizer_deprecation", "The [nGram] tokenizer name is deprecated and will be removed in a future version. " @@ -575,7 +575,7 @@ public class CommonAnalysisPlugin extends Plugin implements AnalysisPlugin, Scri } return new NGramTokenizer(); })); - tokenizers.add(PreConfiguredTokenizer.elasticsearchVersion("edgeNGram", (version) -> { + tokenizers.add(PreConfiguredTokenizer.openSearchVersion("edgeNGram", (version) -> { if (version.onOrAfter(org.opensearch.Version.V_7_6_0)) { deprecationLogger.deprecate("edgeNGram_tokenizer_deprecation", "The [edgeNGram] tokenizer name is deprecated and will be removed in a future version. " 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 aef34d916f3..3a7c48b82c5 100644 --- a/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java +++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexPlugin.java @@ -19,7 +19,7 @@ package org.opensearch.index.reindex; -import org.elasticsearch.watcher.ResourceWatcherService; +import org.opensearch.watcher.ResourceWatcherService; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionResponse; import org.opensearch.client.Client; diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/10_basic.yml index 2221d08c0b7..c646fcb9e54 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/10_basic.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/indices.validate_query/10_basic.yml @@ -85,4 +85,4 @@ setup: match_all: {} - is_false: valid - - match: {error: 'org.elasticsearch.common.ParsingException: request does not support [match_all]'} + - match: {error: 'org.opensearch.common.ParsingException: request does not support [match_all]'} diff --git a/server/src/test/java/org/opensearch/common/geo/BaseGeoParsingTestCase.java b/server/src/test/java/org/opensearch/common/geo/BaseGeoParsingTestCase.java index 9a5b5a9c4a8..1941ae8e260 100644 --- a/server/src/test/java/org/opensearch/common/geo/BaseGeoParsingTestCase.java +++ b/server/src/test/java/org/opensearch/common/geo/BaseGeoParsingTestCase.java @@ -22,7 +22,7 @@ import org.opensearch.common.geo.parsers.ShapeParser; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.geometry.utils.GeographyValidator; -import org.elasticsearch.index.mapper.GeoShapeIndexer; +import org.opensearch.index.mapper.GeoShapeIndexer; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.hamcrest.OpenSearchGeoAssertions; import org.locationtech.jts.geom.Geometry; diff --git a/server/src/test/java/org/opensearch/common/geo/GeoJsonShapeParserTests.java b/server/src/test/java/org/opensearch/common/geo/GeoJsonShapeParserTests.java index a73387f0bd6..c807ac05d84 100644 --- a/server/src/test/java/org/opensearch/common/geo/GeoJsonShapeParserTests.java +++ b/server/src/test/java/org/opensearch/common/geo/GeoJsonShapeParserTests.java @@ -35,10 +35,10 @@ import org.opensearch.geometry.GeometryCollection; import org.opensearch.geometry.Line; import org.opensearch.geometry.MultiLine; import org.opensearch.geometry.MultiPoint; -import org.elasticsearch.index.mapper.ContentPath; -import org.elasticsearch.index.mapper.GeoShapeIndexer; -import org.elasticsearch.index.mapper.LegacyGeoShapeFieldMapper; -import org.elasticsearch.index.mapper.Mapper; +import org.opensearch.index.mapper.ContentPath; +import org.opensearch.index.mapper.GeoShapeIndexer; +import org.opensearch.index.mapper.LegacyGeoShapeFieldMapper; +import org.opensearch.index.mapper.Mapper; import org.opensearch.test.VersionUtils; import org.opensearch.test.hamcrest.OpenSearchGeoAssertions; import org.locationtech.jts.geom.Coordinate; diff --git a/server/src/test/java/org/opensearch/common/geo/GeoWKTShapeParserTests.java b/server/src/test/java/org/opensearch/common/geo/GeoWKTShapeParserTests.java index 4af4db41a89..ef120380757 100644 --- a/server/src/test/java/org/opensearch/common/geo/GeoWKTShapeParserTests.java +++ b/server/src/test/java/org/opensearch/common/geo/GeoWKTShapeParserTests.java @@ -45,11 +45,11 @@ import org.opensearch.geometry.GeometryCollection; import org.opensearch.geometry.Line; import org.opensearch.geometry.MultiLine; import org.opensearch.geometry.MultiPoint; -import org.elasticsearch.index.mapper.ContentPath; -import org.elasticsearch.index.mapper.GeoShapeFieldMapper; -import org.elasticsearch.index.mapper.GeoShapeIndexer; -import org.elasticsearch.index.mapper.LegacyGeoShapeFieldMapper; -import org.elasticsearch.index.mapper.Mapper; +import org.opensearch.index.mapper.ContentPath; +import org.opensearch.index.mapper.GeoShapeFieldMapper; +import org.opensearch.index.mapper.GeoShapeIndexer; +import org.opensearch.index.mapper.LegacyGeoShapeFieldMapper; +import org.opensearch.index.mapper.Mapper; import org.opensearch.test.geo.RandomShapeGenerator; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; diff --git a/server/src/test/java/org/opensearch/common/geo/GeometryIOTests.java b/server/src/test/java/org/opensearch/common/geo/GeometryIOTests.java index e19d2acc827..9db94a55c7d 100644 --- a/server/src/test/java/org/opensearch/common/geo/GeometryIOTests.java +++ b/server/src/test/java/org/opensearch/common/geo/GeometryIOTests.java @@ -30,7 +30,7 @@ import org.opensearch.geometry.ShapeType; import org.opensearch.test.OpenSearchTestCase; import static org.opensearch.geo.GeometryTestUtils.randomGeometry; -import static org.elasticsearch.index.query.LegacyGeoShapeQueryProcessor.geometryToShapeBuilder; +import static org.opensearch.index.query.LegacyGeoShapeQueryProcessor.geometryToShapeBuilder; public class GeometryIOTests extends OpenSearchTestCase { diff --git a/server/src/test/java/org/opensearch/common/geo/GeometryIndexerTests.java b/server/src/test/java/org/opensearch/common/geo/GeometryIndexerTests.java index 8fa46153fde..9273554fbf6 100644 --- a/server/src/test/java/org/opensearch/common/geo/GeometryIndexerTests.java +++ b/server/src/test/java/org/opensearch/common/geo/GeometryIndexerTests.java @@ -46,7 +46,7 @@ import org.opensearch.geometry.MultiPolygon; import org.opensearch.geometry.Point; import org.opensearch.geometry.Polygon; import org.opensearch.geometry.Rectangle; -import org.elasticsearch.index.mapper.GeoShapeIndexer; +import org.opensearch.index.mapper.GeoShapeIndexer; import org.opensearch.test.OpenSearchTestCase; import org.locationtech.spatial4j.exception.InvalidShapeException; diff --git a/server/src/test/java/org/opensearch/common/geo/ShapeBuilderTests.java b/server/src/test/java/org/opensearch/common/geo/ShapeBuilderTests.java index d815840e250..848dc64d8db 100644 --- a/server/src/test/java/org/opensearch/common/geo/ShapeBuilderTests.java +++ b/server/src/test/java/org/opensearch/common/geo/ShapeBuilderTests.java @@ -28,7 +28,7 @@ import org.opensearch.common.geo.builders.PointBuilder; import org.opensearch.common.geo.builders.PolygonBuilder; import org.opensearch.common.geo.builders.ShapeBuilder; import org.opensearch.geometry.LinearRing; -import org.elasticsearch.index.mapper.GeoShapeIndexer; +import org.opensearch.index.mapper.GeoShapeIndexer; import org.opensearch.test.OpenSearchTestCase; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; diff --git a/server/src/test/java/org/opensearch/common/io/stream/ReleasableBytesStreamOutputTests.java b/server/src/test/java/org/opensearch/common/io/stream/ReleasableBytesStreamOutputTests.java index 622ca55a2c8..3c31e0dc1f4 100644 --- a/server/src/test/java/org/opensearch/common/io/stream/ReleasableBytesStreamOutputTests.java +++ b/server/src/test/java/org/opensearch/common/io/stream/ReleasableBytesStreamOutputTests.java @@ -22,7 +22,7 @@ package org.opensearch.common.io.stream; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.MockBigArrays; import org.opensearch.common.util.MockPageCacheRecycler; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/opensearch/common/logging/JsonThrowablePatternConverterTests.java b/server/src/test/java/org/opensearch/common/logging/JsonThrowablePatternConverterTests.java index fa6acea529c..26eb2f71fff 100644 --- a/server/src/test/java/org/opensearch/common/logging/JsonThrowablePatternConverterTests.java +++ b/server/src/test/java/org/opensearch/common/logging/JsonThrowablePatternConverterTests.java @@ -23,8 +23,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.impl.Log4jLogEvent; import org.apache.logging.log4j.message.SimpleMessage; -import org.elasticsearch.common.logging.JsonLogLine; -import org.elasticsearch.common.logging.JsonLogsStream; import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.Matchers; diff --git a/server/src/test/java/org/opensearch/common/lucene/LuceneTests.java b/server/src/test/java/org/opensearch/common/lucene/LuceneTests.java index 468418180c7..e863d146157 100644 --- a/server/src/test/java/org/opensearch/common/lucene/LuceneTests.java +++ b/server/src/test/java/org/opensearch/common/lucene/LuceneTests.java @@ -62,11 +62,11 @@ import org.apache.lucene.util.BytesRef; import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.core.internal.io.IOUtils; -import org.elasticsearch.index.fielddata.IndexFieldData; -import org.elasticsearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource; -import org.elasticsearch.index.fielddata.fieldcomparator.DoubleValuesComparatorSource; -import org.elasticsearch.index.fielddata.fieldcomparator.FloatValuesComparatorSource; -import org.elasticsearch.index.fielddata.fieldcomparator.LongValuesComparatorSource; +import org.opensearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource; +import org.opensearch.index.fielddata.fieldcomparator.DoubleValuesComparatorSource; +import org.opensearch.index.fielddata.fieldcomparator.FloatValuesComparatorSource; +import org.opensearch.index.fielddata.fieldcomparator.LongValuesComparatorSource; import org.opensearch.search.MultiValueMode; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.VersionUtils; diff --git a/server/src/test/java/org/opensearch/common/lucene/ShardCoreKeyMapTests.java b/server/src/test/java/org/opensearch/common/lucene/ShardCoreKeyMapTests.java index ef63aae1dec..2d22b8ba840 100644 --- a/server/src/test/java/org/opensearch/common/lucene/ShardCoreKeyMapTests.java +++ b/server/src/test/java/org/opensearch/common/lucene/ShardCoreKeyMapTests.java @@ -28,7 +28,7 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; import org.opensearch.common.lucene.index.OpenSearchDirectoryReader; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/opensearch/common/lucene/index/OpenSearchDirectoryReaderTests.java b/server/src/test/java/org/opensearch/common/lucene/index/OpenSearchDirectoryReaderTests.java index 8a3d0bf1283..f1d5b8b4b20 100644 --- a/server/src/test/java/org/opensearch/common/lucene/index/OpenSearchDirectoryReaderTests.java +++ b/server/src/test/java/org/opensearch/common/lucene/index/OpenSearchDirectoryReaderTests.java @@ -29,7 +29,7 @@ import org.apache.lucene.index.NoMergePolicy; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; import org.opensearch.core.internal.io.IOUtils; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import org.opensearch.test.OpenSearchTestCase; /** Simple tests for this filterreader */ diff --git a/server/src/test/java/org/opensearch/common/lucene/search/QueriesTests.java b/server/src/test/java/org/opensearch/common/lucene/search/QueriesTests.java index 4c6f8ee4cf8..9886334d892 100644 --- a/server/src/test/java/org/opensearch/common/lucene/search/QueriesTests.java +++ b/server/src/test/java/org/opensearch/common/lucene/search/QueriesTests.java @@ -27,7 +27,7 @@ import org.apache.lucene.search.DocValuesFieldExistsQuery; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.TermQuery; import org.opensearch.Version; -import org.elasticsearch.index.mapper.SeqNoFieldMapper; +import org.opensearch.index.mapper.SeqNoFieldMapper; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.VersionUtils; diff --git a/server/src/test/java/org/opensearch/common/lucene/store/ByteArrayIndexInputTests.java b/server/src/test/java/org/opensearch/common/lucene/store/ByteArrayIndexInputTests.java index 1046155726a..83fc7f3e697 100644 --- a/server/src/test/java/org/opensearch/common/lucene/store/ByteArrayIndexInputTests.java +++ b/server/src/test/java/org/opensearch/common/lucene/store/ByteArrayIndexInputTests.java @@ -19,7 +19,6 @@ package org.opensearch.common.lucene.store; -import org.elasticsearch.common.lucene.store.ESIndexInputTestCase; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/server/src/test/java/org/opensearch/common/lucene/uid/VersionLookupTests.java b/server/src/test/java/org/opensearch/common/lucene/uid/VersionLookupTests.java index a90ff60a947..a208556da5f 100644 --- a/server/src/test/java/org/opensearch/common/lucene/uid/VersionLookupTests.java +++ b/server/src/test/java/org/opensearch/common/lucene/uid/VersionLookupTests.java @@ -32,9 +32,9 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.opensearch.common.lucene.Lucene; import org.opensearch.common.lucene.uid.VersionsAndSeqNoResolver.DocIdAndVersion; -import org.elasticsearch.index.mapper.IdFieldMapper; -import org.elasticsearch.index.mapper.SeqNoFieldMapper; -import org.elasticsearch.index.mapper.VersionFieldMapper; +import org.opensearch.index.mapper.IdFieldMapper; +import org.opensearch.index.mapper.SeqNoFieldMapper; +import org.opensearch.index.mapper.VersionFieldMapper; import org.opensearch.test.OpenSearchTestCase; /** diff --git a/server/src/test/java/org/opensearch/common/lucene/uid/VersionsTests.java b/server/src/test/java/org/opensearch/common/lucene/uid/VersionsTests.java index 1a6faed61ed..0a88fc45a3f 100644 --- a/server/src/test/java/org/opensearch/common/lucene/uid/VersionsTests.java +++ b/server/src/test/java/org/opensearch/common/lucene/uid/VersionsTests.java @@ -29,10 +29,10 @@ import org.apache.lucene.store.Directory; import org.opensearch.Version; import org.opensearch.common.lucene.Lucene; import org.opensearch.common.lucene.index.OpenSearchDirectoryReader; -import org.elasticsearch.index.mapper.IdFieldMapper; -import org.elasticsearch.index.mapper.SeqNoFieldMapper; -import org.elasticsearch.index.mapper.VersionFieldMapper; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.mapper.IdFieldMapper; +import org.opensearch.index.mapper.SeqNoFieldMapper; +import org.opensearch.index.mapper.VersionFieldMapper; +import org.opensearch.index.shard.ShardId; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.VersionUtils; diff --git a/server/src/test/java/org/opensearch/common/network/NetworkModuleTests.java b/server/src/test/java/org/opensearch/common/network/NetworkModuleTests.java index 4e9d10027fc..e71f04acaf1 100644 --- a/server/src/test/java/org/opensearch/common/network/NetworkModuleTests.java +++ b/server/src/test/java/org/opensearch/common/network/NetworkModuleTests.java @@ -32,7 +32,7 @@ import org.opensearch.http.HttpInfo; import org.opensearch.http.HttpServerTransport; import org.opensearch.http.HttpStats; import org.opensearch.http.NullDispatcher; -import org.elasticsearch.indices.breaker.CircuitBreakerService; +import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.plugins.NetworkPlugin; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; diff --git a/server/src/test/java/org/opensearch/common/settings/ConsistentSettingsServiceTests.java b/server/src/test/java/org/opensearch/common/settings/ConsistentSettingsServiceTests.java index e8460707e6c..8e3ffb39c17 100644 --- a/server/src/test/java/org/opensearch/common/settings/ConsistentSettingsServiceTests.java +++ b/server/src/test/java/org/opensearch/common/settings/ConsistentSettingsServiceTests.java @@ -19,7 +19,7 @@ package org.opensearch.common.settings; -import org.elasticsearch.common.settings.MockSecureSettings; +import org.opensearch.common.settings.MockSecureSettings; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.ClusterStateUpdateTask; import org.opensearch.cluster.service.ClusterService; diff --git a/server/src/test/java/org/opensearch/common/settings/MemorySizeSettingsTests.java b/server/src/test/java/org/opensearch/common/settings/MemorySizeSettingsTests.java index 52cb2938f4c..5c354d0c3ad 100644 --- a/server/src/test/java/org/opensearch/common/settings/MemorySizeSettingsTests.java +++ b/server/src/test/java/org/opensearch/common/settings/MemorySizeSettingsTests.java @@ -23,12 +23,12 @@ import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.util.PageCacheRecycler; -import org.elasticsearch.indices.IndexingMemoryController; -import org.elasticsearch.indices.IndicesQueryCache; -import org.elasticsearch.indices.IndicesRequestCache; -import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService; -import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache; -import org.elasticsearch.monitor.jvm.JvmInfo; +import org.opensearch.indices.IndexingMemoryController; +import org.opensearch.indices.IndicesQueryCache; +import org.opensearch.indices.IndicesRequestCache; +import org.opensearch.indices.breaker.HierarchyCircuitBreakerService; +import org.opensearch.indices.fielddata.cache.IndicesFieldDataCache; +import org.opensearch.monitor.jvm.JvmInfo; import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.notNullValue; diff --git a/server/src/test/java/org/opensearch/common/settings/ScopedSettingsTests.java b/server/src/test/java/org/opensearch/common/settings/ScopedSettingsTests.java index 510350f90b6..0493c334301 100644 --- a/server/src/test/java/org/opensearch/common/settings/ScopedSettingsTests.java +++ b/server/src/test/java/org/opensearch/common/settings/ScopedSettingsTests.java @@ -20,7 +20,6 @@ package org.opensearch.common.settings; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; -import org.elasticsearch.common.settings.MockSecureSettings; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.routing.allocation.decider.FilterAllocationDecider; diff --git a/server/src/test/java/org/opensearch/common/settings/SettingTests.java b/server/src/test/java/org/opensearch/common/settings/SettingTests.java index e53e8fd5f11..a7c63ac082f 100644 --- a/server/src/test/java/org/opensearch/common/settings/SettingTests.java +++ b/server/src/test/java/org/opensearch/common/settings/SettingTests.java @@ -22,7 +22,6 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LogEvent; -import org.elasticsearch.common.settings.MockSecureSettings; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.collect.Tuple; import org.opensearch.common.logging.Loggers; diff --git a/server/src/test/java/org/opensearch/common/settings/SettingsTests.java b/server/src/test/java/org/opensearch/common/settings/SettingsTests.java index 355035d415a..c4ffc015b5b 100644 --- a/server/src/test/java/org/opensearch/common/settings/SettingsTests.java +++ b/server/src/test/java/org/opensearch/common/settings/SettingsTests.java @@ -19,7 +19,7 @@ package org.opensearch.common.settings; -import org.elasticsearch.common.settings.MockSecureSettings; +import org.opensearch.common.settings.MockSecureSettings; import org.opensearch.OpenSearchParseException; import org.opensearch.Version; import org.opensearch.common.Strings; diff --git a/server/src/test/java/org/opensearch/common/util/BigArraysTests.java b/server/src/test/java/org/opensearch/common/util/BigArraysTests.java index 230047047a7..5f19cc6c18f 100644 --- a/server/src/test/java/org/opensearch/common/util/BigArraysTests.java +++ b/server/src/test/java/org/opensearch/common/util/BigArraysTests.java @@ -20,15 +20,15 @@ package org.opensearch.common.util; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.common.util.MockBigArrays; -import org.elasticsearch.common.util.MockPageCacheRecycler; +import org.opensearch.common.util.MockBigArrays; +import org.opensearch.common.util.MockPageCacheRecycler; import org.opensearch.common.breaker.CircuitBreaker; import org.opensearch.common.breaker.CircuitBreakingException; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeUnit; -import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.indices.breaker.HierarchyCircuitBreakerService; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; @@ -39,7 +39,7 @@ import java.util.Collections; import java.util.List; import java.util.function.Function; -import static org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService.REQUEST_CIRCUIT_BREAKER_LIMIT_SETTING; +import static org.opensearch.indices.breaker.HierarchyCircuitBreakerService.REQUEST_CIRCUIT_BREAKER_LIMIT_SETTING; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.lessThan; diff --git a/server/src/test/java/org/opensearch/common/util/BinarySearcherTests.java b/server/src/test/java/org/opensearch/common/util/BinarySearcherTests.java index fa266e029d9..a94e8cce724 100644 --- a/server/src/test/java/org/opensearch/common/util/BinarySearcherTests.java +++ b/server/src/test/java/org/opensearch/common/util/BinarySearcherTests.java @@ -19,11 +19,9 @@ package org.opensearch.common.util; -import org.elasticsearch.common.util.MockBigArrays; -import org.elasticsearch.common.util.MockPageCacheRecycler; import org.opensearch.common.lease.Releasables; import org.opensearch.common.settings.Settings; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; diff --git a/server/src/test/java/org/opensearch/common/util/BitArrayTests.java b/server/src/test/java/org/opensearch/common/util/BitArrayTests.java index 822e88e9f90..75ef10a6059 100644 --- a/server/src/test/java/org/opensearch/common/util/BitArrayTests.java +++ b/server/src/test/java/org/opensearch/common/util/BitArrayTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.breaker.CircuitBreakingException; import org.opensearch.common.breaker.NoopCircuitBreaker; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.indices.breaker.CircuitBreakerService; +import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; diff --git a/server/src/test/java/org/opensearch/common/util/BytesRefHashTests.java b/server/src/test/java/org/opensearch/common/util/BytesRefHashTests.java index 636b8d82d0d..93210e4f887 100644 --- a/server/src/test/java/org/opensearch/common/util/BytesRefHashTests.java +++ b/server/src/test/java/org/opensearch/common/util/BytesRefHashTests.java @@ -25,10 +25,8 @@ import com.carrotsearch.hppc.cursors.ObjectLongCursor; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.TestUtil; -import org.elasticsearch.common.util.MockBigArrays; -import org.elasticsearch.common.util.MockPageCacheRecycler; import org.opensearch.common.settings.Settings; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.test.OpenSearchTestCase; import java.util.HashMap; diff --git a/server/src/test/java/org/opensearch/common/util/LongHashTests.java b/server/src/test/java/org/opensearch/common/util/LongHashTests.java index 86c0b3f4dc3..ea30c7caf72 100644 --- a/server/src/test/java/org/opensearch/common/util/LongHashTests.java +++ b/server/src/test/java/org/opensearch/common/util/LongHashTests.java @@ -23,10 +23,8 @@ import com.carrotsearch.hppc.LongLongHashMap; import com.carrotsearch.hppc.LongLongMap; import com.carrotsearch.hppc.cursors.LongLongCursor; -import org.elasticsearch.common.util.MockBigArrays; -import org.elasticsearch.common.util.MockPageCacheRecycler; import org.opensearch.common.settings.Settings; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.test.OpenSearchTestCase; import java.util.HashMap; diff --git a/server/src/test/java/org/opensearch/common/util/LongLongHashTests.java b/server/src/test/java/org/opensearch/common/util/LongLongHashTests.java index 164fb94be05..5b737488215 100644 --- a/server/src/test/java/org/opensearch/common/util/LongLongHashTests.java +++ b/server/src/test/java/org/opensearch/common/util/LongLongHashTests.java @@ -19,10 +19,8 @@ package org.opensearch.common.util; -import org.elasticsearch.common.util.MockBigArrays; -import org.elasticsearch.common.util.MockPageCacheRecycler; import org.opensearch.common.settings.Settings; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; diff --git a/server/src/test/java/org/opensearch/common/util/LongObjectHashMapTests.java b/server/src/test/java/org/opensearch/common/util/LongObjectHashMapTests.java index e4588e9dc77..1b85a07e394 100644 --- a/server/src/test/java/org/opensearch/common/util/LongObjectHashMapTests.java +++ b/server/src/test/java/org/opensearch/common/util/LongObjectHashMapTests.java @@ -20,10 +20,8 @@ package org.opensearch.common.util; import com.carrotsearch.hppc.LongObjectHashMap; -import org.elasticsearch.common.util.MockBigArrays; -import org.elasticsearch.common.util.MockPageCacheRecycler; import org.opensearch.common.settings.Settings; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.test.OpenSearchTestCase; public class LongObjectHashMapTests extends OpenSearchTestCase { diff --git a/server/src/test/java/org/opensearch/common/xcontent/BaseXContentTestCase.java b/server/src/test/java/org/opensearch/common/xcontent/BaseXContentTestCase.java index 54060dc84d7..e949b7688bd 100644 --- a/server/src/test/java/org/opensearch/common/xcontent/BaseXContentTestCase.java +++ b/server/src/test/java/org/opensearch/common/xcontent/BaseXContentTestCase.java @@ -25,18 +25,6 @@ import com.fasterxml.jackson.core.JsonParseException; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Constants; -import org.elasticsearch.common.xcontent.DeprecationHandler; -import org.elasticsearch.common.xcontent.NamedObjectNotFoundException; -import org.elasticsearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.common.xcontent.ToXContent; -import org.elasticsearch.common.xcontent.ToXContentObject; -import org.elasticsearch.common.xcontent.XContent; -import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.common.xcontent.XContentGenerator; -import org.elasticsearch.common.xcontent.XContentParseException; -import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.ParseField; import org.opensearch.common.Strings; diff --git a/server/src/test/java/org/opensearch/common/xcontent/XContentFactoryTests.java b/server/src/test/java/org/opensearch/common/xcontent/XContentFactoryTests.java index 6c81ab3c7d4..d29884c26ef 100644 --- a/server/src/test/java/org/opensearch/common/xcontent/XContentFactoryTests.java +++ b/server/src/test/java/org/opensearch/common/xcontent/XContentFactoryTests.java @@ -21,9 +21,6 @@ package org.opensearch.common.xcontent; import com.fasterxml.jackson.dataformat.cbor.CBORConstants; import com.fasterxml.jackson.dataformat.smile.SmileConstants; -import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.Strings; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; diff --git a/server/src/test/java/org/opensearch/common/xcontent/XContentParserUtilsTests.java b/server/src/test/java/org/opensearch/common/xcontent/XContentParserUtilsTests.java index 198fc1e9637..20b06a697ca 100644 --- a/server/src/test/java/org/opensearch/common/xcontent/XContentParserUtilsTests.java +++ b/server/src/test/java/org/opensearch/common/xcontent/XContentParserUtilsTests.java @@ -20,13 +20,6 @@ package org.opensearch.common.xcontent; import org.apache.lucene.util.SetOnce; -import org.elasticsearch.common.xcontent.DeprecationHandler; -import org.elasticsearch.common.xcontent.NamedObjectNotFoundException; -import org.elasticsearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.common.xcontent.ObjectParser; -import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.common.CheckedBiConsumer; import org.opensearch.common.CheckedConsumer; import org.opensearch.common.ParseField; diff --git a/server/src/test/java/org/opensearch/common/xcontent/XContentTypeTests.java b/server/src/test/java/org/opensearch/common/xcontent/XContentTypeTests.java index 3c11e11860c..4048ef37390 100644 --- a/server/src/test/java/org/opensearch/common/xcontent/XContentTypeTests.java +++ b/server/src/test/java/org/opensearch/common/xcontent/XContentTypeTests.java @@ -18,7 +18,6 @@ */ package org.opensearch.common.xcontent; -import org.elasticsearch.common.xcontent.XContentType; import org.opensearch.test.OpenSearchTestCase; import java.util.Locale; diff --git a/server/src/test/java/org/opensearch/common/xcontent/cbor/CborXContentParserTests.java b/server/src/test/java/org/opensearch/common/xcontent/cbor/CborXContentParserTests.java index 61106abc825..3b685e2dcf8 100644 --- a/server/src/test/java/org/opensearch/common/xcontent/cbor/CborXContentParserTests.java +++ b/server/src/test/java/org/opensearch/common/xcontent/cbor/CborXContentParserTests.java @@ -19,7 +19,6 @@ package org.opensearch.common.xcontent.cbor; -import org.elasticsearch.common.xcontent.cbor.CborXContent; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; diff --git a/server/src/test/java/org/opensearch/common/xcontent/cbor/JsonVsCborTests.java b/server/src/test/java/org/opensearch/common/xcontent/cbor/JsonVsCborTests.java index c3b01c01942..7fd6324aef0 100644 --- a/server/src/test/java/org/opensearch/common/xcontent/cbor/JsonVsCborTests.java +++ b/server/src/test/java/org/opensearch/common/xcontent/cbor/JsonVsCborTests.java @@ -19,7 +19,6 @@ package org.opensearch.common.xcontent.cbor; -import org.elasticsearch.common.xcontent.cbor.CborXContent; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentGenerator; diff --git a/server/src/test/java/org/opensearch/common/xcontent/smile/JsonVsSmileTests.java b/server/src/test/java/org/opensearch/common/xcontent/smile/JsonVsSmileTests.java index 7275c870695..3dcc48fe783 100644 --- a/server/src/test/java/org/opensearch/common/xcontent/smile/JsonVsSmileTests.java +++ b/server/src/test/java/org/opensearch/common/xcontent/smile/JsonVsSmileTests.java @@ -19,7 +19,6 @@ package org.opensearch.common.xcontent.smile; -import org.elasticsearch.common.xcontent.smile.SmileXContent; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentGenerator; diff --git a/server/src/test/java/org/opensearch/common/xcontent/support/filtering/FilterPathGeneratorFilteringTests.java b/server/src/test/java/org/opensearch/common/xcontent/support/filtering/FilterPathGeneratorFilteringTests.java index 1d08232ff6f..409ba6ab49a 100644 --- a/server/src/test/java/org/opensearch/common/xcontent/support/filtering/FilterPathGeneratorFilteringTests.java +++ b/server/src/test/java/org/opensearch/common/xcontent/support/filtering/FilterPathGeneratorFilteringTests.java @@ -22,7 +22,6 @@ package org.opensearch.common.xcontent.support.filtering; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.filter.FilteringGeneratorDelegate; -import org.elasticsearch.common.xcontent.support.filtering.FilterPathBasedFilter; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.test.OpenSearchTestCase; diff --git a/server/src/test/java/org/opensearch/common/xcontent/support/filtering/FilterPathTests.java b/server/src/test/java/org/opensearch/common/xcontent/support/filtering/FilterPathTests.java index b6889ac9980..c740b3d0ba2 100644 --- a/server/src/test/java/org/opensearch/common/xcontent/support/filtering/FilterPathTests.java +++ b/server/src/test/java/org/opensearch/common/xcontent/support/filtering/FilterPathTests.java @@ -19,7 +19,6 @@ package org.opensearch.common.xcontent.support.filtering; -import org.elasticsearch.common.xcontent.support.filtering.FilterPath; import org.opensearch.common.util.set.Sets; import org.opensearch.test.OpenSearchTestCase; diff --git a/server/src/test/java/org/opensearch/indices/IndexingMemoryControllerTests.java b/server/src/test/java/org/opensearch/indices/IndexingMemoryControllerTests.java index a33805b39d2..4a3ae774819 100644 --- a/server/src/test/java/org/opensearch/indices/IndexingMemoryControllerTests.java +++ b/server/src/test/java/org/opensearch/indices/IndexingMemoryControllerTests.java @@ -26,13 +26,13 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.codec.CodecService; -import org.elasticsearch.index.engine.EngineConfig; -import org.elasticsearch.index.engine.InternalEngine; -import org.elasticsearch.index.refresh.RefreshStats; -import org.elasticsearch.index.shard.IndexShard; +import org.opensearch.index.codec.CodecService; +import org.opensearch.index.engine.EngineConfig; +import org.opensearch.index.engine.InternalEngine; +import org.opensearch.index.refresh.RefreshStats; +import org.opensearch.index.shard.IndexShard; import org.opensearch.index.shard.IndexShardTestCase; -import org.elasticsearch.indices.recovery.RecoveryState; +import org.opensearch.indices.recovery.RecoveryState; import org.opensearch.threadpool.Scheduler.Cancellable; import org.opensearch.threadpool.ThreadPool; import org.opensearch.threadpool.ThreadPoolStats; diff --git a/server/src/test/java/org/opensearch/indices/IndicesLifecycleListenerSingleNodeTests.java b/server/src/test/java/org/opensearch/indices/IndicesLifecycleListenerSingleNodeTests.java index 0fc823c70a2..2267a709ee3 100644 --- a/server/src/test/java/org/opensearch/indices/IndicesLifecycleListenerSingleNodeTests.java +++ b/server/src/test/java/org/opensearch/indices/IndicesLifecycleListenerSingleNodeTests.java @@ -26,16 +26,16 @@ import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.ShardRoutingHelper; import org.opensearch.cluster.routing.UnassignedInfo; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.seqno.RetentionLeaseSyncer; -import org.elasticsearch.index.shard.IndexEventListener; -import org.elasticsearch.index.shard.IndexShard; +import org.opensearch.index.Index; +import org.opensearch.index.IndexService; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.seqno.RetentionLeaseSyncer; +import org.opensearch.index.shard.IndexEventListener; +import org.opensearch.index.shard.IndexShard; import org.opensearch.index.shard.IndexShardTestCase; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.indices.cluster.IndicesClusterStateService.AllocatedIndices.IndexRemovalReason; -import org.elasticsearch.indices.recovery.RecoveryState; +import org.opensearch.index.shard.ShardId; +import org.opensearch.indices.cluster.IndicesClusterStateService.AllocatedIndices.IndexRemovalReason; +import org.opensearch.indices.recovery.RecoveryState; import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.util.Arrays; @@ -45,7 +45,7 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; -import static org.elasticsearch.indices.cluster.IndicesClusterStateService.AllocatedIndices.IndexRemovalReason.DELETED; +import static org.opensearch.indices.cluster.IndicesClusterStateService.AllocatedIndices.IndexRemovalReason.DELETED; import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked; public class IndicesLifecycleListenerSingleNodeTests extends OpenSearchSingleNodeTestCase { diff --git a/server/src/test/java/org/opensearch/indices/IndicesModuleTests.java b/server/src/test/java/org/opensearch/indices/IndicesModuleTests.java index 5651f0cf08c..fb1b008f3fd 100644 --- a/server/src/test/java/org/opensearch/indices/IndicesModuleTests.java +++ b/server/src/test/java/org/opensearch/indices/IndicesModuleTests.java @@ -20,21 +20,21 @@ package org.opensearch.indices; import org.opensearch.Version; -import org.elasticsearch.index.mapper.AllFieldMapper; -import org.elasticsearch.index.mapper.FieldNamesFieldMapper; -import org.elasticsearch.index.mapper.IdFieldMapper; -import org.elasticsearch.index.mapper.IgnoredFieldMapper; -import org.elasticsearch.index.mapper.IndexFieldMapper; -import org.elasticsearch.index.mapper.Mapper; -import org.elasticsearch.index.mapper.MapperParsingException; -import org.elasticsearch.index.mapper.MetadataFieldMapper; -import org.elasticsearch.index.mapper.RoutingFieldMapper; -import org.elasticsearch.index.mapper.SeqNoFieldMapper; -import org.elasticsearch.index.mapper.SourceFieldMapper; -import org.elasticsearch.index.mapper.TextFieldMapper; -import org.elasticsearch.index.mapper.TypeFieldMapper; -import org.elasticsearch.index.mapper.VersionFieldMapper; -import org.elasticsearch.indices.mapper.MapperRegistry; +import org.opensearch.index.mapper.AllFieldMapper; +import org.opensearch.index.mapper.FieldNamesFieldMapper; +import org.opensearch.index.mapper.IdFieldMapper; +import org.opensearch.index.mapper.IgnoredFieldMapper; +import org.opensearch.index.mapper.IndexFieldMapper; +import org.opensearch.index.mapper.Mapper; +import org.opensearch.index.mapper.MapperParsingException; +import org.opensearch.index.mapper.MetadataFieldMapper; +import org.opensearch.index.mapper.RoutingFieldMapper; +import org.opensearch.index.mapper.SeqNoFieldMapper; +import org.opensearch.index.mapper.SourceFieldMapper; +import org.opensearch.index.mapper.TextFieldMapper; +import org.opensearch.index.mapper.TypeFieldMapper; +import org.opensearch.index.mapper.VersionFieldMapper; +import org.opensearch.indices.mapper.MapperRegistry; import org.opensearch.plugins.MapperPlugin; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.VersionUtils; diff --git a/server/src/test/java/org/opensearch/indices/IndicesQueryCacheTests.java b/server/src/test/java/org/opensearch/indices/IndicesQueryCacheTests.java index 517f950e9b1..a7b19fe0b33 100644 --- a/server/src/test/java/org/opensearch/indices/IndicesQueryCacheTests.java +++ b/server/src/test/java/org/opensearch/indices/IndicesQueryCacheTests.java @@ -40,8 +40,8 @@ import org.apache.lucene.store.Directory; import org.opensearch.common.lucene.index.OpenSearchDirectoryReader; import org.opensearch.core.internal.io.IOUtils; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.cache.query.QueryCacheStats; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.cache.query.QueryCacheStats; +import org.opensearch.index.shard.ShardId; import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/opensearch/indices/IndicesServiceCloseTests.java b/server/src/test/java/org/opensearch/indices/IndicesServiceCloseTests.java index 2f3eee3f668..9b319beade6 100644 --- a/server/src/test/java/org/opensearch/indices/IndicesServiceCloseTests.java +++ b/server/src/test/java/org/opensearch/indices/IndicesServiceCloseTests.java @@ -28,14 +28,14 @@ import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.cache.RemovalNotification; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.OpenSearchExecutors; -import org.elasticsearch.env.Environment; -import org.elasticsearch.env.NodeEnvironment; -import org.elasticsearch.index.IndexModule; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.engine.Engine; -import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.indices.IndicesRequestCache.Key; -import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService; +import org.opensearch.env.Environment; +import org.opensearch.env.NodeEnvironment; +import org.opensearch.index.IndexModule; +import org.opensearch.index.IndexService; +import org.opensearch.index.engine.Engine; +import org.opensearch.index.shard.IndexShard; +import org.opensearch.indices.IndicesRequestCache.Key; +import org.opensearch.indices.breaker.HierarchyCircuitBreakerService; import org.opensearch.node.MockNode; import org.opensearch.node.Node; import org.opensearch.node.NodeValidationException; diff --git a/server/src/test/java/org/opensearch/indices/IndicesServiceTests.java b/server/src/test/java/org/opensearch/indices/IndicesServiceTests.java index 040779a9110..5f08f15138b 100644 --- a/server/src/test/java/org/opensearch/indices/IndicesServiceTests.java +++ b/server/src/test/java/org/opensearch/indices/IndicesServiceTests.java @@ -36,30 +36,30 @@ import org.opensearch.common.io.FileSystemUtils; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.env.NodeEnvironment; -import org.elasticsearch.env.ShardLockObtainFailedException; +import org.opensearch.env.NodeEnvironment; +import org.opensearch.env.ShardLockObtainFailedException; import org.opensearch.gateway.GatewayMetaState; import org.opensearch.gateway.LocalAllocateDangledIndices; import org.opensearch.gateway.MetaStateService; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.IndexModule; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.engine.Engine; -import org.elasticsearch.index.engine.EngineConfig; -import org.elasticsearch.index.engine.EngineFactory; -import org.elasticsearch.index.engine.InternalEngine; -import org.elasticsearch.index.engine.InternalEngineFactory; -import org.elasticsearch.index.mapper.KeywordFieldMapper; -import org.elasticsearch.index.mapper.Mapper; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.shard.IllegalIndexShardStateException; -import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.index.shard.IndexShardState; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.index.shard.ShardPath; -import org.elasticsearch.index.similarity.NonNegativeScoresSimilarity; -import org.elasticsearch.indices.IndicesService.ShardDeletionCheckResult; +import org.opensearch.index.Index; +import org.opensearch.index.IndexModule; +import org.opensearch.index.IndexService; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.engine.Engine; +import org.opensearch.index.engine.EngineConfig; +import org.opensearch.index.engine.EngineFactory; +import org.opensearch.index.engine.InternalEngine; +import org.opensearch.index.engine.InternalEngineFactory; +import org.opensearch.index.mapper.KeywordFieldMapper; +import org.opensearch.index.mapper.Mapper; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.shard.IllegalIndexShardStateException; +import org.opensearch.index.shard.IndexShard; +import org.opensearch.index.shard.IndexShardState; +import org.opensearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardPath; +import org.opensearch.index.similarity.NonNegativeScoresSimilarity; +import org.opensearch.indices.IndicesService.ShardDeletionCheckResult; import org.opensearch.plugins.EnginePlugin; import org.opensearch.plugins.MapperPlugin; import org.opensearch.plugins.Plugin; diff --git a/server/src/test/java/org/opensearch/indices/ShardLimitValidatorTests.java b/server/src/test/java/org/opensearch/indices/ShardLimitValidatorTests.java index e72efea7d13..f47c60cf0e5 100644 --- a/server/src/test/java/org/opensearch/indices/ShardLimitValidatorTests.java +++ b/server/src/test/java/org/opensearch/indices/ShardLimitValidatorTests.java @@ -32,7 +32,7 @@ import org.opensearch.common.ValidationException; import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.Index; +import org.opensearch.index.Index; import org.opensearch.test.OpenSearchTestCase; import java.util.Arrays; @@ -42,7 +42,7 @@ import java.util.stream.Collectors; import static org.opensearch.cluster.metadata.MetadataIndexStateServiceTests.addClosedIndex; import static org.opensearch.cluster.metadata.MetadataIndexStateServiceTests.addOpenedIndex; import static org.opensearch.cluster.shards.ShardCounts.forDataNodeCount; -import static org.elasticsearch.indices.ShardLimitValidator.SETTING_CLUSTER_MAX_SHARDS_PER_NODE; +import static org.opensearch.indices.ShardLimitValidator.SETTING_CLUSTER_MAX_SHARDS_PER_NODE; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/server/src/test/java/org/opensearch/indices/analysis/AnalysisModuleTests.java b/server/src/test/java/org/opensearch/indices/analysis/AnalysisModuleTests.java index b47183bed6c..6cd14740386 100644 --- a/server/src/test/java/org/opensearch/indices/analysis/AnalysisModuleTests.java +++ b/server/src/test/java/org/opensearch/indices/analysis/AnalysisModuleTests.java @@ -35,24 +35,24 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.io.Streams; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.env.TestEnvironment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.Analysis; -import org.elasticsearch.index.analysis.AnalysisRegistry; -import org.elasticsearch.index.analysis.CharFilterFactory; -import org.elasticsearch.index.analysis.CustomAnalyzer; -import org.elasticsearch.index.analysis.IndexAnalyzers; -import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.index.analysis.PreConfiguredCharFilter; -import org.elasticsearch.index.analysis.PreConfiguredTokenFilter; -import org.elasticsearch.index.analysis.PreConfiguredTokenizer; -import org.elasticsearch.index.analysis.StandardTokenizerFactory; -import org.elasticsearch.index.analysis.StopTokenFilterFactory; -import org.elasticsearch.index.analysis.TokenFilterFactory; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.Analysis; +import org.opensearch.index.analysis.AnalysisRegistry; +import org.opensearch.index.analysis.CharFilterFactory; +import org.opensearch.index.analysis.CustomAnalyzer; +import org.opensearch.index.analysis.IndexAnalyzers; +import org.opensearch.index.analysis.NamedAnalyzer; +import org.opensearch.index.analysis.PreConfiguredCharFilter; +import org.opensearch.index.analysis.PreConfiguredTokenFilter; +import org.opensearch.index.analysis.PreConfiguredTokenizer; +import org.opensearch.index.analysis.StandardTokenizerFactory; +import org.opensearch.index.analysis.StopTokenFilterFactory; +import org.opensearch.index.analysis.TokenFilterFactory; import org.opensearch.index.analysis.MyFilterTokenFilterFactory; -import org.elasticsearch.index.analysis.TokenizerFactory; -import org.elasticsearch.indices.analysis.AnalysisModule.AnalysisProvider; +import org.opensearch.index.analysis.TokenizerFactory; +import org.opensearch.indices.analysis.AnalysisModule.AnalysisProvider; import org.opensearch.plugins.AnalysisPlugin; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.IndexSettingsModule; @@ -269,7 +269,7 @@ public class AnalysisModuleTests extends OpenSearchTestCase { tokenStream -> new AppendCharFilter(tokenStream, "no_version")), PreConfiguredCharFilter.luceneVersion("lucene_version", luceneVersionSupportsMultiTerm, (tokenStream, luceneVersion) -> new AppendCharFilter(tokenStream, luceneVersion.toString())), - PreConfiguredCharFilter.elasticsearchVersion("elasticsearch_version", elasticsearchVersionSupportsMultiTerm, + PreConfiguredCharFilter.openSearchVersion("elasticsearch_version", elasticsearchVersionSupportsMultiTerm, (tokenStream, esVersion) -> new AppendCharFilter(tokenStream, esVersion.toString())) ); } @@ -321,7 +321,7 @@ public class AnalysisModuleTests extends OpenSearchTestCase { tokenStream -> new AppendTokenFilter(tokenStream, "no_version")), PreConfiguredTokenFilter.luceneVersion("lucene_version", luceneVersionSupportsMultiTerm, (tokenStream, luceneVersion) -> new AppendTokenFilter(tokenStream, luceneVersion.toString())), - PreConfiguredTokenFilter.elasticsearchVersion("elasticsearch_version", elasticsearchVersionSupportsMultiTerm, + PreConfiguredTokenFilter.openSearchVersion("elasticsearch_version", elasticsearchVersionSupportsMultiTerm, (tokenStream, esVersion) -> new AppendTokenFilter(tokenStream, esVersion.toString())) ); } @@ -392,7 +392,7 @@ public class AnalysisModuleTests extends OpenSearchTestCase { PreConfiguredTokenizer.singleton("no_version", () -> new FixedTokenizer("no_version")), PreConfiguredTokenizer.luceneVersion("lucene_version", luceneVersion -> new FixedTokenizer(luceneVersion.toString())), - PreConfiguredTokenizer.elasticsearchVersion("elasticsearch_version", + PreConfiguredTokenizer.openSearchVersion("elasticsearch_version", esVersion -> new FixedTokenizer(esVersion.toString())) ); } diff --git a/server/src/test/java/org/opensearch/indices/analyze/HunspellServiceTests.java b/server/src/test/java/org/opensearch/indices/analyze/HunspellServiceTests.java index c148b837c82..0654f7e8966 100644 --- a/server/src/test/java/org/opensearch/indices/analyze/HunspellServiceTests.java +++ b/server/src/test/java/org/opensearch/indices/analyze/HunspellServiceTests.java @@ -20,15 +20,15 @@ package org.opensearch.indices.analyze; import org.apache.lucene.analysis.hunspell.Dictionary; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.indices.analysis.HunspellService; +import org.opensearch.env.Environment; +import org.opensearch.indices.analysis.HunspellService; import org.opensearch.test.OpenSearchTestCase; import java.nio.file.Path; import static java.util.Collections.emptyMap; -import static org.elasticsearch.indices.analysis.HunspellService.HUNSPELL_IGNORE_CASE; -import static org.elasticsearch.indices.analysis.HunspellService.HUNSPELL_LAZY_LOAD; +import static org.opensearch.indices.analysis.HunspellService.HUNSPELL_IGNORE_CASE; +import static org.opensearch.indices.analysis.HunspellService.HUNSPELL_LAZY_LOAD; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.hasToString; import static org.hamcrest.Matchers.notNullValue; diff --git a/server/src/test/java/org/opensearch/indices/breaker/HierarchyCircuitBreakerServiceTests.java b/server/src/test/java/org/opensearch/indices/breaker/HierarchyCircuitBreakerServiceTests.java index dc51f1a1f8c..3f09a1ae18a 100644 --- a/server/src/test/java/org/opensearch/indices/breaker/HierarchyCircuitBreakerServiceTests.java +++ b/server/src/test/java/org/opensearch/indices/breaker/HierarchyCircuitBreakerServiceTests.java @@ -28,7 +28,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.monitor.jvm.JvmInfo; +import org.opensearch.monitor.jvm.JvmInfo; import org.opensearch.search.aggregations.MultiBucketConsumerService; import org.opensearch.test.OpenSearchTestCase; diff --git a/server/src/test/java/org/opensearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java b/server/src/test/java/org/opensearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java index a9af45639a6..bfffee4c7fc 100644 --- a/server/src/test/java/org/opensearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java +++ b/server/src/test/java/org/opensearch/indices/cluster/AbstractIndicesClusterStateServiceTestCase.java @@ -29,21 +29,21 @@ import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.common.Nullable; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.seqno.RetentionLeaseSyncer; -import org.elasticsearch.index.shard.IndexEventListener; -import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.index.shard.IndexShardState; -import org.elasticsearch.index.shard.PrimaryReplicaSyncer.ResyncTask; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.indices.cluster.IndicesClusterStateService.AllocatedIndex; -import org.elasticsearch.indices.cluster.IndicesClusterStateService.AllocatedIndices; -import org.elasticsearch.indices.cluster.IndicesClusterStateService.Shard; -import org.elasticsearch.indices.recovery.PeerRecoveryTargetService; -import org.elasticsearch.indices.recovery.RecoveryState; +import org.opensearch.index.Index; +import org.opensearch.index.IndexService; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.seqno.RetentionLeaseSyncer; +import org.opensearch.index.shard.IndexEventListener; +import org.opensearch.index.shard.IndexShard; +import org.opensearch.index.shard.IndexShardState; +import org.opensearch.index.shard.PrimaryReplicaSyncer.ResyncTask; +import org.opensearch.index.shard.ShardId; +import org.opensearch.indices.IndicesService; +import org.opensearch.indices.cluster.IndicesClusterStateService.AllocatedIndex; +import org.opensearch.indices.cluster.IndicesClusterStateService.AllocatedIndices; +import org.opensearch.indices.cluster.IndicesClusterStateService.Shard; +import org.opensearch.indices.recovery.PeerRecoveryTargetService; +import org.opensearch.indices.recovery.RecoveryState; import org.opensearch.repositories.RepositoriesService; import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; diff --git a/server/src/test/java/org/opensearch/indices/cluster/ClusterStateChanges.java b/server/src/test/java/org/opensearch/indices/cluster/ClusterStateChanges.java index 76ae37ca397..dfeb9649c11 100644 --- a/server/src/test/java/org/opensearch/indices/cluster/ClusterStateChanges.java +++ b/server/src/test/java/org/opensearch/indices/cluster/ClusterStateChanges.java @@ -80,7 +80,7 @@ import org.opensearch.common.CheckedFunction; import org.opensearch.common.UUIDs; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.IndexScopedSettings; -import org.elasticsearch.common.settings.Settings; +import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.env.Environment; diff --git a/server/src/test/java/org/opensearch/indices/flush/SyncedFlushSingleNodeTests.java b/server/src/test/java/org/opensearch/indices/flush/SyncedFlushSingleNodeTests.java index 62c7944efa4..0d703079545 100644 --- a/server/src/test/java/org/opensearch/indices/flush/SyncedFlushSingleNodeTests.java +++ b/server/src/test/java/org/opensearch/indices/flush/SyncedFlushSingleNodeTests.java @@ -28,11 +28,11 @@ import org.opensearch.common.UUIDs; import org.opensearch.common.lease.Releasable; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.index.shard.ShardNotFoundException; -import org.elasticsearch.indices.IndicesService; +import org.opensearch.index.IndexService; +import org.opensearch.index.shard.IndexShard; +import org.opensearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardNotFoundException; +import org.opensearch.indices.IndicesService; import org.opensearch.test.OpenSearchSingleNodeTestCase; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/test/java/org/opensearch/indices/flush/SyncedFlushUtil.java b/server/src/test/java/org/opensearch/indices/flush/SyncedFlushUtil.java index 8c2c4358054..e35034ca961 100644 --- a/server/src/test/java/org/opensearch/indices/flush/SyncedFlushUtil.java +++ b/server/src/test/java/org/opensearch/indices/flush/SyncedFlushUtil.java @@ -23,7 +23,7 @@ import org.opensearch.ExceptionsHelper; import org.opensearch.action.ActionListener; import org.opensearch.cluster.ClusterState; import org.opensearch.cluster.routing.ShardRouting; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import org.opensearch.test.InternalTestCluster; import java.util.List; diff --git a/server/src/test/java/org/opensearch/indices/memory/breaker/CircuitBreakerUnitTests.java b/server/src/test/java/org/opensearch/indices/memory/breaker/CircuitBreakerUnitTests.java index 4409e7245df..137da3491b1 100644 --- a/server/src/test/java/org/opensearch/indices/memory/breaker/CircuitBreakerUnitTests.java +++ b/server/src/test/java/org/opensearch/indices/memory/breaker/CircuitBreakerUnitTests.java @@ -21,8 +21,8 @@ package org.opensearch.indices.memory.breaker; import org.opensearch.common.breaker.CircuitBreaker; import org.opensearch.common.settings.Settings; -import org.elasticsearch.indices.breaker.BreakerSettings; -import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService; +import org.opensearch.indices.breaker.BreakerSettings; +import org.opensearch.indices.breaker.HierarchyCircuitBreakerService; import org.opensearch.test.OpenSearchTestCase; import static org.hamcrest.Matchers.equalTo; diff --git a/server/src/test/java/org/opensearch/indices/recovery/PeerRecoverySourceServiceTests.java b/server/src/test/java/org/opensearch/indices/recovery/PeerRecoverySourceServiceTests.java index bd7253ab2bb..cbe9bedb35f 100644 --- a/server/src/test/java/org/opensearch/indices/recovery/PeerRecoverySourceServiceTests.java +++ b/server/src/test/java/org/opensearch/indices/recovery/PeerRecoverySourceServiceTests.java @@ -22,11 +22,11 @@ package org.opensearch.indices.recovery; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.seqno.SequenceNumbers; -import org.elasticsearch.index.shard.IndexShard; +import org.opensearch.index.seqno.SequenceNumbers; +import org.opensearch.index.shard.IndexShard; import org.opensearch.index.shard.IndexShardTestCase; -import org.elasticsearch.index.store.Store; -import org.elasticsearch.indices.IndicesService; +import org.opensearch.index.store.Store; +import org.opensearch.indices.IndicesService; import org.opensearch.test.NodeRoles; import org.opensearch.transport.TransportService; diff --git a/server/src/test/java/org/opensearch/indices/recovery/PeerRecoveryTargetServiceTests.java b/server/src/test/java/org/opensearch/indices/recovery/PeerRecoveryTargetServiceTests.java index feb4b5866a5..08a0304f46a 100644 --- a/server/src/test/java/org/opensearch/indices/recovery/PeerRecoveryTargetServiceTests.java +++ b/server/src/test/java/org/opensearch/indices/recovery/PeerRecoveryTargetServiceTests.java @@ -36,15 +36,15 @@ import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.XContentType; import org.opensearch.core.internal.io.IOUtils; -import org.elasticsearch.index.engine.NoOpEngine; -import org.elasticsearch.index.mapper.SourceToParse; -import org.elasticsearch.index.seqno.SeqNoStats; -import org.elasticsearch.index.seqno.SequenceNumbers; -import org.elasticsearch.index.shard.IndexShard; +import org.opensearch.index.engine.NoOpEngine; +import org.opensearch.index.mapper.SourceToParse; +import org.opensearch.index.seqno.SeqNoStats; +import org.opensearch.index.seqno.SequenceNumbers; +import org.opensearch.index.shard.IndexShard; import org.opensearch.index.shard.IndexShardTestCase; -import org.elasticsearch.index.store.Store; -import org.elasticsearch.index.store.StoreFileMetadata; -import org.elasticsearch.index.translog.Translog; +import org.opensearch.index.store.Store; +import org.opensearch.index.store.StoreFileMetadata; +import org.opensearch.index.translog.Translog; import java.io.IOException; import java.util.ArrayList; @@ -57,7 +57,7 @@ import java.util.concurrent.CyclicBarrier; import java.util.stream.Collectors; import java.util.stream.LongStream; -import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO; +import static org.opensearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.sameInstance; diff --git a/server/src/test/java/org/opensearch/indices/recovery/RecoverySettingsDynamicUpdateTests.java b/server/src/test/java/org/opensearch/indices/recovery/RecoverySettingsDynamicUpdateTests.java index b92b4f67330..5605962d64f 100644 --- a/server/src/test/java/org/opensearch/indices/recovery/RecoverySettingsDynamicUpdateTests.java +++ b/server/src/test/java/org/opensearch/indices/recovery/RecoverySettingsDynamicUpdateTests.java @@ -22,7 +22,7 @@ package org.opensearch.indices.recovery; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.indices.recovery.RecoverySettings; +import org.opensearch.indices.recovery.RecoverySettings; import org.opensearch.test.OpenSearchTestCase; import java.util.concurrent.TimeUnit; diff --git a/server/src/test/java/org/opensearch/indices/recovery/RecoverySourceHandlerTests.java b/server/src/test/java/org/opensearch/indices/recovery/RecoverySourceHandlerTests.java index ef9890b2ef9..3dc365253dd 100644 --- a/server/src/test/java/org/opensearch/indices/recovery/RecoverySourceHandlerTests.java +++ b/server/src/test/java/org/opensearch/indices/recovery/RecoverySourceHandlerTests.java @@ -78,11 +78,11 @@ import org.opensearch.index.shard.ShardId; import org.opensearch.index.store.Store; import org.opensearch.index.store.StoreFileMetadata; import org.opensearch.index.translog.Translog; -import org.elasticsearch.test.CorruptionUtils; -import org.elasticsearch.test.DummyShardLock; -import org.elasticsearch.test.ESTestCase; -import org.elasticsearch.test.IndexSettingsModule; -import org.elasticsearch.test.VersionUtils; +import org.opensearch.test.CorruptionUtils; +import org.opensearch.test.DummyShardLock; +import org.opensearch.test.OpenSearchTestCase; +import org.opensearch.test.IndexSettingsModule; +import org.opensearch.test.VersionUtils; import org.opensearch.indices.recovery.AsyncRecoveryTarget; import org.opensearch.threadpool.FixedExecutorBuilder; import org.opensearch.threadpool.TestThreadPool; diff --git a/server/src/test/java/org/opensearch/indices/recovery/RecoveryStatusTests.java b/server/src/test/java/org/opensearch/indices/recovery/RecoveryStatusTests.java index 3231749d0db..2e681db0249 100644 --- a/server/src/test/java/org/opensearch/indices/recovery/RecoveryStatusTests.java +++ b/server/src/test/java/org/opensearch/indices/recovery/RecoveryStatusTests.java @@ -21,9 +21,9 @@ package org.opensearch.indices.recovery; import org.apache.lucene.codecs.CodecUtil; import org.apache.lucene.store.IndexOutput; import org.opensearch.common.util.set.Sets; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.index.store.StoreFileMetadata; +import org.opensearch.index.IndexService; +import org.opensearch.index.shard.IndexShard; +import org.opensearch.index.store.StoreFileMetadata; import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/opensearch/indices/recovery/RecoveryTargetTests.java b/server/src/test/java/org/opensearch/indices/recovery/RecoveryTargetTests.java index 3290f7d5086..3fc2dfe01dc 100644 --- a/server/src/test/java/org/opensearch/indices/recovery/RecoveryTargetTests.java +++ b/server/src/test/java/org/opensearch/indices/recovery/RecoveryTargetTests.java @@ -27,13 +27,13 @@ import org.opensearch.cluster.routing.TestShardRouting; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.io.stream.Writeable; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.indices.recovery.RecoveryState.FileDetail; -import org.elasticsearch.indices.recovery.RecoveryState.Index; -import org.elasticsearch.indices.recovery.RecoveryState.Stage; -import org.elasticsearch.indices.recovery.RecoveryState.Timer; -import org.elasticsearch.indices.recovery.RecoveryState.Translog; -import org.elasticsearch.indices.recovery.RecoveryState.VerifyIndex; +import org.opensearch.index.shard.ShardId; +import org.opensearch.indices.recovery.RecoveryState.FileDetail; +import org.opensearch.indices.recovery.RecoveryState.Index; +import org.opensearch.indices.recovery.RecoveryState.Stage; +import org.opensearch.indices.recovery.RecoveryState.Timer; +import org.opensearch.indices.recovery.RecoveryState.Translog; +import org.opensearch.indices.recovery.RecoveryState.VerifyIndex; import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/opensearch/indices/recovery/StartRecoveryRequestTests.java b/server/src/test/java/org/opensearch/indices/recovery/StartRecoveryRequestTests.java index b0d44e40004..bc081c9177e 100644 --- a/server/src/test/java/org/opensearch/indices/recovery/StartRecoveryRequestTests.java +++ b/server/src/test/java/org/opensearch/indices/recovery/StartRecoveryRequestTests.java @@ -24,10 +24,10 @@ import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.UUIDs; import org.opensearch.common.io.stream.InputStreamStreamInput; import org.opensearch.common.io.stream.OutputStreamStreamOutput; -import org.elasticsearch.index.engine.Engine; -import org.elasticsearch.index.seqno.SequenceNumbers; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.index.store.Store; +import org.opensearch.index.engine.Engine; +import org.opensearch.index.seqno.SequenceNumbers; +import org.opensearch.index.shard.ShardId; +import org.opensearch.index.store.Store; import org.opensearch.test.OpenSearchTestCase; import java.io.ByteArrayInputStream; diff --git a/server/src/test/java/org/opensearch/indices/store/IndicesStoreTests.java b/server/src/test/java/org/opensearch/indices/store/IndicesStoreTests.java index 8a0bb459e8f..4b5725f568e 100644 --- a/server/src/test/java/org/opensearch/indices/store/IndicesStoreTests.java +++ b/server/src/test/java/org/opensearch/indices/store/IndicesStoreTests.java @@ -25,7 +25,7 @@ import org.opensearch.cluster.routing.IndexShardRoutingTable; import org.opensearch.cluster.routing.ShardRoutingState; import org.opensearch.cluster.routing.TestShardRouting; import org.opensearch.cluster.routing.UnassignedInfo; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; diff --git a/server/src/test/java/org/opensearch/monitor/fs/FsHealthServiceTests.java b/server/src/test/java/org/opensearch/monitor/fs/FsHealthServiceTests.java index 9c41a760c34..79fbea78dac 100644 --- a/server/src/test/java/org/opensearch/monitor/fs/FsHealthServiceTests.java +++ b/server/src/test/java/org/opensearch/monitor/fs/FsHealthServiceTests.java @@ -50,8 +50,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import static org.elasticsearch.monitor.StatusInfo.Status.HEALTHY; -import static org.elasticsearch.monitor.StatusInfo.Status.UNHEALTHY; +import static org.opensearch.monitor.StatusInfo.Status.HEALTHY; +import static org.opensearch.monitor.StatusInfo.Status.UNHEALTHY; import static org.opensearch.node.Node.NODE_NAME_SETTING; import static org.hamcrest.Matchers.is; @@ -126,7 +126,7 @@ public class FsHealthServiceTests extends OpenSearchTestCase { } } - @TestLogging(value = "org.elasticsearch.monitor.fs:WARN", reason = "to ensure that we log on hung IO at WARN level") + @TestLogging(value = "org.opensearch.monitor.fs:WARN", reason = "to ensure that we log on hung IO at WARN level") public void testLoggingOnHungIO() throws Exception { long slowLogThreshold = randomLongBetween(100, 200); final Settings settings = Settings.builder().put(FsHealthService.SLOW_PATH_LOGGING_THRESHOLD_SETTING.getKey(), diff --git a/server/src/test/java/org/opensearch/monitor/fs/FsProbeTests.java b/server/src/test/java/org/opensearch/monitor/fs/FsProbeTests.java index c765d5f59d9..9eee75e9f61 100644 --- a/server/src/test/java/org/opensearch/monitor/fs/FsProbeTests.java +++ b/server/src/test/java/org/opensearch/monitor/fs/FsProbeTests.java @@ -21,8 +21,8 @@ package org.opensearch.monitor.fs; import org.apache.lucene.util.Constants; import org.opensearch.common.collect.Tuple; -import org.elasticsearch.env.NodeEnvironment; -import org.elasticsearch.env.NodeEnvironment.NodePath; +import org.opensearch.env.NodeEnvironment; +import org.opensearch.env.NodeEnvironment.NodePath; import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/opensearch/monitor/process/ProcessProbeTests.java b/server/src/test/java/org/opensearch/monitor/process/ProcessProbeTests.java index 5b2ec78a060..d45d0192dc4 100644 --- a/server/src/test/java/org/opensearch/monitor/process/ProcessProbeTests.java +++ b/server/src/test/java/org/opensearch/monitor/process/ProcessProbeTests.java @@ -23,7 +23,7 @@ import org.apache.lucene.util.Constants; import org.opensearch.bootstrap.BootstrapInfo; import org.opensearch.test.OpenSearchTestCase; -import static org.elasticsearch.monitor.jvm.JvmInfo.jvmInfo; +import static org.opensearch.monitor.jvm.JvmInfo.jvmInfo; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.equalTo; diff --git a/server/src/test/java/org/opensearch/node/NodeTests.java b/server/src/test/java/org/opensearch/node/NodeTests.java index fb3385bebfa..f49c8bf0a1b 100644 --- a/server/src/test/java/org/opensearch/node/NodeTests.java +++ b/server/src/test/java/org/opensearch/node/NodeTests.java @@ -27,13 +27,13 @@ import org.opensearch.common.breaker.CircuitBreaker; import org.opensearch.common.network.NetworkModule; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.BoundTransportAddress; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.engine.Engine.Searcher; -import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.indices.breaker.BreakerSettings; -import org.elasticsearch.indices.breaker.CircuitBreakerService; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexService; +import org.opensearch.index.engine.Engine.Searcher; +import org.opensearch.index.shard.IndexShard; +import org.opensearch.indices.IndicesService; +import org.opensearch.indices.breaker.BreakerSettings; +import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.plugins.CircuitBreakerPlugin; import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchTestCase; diff --git a/server/src/test/java/org/opensearch/plugins/IndexStorePluginTests.java b/server/src/test/java/org/opensearch/plugins/IndexStorePluginTests.java index 545bac2f183..2f2d504dc2f 100644 --- a/server/src/test/java/org/opensearch/plugins/IndexStorePluginTests.java +++ b/server/src/test/java/org/opensearch/plugins/IndexStorePluginTests.java @@ -119,11 +119,11 @@ public class IndexStorePluginTests extends OpenSearchTestCase { if (JavaVersion.current().compareTo(JavaVersion.parse("9")) >= 0) { assertThat(e, hasToString(matches( "java.lang.IllegalStateException: Duplicate key store \\(attempted merging values " + - "org.elasticsearch.index.store.FsDirectoryFactory@[\\w\\d]+ " + - "and org.elasticsearch.index.store.FsDirectoryFactory@[\\w\\d]+\\)"))); + "org.opensearch.index.store.FsDirectoryFactory@[\\w\\d]+ " + + "and org.opensearch.index.store.FsDirectoryFactory@[\\w\\d]+\\)"))); } else { assertThat(e, hasToString(matches( - "java.lang.IllegalStateException: Duplicate key org.elasticsearch.index.store.FsDirectoryFactory@[\\w\\d]+"))); + "java.lang.IllegalStateException: Duplicate key org.opensearch.index.store.FsDirectoryFactory@[\\w\\d]+"))); } } diff --git a/server/src/test/java/org/opensearch/recovery/RecoveriesCollectionTests.java b/server/src/test/java/org/opensearch/recovery/RecoveriesCollectionTests.java index baf812b32ef..c56213fbb30 100644 --- a/server/src/test/java/org/opensearch/recovery/RecoveriesCollectionTests.java +++ b/server/src/test/java/org/opensearch/recovery/RecoveriesCollectionTests.java @@ -22,9 +22,9 @@ import org.opensearch.OpenSearchException; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.unit.TimeValue; import org.opensearch.index.replication.OpenSearchIndexLevelReplicationTestCase; -import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.index.store.Store; +import org.opensearch.index.shard.IndexShard; +import org.opensearch.index.shard.ShardId; +import org.opensearch.index.store.Store; import org.opensearch.indices.recovery.RecoveriesCollection; import org.opensearch.indices.recovery.RecoveryFailedException; import org.opensearch.indices.recovery.RecoveryState; diff --git a/server/src/test/java/org/opensearch/repositories/RepositoriesModuleTests.java b/server/src/test/java/org/opensearch/repositories/RepositoriesModuleTests.java index 3166453647b..ed02dc1a339 100644 --- a/server/src/test/java/org/opensearch/repositories/RepositoriesModuleTests.java +++ b/server/src/test/java/org/opensearch/repositories/RepositoriesModuleTests.java @@ -22,8 +22,8 @@ package org.opensearch.repositories; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.env.Environment; -import org.elasticsearch.indices.recovery.RecoverySettings; +import org.opensearch.env.Environment; +import org.opensearch.indices.recovery.RecoverySettings; import org.opensearch.plugins.RepositoryPlugin; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/test/java/org/opensearch/repositories/RepositoriesServiceTests.java b/server/src/test/java/org/opensearch/repositories/RepositoriesServiceTests.java index 24da43797bf..1ae2a3cc9b7 100644 --- a/server/src/test/java/org/opensearch/repositories/RepositoriesServiceTests.java +++ b/server/src/test/java/org/opensearch/repositories/RepositoriesServiceTests.java @@ -42,12 +42,12 @@ import org.opensearch.common.component.Lifecycle; import org.opensearch.common.component.LifecycleListener; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.index.snapshots.IndexShardSnapshotStatus; -import org.elasticsearch.index.store.Store; -import org.elasticsearch.indices.recovery.RecoverySettings; -import org.elasticsearch.indices.recovery.RecoveryState; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.shard.ShardId; +import org.opensearch.index.snapshots.IndexShardSnapshotStatus; +import org.opensearch.index.store.Store; +import org.opensearch.indices.recovery.RecoverySettings; +import org.opensearch.indices.recovery.RecoveryState; import org.opensearch.repositories.blobstore.MeteredBlobStoreRepository; import org.opensearch.snapshots.SnapshotId; import org.opensearch.snapshots.SnapshotInfo; @@ -84,7 +84,7 @@ public class RepositoriesServiceTests extends OpenSearchTestCase { final ClusterService clusterService = mock(ClusterService.class); when(clusterService.getClusterApplierService()).thenReturn(clusterApplierService); Map typesRegistry = - org.elasticsearch.common.collect.Map.of(TestRepository.TYPE, TestRepository::new, + org.opensearch.common.collect.Map.of(TestRepository.TYPE, TestRepository::new, MeteredRepositoryTypeA.TYPE, metadata -> new MeteredRepositoryTypeA(metadata, clusterService), MeteredRepositoryTypeB.TYPE, metadata -> new MeteredRepositoryTypeB(metadata, clusterService)); repositoriesService = new RepositoriesService(Settings.EMPTY, mock(ClusterService.class), @@ -331,7 +331,7 @@ public class RepositoriesServiceTests extends OpenSearchTestCase { private static class MeteredRepositoryTypeA extends MeteredBlobStoreRepository { private static final String TYPE = "type-a"; - private static final RepositoryStats STATS = new RepositoryStats(org.elasticsearch.common.collect.Map.of("GET", 10L)); + private static final RepositoryStats STATS = new RepositoryStats(org.opensearch.common.collect.Map.of("GET", 10L)); private MeteredRepositoryTypeA(RepositoryMetadata metadata, ClusterService clusterService) { super(metadata, @@ -339,7 +339,7 @@ public class RepositoriesServiceTests extends OpenSearchTestCase { mock(NamedXContentRegistry.class), clusterService, mock(RecoverySettings.class), - org.elasticsearch.common.collect.Map.of("bucket", "bucket-a")); + org.opensearch.common.collect.Map.of("bucket", "bucket-a")); } @Override @@ -360,7 +360,7 @@ public class RepositoriesServiceTests extends OpenSearchTestCase { private static class MeteredRepositoryTypeB extends MeteredBlobStoreRepository { private static final String TYPE = "type-b"; - private static final RepositoryStats STATS = new RepositoryStats(org.elasticsearch.common.collect.Map.of("LIST", 20L)); + private static final RepositoryStats STATS = new RepositoryStats(org.opensearch.common.collect.Map.of("LIST", 20L)); private MeteredRepositoryTypeB(RepositoryMetadata metadata, ClusterService clusterService) { super(metadata, @@ -368,7 +368,7 @@ public class RepositoriesServiceTests extends OpenSearchTestCase { mock(NamedXContentRegistry.class), clusterService, mock(RecoverySettings.class), - org.elasticsearch.common.collect.Map.of("bucket", "bucket-b")); + org.opensearch.common.collect.Map.of("bucket", "bucket-b")); } @Override diff --git a/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java b/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java index 57db9e84037..cbfe75e83d2 100644 --- a/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java +++ b/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java @@ -33,18 +33,18 @@ import org.opensearch.common.UUIDs; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.core.internal.io.IOUtils; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.env.TestEnvironment; -import org.elasticsearch.index.engine.InternalEngineFactory; -import org.elasticsearch.index.seqno.RetentionLeaseSyncer; -import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.index.shard.IndexShardState; +import org.opensearch.index.engine.InternalEngineFactory; +import org.opensearch.index.seqno.RetentionLeaseSyncer; +import org.opensearch.index.shard.IndexShard; +import org.opensearch.index.shard.IndexShardState; import org.opensearch.index.shard.IndexShardTestCase; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.index.snapshots.IndexShardSnapshotFailedException; -import org.elasticsearch.index.store.Store; -import org.elasticsearch.index.store.StoreFileMetadata; -import org.elasticsearch.indices.recovery.RecoverySettings; +import org.opensearch.index.shard.ShardId; +import org.opensearch.index.snapshots.IndexShardSnapshotFailedException; +import org.opensearch.index.store.Store; +import org.opensearch.index.store.StoreFileMetadata; +import org.opensearch.indices.recovery.RecoverySettings; import org.opensearch.repositories.IndexId; import org.opensearch.repositories.Repository; import org.opensearch.repositories.RepositoryData; diff --git a/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryTests.java b/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryTests.java index d5aacc07adc..ac649d9091f 100644 --- a/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryTests.java +++ b/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryTests.java @@ -30,7 +30,7 @@ import org.opensearch.common.UUIDs; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.indices.recovery.RecoverySettings; import org.opensearch.plugins.Plugin; import org.opensearch.plugins.RepositoryPlugin; diff --git a/server/src/test/java/org/opensearch/rest/RestControllerTests.java b/server/src/test/java/org/opensearch/rest/RestControllerTests.java index 72c692afae7..ded554b439c 100644 --- a/server/src/test/java/org/opensearch/rest/RestControllerTests.java +++ b/server/src/test/java/org/opensearch/rest/RestControllerTests.java @@ -39,7 +39,7 @@ import org.opensearch.http.HttpRequest; import org.opensearch.http.HttpResponse; import org.opensearch.http.HttpServerTransport; import org.opensearch.http.HttpStats; -import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService; +import org.opensearch.indices.breaker.HierarchyCircuitBreakerService; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.client.NoOpNodeClient; import org.opensearch.test.rest.FakeRestRequest; diff --git a/server/src/test/java/org/opensearch/rest/action/RestActionsTests.java b/server/src/test/java/org/opensearch/rest/action/RestActionsTests.java index e6732217a47..9203c20cc2e 100644 --- a/server/src/test/java/org/opensearch/rest/action/RestActionsTests.java +++ b/server/src/test/java/org/opensearch/rest/action/RestActionsTests.java @@ -32,10 +32,10 @@ import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.query.MatchQueryBuilder; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.Index; +import org.opensearch.index.query.MatchQueryBuilder; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.shard.ShardId; import org.opensearch.search.SearchModule; import org.opensearch.search.SearchShardTarget; import org.opensearch.test.OpenSearchTestCase; diff --git a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestAnalyzeActionTests.java b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestAnalyzeActionTests.java index 0888bd45e19..7e53a54ade5 100644 --- a/server/src/test/java/org/opensearch/rest/action/admin/indices/RestAnalyzeActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/admin/indices/RestAnalyzeActionTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.analysis.NameOrDefinition; +import org.opensearch.index.analysis.NameOrDefinition; import org.opensearch.rest.RestRequest; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.client.NoOpNodeClient; diff --git a/server/src/test/java/org/opensearch/rest/action/cat/RestIndicesActionTests.java b/server/src/test/java/org/opensearch/rest/action/cat/RestIndicesActionTests.java index fe3de9f4a76..92cb45048db 100644 --- a/server/src/test/java/org/opensearch/rest/action/cat/RestIndicesActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/cat/RestIndicesActionTests.java @@ -31,9 +31,9 @@ import org.opensearch.cluster.routing.TestShardRouting; import org.opensearch.common.Table; import org.opensearch.common.UUIDs; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.Index; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.shard.ShardId; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.rest.FakeRestRequest; diff --git a/server/src/test/java/org/opensearch/rest/action/cat/RestRecoveryActionTests.java b/server/src/test/java/org/opensearch/rest/action/cat/RestRecoveryActionTests.java index 2924a3ce168..8edac9c6247 100644 --- a/server/src/test/java/org/opensearch/rest/action/cat/RestRecoveryActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/cat/RestRecoveryActionTests.java @@ -29,9 +29,9 @@ import org.opensearch.common.Randomness; import org.opensearch.common.Table; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.xcontent.XContentOpenSearchExtension; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.indices.recovery.RecoveryState; +import org.opensearch.index.Index; +import org.opensearch.index.shard.ShardId; +import org.opensearch.indices.recovery.RecoveryState; import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; diff --git a/server/src/test/java/org/opensearch/rest/action/cat/RestShardsActionTests.java b/server/src/test/java/org/opensearch/rest/action/cat/RestShardsActionTests.java index e6b8125ce44..1da20ac1aa8 100644 --- a/server/src/test/java/org/opensearch/rest/action/cat/RestShardsActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/cat/RestShardsActionTests.java @@ -33,7 +33,7 @@ import org.opensearch.cluster.routing.ShardRouting; import org.opensearch.cluster.routing.ShardRoutingState; import org.opensearch.cluster.routing.TestShardRouting; import org.opensearch.common.Table; -import org.elasticsearch.index.shard.ShardPath; +import org.opensearch.index.shard.ShardPath; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.rest.FakeRestRequest; diff --git a/server/src/test/java/org/opensearch/rest/action/document/RestGetSourceActionTests.java b/server/src/test/java/org/opensearch/rest/action/document/RestGetSourceActionTests.java index 137ee3b5ba2..7c132d7f185 100644 --- a/server/src/test/java/org/opensearch/rest/action/document/RestGetSourceActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/document/RestGetSourceActionTests.java @@ -24,7 +24,7 @@ import org.opensearch.action.get.GetResponse; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.util.concurrent.ThreadContext; -import org.elasticsearch.index.get.GetResult; +import org.opensearch.index.get.GetResult; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestRequest.Method; import org.opensearch.rest.RestResponse; @@ -40,7 +40,7 @@ import java.util.HashMap; import java.util.Map; import static java.util.Collections.emptyMap; -import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO; +import static org.opensearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO; import static org.opensearch.rest.RestStatus.OK; import static org.hamcrest.Matchers.equalTo; diff --git a/server/src/test/java/org/opensearch/rest/action/document/RestUpdateActionTests.java b/server/src/test/java/org/opensearch/rest/action/document/RestUpdateActionTests.java index 2d96ba38689..e4d0ce6416a 100644 --- a/server/src/test/java/org/opensearch/rest/action/document/RestUpdateActionTests.java +++ b/server/src/test/java/org/opensearch/rest/action/document/RestUpdateActionTests.java @@ -23,7 +23,7 @@ import org.opensearch.action.ActionRequestValidationException; import org.opensearch.client.node.NodeClient; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.VersionType; +import org.opensearch.index.VersionType; import org.opensearch.rest.RestRequest; import org.opensearch.rest.RestRequest.Method; import org.opensearch.test.rest.FakeRestRequest; diff --git a/server/src/test/java/org/opensearch/script/JodaCompatibleZonedDateTimeTests.java b/server/src/test/java/org/opensearch/script/JodaCompatibleZonedDateTimeTests.java index 4fa201b4afd..48d5547fa12 100644 --- a/server/src/test/java/org/opensearch/script/JodaCompatibleZonedDateTimeTests.java +++ b/server/src/test/java/org/opensearch/script/JodaCompatibleZonedDateTimeTests.java @@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.equalTo; public class JodaCompatibleZonedDateTimeTests extends OpenSearchTestCase { private static final Logger DEPRECATION_LOGGER = - LogManager.getLogger("org.elasticsearch.deprecation.script.JodaCompatibleZonedDateTime"); + LogManager.getLogger("org.opensearch.deprecation.script.JodaCompatibleZonedDateTime"); // each call to get or getValue will be run with limited permissions, just as they are in scripts private static PermissionCollection NO_PERMISSIONS = new Permissions(); diff --git a/server/src/test/java/org/opensearch/script/ScriptContextInfoTests.java b/server/src/test/java/org/opensearch/script/ScriptContextInfoTests.java index b5bdf640198..799c07a5401 100644 --- a/server/src/test/java/org/opensearch/script/ScriptContextInfoTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptContextInfoTests.java @@ -270,19 +270,19 @@ public class ScriptContextInfoTests extends OpenSearchTestCase { " \"name\": \"weight\"" + " }," + " {" + - " \"type\": \"org.elasticsearch.index.similarity.ScriptedSimilarity$Query\"," + + " \"type\": \"org.opensearch.index.similarity.ScriptedSimilarity$Query\"," + " \"name\": \"query\"" + " }," + " {" + - " \"type\": \"org.elasticsearch.index.similarity.ScriptedSimilarity$Field\"," + + " \"type\": \"org.opensearch.index.similarity.ScriptedSimilarity$Field\"," + " \"name\": \"field\"" + " }," + " {" + - " \"type\": \"org.elasticsearch.index.similarity.ScriptedSimilarity$Term\"," + + " \"type\": \"org.opensearch.index.similarity.ScriptedSimilarity$Term\"," + " \"name\": \"term\"" + " }," + " {" + - " \"type\": \"org.elasticsearch.index.similarity.ScriptedSimilarity$Doc\"," + + " \"type\": \"org.opensearch.index.similarity.ScriptedSimilarity$Doc\"," + " \"name\": \"doc\"" + " }" + " ]" + diff --git a/server/src/test/java/org/opensearch/script/ScriptServiceTests.java b/server/src/test/java/org/opensearch/script/ScriptServiceTests.java index e6ae9c95e7c..b8a78e99007 100644 --- a/server/src/test/java/org/opensearch/script/ScriptServiceTests.java +++ b/server/src/test/java/org/opensearch/script/ScriptServiceTests.java @@ -32,7 +32,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; diff --git a/server/src/test/java/org/opensearch/search/AbstractSearchTestCase.java b/server/src/test/java/org/opensearch/search/AbstractSearchTestCase.java index 7f3434b29cd..d101ce97af4 100644 --- a/server/src/test/java/org/opensearch/search/AbstractSearchTestCase.java +++ b/server/src/test/java/org/opensearch/search/AbstractSearchTestCase.java @@ -29,7 +29,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.indices.IndicesModule; +import org.opensearch.indices.IndicesModule; import org.opensearch.plugins.Plugin; import org.opensearch.plugins.SearchPlugin; import org.opensearch.search.builder.SearchSourceBuilder; diff --git a/server/src/test/java/org/opensearch/search/DefaultSearchContextTests.java b/server/src/test/java/org/opensearch/search/DefaultSearchContextTests.java index 6169a2324a2..686d8372c73 100644 --- a/server/src/test/java/org/opensearch/search/DefaultSearchContextTests.java +++ b/server/src/test/java/org/opensearch/search/DefaultSearchContextTests.java @@ -37,19 +37,19 @@ import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.MockBigArrays; import org.opensearch.common.util.MockPageCacheRecycler; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.cache.IndexCache; -import org.elasticsearch.index.cache.query.QueryCache; -import org.elasticsearch.index.engine.Engine; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.query.AbstractQueryBuilder; -import org.elasticsearch.index.query.ParsedQuery; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.index.IndexService; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.cache.IndexCache; +import org.opensearch.index.cache.query.QueryCache; +import org.opensearch.index.engine.Engine; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.query.AbstractQueryBuilder; +import org.opensearch.index.query.ParsedQuery; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.index.shard.IndexShard; +import org.opensearch.index.shard.ShardId; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.search.internal.AliasFilter; import org.opensearch.search.internal.LegacyReaderContext; import org.opensearch.search.internal.ReaderContext; diff --git a/server/src/test/java/org/opensearch/search/DocValueFormatTests.java b/server/src/test/java/org/opensearch/search/DocValueFormatTests.java index 3a8ce81eef7..793e6719357 100644 --- a/server/src/test/java/org/opensearch/search/DocValueFormatTests.java +++ b/server/src/test/java/org/opensearch/search/DocValueFormatTests.java @@ -28,7 +28,7 @@ import org.opensearch.common.io.stream.NamedWriteableRegistry.Entry; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.network.InetAddresses; import org.opensearch.common.time.DateFormatter; -import org.elasticsearch.index.mapper.DateFieldMapper.Resolution; +import org.opensearch.index.mapper.DateFieldMapper.Resolution; import org.opensearch.test.OpenSearchTestCase; import java.time.ZoneOffset; diff --git a/server/src/test/java/org/opensearch/search/MultiValueModeTests.java b/server/src/test/java/org/opensearch/search/MultiValueModeTests.java index 727cb4a03ed..308772bcfb7 100644 --- a/server/src/test/java/org/opensearch/search/MultiValueModeTests.java +++ b/server/src/test/java/org/opensearch/search/MultiValueModeTests.java @@ -30,15 +30,15 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.FixedBitSet; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.StreamInput; -import org.elasticsearch.index.fielddata.AbstractBinaryDocValues; -import org.elasticsearch.index.fielddata.AbstractNumericDocValues; -import org.elasticsearch.index.fielddata.AbstractSortedDocValues; -import org.elasticsearch.index.fielddata.AbstractSortedNumericDocValues; -import org.elasticsearch.index.fielddata.AbstractSortedSetDocValues; -import org.elasticsearch.index.fielddata.FieldData; -import org.elasticsearch.index.fielddata.NumericDoubleValues; -import org.elasticsearch.index.fielddata.SortedBinaryDocValues; -import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; +import org.opensearch.index.fielddata.AbstractBinaryDocValues; +import org.opensearch.index.fielddata.AbstractNumericDocValues; +import org.opensearch.index.fielddata.AbstractSortedDocValues; +import org.opensearch.index.fielddata.AbstractSortedNumericDocValues; +import org.opensearch.index.fielddata.AbstractSortedSetDocValues; +import org.opensearch.index.fielddata.FieldData; +import org.opensearch.index.fielddata.NumericDoubleValues; +import org.opensearch.index.fielddata.SortedBinaryDocValues; +import org.opensearch.index.fielddata.SortedNumericDoubleValues; import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/opensearch/search/SearchHitTests.java b/server/src/test/java/org/opensearch/search/SearchHitTests.java index cf309f84919..0bec0ef93ff 100644 --- a/server/src/test/java/org/opensearch/search/SearchHitTests.java +++ b/server/src/test/java/org/opensearch/search/SearchHitTests.java @@ -34,9 +34,9 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.Index; +import org.opensearch.index.Index; import org.opensearch.index.get.GetResultTests; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import org.opensearch.search.SearchHit.NestedIdentity; import org.opensearch.search.fetch.subphase.highlight.HighlightField; import org.opensearch.search.fetch.subphase.highlight.HighlightFieldTests; diff --git a/server/src/test/java/org/opensearch/search/SearchHitsTests.java b/server/src/test/java/org/opensearch/search/SearchHitsTests.java index 74466345c13..78e5d6d0359 100644 --- a/server/src/test/java/org/opensearch/search/SearchHitsTests.java +++ b/server/src/test/java/org/opensearch/search/SearchHitsTests.java @@ -34,8 +34,8 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.Index; +import org.opensearch.index.shard.ShardId; import org.opensearch.test.AbstractSerializingTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/opensearch/search/aggregations/AggregationCollectorTests.java b/server/src/test/java/org/opensearch/search/aggregations/AggregationCollectorTests.java index d134542db6c..45c8a81fb86 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/AggregationCollectorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/AggregationCollectorTests.java @@ -21,7 +21,7 @@ package org.opensearch.search.aggregations; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.IndexService; +import org.opensearch.index.IndexService; import org.opensearch.search.internal.SearchContext; import org.opensearch.test.OpenSearchSingleNodeTestCase; diff --git a/server/src/test/java/org/opensearch/search/aggregations/AggregationTestScriptsPlugin.java b/server/src/test/java/org/opensearch/search/aggregations/AggregationTestScriptsPlugin.java index 4417563ba1b..c4d9918a529 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/AggregationTestScriptsPlugin.java +++ b/server/src/test/java/org/opensearch/search/aggregations/AggregationTestScriptsPlugin.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations; -import org.elasticsearch.index.fielddata.ScriptDocValues; +import org.opensearch.index.fielddata.ScriptDocValues; import org.opensearch.script.MockScriptPlugin; import org.opensearch.script.Script; import org.opensearch.script.ScriptType; diff --git a/server/src/test/java/org/opensearch/search/aggregations/AggregatorFactoriesTests.java b/server/src/test/java/org/opensearch/search/aggregations/AggregatorFactoriesTests.java index 3d5051fffb0..5c311a36afe 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/AggregatorFactoriesTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/AggregatorFactoriesTests.java @@ -31,12 +31,12 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.query.MatchAllQueryBuilder; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryRewriteContext; -import org.elasticsearch.index.query.TermsQueryBuilder; -import org.elasticsearch.index.query.WrapperQueryBuilder; +import org.opensearch.env.Environment; +import org.opensearch.index.query.MatchAllQueryBuilder; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryRewriteContext; +import org.opensearch.index.query.TermsQueryBuilder; +import org.opensearch.index.query.WrapperQueryBuilder; import org.opensearch.script.Script; import org.opensearch.search.SearchModule; import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/BucketsAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/BucketsAggregatorTests.java index aaa5c122208..948cdf07e42 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/BucketsAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/BucketsAggregatorTests.java @@ -28,8 +28,8 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; import org.opensearch.common.breaker.CircuitBreaker; -import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.index.mapper.NumberFieldMapper; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.search.aggregations.AggregatorFactories; import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.InternalAggregation; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/FilterTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/FilterTests.java index 65c6cb00691..4108f73b2f1 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/FilterTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/FilterTests.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.bucket; -import org.elasticsearch.index.query.QueryBuilders; +import org.opensearch.index.query.QueryBuilders; import org.opensearch.search.aggregations.BaseAggregationTestCase; import org.opensearch.search.aggregations.bucket.filter.FilterAggregationBuilder; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/FiltersTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/FiltersTests.java index c89ec8336db..c5b3a853ffd 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/FiltersTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/FiltersTests.java @@ -23,12 +23,12 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.query.BoolQueryBuilder; -import org.elasticsearch.index.query.MatchAllQueryBuilder; -import org.elasticsearch.index.query.MatchNoneQueryBuilder; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.index.query.QueryRewriteContext; +import org.opensearch.index.query.BoolQueryBuilder; +import org.opensearch.index.query.MatchAllQueryBuilder; +import org.opensearch.index.query.MatchNoneQueryBuilder; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryBuilders; +import org.opensearch.index.query.QueryRewriteContext; import org.opensearch.search.aggregations.AggregationBuilder; import org.opensearch.search.aggregations.BaseAggregationTestCase; import org.opensearch.search.aggregations.bucket.filter.FiltersAggregationBuilder; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/GlobalAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/GlobalAggregatorTests.java index a85e99ffe1c..d97be1e99eb 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/GlobalAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/GlobalAggregatorTests.java @@ -27,8 +27,8 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.opensearch.common.CheckedConsumer; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.NumberFieldMapper; import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.bucket.global.GlobalAggregationBuilder; import org.opensearch.search.aggregations.bucket.global.GlobalAggregator; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/MergingBucketsDeferringCollectorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/MergingBucketsDeferringCollectorTests.java index a4443f6e556..1536273f15e 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/MergingBucketsDeferringCollectorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/MergingBucketsDeferringCollectorTests.java @@ -61,13 +61,13 @@ public class MergingBucketsDeferringCollectorTests extends AggregatorTestCase { deferringCollector.prepareSelectedBuckets(0, 8, 9); equalTo( - org.elasticsearch.common.collect.Map.of( + org.opensearch.common.collect.Map.of( 0L, - org.elasticsearch.common.collect.List.of(0, 1, 2, 3, 4, 5, 6, 7), + org.opensearch.common.collect.List.of(0, 1, 2, 3, 4, 5, 6, 7), 1L, - org.elasticsearch.common.collect.List.of(8), + org.opensearch.common.collect.List.of(8), 2L, - org.elasticsearch.common.collect.List.of(9) + org.opensearch.common.collect.List.of(9) ) ); }); @@ -89,13 +89,13 @@ public class MergingBucketsDeferringCollectorTests extends AggregatorTestCase { assertThat( finalCollector.collection, equalTo( - org.elasticsearch.common.collect.Map.of( + org.opensearch.common.collect.Map.of( 0L, - org.elasticsearch.common.collect.List.of(4, 5, 6, 7), + org.opensearch.common.collect.List.of(4, 5, 6, 7), 1L, - org.elasticsearch.common.collect.List.of(8), + org.opensearch.common.collect.List.of(8), 2L, - org.elasticsearch.common.collect.List.of(9) + org.opensearch.common.collect.List.of(9) ) ) ); @@ -119,13 +119,13 @@ public class MergingBucketsDeferringCollectorTests extends AggregatorTestCase { assertThat( finalCollector.collection, equalTo( - org.elasticsearch.common.collect.Map.of( + org.opensearch.common.collect.Map.of( 0L, - org.elasticsearch.common.collect.List.of(0, 1, 2, 3), + org.opensearch.common.collect.List.of(0, 1, 2, 3), 1L, - org.elasticsearch.common.collect.List.of(8), + org.opensearch.common.collect.List.of(8), 2L, - org.elasticsearch.common.collect.List.of(9) + org.opensearch.common.collect.List.of(9) ) ) ); diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/SignificantTermsTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/SignificantTermsTests.java index 9fcc0f7796b..84ae8c7f2c6 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/SignificantTermsTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/SignificantTermsTests.java @@ -21,7 +21,7 @@ package org.opensearch.search.aggregations.bucket; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.automaton.RegExp; -import org.elasticsearch.index.query.QueryBuilders; +import org.opensearch.index.query.QueryBuilders; import org.opensearch.search.aggregations.BaseAggregationTestCase; import org.opensearch.search.aggregations.bucket.terms.IncludeExclude; import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregationBuilder; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/SignificantTextTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/SignificantTextTests.java index b1902b15d75..06390664288 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/SignificantTextTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/SignificantTextTests.java @@ -19,7 +19,7 @@ package org.opensearch.search.aggregations.bucket; -import org.elasticsearch.index.query.QueryBuilders; +import org.opensearch.index.query.QueryBuilders; import org.opensearch.search.aggregations.BaseAggregationTestCase; import org.opensearch.search.aggregations.bucket.terms.IncludeExclude; import org.opensearch.search.aggregations.bucket.terms.SignificantTextAggregationBuilder; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilderTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilderTests.java index 780a2c056bc..460f8e68b1d 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/adjacency/AdjacencyMatrixAggregationBuilderTests.java @@ -22,10 +22,10 @@ package org.opensearch.search.aggregations.bucket.adjacency; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.index.shard.IndexShard; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.index.shard.IndexShard; import org.opensearch.search.aggregations.AggregatorFactories; import org.opensearch.search.aggregations.AggregatorFactory; import org.opensearch.search.internal.SearchContext; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java index 94c2cf1caa5..85befe4aa10 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/CompositeAggregatorTests.java @@ -54,16 +54,16 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.text.Text; import org.opensearch.common.time.DateFormatter; import org.opensearch.common.time.DateFormatters; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.mapper.DateFieldMapper; -import org.elasticsearch.index.mapper.DocumentMapper; -import org.elasticsearch.index.mapper.GeoPointFieldMapper; -import org.elasticsearch.index.mapper.IpFieldMapper; -import org.elasticsearch.index.mapper.KeywordFieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.Index; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.mapper.DateFieldMapper; +import org.opensearch.index.mapper.DocumentMapper; +import org.opensearch.index.mapper.GeoPointFieldMapper; +import org.opensearch.index.mapper.IpFieldMapper; +import org.opensearch.index.mapper.KeywordFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.mapper.NumberFieldMapper; import org.opensearch.search.aggregations.Aggregator; import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.bucket.geogrid.GeoTileGridAggregationBuilder; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/CompositeValuesCollectorQueueTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/CompositeValuesCollectorQueueTests.java index 1efe4c809c1..1df69110aaf 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/CompositeValuesCollectorQueueTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/CompositeValuesCollectorQueueTests.java @@ -43,10 +43,10 @@ import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.NumericUtils; import org.opensearch.common.util.BigArrays; -import org.elasticsearch.index.fielddata.FieldData; -import org.elasticsearch.index.mapper.KeywordFieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.fielddata.FieldData; +import org.opensearch.index.mapper.KeywordFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.NumberFieldMapper; import org.opensearch.search.DocValueFormat; import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.LeafBucketCollector; @@ -58,8 +58,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import static org.elasticsearch.index.mapper.NumberFieldMapper.NumberType.DOUBLE; -import static org.elasticsearch.index.mapper.NumberFieldMapper.NumberType.LONG; +import static org.opensearch.index.mapper.NumberFieldMapper.NumberType.DOUBLE; +import static org.opensearch.index.mapper.NumberFieldMapper.NumberType.LONG; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/InternalCompositeTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/InternalCompositeTests.java index a97a6209d2e..9c1e5f26867 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/InternalCompositeTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/InternalCompositeTests.java @@ -21,7 +21,7 @@ package org.opensearch.search.aggregations.bucket.composite; import org.apache.lucene.util.BytesRef; import org.opensearch.common.time.DateFormatter; -import org.elasticsearch.index.mapper.DateFieldMapper; +import org.opensearch.index.mapper.DateFieldMapper; import org.opensearch.search.DocValueFormat; import org.opensearch.search.aggregations.InternalAggregation; import org.opensearch.search.aggregations.InternalAggregations; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/SingleDimensionValuesSourceTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/SingleDimensionValuesSourceTests.java index cfae4668457..5de3ddeaf48 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/SingleDimensionValuesSourceTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/composite/SingleDimensionValuesSourceTests.java @@ -29,10 +29,10 @@ import org.apache.lucene.search.IndexOrDocValuesQuery; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.TermQuery; import org.opensearch.common.util.BigArrays; -import org.elasticsearch.index.mapper.IpFieldMapper; -import org.elasticsearch.index.mapper.KeywordFieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.mapper.IpFieldMapper; +import org.opensearch.index.mapper.KeywordFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.NumberFieldMapper; import org.opensearch.search.DocValueFormat; import org.opensearch.test.OpenSearchTestCase; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/filter/FilterAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/filter/FilterAggregatorTests.java index 67a17dd31e1..2f4aa15b9c7 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/filter/FilterAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/filter/FilterAggregatorTests.java @@ -26,11 +26,11 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; -import org.elasticsearch.index.mapper.KeywordFieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.query.MatchAllQueryBuilder; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; +import org.opensearch.index.mapper.KeywordFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.query.MatchAllQueryBuilder; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryBuilders; import org.opensearch.search.aggregations.Aggregator.BucketComparator; import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.LeafBucketCollector; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java index 08c1a9b0d3c..10ae5fc1e4a 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/filter/FiltersAggregatorTests.java @@ -26,10 +26,10 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; -import org.elasticsearch.index.mapper.KeywordFieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; +import org.opensearch.index.mapper.KeywordFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryBuilders; import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.support.AggregationInspectionHelper; import org.junit.Before; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/filter/InternalFilterTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/filter/InternalFilterTests.java index 1408457168c..610c413ea71 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/filter/InternalFilterTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/filter/InternalFilterTests.java @@ -75,7 +75,7 @@ public class InternalFilterTests extends InternalSingleBucketAggregationTestCase } }; PipelineTree tree = new PipelineTree( - org.elasticsearch.common.collect.Map.of(inner.getName(), new PipelineTree(emptyMap(), singletonList(mockPipeline))), + org.opensearch.common.collect.Map.of(inner.getName(), new PipelineTree(emptyMap(), singletonList(mockPipeline))), emptyList()); InternalFilter reduced = (InternalFilter) test.reducePipelines(test, emptyReduceContextBuilder().forFinalReduction(), tree); assertThat(reduced.getAggregations().get(dummy.getName()), sameInstance(dummy)); diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/filter/InternalFiltersTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/filter/InternalFiltersTests.java index dda54ab74b2..b808efae19c 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/filter/InternalFiltersTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/filter/InternalFiltersTests.java @@ -142,7 +142,7 @@ public class InternalFiltersTests extends InternalMultiBucketAggregationTestCase } }; PipelineTree tree = new PipelineTree( - org.elasticsearch.common.collect.Map.of(inner.getName(), new PipelineTree(emptyMap(), singletonList(mockPipeline))), + org.opensearch.common.collect.Map.of(inner.getName(), new PipelineTree(emptyMap(), singletonList(mockPipeline))), emptyList()); InternalFilters reduced = (InternalFilters) test.reducePipelines(test, emptyReduceContextBuilder().forFinalReduction(), tree); for (InternalFilters.InternalBucket bucket : reduced.getBuckets()) { diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoGridAggregatorTestCase.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoGridAggregatorTestCase.java index 1ba584fc6c2..7d815347d86 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoGridAggregatorTestCase.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoGridAggregatorTestCase.java @@ -34,8 +34,8 @@ import org.opensearch.common.CheckedConsumer; import org.opensearch.common.geo.GeoBoundingBox; import org.opensearch.common.geo.GeoBoundingBoxTests; import org.opensearch.common.geo.GeoUtils; -import org.elasticsearch.index.mapper.GeoPointFieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.GeoPointFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; import org.opensearch.search.aggregations.Aggregation; import org.opensearch.search.aggregations.Aggregator; import org.opensearch.search.aggregations.AggregatorTestCase; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregatorTests.java index 8eacc056657..2307f1b2eab 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregatorTests.java @@ -37,10 +37,10 @@ import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.CheckedBiConsumer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.mapper.DateFieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.mapper.DateFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.NumberFieldMapper; import org.opensearch.search.aggregations.Aggregation; import org.opensearch.search.aggregations.AggregationBuilder; import org.opensearch.search.aggregations.AggregationBuilders; @@ -279,7 +279,7 @@ public class AutoDateHistogramAggregatorTests extends DateHistogramAggregatorTes BytesRef cBytes = new BytesRef("c"); int n = 0; for (long d = start; d < end; d += anHour) { - docs.add(org.elasticsearch.common.collect.List.of( + docs.add(org.opensearch.common.collect.List.of( new SortedNumericDocValuesField(AGGREGABLE_DATE, d), new SortedSetDocValuesField("k1", aBytes), new SortedSetDocValuesField("k1", d < useC ? bBytes : cBytes), @@ -343,7 +343,7 @@ public class AutoDateHistogramAggregatorTests extends DateHistogramAggregatorTes List> docs = new ArrayList<>(); int n = 0; for (long d = start; d < end; d += anHour) { - docs.add(org.elasticsearch.common.collect.List.of( + docs.add(org.opensearch.common.collect.List.of( new SortedNumericDocValuesField(AGGREGABLE_DATE, d), new SortedNumericDocValuesField("n", n % 100) )); diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTestCase.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTestCase.java index 0d66157b802..647b9225a6f 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTestCase.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTestCase.java @@ -25,10 +25,10 @@ import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.util.BytesRef; import org.opensearch.common.CheckedBiConsumer; -import org.elasticsearch.index.mapper.DateFieldMapper; -import org.elasticsearch.index.mapper.KeywordFieldMapper; -import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType; +import org.opensearch.index.mapper.DateFieldMapper; +import org.opensearch.index.mapper.KeywordFieldMapper; +import org.opensearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.mapper.NumberFieldMapper.NumberType; import org.opensearch.search.aggregations.AggregationBuilder; import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.InternalAggregation; @@ -49,31 +49,31 @@ public abstract class DateHistogramAggregatorTestCase extends AggregatorTestCase protected final void asSubAggTestCase(AggregationBuilder builder, Consumer verify) throws IOException { CheckedBiConsumer buildIndex = (iw, dft) -> { - iw.addDocument(org.elasticsearch.common.collect.List.of( + iw.addDocument(org.opensearch.common.collect.List.of( new SortedNumericDocValuesField(AGGREGABLE_DATE, dft.parse("2020-02-01T00:00:00Z")), new SortedSetDocValuesField("k1", new BytesRef("a")), new SortedSetDocValuesField("k2", new BytesRef("a")), new SortedNumericDocValuesField("n", 1) )); - iw.addDocument(org.elasticsearch.common.collect.List.of( + iw.addDocument(org.opensearch.common.collect.List.of( new SortedNumericDocValuesField(AGGREGABLE_DATE, dft.parse("2020-03-01T00:00:00Z")), new SortedSetDocValuesField("k1", new BytesRef("a")), new SortedSetDocValuesField("k2", new BytesRef("a")), new SortedNumericDocValuesField("n", 2) )); - iw.addDocument(org.elasticsearch.common.collect.List.of( + iw.addDocument(org.opensearch.common.collect.List.of( new SortedNumericDocValuesField(AGGREGABLE_DATE, dft.parse("2021-02-01T00:00:00Z")), new SortedSetDocValuesField("k1", new BytesRef("a")), new SortedSetDocValuesField("k2", new BytesRef("a")), new SortedNumericDocValuesField("n", 3) )); - iw.addDocument(org.elasticsearch.common.collect.List.of( + iw.addDocument(org.opensearch.common.collect.List.of( new SortedNumericDocValuesField(AGGREGABLE_DATE, dft.parse("2021-03-01T00:00:00Z")), new SortedSetDocValuesField("k1", new BytesRef("a")), new SortedSetDocValuesField("k2", new BytesRef("b")), new SortedNumericDocValuesField("n", 4) )); - iw.addDocument(org.elasticsearch.common.collect.List.of( + iw.addDocument(org.opensearch.common.collect.List.of( new SortedNumericDocValuesField(AGGREGABLE_DATE, dft.parse("2020-02-01T00:00:00Z")), new SortedSetDocValuesField("k1", new BytesRef("b")), new SortedSetDocValuesField("k2", new BytesRef("b")), diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java index b75faad1d2f..26fcec8b5f9 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregatorTests.java @@ -31,7 +31,7 @@ import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.opensearch.common.time.DateFormatters; -import org.elasticsearch.index.mapper.DateFieldMapper; +import org.opensearch.index.mapper.DateFieldMapper; import org.opensearch.search.aggregations.AggregationBuilder; import org.opensearch.search.aggregations.BucketOrder; import org.opensearch.search.aggregations.bucket.terms.StringTerms; @@ -147,14 +147,14 @@ public class DateHistogramAggregatorTests extends DateHistogramAggregatorTestCas StringTerms.Bucket a = terms.getBucketByKey("a"); InternalDateHistogram adh = a.getAggregations().get("dh"); assertThat(adh.getBuckets().stream().map(bucket -> bucket.getKey().toString()).collect(toList()), - equalTo(org.elasticsearch.common.collect.List.of("2020-01-01T00:00Z", "2021-01-01T00:00Z") + equalTo(org.opensearch.common.collect.List.of("2020-01-01T00:00Z", "2021-01-01T00:00Z") )); StringTerms.Bucket b = terms.getBucketByKey("b"); InternalDateHistogram bdh = b.getAggregations().get("dh"); assertThat( bdh.getBuckets().stream().map(bucket -> bucket.getKey().toString()).collect(toList()), - equalTo(org.elasticsearch.common.collect.List.of("2020-01-01T00:00Z")) + equalTo(org.opensearch.common.collect.List.of("2020-01-01T00:00Z")) ); }); builder = new TermsAggregationBuilder("k2").field("k2").subAggregation(builder); @@ -165,7 +165,7 @@ public class DateHistogramAggregatorTests extends DateHistogramAggregatorTestCas InternalDateHistogram ak1adh = ak1a.getAggregations().get("dh"); assertThat( ak1adh.getBuckets().stream().map(bucket -> bucket.getKey().toString()).collect(toList()), - equalTo(org.elasticsearch.common.collect.List.of("2020-01-01T00:00Z", "2021-01-01T00:00Z")) + equalTo(org.opensearch.common.collect.List.of("2020-01-01T00:00Z", "2021-01-01T00:00Z")) ); StringTerms.Bucket b = terms.getBucketByKey("b"); @@ -174,13 +174,13 @@ public class DateHistogramAggregatorTests extends DateHistogramAggregatorTestCas InternalDateHistogram bk1adh = bk1a.getAggregations().get("dh"); assertThat( bk1adh.getBuckets().stream().map(bucket -> bucket.getKey().toString()).collect(toList()), - equalTo(org.elasticsearch.common.collect.List.of("2021-01-01T00:00Z")) + equalTo(org.opensearch.common.collect.List.of("2021-01-01T00:00Z")) ); StringTerms.Bucket bk1b = bk1.getBucketByKey("b"); InternalDateHistogram bk1bdh = bk1b.getAggregations().get("dh"); assertThat( bk1bdh.getBuckets().stream().map(bucket -> bucket.getKey().toString()).collect(toList()), - equalTo(org.elasticsearch.common.collect.List.of("2020-01-01T00:00Z")) + equalTo(org.opensearch.common.collect.List.of("2020-01-01T00:00Z")) ); }); } diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DateRangeHistogramAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DateRangeHistogramAggregatorTests.java index 76f1053ded9..27ac4ae4bc4 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DateRangeHistogramAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/DateRangeHistogramAggregatorTests.java @@ -33,10 +33,10 @@ import org.apache.lucene.util.BytesRef; import org.opensearch.common.CheckedConsumer; import org.opensearch.common.lucene.search.Queries; import org.opensearch.common.time.DateFormatters; -import org.elasticsearch.index.mapper.DateFieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.RangeFieldMapper; -import org.elasticsearch.index.mapper.RangeType; +import org.opensearch.index.mapper.DateFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.RangeFieldMapper; +import org.opensearch.index.mapper.RangeType; import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.support.AggregationInspectionHelper; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalAutoDateHistogramTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalAutoDateHistogramTests.java index 75bd37f2eba..e719bd15706 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalAutoDateHistogramTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalAutoDateHistogramTests.java @@ -21,7 +21,7 @@ package org.opensearch.search.aggregations.bucket.histogram; import org.opensearch.common.Rounding; import org.opensearch.common.time.DateFormatter; -import org.elasticsearch.index.mapper.DateFieldMapper; +import org.opensearch.index.mapper.DateFieldMapper; import org.opensearch.search.DocValueFormat; import org.opensearch.search.aggregations.InternalAggregation; import org.opensearch.search.aggregations.InternalAggregations; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalVariableWidthHistogramTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalVariableWidthHistogramTests.java index af6608744ec..7a59f40e980 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalVariableWidthHistogramTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/InternalVariableWidthHistogramTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.breaker.CircuitBreaker; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.MockBigArrays; import org.opensearch.common.util.MockPageCacheRecycler; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.script.ScriptService; import org.opensearch.search.DocValueFormat; import org.opensearch.search.aggregations.InternalAggregation; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/LongBoundsTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/LongBoundsTests.java index b23322ee032..b75918a3647 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/LongBoundsTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/LongBoundsTests.java @@ -31,9 +31,9 @@ import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.mapper.DateFieldMapper; -import org.elasticsearch.index.query.QueryShardContext; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.mapper.DateFieldMapper; +import org.opensearch.index.query.QueryShardContext; import org.opensearch.search.DocValueFormat; import org.opensearch.test.OpenSearchTestCase; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/NumericHistogramAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/NumericHistogramAggregatorTests.java index d1832e5b55a..4c608f2cb59 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/NumericHistogramAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/NumericHistogramAggregatorTests.java @@ -31,9 +31,9 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.NumericUtils; import org.opensearch.common.CheckedConsumer; -import org.elasticsearch.index.mapper.DateFieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.mapper.DateFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.NumberFieldMapper; import org.opensearch.search.aggregations.AggregationBuilder; import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.metrics.InternalMin; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/RangeHistogramAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/RangeHistogramAggregatorTests.java index 8ee09793638..22c2f62bdba 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/RangeHistogramAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/RangeHistogramAggregatorTests.java @@ -31,8 +31,8 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.opensearch.common.CheckedConsumer; import org.opensearch.common.network.InetAddresses; -import org.elasticsearch.index.mapper.RangeFieldMapper; -import org.elasticsearch.index.mapper.RangeType; +import org.opensearch.index.mapper.RangeFieldMapper; +import org.opensearch.index.mapper.RangeType; import org.opensearch.search.aggregations.AggregationBuilder; import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.metrics.InternalMin; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregatorTests.java index 14a84cb5f9c..10098717aef 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregatorTests.java @@ -33,9 +33,9 @@ import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.CheckedConsumer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.NumberFieldMapper; import org.opensearch.search.aggregations.AggregationBuilder; import org.opensearch.search.aggregations.AggregationBuilders; import org.opensearch.search.aggregations.AggregatorTestCase; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/missing/MissingAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/missing/MissingAggregatorTests.java index 95ed47bde2f..21f48d38f90 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/missing/MissingAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/missing/MissingAggregatorTests.java @@ -31,11 +31,11 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.opensearch.common.CheckedConsumer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType; -import org.elasticsearch.index.mapper.RangeFieldMapper; -import org.elasticsearch.index.mapper.RangeType; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.mapper.NumberFieldMapper.NumberType; +import org.opensearch.index.mapper.RangeFieldMapper; +import org.opensearch.index.mapper.RangeType; import org.opensearch.script.MockScriptEngine; import org.opensearch.script.Script; import org.opensearch.script.ScriptEngine; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/nested/ReverseNestedAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/nested/ReverseNestedAggregatorTests.java index ff4366616f6..877034f5b7e 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/nested/ReverseNestedAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/nested/ReverseNestedAggregatorTests.java @@ -27,12 +27,12 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; -import org.elasticsearch.index.mapper.IdFieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.index.mapper.SeqNoFieldMapper; -import org.elasticsearch.index.mapper.TypeFieldMapper; -import org.elasticsearch.index.mapper.Uid; +import org.opensearch.index.mapper.IdFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.mapper.SeqNoFieldMapper; +import org.opensearch.index.mapper.TypeFieldMapper; +import org.opensearch.index.mapper.Uid; import org.opensearch.search.aggregations.AggregationBuilder; import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.InternalAggregation; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java index c3340c2cef2..c10b4c69041 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/BinaryRangeAggregatorTests.java @@ -25,8 +25,8 @@ import java.util.Set; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.TestUtil; -import org.elasticsearch.index.fielddata.AbstractSortedSetDocValues; -import org.elasticsearch.index.fielddata.SortedBinaryDocValues; +import org.opensearch.index.fielddata.AbstractSortedSetDocValues; +import org.opensearch.index.fielddata.SortedBinaryDocValues; import org.opensearch.search.aggregations.LeafBucketCollector; import org.opensearch.search.aggregations.bucket.range.BinaryRangeAggregator.SortedBinaryRangeLeafCollector; import org.opensearch.search.aggregations.bucket.range.BinaryRangeAggregator.SortedSetRangeLeafCollector; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java index d3a6a760a6a..a25056d36f6 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/DateRangeAggregatorTests.java @@ -32,10 +32,10 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.opensearch.OpenSearchParseException; import org.opensearch.common.CheckedConsumer; -import org.elasticsearch.index.mapper.DateFieldMapper; -import org.elasticsearch.index.mapper.KeywordFieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.mapper.DateFieldMapper; +import org.opensearch.index.mapper.KeywordFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.NumberFieldMapper; import org.opensearch.search.aggregations.Aggregation; import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.MultiBucketConsumerService; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java index f9a52ac3bbb..06593d3baab 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/IpRangeAggregatorTests.java @@ -29,8 +29,8 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.opensearch.common.collect.Tuple; import org.opensearch.common.network.NetworkAddress; -import org.elasticsearch.index.mapper.IpFieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.IpFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; import org.opensearch.search.DocValueFormat; import org.opensearch.search.aggregations.AggregatorTestCase; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/RangeAggregationBuilderTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/RangeAggregationBuilderTests.java index 0a1adc2cc5a..881d2cb3cf5 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/range/RangeAggregationBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/range/RangeAggregationBuilderTests.java @@ -114,6 +114,6 @@ public class RangeAggregationBuilderTests extends AbstractSerializingTestCase evenRare = even.getAggregations().get("rare"); assertEquals( evenRare.getBuckets().stream().map(InternalRareTerms.Bucket::getKeyAsString).collect(toList()), - org.elasticsearch.common.collect.List.of("2") + org.opensearch.common.collect.List.of("2") ); assertEquals( evenRare.getBuckets().stream().map(InternalRareTerms.Bucket::getDocCount).collect(toList()), - org.elasticsearch.common.collect.List.of(2L) + org.opensearch.common.collect.List.of(2L) ); StringTerms.Bucket odd = terms.getBucketByKey("odd"); InternalRareTerms oddRare = odd.getAggregations().get("rare"); assertEquals( oddRare.getBuckets().stream().map(InternalRareTerms.Bucket::getKeyAsString).collect(toList()), - org.elasticsearch.common.collect.List.of("1") + org.opensearch.common.collect.List.of("1") ); assertEquals( oddRare.getBuckets().stream().map(InternalRareTerms.Bucket::getDocCount).collect(toList()), - org.elasticsearch.common.collect.List.of(1L) + org.opensearch.common.collect.List.of(1L) ); } } diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/SignificantTermsAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/SignificantTermsAggregatorTests.java index 7c1a9e98779..0e34e15ce20 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/SignificantTermsAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/SignificantTermsAggregatorTests.java @@ -37,19 +37,19 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.index.analysis.AnalyzerScope; -import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.index.mapper.BinaryFieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.index.mapper.NumberFieldMapper.NumberFieldType; -import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType; -import org.elasticsearch.index.mapper.RangeFieldMapper; -import org.elasticsearch.index.mapper.RangeType; -import org.elasticsearch.index.mapper.TextFieldMapper; -import org.elasticsearch.index.mapper.TextFieldMapper.TextFieldType; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; +import org.opensearch.index.analysis.AnalyzerScope; +import org.opensearch.index.analysis.NamedAnalyzer; +import org.opensearch.index.mapper.BinaryFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.mapper.NumberFieldMapper.NumberFieldType; +import org.opensearch.index.mapper.NumberFieldMapper.NumberType; +import org.opensearch.index.mapper.RangeFieldMapper; +import org.opensearch.index.mapper.RangeType; +import org.opensearch.index.mapper.TextFieldMapper; +import org.opensearch.index.mapper.TextFieldMapper.TextFieldType; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryBuilders; import org.opensearch.search.aggregations.AggregationBuilder; import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.bucket.terms.SignificantTermsAggregatorFactory.ExecutionMode; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/SignificantTextAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/SignificantTextAggregatorTests.java index 3470a5170f8..a535fe189f1 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/SignificantTextAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/SignificantTextAggregatorTests.java @@ -34,13 +34,13 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; -import org.elasticsearch.index.analysis.AnalyzerScope; -import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.index.mapper.BinaryFieldMapper; -import org.elasticsearch.index.mapper.GeoPointFieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.TextFieldMapper; -import org.elasticsearch.index.mapper.TextFieldMapper.TextFieldType; +import org.opensearch.index.analysis.AnalyzerScope; +import org.opensearch.index.analysis.NamedAnalyzer; +import org.opensearch.index.mapper.BinaryFieldMapper; +import org.opensearch.index.mapper.GeoPointFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.TextFieldMapper; +import org.opensearch.index.mapper.TextFieldMapper.TextFieldType; import org.opensearch.search.aggregations.AggregationBuilder; import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.bucket.sampler.InternalSampler; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/TermsAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/TermsAggregatorTests.java index 46f8988a9bf..cc6fbf67e55 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/TermsAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/terms/TermsAggregatorTests.java @@ -46,22 +46,22 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.text.Text; import org.opensearch.common.util.MockBigArrays; import org.opensearch.common.util.MockPageCacheRecycler; -import org.elasticsearch.index.mapper.DocumentMapper; -import org.elasticsearch.index.mapper.GeoPointFieldMapper; -import org.elasticsearch.index.mapper.IdFieldMapper; -import org.elasticsearch.index.mapper.IpFieldMapper; -import org.elasticsearch.index.mapper.KeywordFieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.index.mapper.RangeFieldMapper; -import org.elasticsearch.index.mapper.RangeType; -import org.elasticsearch.index.mapper.SeqNoFieldMapper; -import org.elasticsearch.index.mapper.TypeFieldMapper; -import org.elasticsearch.index.mapper.Uid; -import org.elasticsearch.index.query.MatchAllQueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.index.mapper.DocumentMapper; +import org.opensearch.index.mapper.GeoPointFieldMapper; +import org.opensearch.index.mapper.IdFieldMapper; +import org.opensearch.index.mapper.IpFieldMapper; +import org.opensearch.index.mapper.KeywordFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.mapper.RangeFieldMapper; +import org.opensearch.index.mapper.RangeType; +import org.opensearch.index.mapper.SeqNoFieldMapper; +import org.opensearch.index.mapper.TypeFieldMapper; +import org.opensearch.index.mapper.Uid; +import org.opensearch.index.query.MatchAllQueryBuilder; +import org.opensearch.index.query.QueryBuilders; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.script.MockScriptEngine; import org.opensearch.script.Script; import org.opensearch.script.ScriptEngine; @@ -113,7 +113,7 @@ import java.util.function.Function; import static java.util.Arrays.asList; import static java.util.Collections.singleton; -import static org.elasticsearch.index.mapper.SeqNoFieldMapper.PRIMARY_TERM_NAME; +import static org.opensearch.index.mapper.SeqNoFieldMapper.PRIMARY_TERM_NAME; import static org.opensearch.search.aggregations.AggregationBuilders.terms; import static org.opensearch.search.aggregations.PipelineAggregatorBuilders.bucketScript; import static org.hamcrest.Matchers.equalTo; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/AdjacencyMatrixTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/AdjacencyMatrixTests.java index 21ef1dc90c3..4af01dc1ab2 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/AdjacencyMatrixTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/AdjacencyMatrixTests.java @@ -19,9 +19,9 @@ package org.opensearch.search.aggregations.metrics; -import org.elasticsearch.index.query.MatchNoneQueryBuilder; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; +import org.opensearch.index.query.MatchNoneQueryBuilder; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryBuilders; import org.opensearch.search.aggregations.BaseAggregationTestCase; import org.opensearch.search.aggregations.bucket.adjacency.AdjacencyMatrixAggregationBuilder; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/AvgAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/AvgAggregatorTests.java index 4507e9ed2fe..388836a65ca 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/AvgAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/AvgAggregatorTests.java @@ -35,8 +35,8 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.NumericUtils; import org.opensearch.common.CheckedConsumer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.NumberFieldMapper; import org.opensearch.script.MockScriptEngine; import org.opensearch.script.Script; import org.opensearch.script.ScriptEngine; @@ -69,7 +69,7 @@ import java.util.function.Consumer; import java.util.function.Function; import static java.util.Collections.singleton; -import static org.elasticsearch.index.query.QueryBuilders.termQuery; +import static org.opensearch.index.query.QueryBuilders.termQuery; public class AvgAggregatorTests extends AggregatorTestCase { diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/CardinalityAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/CardinalityAggregatorTests.java index cb3bcd85403..be5a7a698f1 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/CardinalityAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/CardinalityAggregatorTests.java @@ -29,10 +29,10 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; import org.opensearch.common.CheckedConsumer; import org.opensearch.common.geo.GeoPoint; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.index.mapper.RangeFieldMapper; -import org.elasticsearch.index.mapper.RangeType; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.mapper.RangeFieldMapper; +import org.opensearch.index.mapper.RangeType; import org.opensearch.search.aggregations.AggregationBuilder; import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.support.AggregationInspectionHelper; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/ExtendedStatsAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/ExtendedStatsAggregatorTests.java index a2e463bcfbd..76a945d4d5c 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/ExtendedStatsAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/ExtendedStatsAggregatorTests.java @@ -29,8 +29,8 @@ import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.util.NumericUtils; import org.opensearch.common.CheckedConsumer; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.NumberFieldMapper; import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.support.AggregationInspectionHelper; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/GeoBoundsAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/GeoBoundsAggregatorTests.java index ea22adfb08d..b0f0ac1b0f2 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/GeoBoundsAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/GeoBoundsAggregatorTests.java @@ -27,8 +27,8 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.opensearch.common.geo.GeoPoint; -import org.elasticsearch.index.mapper.GeoPointFieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.GeoPointFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.support.AggregationInspectionHelper; import org.opensearch.test.geo.RandomGeoGenerator; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/GeoCentroidAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/GeoCentroidAggregatorTests.java index b7d26c6f934..517abc6bfc9 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/GeoCentroidAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/GeoCentroidAggregatorTests.java @@ -26,8 +26,8 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.opensearch.common.geo.GeoPoint; -import org.elasticsearch.index.mapper.GeoPointFieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.GeoPointFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; import org.opensearch.search.aggregations.AggregationBuilder; import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.support.AggregationInspectionHelper; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/HDRPercentileRanksAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/HDRPercentileRanksAggregatorTests.java index a76f5dcde29..1d76f065c94 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/HDRPercentileRanksAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/HDRPercentileRanksAggregatorTests.java @@ -28,8 +28,8 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.util.NumericUtils; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.NumberFieldMapper; import org.opensearch.search.aggregations.AggregationBuilder; import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.support.AggregationInspectionHelper; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/HDRPercentilesAggregatorTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/HDRPercentilesAggregatorTests.java index 3f0268b0612..148e0ceacbf 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/HDRPercentilesAggregatorTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/HDRPercentilesAggregatorTests.java @@ -34,11 +34,11 @@ import org.apache.lucene.search.Query; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.opensearch.common.CheckedConsumer; -import org.elasticsearch.index.mapper.KeywordFieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.index.mapper.RangeFieldMapper; -import org.elasticsearch.index.mapper.RangeType; +import org.opensearch.index.mapper.KeywordFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.mapper.RangeFieldMapper; +import org.opensearch.index.mapper.RangeType; import org.opensearch.search.aggregations.AggregationBuilder; import org.opensearch.search.aggregations.AggregatorTestCase; import org.opensearch.search.aggregations.support.AggregationInspectionHelper; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/HyperLogLogPlusPlusSparseTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/HyperLogLogPlusPlusSparseTests.java index 32412642114..e58847338e4 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/HyperLogLogPlusPlusSparseTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/HyperLogLogPlusPlusSparseTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.breaker.CircuitBreakingException; import org.opensearch.common.breaker.NoopCircuitBreaker; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.util.BigArrays; -import org.elasticsearch.indices.breaker.CircuitBreakerService; +import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.test.OpenSearchTestCase; import org.hamcrest.CoreMatchers; import org.hamcrest.Matchers; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/HyperLogLogPlusPlusTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/HyperLogLogPlusPlusTests.java index 96df93fdc29..4d6eccbf3b8 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/HyperLogLogPlusPlusTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/HyperLogLogPlusPlusTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.breaker.CircuitBreaker; import org.opensearch.common.breaker.CircuitBreakingException; import org.opensearch.common.breaker.NoopCircuitBreaker; import org.opensearch.common.util.BigArrays; -import org.elasticsearch.indices.breaker.CircuitBreakerService; +import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.test.OpenSearchTestCase; import java.util.concurrent.atomic.AtomicLong; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalCardinalityTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalCardinalityTests.java index d6f1918c520..3ce3713fd3e 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalCardinalityTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalCardinalityTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.lease.Releasables; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.MockBigArrays; import org.opensearch.common.util.MockPageCacheRecycler; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.search.aggregations.ParsedAggregation; import org.opensearch.test.InternalAggregationTestCase; import org.junit.After; diff --git a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalScriptedMetricTests.java b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalScriptedMetricTests.java index c13f5650dcc..6de66878934 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalScriptedMetricTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/metrics/InternalScriptedMetricTests.java @@ -256,7 +256,7 @@ public class InternalScriptedMetricTests extends InternalAggregationTestCase fieldAndFormats = org.elasticsearch.common.collect.List.of( + List fieldAndFormats = org.opensearch.common.collect.List.of( new FieldAndFormat("field", null), new FieldAndFormat("object.field", null)); Map fields = fetchFields(mapperService, source, fieldAndFormats); @@ -80,7 +80,7 @@ public class FieldFetcherTests extends OpenSearchSingleNodeTestCase { DocumentField rangeField = fields.get("float_range"); assertNotNull(rangeField); assertThat(rangeField.getValues().size(), equalTo(1)); - assertThat(rangeField.getValue(), equalTo(org.elasticsearch.common.collect.Map.of("gte", 0.0f, "lte", 2.718f))); + assertThat(rangeField.getValue(), equalTo(org.opensearch.common.collect.Map.of("gte", 0.0f, "lte", 2.718f))); } public void testNonExistentField() throws IOException { @@ -211,7 +211,7 @@ public class FieldFetcherTests extends OpenSearchSingleNodeTestCase { .field("date_field", "1990-12-29T00:00:00.000Z") .endObject(); - Map fields = fetchFields(mapperService, source, org.elasticsearch.common.collect.List.of( + Map fields = fetchFields(mapperService, source, org.opensearch.common.collect.List.of( new FieldAndFormat("field", null), new FieldAndFormat("date_field", "yyyy/MM/dd"))); assertThat(fields.size(), equalTo(2)); @@ -391,7 +391,7 @@ public class FieldFetcherTests extends OpenSearchSingleNodeTestCase { private Map fetchFields(MapperService mapperService, XContentBuilder source, String fieldPattern) throws IOException { - List fields = org.elasticsearch.common.collect.List.of(new FieldAndFormat(fieldPattern, null)); + List fields = org.opensearch.common.collect.List.of(new FieldAndFormat(fieldPattern, null)); return fetchFields(mapperService, source, fields); } @@ -402,7 +402,7 @@ public class FieldFetcherTests extends OpenSearchSingleNodeTestCase { sourceLookup.setSource(BytesReference.bytes(source)); FieldFetcher fieldFetcher = FieldFetcher.create(mapperService, null, fields); - return fieldFetcher.fetch(sourceLookup, org.elasticsearch.common.collect.Set.of()); + return fieldFetcher.fetch(sourceLookup, org.opensearch.common.collect.Set.of()); } public MapperService createMapperService() throws IOException { diff --git a/server/src/test/java/org/opensearch/search/fetch/subphase/highlight/CustomHighlighter.java b/server/src/test/java/org/opensearch/search/fetch/subphase/highlight/CustomHighlighter.java index 1d8e9f0eeba..cbd45b78551 100644 --- a/server/src/test/java/org/opensearch/search/fetch/subphase/highlight/CustomHighlighter.java +++ b/server/src/test/java/org/opensearch/search/fetch/subphase/highlight/CustomHighlighter.java @@ -19,7 +19,7 @@ package org.opensearch.search.fetch.subphase.highlight; import org.opensearch.common.text.Text; -import org.elasticsearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.MappedFieldType; import java.util.ArrayList; import java.util.List; diff --git a/server/src/test/java/org/opensearch/search/geo/GeoPointShapeQueryTests.java b/server/src/test/java/org/opensearch/search/geo/GeoPointShapeQueryTests.java index 61b15fe4640..ceaa686a54d 100644 --- a/server/src/test/java/org/opensearch/search/geo/GeoPointShapeQueryTests.java +++ b/server/src/test/java/org/opensearch/search/geo/GeoPointShapeQueryTests.java @@ -37,8 +37,8 @@ import org.opensearch.geometry.MultiLine; import org.opensearch.geometry.MultiPoint; import org.opensearch.geometry.Point; import org.opensearch.geometry.Rectangle; -import org.elasticsearch.index.query.GeoShapeQueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; +import org.opensearch.index.query.GeoShapeQueryBuilder; +import org.opensearch.index.query.QueryBuilders; import static org.hamcrest.Matchers.containsString; diff --git a/server/src/test/java/org/opensearch/search/internal/AliasFilterTests.java b/server/src/test/java/org/opensearch/search/internal/AliasFilterTests.java index a834f31f001..6167cf5041f 100644 --- a/server/src/test/java/org/opensearch/search/internal/AliasFilterTests.java +++ b/server/src/test/java/org/opensearch/search/internal/AliasFilterTests.java @@ -20,9 +20,9 @@ package org.opensearch.search.internal; import org.opensearch.common.io.stream.BytesStreamOutput; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.index.query.TermQueryBuilder; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryBuilders; +import org.opensearch.index.query.TermQueryBuilder; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.EqualsHashCodeTestUtils; diff --git a/server/src/test/java/org/opensearch/search/internal/ShardSearchRequestTests.java b/server/src/test/java/org/opensearch/search/internal/ShardSearchRequestTests.java index 3c839e12dc9..c0c37d0a6e9 100644 --- a/server/src/test/java/org/opensearch/search/internal/ShardSearchRequestTests.java +++ b/server/src/test/java/org/opensearch/search/internal/ShardSearchRequestTests.java @@ -35,11 +35,11 @@ import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryBuilders; import org.opensearch.index.query.RandomQueryBuilder; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.indices.InvalidAliasNameException; +import org.opensearch.index.shard.ShardId; +import org.opensearch.indices.InvalidAliasNameException; import org.opensearch.search.AbstractSearchTestCase; import org.opensearch.test.VersionUtils; import org.opensearch.search.SearchSortValuesAndFormatsTests; @@ -47,8 +47,8 @@ import org.opensearch.search.SearchSortValuesAndFormatsTests; import java.io.IOException; import java.io.InputStream; -import static org.elasticsearch.index.query.AbstractQueryBuilder.parseInnerQueryBuilder; -import static org.elasticsearch.index.query.QueryBuilders.termQuery; +import static org.opensearch.index.query.AbstractQueryBuilder.parseInnerQueryBuilder; +import static org.opensearch.index.query.QueryBuilders.termQuery; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; diff --git a/server/src/test/java/org/opensearch/search/lookup/LeafDocLookupTests.java b/server/src/test/java/org/opensearch/search/lookup/LeafDocLookupTests.java index 608238b8c8e..7528fcd9e5c 100644 --- a/server/src/test/java/org/opensearch/search/lookup/LeafDocLookupTests.java +++ b/server/src/test/java/org/opensearch/search/lookup/LeafDocLookupTests.java @@ -18,11 +18,11 @@ */ package org.opensearch.search.lookup; -import org.elasticsearch.index.fielddata.LeafFieldData; -import org.elasticsearch.index.fielddata.IndexFieldData; -import org.elasticsearch.index.fielddata.ScriptDocValues; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.MapperService; +import org.opensearch.index.fielddata.LeafFieldData; +import org.opensearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.ScriptDocValues; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.MapperService; import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; diff --git a/server/src/test/java/org/opensearch/search/lookup/LeafFieldsLookupTests.java b/server/src/test/java/org/opensearch/search/lookup/LeafFieldsLookupTests.java index 15cbd384d07..a8ad1391afe 100644 --- a/server/src/test/java/org/opensearch/search/lookup/LeafFieldsLookupTests.java +++ b/server/src/test/java/org/opensearch/search/lookup/LeafFieldsLookupTests.java @@ -23,8 +23,8 @@ import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.StoredFieldVisitor; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.MapperService; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.MapperService; import org.opensearch.test.OpenSearchTestCase; import org.junit.Before; diff --git a/server/src/test/java/org/opensearch/search/profile/ProfileResultTests.java b/server/src/test/java/org/opensearch/search/profile/ProfileResultTests.java index 69fbd0319e6..a057359d043 100644 --- a/server/src/test/java/org/opensearch/search/profile/ProfileResultTests.java +++ b/server/src/test/java/org/opensearch/search/profile/ProfileResultTests.java @@ -111,18 +111,18 @@ public class ProfileResultTests extends OpenSearchTestCase { children.add(new ProfileResult( "child1", "desc1", - org.elasticsearch.common.collect.Map.of("key1", 100L), - org.elasticsearch.common.collect.Map.of(), + org.opensearch.common.collect.Map.of("key1", 100L), + org.opensearch.common.collect.Map.of(), 100L, - org.elasticsearch.common.collect.List.of()) + org.opensearch.common.collect.List.of()) ); children.add(new ProfileResult( "child2", "desc2", - org.elasticsearch.common.collect.Map.of("key1", 123356L), - org.elasticsearch.common.collect.Map.of(), + org.opensearch.common.collect.Map.of("key1", 123356L), + org.opensearch.common.collect.Map.of(), 123356L, - org.elasticsearch.common.collect.List.of())); + org.opensearch.common.collect.List.of())); Map breakdown = new LinkedHashMap<>(); breakdown.put("key1", 123456L); breakdown.put("stuff", 10000L); @@ -204,10 +204,10 @@ public class ProfileResultTests extends OpenSearchTestCase { result = new ProfileResult( "profileName", "some description", - org.elasticsearch.common.collect.Map.of("key1", 12345678L), - org.elasticsearch.common.collect.Map.of(), + org.opensearch.common.collect.Map.of("key1", 12345678L), + org.opensearch.common.collect.Map.of(), 12345678L, - org.elasticsearch.common.collect.List.of() + org.opensearch.common.collect.List.of() ); builder = XContentFactory.jsonBuilder().prettyPrint().humanReadable(true); result.toXContent(builder, ToXContent.EMPTY_PARAMS); @@ -224,10 +224,10 @@ public class ProfileResultTests extends OpenSearchTestCase { result = new ProfileResult( "profileName", "some description", - org.elasticsearch.common.collect.Map.of("key1", 1234567890L), - org.elasticsearch.common.collect.Map.of(), + org.opensearch.common.collect.Map.of("key1", 1234567890L), + org.opensearch.common.collect.Map.of(), 1234567890L, - org.elasticsearch.common.collect.List.of() + org.opensearch.common.collect.List.of() ); builder = XContentFactory.jsonBuilder().prettyPrint().humanReadable(true); result.toXContent(builder, ToXContent.EMPTY_PARAMS); diff --git a/server/src/test/java/org/opensearch/search/profile/aggregation/AggregationProfileShardResultTests.java b/server/src/test/java/org/opensearch/search/profile/aggregation/AggregationProfileShardResultTests.java index 7b5f37ad02e..770b7dd2ec9 100644 --- a/server/src/test/java/org/opensearch/search/profile/aggregation/AggregationProfileShardResultTests.java +++ b/server/src/test/java/org/opensearch/search/profile/aggregation/AggregationProfileShardResultTests.java @@ -74,7 +74,7 @@ public class AggregationProfileShardResultTests extends OpenSearchTestCase { breakdown.put("timing2", 4000L); Map debug = new LinkedHashMap<>(); debug.put("stuff", "stuff"); - debug.put("other_stuff", org.elasticsearch.common.collect.List.of("foo", "bar")); + debug.put("other_stuff", org.opensearch.common.collect.List.of("foo", "bar")); ProfileResult profileResult = new ProfileResult("someType", "someDescription", breakdown, debug,6000L, Collections.emptyList()); profileResults.add(profileResult); AggregationProfileShardResult aggProfileResults = new AggregationProfileShardResult(profileResults); diff --git a/server/src/test/java/org/opensearch/search/profile/query/RandomQueryGenerator.java b/server/src/test/java/org/opensearch/search/profile/query/RandomQueryGenerator.java index 0ea8d7f3119..d07735e5859 100644 --- a/server/src/test/java/org/opensearch/search/profile/query/RandomQueryGenerator.java +++ b/server/src/test/java/org/opensearch/search/profile/query/RandomQueryGenerator.java @@ -21,13 +21,13 @@ package org.opensearch.search.profile.query; import org.apache.lucene.util.English; import org.opensearch.common.unit.Fuzziness; -import org.elasticsearch.index.query.BoolQueryBuilder; -import org.elasticsearch.index.query.DisMaxQueryBuilder; -import org.elasticsearch.index.query.FuzzyQueryBuilder; -import org.elasticsearch.index.query.IdsQueryBuilder; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.index.query.RangeQueryBuilder; +import org.opensearch.index.query.BoolQueryBuilder; +import org.opensearch.index.query.DisMaxQueryBuilder; +import org.opensearch.index.query.FuzzyQueryBuilder; +import org.opensearch.index.query.IdsQueryBuilder; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryBuilders; +import org.opensearch.index.query.RangeQueryBuilder; import java.util.ArrayList; import java.util.List; diff --git a/server/src/test/java/org/opensearch/search/query/QuerySearchResultTests.java b/server/src/test/java/org/opensearch/search/query/QuerySearchResultTests.java index 6a01d16c2bb..2b253ffa369 100644 --- a/server/src/test/java/org/opensearch/search/query/QuerySearchResultTests.java +++ b/server/src/test/java/org/opensearch/search/query/QuerySearchResultTests.java @@ -32,7 +32,7 @@ import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput; import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.lucene.search.TopDocsAndMaxScore; -import org.elasticsearch.common.settings.Settings; +import org.opensearch.common.settings.Settings; import org.opensearch.index.shard.ShardId; import org.opensearch.search.DocValueFormat; import org.opensearch.search.SearchModule; diff --git a/server/src/test/java/org/opensearch/search/searchafter/SearchAfterBuilderTests.java b/server/src/test/java/org/opensearch/search/searchafter/SearchAfterBuilderTests.java index 082751eb75c..ecf9d2760d9 100644 --- a/server/src/test/java/org/opensearch/search/searchafter/SearchAfterBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/searchafter/SearchAfterBuilderTests.java @@ -34,7 +34,7 @@ import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.IndexFieldData; import org.opensearch.search.DocValueFormat; import org.opensearch.search.MultiValueMode; import org.opensearch.search.sort.BucketedSort; diff --git a/server/src/test/java/org/opensearch/search/slice/SliceBuilderTests.java b/server/src/test/java/org/opensearch/search/slice/SliceBuilderTests.java index 4f68d034678..2235077c8c0 100644 --- a/server/src/test/java/org/opensearch/search/slice/SliceBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/slice/SliceBuilderTests.java @@ -48,15 +48,15 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.fielddata.IndexNumericFieldData; -import org.elasticsearch.index.mapper.IdFieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.mapper.TextSearchInfo; -import org.elasticsearch.index.mapper.ValueFetcher; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.fielddata.IndexNumericFieldData; +import org.opensearch.index.mapper.IdFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.mapper.TextSearchInfo; +import org.opensearch.index.mapper.ValueFetcher; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.index.shard.ShardId; import org.opensearch.search.internal.ShardSearchRequest; import org.opensearch.search.lookup.SearchLookup; import org.opensearch.test.OpenSearchTestCase; diff --git a/server/src/test/java/org/opensearch/search/sort/FieldSortBuilderTests.java b/server/src/test/java/org/opensearch/search/sort/FieldSortBuilderTests.java index 585b686c455..61047acabfb 100644 --- a/server/src/test/java/org/opensearch/search/sort/FieldSortBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/sort/FieldSortBuilderTests.java @@ -45,20 +45,20 @@ import org.apache.lucene.util.BytesRef; import org.opensearch.common.xcontent.XContentParseException; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource; -import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested; -import org.elasticsearch.index.mapper.DateFieldMapper; -import org.elasticsearch.index.mapper.KeywordFieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.NumberFieldMapper; -import org.elasticsearch.index.mapper.TypeFieldMapper; -import org.elasticsearch.index.query.MatchNoneQueryBuilder; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.index.query.QueryRewriteContext; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.index.query.QueryShardException; -import org.elasticsearch.index.query.RangeQueryBuilder; +import org.opensearch.index.fielddata.IndexFieldData.XFieldComparatorSource; +import org.opensearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested; +import org.opensearch.index.mapper.DateFieldMapper; +import org.opensearch.index.mapper.KeywordFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.mapper.TypeFieldMapper; +import org.opensearch.index.query.MatchNoneQueryBuilder; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryBuilders; +import org.opensearch.index.query.QueryRewriteContext; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.index.query.QueryShardException; +import org.opensearch.index.query.RangeQueryBuilder; import org.opensearch.search.DocValueFormat; import org.opensearch.search.MultiValueMode; import org.opensearch.search.SearchSortValuesAndFormats; diff --git a/server/src/test/java/org/opensearch/search/sort/GeoDistanceSortBuilderTests.java b/server/src/test/java/org/opensearch/search/sort/GeoDistanceSortBuilderTests.java index 23020bc1148..be3cf8ce02d 100644 --- a/server/src/test/java/org/opensearch/search/sort/GeoDistanceSortBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/sort/GeoDistanceSortBuilderTests.java @@ -32,19 +32,19 @@ import org.opensearch.common.unit.DistanceUnit; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource; -import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested; -import org.elasticsearch.index.mapper.GeoPointFieldMapper; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.TypeFieldMapper; -import org.elasticsearch.index.query.GeoValidationMethod; -import org.elasticsearch.index.query.MatchAllQueryBuilder; -import org.elasticsearch.index.query.MatchNoneQueryBuilder; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.index.query.QueryRewriteContext; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.index.query.RangeQueryBuilder; +import org.opensearch.index.fielddata.IndexFieldData.XFieldComparatorSource; +import org.opensearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested; +import org.opensearch.index.mapper.GeoPointFieldMapper; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.TypeFieldMapper; +import org.opensearch.index.query.GeoValidationMethod; +import org.opensearch.index.query.MatchAllQueryBuilder; +import org.opensearch.index.query.MatchNoneQueryBuilder; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryBuilders; +import org.opensearch.index.query.QueryRewriteContext; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.index.query.RangeQueryBuilder; import org.opensearch.search.DocValueFormat; import org.opensearch.search.MultiValueMode; import org.opensearch.test.geo.RandomGeoGenerator; diff --git a/server/src/test/java/org/opensearch/search/sort/NestedSortBuilderTests.java b/server/src/test/java/org/opensearch/search/sort/NestedSortBuilderTests.java index 5ee2a699bc3..321f72a1028 100644 --- a/server/src/test/java/org/opensearch/search/sort/NestedSortBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/sort/NestedSortBuilderTests.java @@ -27,11 +27,11 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.query.ConstantScoreQueryBuilder; -import org.elasticsearch.index.query.MatchAllQueryBuilder; -import org.elasticsearch.index.query.MatchNoneQueryBuilder; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryRewriteContext; +import org.opensearch.index.query.ConstantScoreQueryBuilder; +import org.opensearch.index.query.MatchAllQueryBuilder; +import org.opensearch.index.query.MatchNoneQueryBuilder; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryRewriteContext; import org.opensearch.search.SearchModule; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.EqualsHashCodeTestUtils; @@ -150,7 +150,7 @@ public class NestedSortBuilderTests extends OpenSearchTestCase { public void testRewrite() throws IOException { QueryBuilder filterThatRewrites = new MatchNoneQueryBuilder() { @Override - protected QueryBuilder doRewrite(org.elasticsearch.index.query.QueryRewriteContext queryShardContext) throws IOException { + protected QueryBuilder doRewrite(org.opensearch.index.query.QueryRewriteContext queryShardContext) throws IOException { return new MatchAllQueryBuilder(); } }; diff --git a/server/src/test/java/org/opensearch/search/sort/ScriptSortBuilderTests.java b/server/src/test/java/org/opensearch/search/sort/ScriptSortBuilderTests.java index 9189fedc013..a7a0818bdc2 100644 --- a/server/src/test/java/org/opensearch/search/sort/ScriptSortBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/sort/ScriptSortBuilderTests.java @@ -27,17 +27,17 @@ import org.apache.lucene.search.TermQuery; import org.opensearch.common.xcontent.XContentParseException; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource; -import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested; -import org.elasticsearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource; -import org.elasticsearch.index.fielddata.fieldcomparator.DoubleValuesComparatorSource; -import org.elasticsearch.index.mapper.TypeFieldMapper; -import org.elasticsearch.index.query.MatchNoneQueryBuilder; -import org.elasticsearch.index.query.QueryBuilder; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.index.query.QueryRewriteContext; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.index.query.RangeQueryBuilder; +import org.opensearch.index.fielddata.IndexFieldData.XFieldComparatorSource; +import org.opensearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested; +import org.opensearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource; +import org.opensearch.index.fielddata.fieldcomparator.DoubleValuesComparatorSource; +import org.opensearch.index.mapper.TypeFieldMapper; +import org.opensearch.index.query.MatchNoneQueryBuilder; +import org.opensearch.index.query.QueryBuilder; +import org.opensearch.index.query.QueryBuilders; +import org.opensearch.index.query.QueryRewriteContext; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.index.query.RangeQueryBuilder; import org.opensearch.script.Script; import org.opensearch.script.ScriptType; import org.opensearch.search.DocValueFormat; diff --git a/server/src/test/java/org/opensearch/search/sort/SortValueTests.java b/server/src/test/java/org/opensearch/search/sort/SortValueTests.java index 339cabf8775..acf59babd1c 100644 --- a/server/src/test/java/org/opensearch/search/sort/SortValueTests.java +++ b/server/src/test/java/org/opensearch/search/sort/SortValueTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.time.DateFormatter; import org.opensearch.common.xcontent.ToXContentFragment; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.index.mapper.DateFieldMapper; +import org.opensearch.index.mapper.DateFieldMapper; import org.opensearch.search.DocValueFormat; import org.opensearch.test.AbstractNamedWriteableTestCase; diff --git a/server/src/test/java/org/opensearch/search/suggest/completion/CategoryContextMappingTests.java b/server/src/test/java/org/opensearch/search/suggest/completion/CategoryContextMappingTests.java index 9b7f2d5d3b1..4a1cc14940c 100644 --- a/server/src/test/java/org/opensearch/search/suggest/completion/CategoryContextMappingTests.java +++ b/server/src/test/java/org/opensearch/search/suggest/completion/CategoryContextMappingTests.java @@ -37,16 +37,16 @@ import org.opensearch.common.xcontent.XContentParseException; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.mapper.CompletionFieldMapper.CompletionFieldType; -import org.elasticsearch.index.mapper.DocumentMapper; -import org.elasticsearch.index.mapper.KeywordFieldMapper; -import org.elasticsearch.index.mapper.Mapper; -import org.elasticsearch.index.mapper.MapperParsingException; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.mapper.ParseContext; -import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.index.mapper.SourceToParse; -import org.elasticsearch.index.mapper.TextFieldMapper; +import org.opensearch.index.mapper.CompletionFieldMapper.CompletionFieldType; +import org.opensearch.index.mapper.DocumentMapper; +import org.opensearch.index.mapper.KeywordFieldMapper; +import org.opensearch.index.mapper.Mapper; +import org.opensearch.index.mapper.MapperParsingException; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.mapper.ParseContext; +import org.opensearch.index.mapper.ParsedDocument; +import org.opensearch.index.mapper.SourceToParse; +import org.opensearch.index.mapper.TextFieldMapper; import org.opensearch.search.suggest.completion.context.CategoryContextMapping; import org.opensearch.search.suggest.completion.context.ContextBuilder; import org.opensearch.search.suggest.completion.context.ContextMapping; diff --git a/server/src/test/java/org/opensearch/search/suggest/completion/CompletionSuggesterBuilderTests.java b/server/src/test/java/org/opensearch/search/suggest/completion/CompletionSuggesterBuilderTests.java index d1b6f0cd6a3..90cc04523a6 100644 --- a/server/src/test/java/org/opensearch/search/suggest/completion/CompletionSuggesterBuilderTests.java +++ b/server/src/test/java/org/opensearch/search/suggest/completion/CompletionSuggesterBuilderTests.java @@ -23,10 +23,10 @@ import org.apache.lucene.analysis.core.SimpleAnalyzer; import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.unit.Fuzziness; import org.opensearch.common.xcontent.ToXContent; -import org.elasticsearch.index.analysis.AnalyzerScope; -import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.index.mapper.CompletionFieldMapper.CompletionFieldType; -import org.elasticsearch.index.mapper.MappedFieldType; +import org.opensearch.index.analysis.AnalyzerScope; +import org.opensearch.index.analysis.NamedAnalyzer; +import org.opensearch.index.mapper.CompletionFieldMapper.CompletionFieldType; +import org.opensearch.index.mapper.MappedFieldType; import org.opensearch.search.suggest.AbstractSuggestionBuilderTestCase; import org.opensearch.search.suggest.SuggestionSearchContext.SuggestionContext; import org.opensearch.search.suggest.completion.context.CategoryQueryContext; diff --git a/server/src/test/java/org/opensearch/search/suggest/completion/GeoContextMappingTests.java b/server/src/test/java/org/opensearch/search/suggest/completion/GeoContextMappingTests.java index 8c1ceb2ab2c..a0d522ca961 100644 --- a/server/src/test/java/org/opensearch/search/suggest/completion/GeoContextMappingTests.java +++ b/server/src/test/java/org/opensearch/search/suggest/completion/GeoContextMappingTests.java @@ -27,10 +27,10 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.mapper.ParsedDocument; -import org.elasticsearch.index.mapper.SourceToParse; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.mapper.ParsedDocument; +import org.opensearch.index.mapper.SourceToParse; import org.opensearch.search.suggest.completion.context.ContextBuilder; import org.opensearch.search.suggest.completion.context.ContextMapping; import org.opensearch.search.suggest.completion.context.GeoContextMapping; diff --git a/server/src/test/java/org/opensearch/search/suggest/completion/RegexOptionsTests.java b/server/src/test/java/org/opensearch/search/suggest/completion/RegexOptionsTests.java index b71a4f08878..d5cb8c5e747 100644 --- a/server/src/test/java/org/opensearch/search/suggest/completion/RegexOptionsTests.java +++ b/server/src/test/java/org/opensearch/search/suggest/completion/RegexOptionsTests.java @@ -20,7 +20,7 @@ package org.opensearch.search.suggest.completion; import org.opensearch.common.io.stream.NamedWriteableRegistry; -import org.elasticsearch.index.query.RegexpFlag; +import org.opensearch.index.query.RegexpFlag; import org.opensearch.test.OpenSearchTestCase; import java.io.IOException; diff --git a/server/src/test/java/org/opensearch/snapshots/BlobStoreFormatTests.java b/server/src/test/java/org/opensearch/snapshots/BlobStoreFormatTests.java index 05cbc5d0362..41272982e1a 100644 --- a/server/src/test/java/org/opensearch/snapshots/BlobStoreFormatTests.java +++ b/server/src/test/java/org/opensearch/snapshots/BlobStoreFormatTests.java @@ -34,7 +34,7 @@ import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.ToXContentFragment; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.index.translog.BufferedChecksumStreamOutput; +import org.opensearch.index.translog.BufferedChecksumStreamOutput; import org.opensearch.repositories.blobstore.ChecksumBlobStoreFormat; import org.opensearch.test.OpenSearchTestCase; diff --git a/server/src/test/java/org/opensearch/snapshots/InternalSnapshotsInfoServiceTests.java b/server/src/test/java/org/opensearch/snapshots/InternalSnapshotsInfoServiceTests.java index 69824d0edcc..d1e7668ba02 100644 --- a/server/src/test/java/org/opensearch/snapshots/InternalSnapshotsInfoServiceTests.java +++ b/server/src/test/java/org/opensearch/snapshots/InternalSnapshotsInfoServiceTests.java @@ -43,9 +43,9 @@ import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.UUIDs; import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.index.snapshots.IndexShardSnapshotStatus; +import org.opensearch.index.Index; +import org.opensearch.index.shard.ShardId; +import org.opensearch.index.snapshots.IndexShardSnapshotStatus; import org.opensearch.repositories.FilterRepository; import org.opensearch.repositories.IndexId; import org.opensearch.repositories.RepositoriesService; diff --git a/server/src/test/java/org/opensearch/snapshots/RestoreServiceTests.java b/server/src/test/java/org/opensearch/snapshots/RestoreServiceTests.java index 061ea7b2e79..772251cb9d0 100644 --- a/server/src/test/java/org/opensearch/snapshots/RestoreServiceTests.java +++ b/server/src/test/java/org/opensearch/snapshots/RestoreServiceTests.java @@ -23,7 +23,7 @@ import org.opensearch.action.admin.cluster.snapshots.restore.RestoreSnapshotRequ import org.opensearch.cluster.metadata.DataStream; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.Metadata; -import org.elasticsearch.index.Index; +import org.opensearch.index.Index; import org.opensearch.test.OpenSearchTestCase; import java.util.Collections; diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotInfoTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotInfoTests.java index 4c3ce202f41..d843912decf 100644 --- a/server/src/test/java/org/opensearch/snapshots/SnapshotInfoTests.java +++ b/server/src/test/java/org/opensearch/snapshots/SnapshotInfoTests.java @@ -20,7 +20,7 @@ package org.opensearch.snapshots; import org.opensearch.common.io.stream.Writeable; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import org.opensearch.test.AbstractWireSerializingTestCase; import org.opensearch.test.OpenSearchTestCase; diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java index 71444b4d192..0e181ddaa42 100644 --- a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java +++ b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java @@ -132,7 +132,7 @@ import org.opensearch.cluster.routing.allocation.command.AllocateEmptyPrimaryAll import org.opensearch.cluster.service.ClusterApplierService; import org.opensearch.cluster.service.ClusterService; import org.opensearch.cluster.service.FakeThreadPoolMasterService; -import org.elasticsearch.cluster.service.MasterService; +import org.opensearch.cluster.service.MasterService; import org.opensearch.common.CheckedConsumer; import org.opensearch.common.Nullable; import org.opensearch.common.io.stream.NamedWriteableRegistry; @@ -142,7 +142,7 @@ import org.opensearch.common.settings.IndexScopedSettings; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; import org.opensearch.common.util.BigArrays; -import org.elasticsearch.common.util.PageCacheRecycler; +import org.opensearch.common.util.PageCacheRecycler; import org.opensearch.common.util.concurrent.AbstractRunnable; import org.opensearch.common.util.concurrent.PrioritizedOpenSearchThreadPoolExecutor; import org.opensearch.common.util.concurrent.ThreadContext; diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotShardsServiceTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotShardsServiceTests.java index a4b4478dee6..2155d0d742d 100644 --- a/server/src/test/java/org/opensearch/snapshots/SnapshotShardsServiceTests.java +++ b/server/src/test/java/org/opensearch/snapshots/SnapshotShardsServiceTests.java @@ -20,7 +20,7 @@ package org.opensearch.snapshots; import org.opensearch.cluster.SnapshotsInProgress; import org.opensearch.common.UUIDs; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.EqualsHashCodeTestUtils; diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotsInProgressSerializationTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotsInProgressSerializationTests.java index 4e8a12e5cb1..61a88d25ef0 100644 --- a/server/src/test/java/org/opensearch/snapshots/SnapshotsInProgressSerializationTests.java +++ b/server/src/test/java/org/opensearch/snapshots/SnapshotsInProgressSerializationTests.java @@ -29,8 +29,8 @@ import org.opensearch.cluster.SnapshotsInProgress.State; import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.io.stream.Writeable; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.Index; +import org.opensearch.index.shard.ShardId; import org.opensearch.repositories.IndexId; import org.opensearch.test.AbstractDiffableWireSerializationTestCase; import org.opensearch.test.VersionUtils; diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotsServiceTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotsServiceTests.java index 0d111a7a738..41ba5b7a29f 100644 --- a/server/src/test/java/org/opensearch/snapshots/SnapshotsServiceTests.java +++ b/server/src/test/java/org/opensearch/snapshots/SnapshotsServiceTests.java @@ -33,8 +33,8 @@ import org.opensearch.cluster.routing.TestShardRouting; import org.opensearch.common.UUIDs; import org.opensearch.common.collect.ImmutableOpenMap; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.Index; +import org.opensearch.index.shard.ShardId; import org.opensearch.repositories.IndexId; import org.opensearch.repositories.RepositoryShardId; import org.opensearch.test.OpenSearchTestCase; diff --git a/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepository.java b/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepository.java index f7c8fbca863..bc741ebeb2f 100644 --- a/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepository.java +++ b/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepository.java @@ -31,7 +31,7 @@ import org.opensearch.common.blobstore.support.PlainBlobMetadata; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.io.Streams; import org.opensearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.indices.recovery.RecoverySettings; +import org.opensearch.indices.recovery.RecoverySettings; import org.opensearch.repositories.blobstore.BlobStoreRepository; import org.opensearch.snapshots.SnapshotInfo; import org.opensearch.test.OpenSearchTestCase; diff --git a/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepositoryTests.java b/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepositoryTests.java index e0705516402..bfa097c60dd 100644 --- a/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepositoryTests.java +++ b/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepositoryTests.java @@ -27,7 +27,7 @@ import org.opensearch.common.UUIDs; import org.opensearch.common.blobstore.BlobContainer; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; -import org.elasticsearch.indices.recovery.RecoverySettings; +import org.opensearch.indices.recovery.RecoverySettings; import org.opensearch.repositories.RepositoryData; import org.opensearch.repositories.ShardGenerations; import org.opensearch.repositories.blobstore.BlobStoreRepository; diff --git a/server/src/test/java/org/opensearch/tasks/TaskManagerTests.java b/server/src/test/java/org/opensearch/tasks/TaskManagerTests.java index 8355644ed01..fc2bcb34c0e 100644 --- a/server/src/test/java/org/opensearch/tasks/TaskManagerTests.java +++ b/server/src/test/java/org/opensearch/tasks/TaskManagerTests.java @@ -20,7 +20,7 @@ package org.opensearch.tasks; import org.opensearch.action.ActionListener; -import org.elasticsearch.action.admin.cluster.node.tasks.TransportTasksActionTests; +import org.opensearch.action.admin.cluster.node.tasks.TransportTasksActionTests; import org.opensearch.common.lease.Releasable; import org.opensearch.common.lease.Releasables; import org.opensearch.common.settings.Settings; diff --git a/server/src/test/java/org/opensearch/transport/RemoteClusterConnectionTests.java b/server/src/test/java/org/opensearch/transport/RemoteClusterConnectionTests.java index 122c34c7a1f..591bbc16d0c 100644 --- a/server/src/test/java/org/opensearch/transport/RemoteClusterConnectionTests.java +++ b/server/src/test/java/org/opensearch/transport/RemoteClusterConnectionTests.java @@ -48,7 +48,7 @@ import org.opensearch.common.unit.TimeValue; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.core.internal.io.IOUtils; -import org.elasticsearch.index.IndexNotFoundException; +import org.opensearch.index.IndexNotFoundException; import org.elasticsearch.mocksocket.MockServerSocket; import org.opensearch.search.SearchHit; import org.opensearch.search.SearchHits; diff --git a/server/src/test/java/org/opensearch/transport/RemoteClusterSettingsTests.java b/server/src/test/java/org/opensearch/transport/RemoteClusterSettingsTests.java index e68d506f81c..e3a85894903 100644 --- a/server/src/test/java/org/opensearch/transport/RemoteClusterSettingsTests.java +++ b/server/src/test/java/org/opensearch/transport/RemoteClusterSettingsTests.java @@ -21,9 +21,9 @@ package org.opensearch.transport; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.cluster.node.DiscoveryNodeRole; -import org.elasticsearch.common.settings.Setting; -import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.common.unit.TimeValue; +import org.opensearch.common.settings.Setting; +import org.opensearch.common.settings.Settings; +import org.opensearch.common.unit.TimeValue; import org.opensearch.node.NodeRoleSettings; import org.opensearch.test.OpenSearchTestCase; diff --git a/server/src/test/java/org/opensearch/transport/TcpTransportTests.java b/server/src/test/java/org/opensearch/transport/TcpTransportTests.java index 34e62e9be57..590ee3f7f29 100644 --- a/server/src/test/java/org/opensearch/transport/TcpTransportTests.java +++ b/server/src/test/java/org/opensearch/transport/TcpTransportTests.java @@ -34,7 +34,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.MockPageCacheRecycler; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.MockLogAppender; import org.opensearch.test.junit.annotations.TestLogging; diff --git a/test/external-modules/delayed-aggs/src/internalClusterTest/java/org/opensearch/search/aggregations/DelayedShardAggregationIT.java b/test/external-modules/delayed-aggs/src/internalClusterTest/java/org/opensearch/search/aggregations/DelayedShardAggregationIT.java index 487743c7a48..78df6373a00 100644 --- a/test/external-modules/delayed-aggs/src/internalClusterTest/java/org/opensearch/search/aggregations/DelayedShardAggregationIT.java +++ b/test/external-modules/delayed-aggs/src/internalClusterTest/java/org/opensearch/search/aggregations/DelayedShardAggregationIT.java @@ -32,7 +32,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; +import static org.opensearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; diff --git a/test/framework/src/main/java/org/opensearch/action/support/replication/ClusterStateCreationUtils.java b/test/framework/src/main/java/org/opensearch/action/support/replication/ClusterStateCreationUtils.java index d9337e4d573..1efd2ffa2f5 100644 --- a/test/framework/src/main/java/org/opensearch/action/support/replication/ClusterStateCreationUtils.java +++ b/test/framework/src/main/java/org/opensearch/action/support/replication/ClusterStateCreationUtils.java @@ -38,7 +38,7 @@ import org.opensearch.cluster.routing.ShardRoutingState; import org.opensearch.cluster.routing.TestShardRouting; import org.opensearch.cluster.routing.UnassignedInfo; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; diff --git a/test/framework/src/main/java/org/opensearch/action/support/replication/TransportWriteActionTestHelper.java b/test/framework/src/main/java/org/opensearch/action/support/replication/TransportWriteActionTestHelper.java index 92c2f0a40cf..efc5c76194a 100644 --- a/test/framework/src/main/java/org/opensearch/action/support/replication/TransportWriteActionTestHelper.java +++ b/test/framework/src/main/java/org/opensearch/action/support/replication/TransportWriteActionTestHelper.java @@ -21,8 +21,8 @@ package org.opensearch.action.support.replication; import org.apache.logging.log4j.Logger; import org.opensearch.action.support.WriteRequest; import org.opensearch.common.Nullable; -import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.index.translog.Translog; +import org.opensearch.index.shard.IndexShard; +import org.opensearch.index.translog.Translog; import org.opensearch.action.support.replication.TransportWriteAction; import java.util.concurrent.CountDownLatch; diff --git a/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java b/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java index d7a91a1714f..3c2ac042643 100644 --- a/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java +++ b/test/framework/src/main/java/org/opensearch/bootstrap/BootstrapForTesting.java @@ -144,9 +144,9 @@ public class BootstrapForTesting { if (System.getProperty("tests.gradle") == null) { // intellij and eclipse don't package our internal libs, so we need to set the codebases for them manually addClassCodebase(codebases,"plugin-classloader", "org.opensearch.plugins.ExtendedPluginsClassLoader"); - addClassCodebase(codebases,"opensearch-nio", "org.elasticsearch.nio.ChannelFactory"); - addClassCodebase(codebases, "opensearch-secure-sm", "org.elasticsearch.secure_sm.SecureSM"); - addClassCodebase(codebases, "opensearch-rest-client", "org.elasticsearch.client.RestClient"); + addClassCodebase(codebases,"opensearch-nio", "org.opensearch.nio.ChannelFactory"); + addClassCodebase(codebases, "opensearch-secure-sm", "org.opensearch.secure_sm.SecureSM"); + addClassCodebase(codebases, "opensearch-rest-client", "org.opensearch.client.RestClient"); } final Policy testFramework = Security.readPolicy(Bootstrap.class.getResource("test-framework.policy"), codebases); final Policy opensearchPolicy = new OpenSearchPolicy(codebases, perms, getPluginPermissions(), true, new Permissions()); diff --git a/test/framework/src/main/java/org/opensearch/cluster/DataStreamTestHelper.java b/test/framework/src/main/java/org/opensearch/cluster/DataStreamTestHelper.java index 0fc20c0b27f..ba6de34c953 100644 --- a/test/framework/src/main/java/org/opensearch/cluster/DataStreamTestHelper.java +++ b/test/framework/src/main/java/org/opensearch/cluster/DataStreamTestHelper.java @@ -27,7 +27,7 @@ import org.opensearch.cluster.metadata.Metadata; import org.opensearch.common.UUIDs; import org.opensearch.common.collect.Tuple; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.Index; +import org.opensearch.index.Index; import org.opensearch.test.OpenSearchTestCase; import java.util.ArrayList; diff --git a/test/framework/src/main/java/org/opensearch/cluster/routing/TestShardRouting.java b/test/framework/src/main/java/org/opensearch/cluster/routing/TestShardRouting.java index 853d8ccd11e..d31dab2a1e6 100644 --- a/test/framework/src/main/java/org/opensearch/cluster/routing/TestShardRouting.java +++ b/test/framework/src/main/java/org/opensearch/cluster/routing/TestShardRouting.java @@ -22,7 +22,7 @@ package org.opensearch.cluster.routing; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.UUIDs; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardId; import org.opensearch.repositories.IndexId; import org.opensearch.snapshots.Snapshot; import org.opensearch.snapshots.SnapshotId; diff --git a/test/framework/src/main/java/org/opensearch/common/bytes/AbstractBytesReferenceTestCase.java b/test/framework/src/main/java/org/opensearch/common/bytes/AbstractBytesReferenceTestCase.java index cc95b2d3c5b..fe8078f3569 100644 --- a/test/framework/src/main/java/org/opensearch/common/bytes/AbstractBytesReferenceTestCase.java +++ b/test/framework/src/main/java/org/opensearch/common/bytes/AbstractBytesReferenceTestCase.java @@ -29,7 +29,7 @@ import org.opensearch.common.io.stream.StreamInput; import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.ByteArray; import org.opensearch.common.util.PageCacheRecycler; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.test.OpenSearchTestCase; import java.io.EOFException; diff --git a/test/framework/src/main/java/org/opensearch/index/MapperTestUtils.java b/test/framework/src/main/java/org/opensearch/index/MapperTestUtils.java index 11f5bac35a9..13699944e95 100644 --- a/test/framework/src/main/java/org/opensearch/index/MapperTestUtils.java +++ b/test/framework/src/main/java/org/opensearch/index/MapperTestUtils.java @@ -24,15 +24,15 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.compress.CompressedXContent; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.NamedXContentRegistry; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.analysis.IndexAnalyzers; -import org.elasticsearch.index.mapper.DocumentMapper; -import org.elasticsearch.index.mapper.DocumentMapperParser; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.mapper.MapperService.MergeReason; -import org.elasticsearch.index.similarity.SimilarityService; -import org.elasticsearch.indices.IndicesModule; -import org.elasticsearch.indices.mapper.MapperRegistry; +import org.opensearch.env.Environment; +import org.opensearch.index.analysis.IndexAnalyzers; +import org.opensearch.index.mapper.DocumentMapper; +import org.opensearch.index.mapper.DocumentMapperParser; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.mapper.MapperService.MergeReason; +import org.opensearch.index.similarity.SimilarityService; +import org.opensearch.indices.IndicesModule; +import org.opensearch.indices.mapper.MapperRegistry; import org.opensearch.test.IndexSettingsModule; import java.io.IOException; diff --git a/test/framework/src/main/java/org/opensearch/index/MockEngineFactoryPlugin.java b/test/framework/src/main/java/org/opensearch/index/MockEngineFactoryPlugin.java index 88b62f7fe02..ba3ae328347 100644 --- a/test/framework/src/main/java/org/opensearch/index/MockEngineFactoryPlugin.java +++ b/test/framework/src/main/java/org/opensearch/index/MockEngineFactoryPlugin.java @@ -21,7 +21,7 @@ package org.opensearch.index; import org.apache.lucene.index.AssertingDirectoryReader; import org.apache.lucene.index.FilterDirectoryReader; import org.opensearch.common.settings.Setting; -import org.elasticsearch.index.engine.EngineFactory; +import org.opensearch.index.engine.EngineFactory; import org.opensearch.plugins.EnginePlugin; import org.opensearch.plugins.Plugin; import org.opensearch.test.engine.MockEngineFactory; diff --git a/test/framework/src/main/java/org/opensearch/index/analysis/AnalysisTestsHelper.java b/test/framework/src/main/java/org/opensearch/index/analysis/AnalysisTestsHelper.java index 42faadd1300..b2eaa9ef086 100644 --- a/test/framework/src/main/java/org/opensearch/index/analysis/AnalysisTestsHelper.java +++ b/test/framework/src/main/java/org/opensearch/index/analysis/AnalysisTestsHelper.java @@ -22,9 +22,9 @@ package org.opensearch.index.analysis; import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.indices.analysis.AnalysisModule; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; +import org.opensearch.indices.analysis.AnalysisModule; import org.opensearch.plugins.AnalysisPlugin; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.IndexSettingsModule; diff --git a/test/framework/src/main/java/org/opensearch/index/analysis/MyFilterTokenFilterFactory.java b/test/framework/src/main/java/org/opensearch/index/analysis/MyFilterTokenFilterFactory.java index 91a1499c1c5..1c583d62ee1 100644 --- a/test/framework/src/main/java/org/opensearch/index/analysis/MyFilterTokenFilterFactory.java +++ b/test/framework/src/main/java/org/opensearch/index/analysis/MyFilterTokenFilterFactory.java @@ -22,8 +22,8 @@ import org.apache.lucene.analysis.StopFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.en.EnglishAnalyzer; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; -import org.elasticsearch.index.IndexSettings; +import org.opensearch.env.Environment; +import org.opensearch.index.IndexSettings; public class MyFilterTokenFilterFactory extends AbstractTokenFilterFactory { diff --git a/test/framework/src/main/java/org/opensearch/index/engine/InternalTestEngine.java b/test/framework/src/main/java/org/opensearch/index/engine/InternalTestEngine.java index 4ca513ba49a..8e6bc70b8a3 100644 --- a/test/framework/src/main/java/org/opensearch/index/engine/InternalTestEngine.java +++ b/test/framework/src/main/java/org/opensearch/index/engine/InternalTestEngine.java @@ -20,8 +20,8 @@ package org.opensearch.index.engine; import org.opensearch.common.util.concurrent.ConcurrentCollections; -import org.elasticsearch.index.seqno.LocalCheckpointTracker; -import org.elasticsearch.index.seqno.SequenceNumbers; +import org.opensearch.index.seqno.LocalCheckpointTracker; +import org.opensearch.index.seqno.SequenceNumbers; import java.io.IOException; import java.util.Map; diff --git a/test/framework/src/main/java/org/opensearch/index/engine/TranslogHandler.java b/test/framework/src/main/java/org/opensearch/index/engine/TranslogHandler.java index 2862343531b..40fa8ef4d79 100644 --- a/test/framework/src/main/java/org/opensearch/index/engine/TranslogHandler.java +++ b/test/framework/src/main/java/org/opensearch/index/engine/TranslogHandler.java @@ -22,24 +22,24 @@ package org.opensearch.index.engine; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.XContentHelper; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.VersionType; -import org.elasticsearch.index.analysis.AnalysisRegistry; -import org.elasticsearch.index.analysis.AnalyzerScope; -import org.elasticsearch.index.analysis.IndexAnalyzers; -import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.index.mapper.DocumentMapper; -import org.elasticsearch.index.mapper.DocumentMapperForType; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.mapper.Mapping; -import org.elasticsearch.index.mapper.RootObjectMapper; -import org.elasticsearch.index.mapper.SourceToParse; -import org.elasticsearch.index.seqno.SequenceNumbers; -import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.index.similarity.SimilarityService; -import org.elasticsearch.index.translog.Translog; -import org.elasticsearch.indices.IndicesModule; -import org.elasticsearch.indices.mapper.MapperRegistry; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.VersionType; +import org.opensearch.index.analysis.AnalysisRegistry; +import org.opensearch.index.analysis.AnalyzerScope; +import org.opensearch.index.analysis.IndexAnalyzers; +import org.opensearch.index.analysis.NamedAnalyzer; +import org.opensearch.index.mapper.DocumentMapper; +import org.opensearch.index.mapper.DocumentMapperForType; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.mapper.Mapping; +import org.opensearch.index.mapper.RootObjectMapper; +import org.opensearch.index.mapper.SourceToParse; +import org.opensearch.index.seqno.SequenceNumbers; +import org.opensearch.index.shard.IndexShard; +import org.opensearch.index.similarity.SimilarityService; +import org.opensearch.index.translog.Translog; +import org.opensearch.indices.IndicesModule; +import org.opensearch.indices.mapper.MapperRegistry; import java.io.IOException; import java.util.HashMap; diff --git a/test/framework/src/main/java/org/opensearch/index/mapper/FieldMapperTestCase.java b/test/framework/src/main/java/org/opensearch/index/mapper/FieldMapperTestCase.java index 2edffc3da8b..3876911f76c 100644 --- a/test/framework/src/main/java/org/opensearch/index/mapper/FieldMapperTestCase.java +++ b/test/framework/src/main/java/org/opensearch/index/mapper/FieldMapperTestCase.java @@ -29,9 +29,9 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.analysis.AnalyzerScope; -import org.elasticsearch.index.analysis.NamedAnalyzer; +import org.opensearch.index.IndexService; +import org.opensearch.index.analysis.AnalyzerScope; +import org.opensearch.index.analysis.NamedAnalyzer; import org.opensearch.test.OpenSearchSingleNodeTestCase; import java.io.IOException; diff --git a/test/framework/src/main/java/org/opensearch/index/mapper/FieldMapperTestCase2.java b/test/framework/src/main/java/org/opensearch/index/mapper/FieldMapperTestCase2.java index fb69ff0d15c..0fedf59d643 100644 --- a/test/framework/src/main/java/org/opensearch/index/mapper/FieldMapperTestCase2.java +++ b/test/framework/src/main/java/org/opensearch/index/mapper/FieldMapperTestCase2.java @@ -25,8 +25,8 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.opensearch.common.Strings; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; -import org.elasticsearch.index.analysis.AnalyzerScope; -import org.elasticsearch.index.analysis.NamedAnalyzer; +import org.opensearch.index.analysis.AnalyzerScope; +import org.opensearch.index.analysis.NamedAnalyzer; import java.io.IOException; import java.util.ArrayList; diff --git a/test/framework/src/main/java/org/opensearch/index/mapper/FieldTypeTestCase.java b/test/framework/src/main/java/org/opensearch/index/mapper/FieldTypeTestCase.java index 895fc529456..dd82eb20b05 100644 --- a/test/framework/src/main/java/org/opensearch/index/mapper/FieldTypeTestCase.java +++ b/test/framework/src/main/java/org/opensearch/index/mapper/FieldTypeTestCase.java @@ -18,7 +18,7 @@ */ package org.opensearch.index.mapper; -import org.elasticsearch.index.query.QueryShardContext; +import org.opensearch.index.query.QueryShardContext; import org.opensearch.search.lookup.SourceLookup; import org.opensearch.test.OpenSearchTestCase; @@ -52,7 +52,7 @@ public abstract class FieldTypeTestCase extends OpenSearchTestCase { public static List fetchSourceValue(MappedFieldType fieldType, Object sourceValue, String format) throws IOException { String field = fieldType.name(); MapperService mapperService = mock(MapperService.class); - when(mapperService.sourcePath(field)).thenReturn(org.elasticsearch.common.collect.Set.of(field)); + when(mapperService.sourcePath(field)).thenReturn(org.opensearch.common.collect.Set.of(field)); ValueFetcher fetcher = fieldType.valueFetcher(mapperService, null, format); SourceLookup lookup = new SourceLookup(); diff --git a/test/framework/src/main/java/org/opensearch/index/mapper/MapperServiceTestCase.java b/test/framework/src/main/java/org/opensearch/index/mapper/MapperServiceTestCase.java index 81cacb3d0ea..33ed9b7a19e 100644 --- a/test/framework/src/main/java/org/opensearch/index/mapper/MapperServiceTestCase.java +++ b/test/framework/src/main/java/org/opensearch/index/mapper/MapperServiceTestCase.java @@ -36,14 +36,14 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.analysis.AnalyzerScope; -import org.elasticsearch.index.analysis.IndexAnalyzers; -import org.elasticsearch.index.analysis.NamedAnalyzer; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.index.similarity.SimilarityService; -import org.elasticsearch.indices.IndicesModule; -import org.elasticsearch.indices.mapper.MapperRegistry; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.analysis.AnalyzerScope; +import org.opensearch.index.analysis.IndexAnalyzers; +import org.opensearch.index.analysis.NamedAnalyzer; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.index.similarity.SimilarityService; +import org.opensearch.indices.IndicesModule; +import org.opensearch.indices.mapper.MapperRegistry; import org.opensearch.plugins.MapperPlugin; import org.opensearch.plugins.Plugin; import org.opensearch.plugins.ScriptPlugin; diff --git a/test/framework/src/main/java/org/opensearch/index/mapper/MapperTestCase.java b/test/framework/src/main/java/org/opensearch/index/mapper/MapperTestCase.java index 13a505db59e..ba20cce91fa 100644 --- a/test/framework/src/main/java/org/opensearch/index/mapper/MapperTestCase.java +++ b/test/framework/src/main/java/org/opensearch/index/mapper/MapperTestCase.java @@ -37,10 +37,10 @@ import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.index.fielddata.IndexFieldData; -import org.elasticsearch.index.fielddata.IndexFieldDataCache; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.index.fielddata.IndexFieldData; +import org.opensearch.index.fielddata.IndexFieldDataCache; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.search.DocValueFormat; import org.opensearch.search.lookup.SearchLookup; diff --git a/test/framework/src/main/java/org/opensearch/index/replication/OpenSearchIndexLevelReplicationTestCase.java b/test/framework/src/main/java/org/opensearch/index/replication/OpenSearchIndexLevelReplicationTestCase.java index 12509f575b9..cb0512da659 100644 --- a/test/framework/src/main/java/org/opensearch/index/replication/OpenSearchIndexLevelReplicationTestCase.java +++ b/test/framework/src/main/java/org/opensearch/index/replication/OpenSearchIndexLevelReplicationTestCase.java @@ -66,24 +66,24 @@ import org.opensearch.common.lease.Releasables; import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.IndexSettings; +import org.opensearch.index.Index; +import org.opensearch.index.IndexSettings; import org.opensearch.index.engine.DocIdSeqNoAndSource; -import org.elasticsearch.index.engine.EngineFactory; -import org.elasticsearch.index.engine.InternalEngineFactory; -import org.elasticsearch.index.seqno.GlobalCheckpointSyncAction; -import org.elasticsearch.index.seqno.RetentionLease; -import org.elasticsearch.index.seqno.RetentionLeaseSyncAction; -import org.elasticsearch.index.seqno.RetentionLeaseSyncer; -import org.elasticsearch.index.seqno.RetentionLeases; -import org.elasticsearch.index.shard.IndexShard; +import org.opensearch.index.engine.EngineFactory; +import org.opensearch.index.engine.InternalEngineFactory; +import org.opensearch.index.seqno.GlobalCheckpointSyncAction; +import org.opensearch.index.seqno.RetentionLease; +import org.opensearch.index.seqno.RetentionLeaseSyncAction; +import org.opensearch.index.seqno.RetentionLeaseSyncer; +import org.opensearch.index.seqno.RetentionLeases; +import org.opensearch.index.shard.IndexShard; import org.opensearch.index.shard.IndexShardTestCase; -import org.elasticsearch.index.shard.PrimaryReplicaSyncer; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.index.shard.ShardPath; -import org.elasticsearch.index.translog.Translog; -import org.elasticsearch.indices.recovery.RecoveryState; -import org.elasticsearch.indices.recovery.RecoveryTarget; +import org.opensearch.index.shard.PrimaryReplicaSyncer; +import org.opensearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardPath; +import org.opensearch.index.translog.Translog; +import org.opensearch.indices.recovery.RecoveryState; +import org.opensearch.indices.recovery.RecoveryTarget; import org.opensearch.tasks.TaskManager; import org.opensearch.threadpool.ThreadPool; import org.opensearch.threadpool.ThreadPool.Names; @@ -680,7 +680,7 @@ public abstract class OpenSearchIndexLevelReplicationTestCase extends IndexShard } @Override - public org.elasticsearch.index.shard.ReplicationGroup getReplicationGroup() { + public org.opensearch.index.shard.ReplicationGroup getReplicationGroup() { return getPrimaryShard().getReplicationGroup(); } diff --git a/test/framework/src/main/java/org/opensearch/index/shard/RestoreOnlyRepository.java b/test/framework/src/main/java/org/opensearch/index/shard/RestoreOnlyRepository.java index 5e2ca7e8c76..32d97b40cb4 100644 --- a/test/framework/src/main/java/org/opensearch/index/shard/RestoreOnlyRepository.java +++ b/test/framework/src/main/java/org/opensearch/index/shard/RestoreOnlyRepository.java @@ -28,9 +28,9 @@ import org.opensearch.cluster.metadata.Metadata; import org.opensearch.cluster.metadata.RepositoryMetadata; import org.opensearch.cluster.node.DiscoveryNode; import org.opensearch.common.component.AbstractLifecycleComponent; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.snapshots.IndexShardSnapshotStatus; -import org.elasticsearch.index.store.Store; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.snapshots.IndexShardSnapshotStatus; +import org.opensearch.index.store.Store; import org.opensearch.repositories.IndexId; import org.opensearch.repositories.IndexMetaDataGenerations; import org.opensearch.repositories.Repository; diff --git a/test/framework/src/main/java/org/opensearch/index/translog/TranslogDeletionPolicies.java b/test/framework/src/main/java/org/opensearch/index/translog/TranslogDeletionPolicies.java index 859fa9a53a1..381e823909b 100644 --- a/test/framework/src/main/java/org/opensearch/index/translog/TranslogDeletionPolicies.java +++ b/test/framework/src/main/java/org/opensearch/index/translog/TranslogDeletionPolicies.java @@ -20,7 +20,7 @@ package org.opensearch.index.translog; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.IndexSettings; +import org.opensearch.index.IndexSettings; public class TranslogDeletionPolicies { diff --git a/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java b/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java index 821ba53ad41..b759b8e556c 100644 --- a/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java +++ b/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java @@ -22,10 +22,10 @@ package org.opensearch.indices.analysis; import org.apache.lucene.analysis.util.TokenFilterFactory; import org.apache.lucene.analysis.util.TokenizerFactory; import org.opensearch.common.collect.MapBuilder; -import org.elasticsearch.index.analysis.HunspellTokenFilterFactory; -import org.elasticsearch.index.analysis.ShingleTokenFilterFactory; -import org.elasticsearch.index.analysis.StandardTokenizerFactory; -import org.elasticsearch.index.analysis.StopTokenFilterFactory; +import org.opensearch.index.analysis.HunspellTokenFilterFactory; +import org.opensearch.index.analysis.ShingleTokenFilterFactory; +import org.opensearch.index.analysis.StandardTokenizerFactory; +import org.opensearch.index.analysis.StopTokenFilterFactory; import org.opensearch.plugins.AnalysisPlugin; import org.opensearch.test.OpenSearchTestCase; diff --git a/test/framework/src/main/java/org/opensearch/indices/recovery/AsyncRecoveryTarget.java b/test/framework/src/main/java/org/opensearch/indices/recovery/AsyncRecoveryTarget.java index ea0935390e4..bdbcb2d74b1 100644 --- a/test/framework/src/main/java/org/opensearch/indices/recovery/AsyncRecoveryTarget.java +++ b/test/framework/src/main/java/org/opensearch/indices/recovery/AsyncRecoveryTarget.java @@ -23,11 +23,11 @@ import org.apache.lucene.util.BytesRef; import org.opensearch.action.ActionListener; import org.opensearch.common.bytes.BytesArray; import org.opensearch.common.bytes.BytesReference; -import org.elasticsearch.index.seqno.ReplicationTracker; -import org.elasticsearch.index.seqno.RetentionLeases; -import org.elasticsearch.index.store.Store; -import org.elasticsearch.index.store.StoreFileMetadata; -import org.elasticsearch.index.translog.Translog; +import org.opensearch.index.seqno.ReplicationTracker; +import org.opensearch.index.seqno.RetentionLeases; +import org.opensearch.index.store.Store; +import org.opensearch.index.store.StoreFileMetadata; +import org.opensearch.index.translog.Translog; import java.util.List; import java.util.concurrent.Executor; diff --git a/test/framework/src/main/java/org/opensearch/ingest/RandomDocumentPicks.java b/test/framework/src/main/java/org/opensearch/ingest/RandomDocumentPicks.java index 263b639cdce..e80cf1e28cc 100644 --- a/test/framework/src/main/java/org/opensearch/ingest/RandomDocumentPicks.java +++ b/test/framework/src/main/java/org/opensearch/ingest/RandomDocumentPicks.java @@ -22,7 +22,7 @@ package org.opensearch.ingest; import com.carrotsearch.randomizedtesting.generators.RandomNumbers; import com.carrotsearch.randomizedtesting.generators.RandomPicks; import com.carrotsearch.randomizedtesting.generators.RandomStrings; -import org.elasticsearch.index.VersionType; +import org.opensearch.index.VersionType; import java.util.ArrayList; import java.util.HashMap; diff --git a/test/framework/src/main/java/org/opensearch/node/MockNode.java b/test/framework/src/main/java/org/opensearch/node/MockNode.java index 6b8eb34eaef..a6e8c23a6e0 100644 --- a/test/framework/src/main/java/org/opensearch/node/MockNode.java +++ b/test/framework/src/main/java/org/opensearch/node/MockNode.java @@ -32,11 +32,11 @@ import org.opensearch.common.util.BigArrays; import org.opensearch.common.util.MockBigArrays; import org.opensearch.common.util.MockPageCacheRecycler; import org.opensearch.common.util.PageCacheRecycler; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.http.HttpServerTransport; -import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.indices.breaker.CircuitBreakerService; -import org.elasticsearch.indices.recovery.RecoverySettings; +import org.opensearch.indices.IndicesService; +import org.opensearch.indices.breaker.CircuitBreakerService; +import org.opensearch.indices.recovery.RecoverySettings; import org.opensearch.plugins.Plugin; import org.opensearch.script.MockScriptService; import org.opensearch.script.ScriptContext; diff --git a/test/framework/src/main/java/org/opensearch/node/RecoverySettingsChunkSizePlugin.java b/test/framework/src/main/java/org/opensearch/node/RecoverySettingsChunkSizePlugin.java index 1a8be4b2618..eda3890376b 100644 --- a/test/framework/src/main/java/org/opensearch/node/RecoverySettingsChunkSizePlugin.java +++ b/test/framework/src/main/java/org/opensearch/node/RecoverySettingsChunkSizePlugin.java @@ -22,7 +22,7 @@ package org.opensearch.node; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.unit.ByteSizeValue; -import org.elasticsearch.indices.recovery.RecoverySettings; +import org.opensearch.indices.recovery.RecoverySettings; import org.opensearch.plugins.Plugin; import java.util.List; diff --git a/test/framework/src/main/java/org/opensearch/script/MockScriptEngine.java b/test/framework/src/main/java/org/opensearch/script/MockScriptEngine.java index 71b89adf192..6f42b0a6444 100644 --- a/test/framework/src/main/java/org/opensearch/script/MockScriptEngine.java +++ b/test/framework/src/main/java/org/opensearch/script/MockScriptEngine.java @@ -21,11 +21,11 @@ package org.opensearch.script; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.Scorable; -import org.elasticsearch.index.query.IntervalFilterScript; -import org.elasticsearch.index.similarity.ScriptedSimilarity.Doc; -import org.elasticsearch.index.similarity.ScriptedSimilarity.Field; -import org.elasticsearch.index.similarity.ScriptedSimilarity.Query; -import org.elasticsearch.index.similarity.ScriptedSimilarity.Term; +import org.opensearch.index.query.IntervalFilterScript; +import org.opensearch.index.similarity.ScriptedSimilarity.Doc; +import org.opensearch.index.similarity.ScriptedSimilarity.Field; +import org.opensearch.index.similarity.ScriptedSimilarity.Query; +import org.opensearch.index.similarity.ScriptedSimilarity.Term; import org.opensearch.search.aggregations.pipeline.MovingFunctionScript; import org.opensearch.search.lookup.LeafSearchLookup; import org.opensearch.search.lookup.SearchLookup; diff --git a/test/framework/src/main/java/org/opensearch/script/MockScriptService.java b/test/framework/src/main/java/org/opensearch/script/MockScriptService.java index 72c321589e4..458f2a69d84 100644 --- a/test/framework/src/main/java/org/opensearch/script/MockScriptService.java +++ b/test/framework/src/main/java/org/opensearch/script/MockScriptService.java @@ -19,7 +19,7 @@ package org.opensearch.script; -import org.elasticsearch.common.settings.Settings; +import org.opensearch.common.settings.Settings; import org.opensearch.node.MockNode; import org.opensearch.plugins.Plugin; @@ -59,11 +59,11 @@ public class MockScriptService extends ScriptService { @Override public Set> getSupportedContexts() { - return org.elasticsearch.common.collect.Set.of(context); + return org.opensearch.common.collect.Set.of(context); } }; - return new MockScriptService(Settings.EMPTY, org.elasticsearch.common.collect.Map.of("lang", engine), - org.elasticsearch.common.collect.Map.of(context.name, context)) { + return new MockScriptService(Settings.EMPTY, org.opensearch.common.collect.Map.of("lang", engine), + org.opensearch.common.collect.Map.of(context.name, context)) { @Override protected StoredScriptSource getScriptFromClusterState(String id) { return storedLookup.get(id); diff --git a/test/framework/src/main/java/org/opensearch/search/MockSearchService.java b/test/framework/src/main/java/org/opensearch/search/MockSearchService.java index b4a24327c15..4eee58a9b10 100644 --- a/test/framework/src/main/java/org/opensearch/search/MockSearchService.java +++ b/test/framework/src/main/java/org/opensearch/search/MockSearchService.java @@ -21,8 +21,8 @@ package org.opensearch.search; import org.opensearch.cluster.service.ClusterService; import org.opensearch.common.util.BigArrays; -import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.indices.breaker.CircuitBreakerService; +import org.opensearch.indices.IndicesService; +import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.node.MockNode; import org.opensearch.plugins.Plugin; import org.opensearch.script.ScriptService; diff --git a/test/framework/src/main/java/org/opensearch/search/RandomSearchRequestGenerator.java b/test/framework/src/main/java/org/opensearch/search/RandomSearchRequestGenerator.java index 6078443bbd8..a2bab416cc2 100644 --- a/test/framework/src/main/java/org/opensearch/search/RandomSearchRequestGenerator.java +++ b/test/framework/src/main/java/org/opensearch/search/RandomSearchRequestGenerator.java @@ -31,7 +31,7 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.query.QueryBuilders; +import org.opensearch.index.query.QueryBuilders; import org.opensearch.script.Script; import org.opensearch.script.ScriptType; import org.opensearch.search.aggregations.AggregationBuilders; diff --git a/test/framework/src/main/java/org/opensearch/search/aggregations/BasePipelineAggregationTestCase.java b/test/framework/src/main/java/org/opensearch/search/aggregations/BasePipelineAggregationTestCase.java index 9abb6f9da94..1d71837c451 100644 --- a/test/framework/src/main/java/org/opensearch/search/aggregations/BasePipelineAggregationTestCase.java +++ b/test/framework/src/main/java/org/opensearch/search/aggregations/BasePipelineAggregationTestCase.java @@ -41,8 +41,8 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.env.Environment; -import org.elasticsearch.indices.IndicesModule; +import org.opensearch.env.Environment; +import org.opensearch.indices.IndicesModule; import org.opensearch.plugins.SearchPlugin; import org.opensearch.search.SearchModule; import org.opensearch.search.aggregations.PipelineAggregationBuilder.ValidationContext; diff --git a/test/framework/src/main/java/org/opensearch/snapshots/mockstore/MockRepository.java b/test/framework/src/main/java/org/opensearch/snapshots/mockstore/MockRepository.java index bbd19cf96f4..a4dcfcf8254 100644 --- a/test/framework/src/main/java/org/opensearch/snapshots/mockstore/MockRepository.java +++ b/test/framework/src/main/java/org/opensearch/snapshots/mockstore/MockRepository.java @@ -39,7 +39,7 @@ import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.settings.Settings; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.env.Environment; -import org.elasticsearch.indices.recovery.RecoverySettings; +import org.opensearch.indices.recovery.RecoverySettings; import org.opensearch.plugins.RepositoryPlugin; import org.opensearch.repositories.Repository; import org.opensearch.repositories.blobstore.BlobStoreRepository; diff --git a/test/framework/src/main/java/org/opensearch/test/AbstractBootstrapCheckTestCase.java b/test/framework/src/main/java/org/opensearch/test/AbstractBootstrapCheckTestCase.java index ca1abdbd5b9..a2ec5de06a6 100644 --- a/test/framework/src/main/java/org/opensearch/test/AbstractBootstrapCheckTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/AbstractBootstrapCheckTestCase.java @@ -23,7 +23,7 @@ import org.opensearch.Version; import org.opensearch.bootstrap.BootstrapContext; import org.opensearch.cluster.metadata.Metadata; import org.opensearch.common.settings.Settings; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import java.nio.file.Path; diff --git a/test/framework/src/main/java/org/opensearch/test/AbstractBroadcastResponseTestCase.java b/test/framework/src/main/java/org/opensearch/test/AbstractBroadcastResponseTestCase.java index f33f34cdd0f..6a4564df7f2 100644 --- a/test/framework/src/main/java/org/opensearch/test/AbstractBroadcastResponseTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/AbstractBroadcastResponseTestCase.java @@ -27,8 +27,8 @@ import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.xcontent.ToXContent; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.Index; +import org.opensearch.index.shard.ShardId; import org.opensearch.rest.RestStatus; import java.io.IOException; diff --git a/test/framework/src/main/java/org/opensearch/test/ClusterServiceUtils.java b/test/framework/src/main/java/org/opensearch/test/ClusterServiceUtils.java index 6eae671d0c9..152e9dd5543 100644 --- a/test/framework/src/main/java/org/opensearch/test/ClusterServiceUtils.java +++ b/test/framework/src/main/java/org/opensearch/test/ClusterServiceUtils.java @@ -35,8 +35,8 @@ import org.opensearch.cluster.service.ClusterApplier.ClusterApplyListener; import org.opensearch.cluster.service.ClusterApplierService; import org.opensearch.cluster.service.ClusterService; import org.opensearch.cluster.service.MasterService; -import org.elasticsearch.common.settings.ClusterSettings; -import org.elasticsearch.common.settings.Settings; +import org.opensearch.common.settings.ClusterSettings; +import org.opensearch.common.settings.Settings; import org.opensearch.node.Node; import org.opensearch.threadpool.ThreadPool; diff --git a/test/framework/src/main/java/org/opensearch/test/DummyShardLock.java b/test/framework/src/main/java/org/opensearch/test/DummyShardLock.java index 69daaa11230..bf2be5a7a13 100644 --- a/test/framework/src/main/java/org/opensearch/test/DummyShardLock.java +++ b/test/framework/src/main/java/org/opensearch/test/DummyShardLock.java @@ -19,8 +19,8 @@ package org.opensearch.test; -import org.elasticsearch.env.ShardLock; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.env.ShardLock; +import org.opensearch.index.shard.ShardId; /* * A ShardLock that does nothing... for tests only diff --git a/test/framework/src/main/java/org/opensearch/test/ExternalTestCluster.java b/test/framework/src/main/java/org/opensearch/test/ExternalTestCluster.java index d34c1d3cfd7..f8d74f2d5c6 100644 --- a/test/framework/src/main/java/org/opensearch/test/ExternalTestCluster.java +++ b/test/framework/src/main/java/org/opensearch/test/ExternalTestCluster.java @@ -32,7 +32,7 @@ import org.opensearch.common.io.stream.NamedWriteableRegistry; import org.opensearch.common.network.NetworkModule; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; -import org.elasticsearch.env.Environment; +import org.opensearch.env.Environment; import org.opensearch.http.HttpInfo; import org.opensearch.plugins.Plugin; import org.opensearch.transport.MockTransportClient; diff --git a/test/framework/src/main/java/org/opensearch/test/InternalSettingsPlugin.java b/test/framework/src/main/java/org/opensearch/test/InternalSettingsPlugin.java index 7f6528dc112..096daf1a719 100644 --- a/test/framework/src/main/java/org/opensearch/test/InternalSettingsPlugin.java +++ b/test/framework/src/main/java/org/opensearch/test/InternalSettingsPlugin.java @@ -22,10 +22,10 @@ import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.unit.TimeValue; -import org.elasticsearch.index.IndexModule; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.monitor.fs.FsService; +import org.opensearch.index.IndexModule; +import org.opensearch.index.IndexService; +import org.opensearch.index.IndexSettings; +import org.opensearch.monitor.fs.FsService; import org.opensearch.plugins.Plugin; import org.opensearch.transport.RemoteConnectionStrategy; diff --git a/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java b/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java index 413b98ba2af..3ee6aeaac1d 100644 --- a/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java +++ b/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java @@ -81,28 +81,28 @@ import org.opensearch.common.util.set.Sets; import org.opensearch.core.internal.io.IOUtils; import org.opensearch.discovery.zen.ElectMasterService; import org.opensearch.discovery.zen.ZenDiscovery; -import org.elasticsearch.env.Environment; -import org.elasticsearch.env.NodeEnvironment; -import org.elasticsearch.env.ShardLockObtainFailedException; +import org.opensearch.env.Environment; +import org.opensearch.env.NodeEnvironment; +import org.opensearch.env.ShardLockObtainFailedException; import org.opensearch.http.HttpServerTransport; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.IndexingPressure; -import org.elasticsearch.index.engine.CommitStats; +import org.opensearch.index.Index; +import org.opensearch.index.IndexService; +import org.opensearch.index.IndexingPressure; +import org.opensearch.index.engine.CommitStats; import org.opensearch.index.engine.DocIdSeqNoAndSource; -import org.elasticsearch.index.engine.Engine; +import org.opensearch.index.engine.Engine; import org.opensearch.index.engine.EngineTestCase; -import org.elasticsearch.index.engine.InternalEngine; -import org.elasticsearch.index.seqno.SeqNoStats; -import org.elasticsearch.index.seqno.SequenceNumbers; -import org.elasticsearch.index.shard.IndexShard; +import org.opensearch.index.engine.InternalEngine; +import org.opensearch.index.seqno.SeqNoStats; +import org.opensearch.index.seqno.SequenceNumbers; +import org.opensearch.index.shard.IndexShard; import org.opensearch.index.shard.IndexShardTestCase; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.indices.breaker.CircuitBreakerService; -import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService; -import org.elasticsearch.indices.fielddata.cache.IndicesFieldDataCache; -import org.elasticsearch.indices.recovery.RecoverySettings; +import org.opensearch.index.shard.ShardId; +import org.opensearch.indices.IndicesService; +import org.opensearch.indices.breaker.CircuitBreakerService; +import org.opensearch.indices.breaker.HierarchyCircuitBreakerService; +import org.opensearch.indices.fielddata.cache.IndicesFieldDataCache; +import org.opensearch.indices.recovery.RecoverySettings; import org.opensearch.node.MockNode; import org.opensearch.node.Node; import org.opensearch.node.NodeRoleSettings; diff --git a/test/framework/src/main/java/org/opensearch/test/MockIndexEventListener.java b/test/framework/src/main/java/org/opensearch/test/MockIndexEventListener.java index 82c48e92e4c..512a786dc11 100644 --- a/test/framework/src/main/java/org/opensearch/test/MockIndexEventListener.java +++ b/test/framework/src/main/java/org/opensearch/test/MockIndexEventListener.java @@ -24,15 +24,15 @@ import org.opensearch.common.inject.Module; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.IndexModule; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.index.shard.IndexEventListener; -import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.index.shard.IndexShardState; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.indices.cluster.IndicesClusterStateService.AllocatedIndices.IndexRemovalReason; +import org.opensearch.index.Index; +import org.opensearch.index.IndexModule; +import org.opensearch.index.IndexService; +import org.opensearch.index.IndexSettings; +import org.opensearch.index.shard.IndexEventListener; +import org.opensearch.index.shard.IndexShard; +import org.opensearch.index.shard.IndexShardState; +import org.opensearch.index.shard.ShardId; +import org.opensearch.indices.cluster.IndicesClusterStateService.AllocatedIndices.IndexRemovalReason; import org.opensearch.plugins.Plugin; import java.util.Arrays; diff --git a/test/framework/src/main/java/org/opensearch/test/MockKeywordPlugin.java b/test/framework/src/main/java/org/opensearch/test/MockKeywordPlugin.java index a08e39f2d2c..51985c83f35 100644 --- a/test/framework/src/main/java/org/opensearch/test/MockKeywordPlugin.java +++ b/test/framework/src/main/java/org/opensearch/test/MockKeywordPlugin.java @@ -19,8 +19,8 @@ package org.opensearch.test; import org.apache.lucene.analysis.MockTokenizer; -import org.elasticsearch.index.analysis.TokenizerFactory; -import org.elasticsearch.indices.analysis.AnalysisModule; +import org.opensearch.index.analysis.TokenizerFactory; +import org.opensearch.indices.analysis.AnalysisModule; import org.opensearch.plugins.AnalysisPlugin; import org.opensearch.plugins.Plugin; diff --git a/test/framework/src/main/java/org/opensearch/test/MockLogAppender.java b/test/framework/src/main/java/org/opensearch/test/MockLogAppender.java index 33b33e1fc32..4acd7428d67 100644 --- a/test/framework/src/main/java/org/opensearch/test/MockLogAppender.java +++ b/test/framework/src/main/java/org/opensearch/test/MockLogAppender.java @@ -36,7 +36,7 @@ import static org.hamcrest.MatcherAssert.assertThat; */ public class MockLogAppender extends AbstractAppender { - private static final String COMMON_PREFIX = System.getProperty("opensearch.logger.prefix", "org.elasticsearch."); + private static final String COMMON_PREFIX = System.getProperty("opensearch.logger.prefix", "org.opensearch."); private List expectations; @@ -191,8 +191,8 @@ public class MockLogAppender extends AbstractAppender { } private static String getLoggerName(String name) { - if (name.startsWith("org.elasticsearch.")) { - name = name.substring("org.elasticsearch.".length()); + if (name.startsWith("org.opensearch.")) { + name = name.substring("org.opensearch.".length()); } return COMMON_PREFIX + name; } diff --git a/test/framework/src/main/java/org/opensearch/test/NodeRoles.java b/test/framework/src/main/java/org/opensearch/test/NodeRoles.java index e4e24deeb9e..690b70e2710 100644 --- a/test/framework/src/main/java/org/opensearch/test/NodeRoles.java +++ b/test/framework/src/main/java/org/opensearch/test/NodeRoles.java @@ -20,7 +20,7 @@ package org.opensearch.test; import org.opensearch.cluster.node.DiscoveryNodeRole; -import org.elasticsearch.common.settings.Settings; +import org.opensearch.common.settings.Settings; import org.opensearch.node.NodeRoleSettings; import java.util.Collections; diff --git a/test/framework/src/main/java/org/opensearch/test/OpenSearchSingleNodeTestCase.java b/test/framework/src/main/java/org/opensearch/test/OpenSearchSingleNodeTestCase.java index 75d73c0a999..955bdc53d04 100644 --- a/test/framework/src/main/java/org/opensearch/test/OpenSearchSingleNodeTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/OpenSearchSingleNodeTestCase.java @@ -40,13 +40,13 @@ import org.opensearch.common.util.concurrent.OpenSearchExecutors; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.core.internal.io.IOUtils; -import org.elasticsearch.env.Environment; -import org.elasticsearch.env.NodeEnvironment; -import org.elasticsearch.index.Index; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.IndexSettings; -import org.elasticsearch.indices.IndicesService; -import org.elasticsearch.indices.breaker.HierarchyCircuitBreakerService; +import org.opensearch.env.Environment; +import org.opensearch.env.NodeEnvironment; +import org.opensearch.index.Index; +import org.opensearch.index.IndexService; +import org.opensearch.index.IndexSettings; +import org.opensearch.indices.IndicesService; +import org.opensearch.indices.breaker.HierarchyCircuitBreakerService; import org.opensearch.node.MockNode; import org.opensearch.node.Node; import org.opensearch.node.NodeValidationException; diff --git a/test/framework/src/main/java/org/opensearch/test/OpenSearchTestCase.java b/test/framework/src/main/java/org/opensearch/test/OpenSearchTestCase.java index 6622adf9797..e88a31e1699 100644 --- a/test/framework/src/main/java/org/opensearch/test/OpenSearchTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/OpenSearchTestCase.java @@ -350,13 +350,13 @@ public abstract class OpenSearchTestCase extends LuceneTestCase { public void setHeaderWarningAppender() { this.headerWarningAppender = HeaderWarningAppender.createAppender("header_warning", null); this.headerWarningAppender.start(); - Loggers.addAppender(LogManager.getLogger("org.elasticsearch.deprecation"), this.headerWarningAppender); + Loggers.addAppender(LogManager.getLogger("org.opensearch.deprecation"), this.headerWarningAppender); } @After public void removeHeaderWarningAppender() { if (this.headerWarningAppender != null) { - Loggers.removeAppender(LogManager.getLogger("org.elasticsearch.deprecation"), this.headerWarningAppender); + Loggers.removeAppender(LogManager.getLogger("org.opensearch.deprecation"), this.headerWarningAppender); this.headerWarningAppender = null; } } diff --git a/test/framework/src/main/java/org/opensearch/test/RandomObjects.java b/test/framework/src/main/java/org/opensearch/test/RandomObjects.java index 87af0fd111d..fc52ff3b429 100644 --- a/test/framework/src/main/java/org/opensearch/test/RandomObjects.java +++ b/test/framework/src/main/java/org/opensearch/test/RandomObjects.java @@ -39,9 +39,9 @@ import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.XContentType; -import org.elasticsearch.index.shard.IndexShardRecoveringException; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.index.shard.ShardNotFoundException; +import org.opensearch.index.shard.IndexShardRecoveringException; +import org.opensearch.index.shard.ShardId; +import org.opensearch.index.shard.ShardNotFoundException; import org.opensearch.rest.RestStatus; import java.io.IOException; @@ -71,7 +71,7 @@ public final class RandomObjects { * via {@link org.opensearch.common.xcontent.ToXContent#toXContent(XContentBuilder, ToXContent.Params)} and parsed back via * {@link org.opensearch.common.xcontent.XContentParser#objectText()}. * Generates values based on what can get printed out. Stored fields values are retrieved from lucene and converted via - * {@link org.elasticsearch.index.mapper.MappedFieldType#valueForDisplay(Object)} to either strings, numbers or booleans. + * {@link org.opensearch.index.mapper.MappedFieldType#valueForDisplay(Object)} to either strings, numbers or booleans. * * @param random Random generator * @param xContentType the content type, used to determine what the expected values are for float numbers. @@ -132,7 +132,7 @@ public final class RandomObjects { * via {@link org.opensearch.common.xcontent.ToXContent#toXContent(XContentBuilder, ToXContent.Params)} and parsed back via * {@link org.opensearch.common.xcontent.XContentParser#objectText()}. * Generates values based on what can get printed out. Stored fields values are retrieved from lucene and converted via - * {@link org.elasticsearch.index.mapper.MappedFieldType#valueForDisplay(Object)} to either strings, numbers or booleans. + * {@link org.opensearch.index.mapper.MappedFieldType#valueForDisplay(Object)} to either strings, numbers or booleans. */ public static Object getExpectedParsedValue(XContentType xContentType, Object value) { if (value instanceof BytesArray) { diff --git a/test/framework/src/main/java/org/opensearch/test/TestCluster.java b/test/framework/src/main/java/org/opensearch/test/TestCluster.java index 16854d32fe3..0e542d1cc51 100644 --- a/test/framework/src/main/java/org/opensearch/test/TestCluster.java +++ b/test/framework/src/main/java/org/opensearch/test/TestCluster.java @@ -32,7 +32,7 @@ import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.cluster.metadata.IndexTemplateMetadata; import org.opensearch.common.io.stream.NamedWriteableRegistry; -import org.elasticsearch.index.IndexNotFoundException; +import org.opensearch.index.IndexNotFoundException; import org.opensearch.indices.IndexTemplateMissingException; import org.opensearch.repositories.RepositoryMissingException; import org.opensearch.test.hamcrest.OpenSearchAssertions; diff --git a/test/framework/src/main/java/org/opensearch/test/TestGeoShapeFieldMapperPlugin.java b/test/framework/src/main/java/org/opensearch/test/TestGeoShapeFieldMapperPlugin.java index b20336136ba..513a932d47c 100644 --- a/test/framework/src/main/java/org/opensearch/test/TestGeoShapeFieldMapperPlugin.java +++ b/test/framework/src/main/java/org/opensearch/test/TestGeoShapeFieldMapperPlugin.java @@ -18,8 +18,8 @@ */ package org.opensearch.test; -import org.elasticsearch.index.mapper.GeoShapeFieldMapper; -import org.elasticsearch.index.mapper.Mapper; +import org.opensearch.index.mapper.GeoShapeFieldMapper; +import org.opensearch.index.mapper.Mapper; import org.opensearch.plugins.MapperPlugin; import org.opensearch.plugins.Plugin; @@ -28,7 +28,7 @@ import java.util.LinkedHashMap; import java.util.Map; /** - * Some tests depend on the {@link org.elasticsearch.index.mapper.GeoShapeFieldMapper}. + * Some tests depend on the {@link org.opensearch.index.mapper.GeoShapeFieldMapper}. * This mapper is registered in the spatial-extras module, but used in many integration * tests in server code. The goal is to migrate all of the spatial/geo pieces to the spatial-extras * module such that no tests in server depend on this test plugin diff --git a/test/framework/src/main/java/org/opensearch/test/TestSearchContext.java b/test/framework/src/main/java/org/opensearch/test/TestSearchContext.java index 428b90c1ebc..e2602e46daa 100644 --- a/test/framework/src/main/java/org/opensearch/test/TestSearchContext.java +++ b/test/framework/src/main/java/org/opensearch/test/TestSearchContext.java @@ -26,16 +26,16 @@ import org.opensearch.action.search.SearchShardTask; import org.opensearch.action.search.SearchType; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.BigArrays; -import org.elasticsearch.index.IndexService; -import org.elasticsearch.index.cache.bitset.BitsetFilterCache; -import org.elasticsearch.index.mapper.MappedFieldType; -import org.elasticsearch.index.mapper.MapperService; -import org.elasticsearch.index.mapper.ObjectMapper; -import org.elasticsearch.index.query.ParsedQuery; -import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.index.shard.IndexShard; -import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.index.similarity.SimilarityService; +import org.opensearch.index.IndexService; +import org.opensearch.index.cache.bitset.BitsetFilterCache; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.MapperService; +import org.opensearch.index.mapper.ObjectMapper; +import org.opensearch.index.query.ParsedQuery; +import org.opensearch.index.query.QueryShardContext; +import org.opensearch.index.shard.IndexShard; +import org.opensearch.index.shard.ShardId; +import org.opensearch.index.similarity.SimilarityService; import org.opensearch.search.SearchExtBuilder; import org.opensearch.search.SearchShardTarget; import org.opensearch.search.aggregations.SearchContextAggregations; diff --git a/test/framework/src/main/java/org/opensearch/test/engine/MockEngineFactory.java b/test/framework/src/main/java/org/opensearch/test/engine/MockEngineFactory.java index 0a87b661446..62f7d128c9a 100644 --- a/test/framework/src/main/java/org/opensearch/test/engine/MockEngineFactory.java +++ b/test/framework/src/main/java/org/opensearch/test/engine/MockEngineFactory.java @@ -19,9 +19,9 @@ package org.opensearch.test.engine; import org.apache.lucene.index.FilterDirectoryReader; -import org.elasticsearch.index.engine.Engine; -import org.elasticsearch.index.engine.EngineConfig; -import org.elasticsearch.index.engine.EngineFactory; +import org.opensearch.index.engine.Engine; +import org.opensearch.index.engine.EngineConfig; +import org.opensearch.index.engine.EngineFactory; public final class MockEngineFactory implements EngineFactory { diff --git a/test/framework/src/main/java/org/opensearch/test/engine/MockEngineSupport.java b/test/framework/src/main/java/org/opensearch/test/engine/MockEngineSupport.java index 4438b99fe0f..a9ab4436e3a 100644 --- a/test/framework/src/main/java/org/opensearch/test/engine/MockEngineSupport.java +++ b/test/framework/src/main/java/org/opensearch/test/engine/MockEngineSupport.java @@ -29,10 +29,10 @@ import org.opensearch.OpenSearchException; import org.opensearch.common.settings.Setting; import org.opensearch.common.settings.Setting.Property; import org.opensearch.common.settings.Settings; -import org.elasticsearch.index.engine.Engine; -import org.elasticsearch.index.engine.EngineConfig; -import org.elasticsearch.index.engine.EngineException; -import org.elasticsearch.index.shard.ShardId; +import org.opensearch.index.engine.Engine; +import org.opensearch.index.engine.EngineConfig; +import org.opensearch.index.engine.EngineException; +import org.opensearch.index.shard.ShardId; import org.opensearch.test.OpenSearchIntegTestCase; import java.io.Closeable; diff --git a/test/framework/src/main/java/org/opensearch/test/engine/MockInternalEngine.java b/test/framework/src/main/java/org/opensearch/test/engine/MockInternalEngine.java index e63655f773c..bf4c7dc1cc1 100644 --- a/test/framework/src/main/java/org/opensearch/test/engine/MockInternalEngine.java +++ b/test/framework/src/main/java/org/opensearch/test/engine/MockInternalEngine.java @@ -19,10 +19,10 @@ package org.opensearch.test.engine; import org.apache.lucene.index.FilterDirectoryReader; -import org.elasticsearch.index.engine.Engine; -import org.elasticsearch.index.engine.EngineConfig; -import org.elasticsearch.index.engine.EngineException; -import org.elasticsearch.index.engine.InternalEngine; +import org.opensearch.index.engine.Engine; +import org.opensearch.index.engine.EngineConfig; +import org.opensearch.index.engine.EngineException; +import org.opensearch.index.engine.InternalEngine; import java.io.IOException; import java.util.function.Function; diff --git a/test/framework/src/main/java/org/opensearch/test/junit/annotations/TestIssueLogging.java b/test/framework/src/main/java/org/opensearch/test/junit/annotations/TestIssueLogging.java index 852502ce620..a4aaaf2522f 100644 --- a/test/framework/src/main/java/org/opensearch/test/junit/annotations/TestIssueLogging.java +++ b/test/framework/src/main/java/org/opensearch/test/junit/annotations/TestIssueLogging.java @@ -32,7 +32,7 @@ import static java.lang.annotation.ElementType.TYPE; * control the logging level in tests; instead, use {@link TestLogging}. * * It supports multiple logger:level comma-separated key-value pairs of logger:level (e.g., - * org.elasticsearch.cluster.metadata:TRACE). Use the _root keyword to set the root logger level. + * org.opensearch.cluster.metadata:TRACE). Use the _root keyword to set the root logger level. */ @Retention(RetentionPolicy.RUNTIME) @Target({PACKAGE, TYPE, METHOD}) diff --git a/test/framework/src/main/java/org/opensearch/test/junit/annotations/TestLogging.java b/test/framework/src/main/java/org/opensearch/test/junit/annotations/TestLogging.java index 96933820ae7..c02b4ab8521 100644 --- a/test/framework/src/main/java/org/opensearch/test/junit/annotations/TestLogging.java +++ b/test/framework/src/main/java/org/opensearch/test/junit/annotations/TestLogging.java @@ -32,7 +32,7 @@ import static java.lang.annotation.ElementType.TYPE; * investigating test failures; instead, use {@link TestIssueLogging}. * * It supports multiple logger:level comma-separated key-value pairs of logger:level (e.g., - * org.elasticsearch.cluster.metadata:TRACE). Use the _root keyword to set the root logger level. + * org.opensearch.cluster.metadata:TRACE). Use the _root keyword to set the root logger level. */ @Retention(RetentionPolicy.RUNTIME) @Target({PACKAGE, TYPE, METHOD}) diff --git a/test/framework/src/main/java/org/opensearch/test/rest/RestActionTestCase.java b/test/framework/src/main/java/org/opensearch/test/rest/RestActionTestCase.java index 1e6c2a4abab..99ed3420e02 100644 --- a/test/framework/src/main/java/org/opensearch/test/rest/RestActionTestCase.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/RestActionTestCase.java @@ -23,7 +23,7 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRequest; import org.opensearch.action.ActionResponse; import org.opensearch.action.ActionType; -import org.elasticsearch.common.settings.Settings; +import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.client.node.NodeClient; diff --git a/test/framework/src/main/java/org/opensearch/test/rest/yaml/ObjectPath.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/ObjectPath.java index 4ce804e3fa5..c530ad73de0 100644 --- a/test/framework/src/main/java/org/opensearch/test/rest/yaml/ObjectPath.java +++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/ObjectPath.java @@ -20,8 +20,8 @@ package org.opensearch.test.rest.yaml; import org.apache.http.util.EntityUtils; import org.opensearch.client.Response; -import org.elasticsearch.common.bytes.BytesArray; -import org.elasticsearch.common.bytes.BytesReference; +import org.opensearch.common.bytes.BytesArray; +import org.opensearch.common.bytes.BytesReference; import org.opensearch.common.xcontent.DeprecationHandler; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.XContent; diff --git a/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java b/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java index 842aa72e318..aa009fd9034 100644 --- a/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java +++ b/test/framework/src/main/java/org/opensearch/transport/AbstractSimpleTransportTestCase.java @@ -1020,7 +1020,7 @@ public abstract class AbstractSimpleTransportTestCase extends OpenSearchTestCase } @TestLogging( - value = "org.elasticsearch.transport.TransportService.tracer:trace", + value = "org.opensearch.transport.TransportService.tracer:trace", reason = "to ensure we log network events on TRACE level") public void testTracerLog() throws Exception { TransportRequestHandler handler = (request, channel, task) -> channel.sendResponse(new StringMessageResponse("")); @@ -1078,23 +1078,23 @@ public abstract class AbstractSimpleTransportTestCase extends OpenSearchTestCase MockLogAppender appender = new MockLogAppender(); try { appender.start(); - Loggers.addAppender(LogManager.getLogger("org.elasticsearch.transport.TransportService.tracer"), appender); + Loggers.addAppender(LogManager.getLogger("org.opensearch.transport.TransportService.tracer"), appender); final String requestSent = ".*\\[internal:test].*sent to.*\\{TS_B}.*"; final MockLogAppender.LoggingExpectation requestSentExpectation = new MockLogAppender.PatternSeenEventExpectation( - "sent request", "org.elasticsearch.transport.TransportService.tracer", Level.TRACE, requestSent); + "sent request", "org.opensearch.transport.TransportService.tracer", Level.TRACE, requestSent); final String requestReceived = ".*\\[internal:test].*received request.*"; final MockLogAppender.LoggingExpectation requestReceivedExpectation = new MockLogAppender.PatternSeenEventExpectation( - "received request", "org.elasticsearch.transport.TransportService.tracer", Level.TRACE, requestReceived); + "received request", "org.opensearch.transport.TransportService.tracer", Level.TRACE, requestReceived); final String responseSent = ".*\\[internal:test].*sent response.*"; final MockLogAppender.LoggingExpectation responseSentExpectation = new MockLogAppender.PatternSeenEventExpectation( - "sent response", "org.elasticsearch.transport.TransportService.tracer", Level.TRACE, responseSent); + "sent response", "org.opensearch.transport.TransportService.tracer", Level.TRACE, responseSent); final String responseReceived = ".*\\[internal:test].*received response from.*\\{TS_B}.*"; final MockLogAppender.LoggingExpectation responseReceivedExpectation = new MockLogAppender.PatternSeenEventExpectation( - "received response", "org.elasticsearch.transport.TransportService.tracer", Level.TRACE, responseReceived); + "received response", "org.opensearch.transport.TransportService.tracer", Level.TRACE, responseReceived); appender.addExpectation(requestSentExpectation); appender.addExpectation(requestReceivedExpectation); @@ -1109,12 +1109,12 @@ public abstract class AbstractSimpleTransportTestCase extends OpenSearchTestCase final String errorResponseSent = ".*\\[internal:testError].*sent error response.*"; final MockLogAppender.LoggingExpectation errorResponseSentExpectation = new MockLogAppender.PatternSeenEventExpectation( - "sent error response", "org.elasticsearch.transport.TransportService.tracer", Level.TRACE, errorResponseSent); + "sent error response", "org.opensearch.transport.TransportService.tracer", Level.TRACE, errorResponseSent); final String errorResponseReceived = ".*\\[internal:testError].*received response from.*\\{TS_B}.*"; final MockLogAppender.LoggingExpectation errorResponseReceivedExpectation = new MockLogAppender.PatternSeenEventExpectation( - "received error response", "org.elasticsearch.transport.TransportService.tracer", Level.TRACE, errorResponseReceived); + "received error response", "org.opensearch.transport.TransportService.tracer", Level.TRACE, errorResponseReceived); appender.addExpectation(errorResponseSentExpectation); appender.addExpectation(errorResponseReceivedExpectation); @@ -1126,11 +1126,11 @@ public abstract class AbstractSimpleTransportTestCase extends OpenSearchTestCase final String notSeenSent = "*[internal:testNotSeen]*sent to*"; final MockLogAppender.LoggingExpectation notSeenSentExpectation = new MockLogAppender.UnseenEventExpectation( - "not seen request sent", "org.elasticsearch.transport.TransportService.tracer", Level.TRACE, notSeenSent); + "not seen request sent", "org.opensearch.transport.TransportService.tracer", Level.TRACE, notSeenSent); final String notSeenReceived = ".*\\[internal:testNotSeen].*received request.*"; final MockLogAppender.LoggingExpectation notSeenReceivedExpectation = new MockLogAppender.PatternSeenEventExpectation( - "not seen request received", "org.elasticsearch.transport.TransportService.tracer", Level.TRACE, notSeenReceived); + "not seen request received", "org.opensearch.transport.TransportService.tracer", Level.TRACE, notSeenReceived); appender.addExpectation(notSeenSentExpectation); appender.addExpectation(notSeenReceivedExpectation); @@ -1141,7 +1141,7 @@ public abstract class AbstractSimpleTransportTestCase extends OpenSearchTestCase assertBusy(appender::assertAllExpectationsMatched); } finally { - Loggers.removeAppender(LogManager.getLogger("org.elasticsearch.transport.TransportService.tracer"), appender); + Loggers.removeAppender(LogManager.getLogger("org.opensearch.transport.TransportService.tracer"), appender); appender.stop(); } } diff --git a/test/framework/src/main/java/org/opensearch/transport/nio/MockNioTransport.java b/test/framework/src/main/java/org/opensearch/transport/nio/MockNioTransport.java index 28a7bfb194b..fd402514966 100644 --- a/test/framework/src/main/java/org/opensearch/transport/nio/MockNioTransport.java +++ b/test/framework/src/main/java/org/opensearch/transport/nio/MockNioTransport.java @@ -40,7 +40,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.unit.TimeValue; import org.opensearch.common.util.PageCacheRecycler; import org.opensearch.core.internal.io.IOUtils; -import org.elasticsearch.indices.breaker.CircuitBreakerService; +import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.nio.BytesChannelContext; import org.opensearch.nio.BytesWriteHandler; import org.opensearch.nio.ChannelFactory; diff --git a/test/framework/src/test/java/org/opensearch/test/test/InternalTestClusterTests.java b/test/framework/src/test/java/org/opensearch/test/test/InternalTestClusterTests.java index 738e274fe51..3a7f02a1e4b 100644 --- a/test/framework/src/test/java/org/opensearch/test/test/InternalTestClusterTests.java +++ b/test/framework/src/test/java/org/opensearch/test/test/InternalTestClusterTests.java @@ -29,8 +29,8 @@ import org.opensearch.core.internal.io.IOUtils; import org.opensearch.discovery.DiscoveryModule; import org.opensearch.discovery.DiscoverySettings; import org.opensearch.discovery.SettingsBasedSeedHostsProvider; -import org.elasticsearch.env.Environment; -import org.elasticsearch.env.NodeEnvironment; +import org.opensearch.env.Environment; +import org.opensearch.env.NodeEnvironment; import org.opensearch.plugins.Plugin; import org.opensearch.test.OpenSearchTestCase; import org.opensearch.test.InternalTestCluster; diff --git a/test/framework/src/test/java/org/opensearch/transport/nio/SimpleMockNioTransportTests.java b/test/framework/src/test/java/org/opensearch/transport/nio/SimpleMockNioTransportTests.java index ab17659f12c..f94ffdeb80a 100644 --- a/test/framework/src/test/java/org/opensearch/transport/nio/SimpleMockNioTransportTests.java +++ b/test/framework/src/test/java/org/opensearch/transport/nio/SimpleMockNioTransportTests.java @@ -28,7 +28,7 @@ import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.common.transport.TransportAddress; import org.opensearch.common.util.MockPageCacheRecycler; -import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; +import org.opensearch.indices.breaker.NoneCircuitBreakerService; import org.opensearch.transport.AbstractSimpleTransportTestCase; import org.opensearch.transport.ConnectTransportException; import org.opensearch.transport.ConnectionProfile;