From 5bef7cec87ebb6b2b881c260e581fda507195a53 Mon Sep 17 00:00:00 2001 From: Nick Knize Date: Wed, 17 Mar 2021 17:20:22 -0500 Subject: [PATCH] [Rename] env,geo,http,indices,ingest,plugin,upgrade packages from test framework (#363) This commit refactors the following test framework packages: * o.e.env * o.e.geo * o.e.http * o.e.indices * o.e.ingest * o.e.plugin * o.e.upgrades to the o.opensearch namespace. All references throughout the test codebase have been refactored. Signed-off-by: Nicholas Walter Knize --- .../settings/KeyStoreCommandTestCase.java | 2 +- .../plugins/InstallPluginCommandTests.java | 2 +- .../geometry/GeometryCollectionTests.java | 2 +- .../org/opensearch/geometry/LineTests.java | 2 +- .../opensearch/geometry/MultiLineTests.java | 2 +- .../opensearch/geometry/MultiPointTests.java | 2 +- .../geometry/MultiPolygonTests.java | 2 +- .../org/opensearch/geometry/PointTests.java | 2 +- .../org/opensearch/geometry/PolygonTests.java | 2 +- .../opensearch/geometry/RectangleTests.java | 2 +- .../common/CommonAnalysisFactoryTests.java | 2 +- .../common/CompoundAnalysisTests.java | 2 +- .../common/EdgeNGramTokenizerTests.java | 2 +- .../common/MultiplexerTokenFilterTests.java | 2 +- .../ScriptedConditionTokenFilterTests.java | 2 +- ...DelimiterGraphTokenFilterFactoryTests.java | 2 +- ...bstractStringProcessorFactoryTestCase.java | 2 +- .../AbstractStringProcessorTestCase.java | 4 ++-- .../common/AppendProcessorFactoryTests.java | 2 +- .../ingest/common/AppendProcessorTests.java | 4 ++-- .../ingest/common/BytesProcessorTests.java | 2 +- .../ingest/common/ConvertProcessorTests.java | 4 ++-- .../ingest/common/CsvProcessorTests.java | 2 +- .../common/DateIndexNameFactoryTests.java | 2 +- .../common/DateIndexNameProcessorTests.java | 2 +- .../common/DateProcessorFactoryTests.java | 2 +- .../ingest/common/DateProcessorTests.java | 4 ++-- .../common/DissectProcessorFactoryTests.java | 2 +- .../ingest/common/DissectProcessorTests.java | 4 ++-- .../common/DotExpanderProcessorTests.java | 2 +- .../common/FailProcessorFactoryTests.java | 2 +- .../ingest/common/FailProcessorTests.java | 4 ++-- .../common/ForEachProcessorFactoryTests.java | 2 +- .../ingest/common/ForEachProcessorTests.java | 6 +++--- .../ingest/common/GrokProcessorTests.java | 4 ++-- .../ingest/common/JoinProcessorTests.java | 2 +- .../ingest/common/JsonProcessorTests.java | 2 +- .../ingest/common/KeyValueProcessorTests.java | 4 ++-- .../common/RemoveProcessorFactoryTests.java | 2 +- .../ingest/common/RemoveProcessorTests.java | 4 ++-- .../common/RenameProcessorFactoryTests.java | 2 +- .../ingest/common/RenameProcessorTests.java | 6 +++--- .../ingest/common/ScriptProcessorTests.java | 2 +- .../common/SetProcessorFactoryTests.java | 2 +- .../ingest/common/SetProcessorTests.java | 4 ++-- .../common/SortProcessorFactoryTests.java | 2 +- .../ingest/common/SortProcessorTests.java | 2 +- .../ingest/common/SplitProcessorTests.java | 4 ++-- .../ingest/geoip/GeoIpProcessorTests.java | 4 ++-- .../useragent/UserAgentProcessorTests.java | 4 ++-- .../PercolateQueryBuilderTests.java | 2 +- .../opensearch/index/reindex/CancelTests.java | 2 +- .../elasticsearch/index/IndexModuleTests.java | 2 +- .../index/analysis/AnalysisRegistryTests.java | 2 +- .../index/analysis/AnalysisTests.java | 2 +- .../analysis/CoreAnalysisFactoryTests.java | 2 +- .../PreConfiguredTokenFilterTests.java | 2 +- .../index/shard/NewPathForShardTests.java | 2 +- .../RemoveCorruptedShardDataCommandTests.java | 2 +- .../indices/analysis/AnalysisModuleTests.java | 2 +- .../indices/cluster/ClusterStateChanges.java | 2 +- .../recovery/RecoverySourceHandlerTests.java | 1 + .../plugins/PluginInfoTests.java | 1 + .../plugins/PluginsServiceTests.java | 3 ++- .../common/geo/GeoBoundingBoxTests.java | 5 +---- .../common/geo/GeoJsonSerializationTests.java | 19 +++++++++---------- .../common/geo/GeometryIOTests.java | 4 +--- .../common/geo/GeometryIndexerTests.java | 5 +---- .../BlobStoreRepositoryRestoreTests.java | 2 +- .../geogrid/GeoHashGridParserTests.java | 2 +- .../geogrid/GeoTileGridParserTests.java | 2 +- .../AbstractSuggestionBuilderTestCase.java | 2 +- .../snapshots/SnapshotResiliencyTests.java | 2 +- .../index/shard/IndexShardTestCase.java | 2 +- .../test/AbstractBuilderTestCase.java | 2 +- .../elasticsearch/test/ESIntegTestCase.java | 2 +- .../org/elasticsearch/test/ESTestCase.java | 2 +- .../env/TestEnvironment.java | 4 ++-- .../gateway/MockGatewayMetaState.java | 0 .../geo/GeometryTestUtils.java | 4 ++-- .../http/NullDispatcher.java | 0 .../analysis/AnalysisFactoryTestCase.java | 4 ++-- .../indices/recovery/AsyncRecoveryTarget.java | 4 ++-- .../ingest/IngestDocumentMatcher.java | 4 ++-- .../ingest/IngestTestPlugin.java | 4 ++-- .../ingest/RandomDocumentPicks.java | 4 ++-- .../ingest/TestProcessor.java | 4 ++-- .../ingest/TestTemplateService.java | 4 ++-- .../plugins/PluginTestUtil.java | 4 ++-- .../AbstractFullClusterRestartTestCase.java | 4 ++-- .../ingest/IngestDocumentMatcherTests.java | 2 +- .../DeterministicTaskQueueTests.java | 4 ++-- .../MockSinglePrioritizingExecutorTests.java | 4 ++-- .../FakeThreadPoolMasterServiceTests.java | 4 ++-- .../TestThreadInfoPatternConverterTests.java | 4 ++-- .../common/util/NamedFormatterTests.java | 4 ++-- 96 files changed, 136 insertions(+), 142 deletions(-) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/env/TestEnvironment.java (94%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/gateway/MockGatewayMetaState.java (100%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/geo/GeometryTestUtils.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/http/NullDispatcher.java (100%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/indices/analysis/AnalysisFactoryTestCase.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/indices/recovery/AsyncRecoveryTarget.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/ingest/IngestDocumentMatcher.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/ingest/IngestTestPlugin.java (95%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/ingest/RandomDocumentPicks.java (99%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/ingest/TestProcessor.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/ingest/TestTemplateService.java (97%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/plugins/PluginTestUtil.java (95%) rename test/framework/src/main/java/org/{elasticsearch => opensearch}/upgrades/AbstractFullClusterRestartTestCase.java (98%) rename test/framework/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/DeterministicTaskQueueTests.java (99%) rename test/framework/src/test/java/org/{elasticsearch => opensearch}/cluster/coordination/MockSinglePrioritizingExecutorTests.java (96%) rename test/framework/src/test/java/org/{elasticsearch => opensearch}/cluster/service/FakeThreadPoolMasterServiceTests.java (98%) rename test/framework/src/test/java/org/{elasticsearch => opensearch}/common/logging/TestThreadInfoPatternConverterTests.java (95%) rename test/framework/src/test/java/org/{elasticsearch => opensearch}/common/util/NamedFormatterTests.java (96%) diff --git a/distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreCommandTestCase.java b/distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreCommandTestCase.java index 50a332a81e3..2b78b662865 100644 --- a/distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreCommandTestCase.java +++ b/distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreCommandTestCase.java @@ -34,7 +34,7 @@ import org.apache.lucene.util.LuceneTestCase; import org.opensearch.cli.CommandTestCase; import org.opensearch.common.io.PathUtilsForTesting; import org.opensearch.env.Environment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.TestEnvironment; import org.junit.After; import org.junit.Before; diff --git a/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java b/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java index 995faed3d1e..bb2797d30b6 100644 --- a/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java +++ b/distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java @@ -55,7 +55,7 @@ import org.opensearch.common.io.PathUtils; import org.opensearch.common.io.PathUtilsForTesting; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.TestEnvironment; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.PosixPermissionsResetter; import org.junit.After; diff --git a/libs/geo/src/test/java/org/opensearch/geometry/GeometryCollectionTests.java b/libs/geo/src/test/java/org/opensearch/geometry/GeometryCollectionTests.java index bf32fe8c91c..6bfe3683b9d 100644 --- a/libs/geo/src/test/java/org/opensearch/geometry/GeometryCollectionTests.java +++ b/libs/geo/src/test/java/org/opensearch/geometry/GeometryCollectionTests.java @@ -19,7 +19,7 @@ package org.opensearch.geometry; -import org.elasticsearch.geo.GeometryTestUtils; +import org.opensearch.geo.GeometryTestUtils; import org.opensearch.geometry.utils.GeographyValidator; import org.opensearch.geometry.utils.StandardValidator; import org.opensearch.geometry.utils.WellKnownText; diff --git a/libs/geo/src/test/java/org/opensearch/geometry/LineTests.java b/libs/geo/src/test/java/org/opensearch/geometry/LineTests.java index fb8ecc1f314..e83ab49cf82 100644 --- a/libs/geo/src/test/java/org/opensearch/geometry/LineTests.java +++ b/libs/geo/src/test/java/org/opensearch/geometry/LineTests.java @@ -19,7 +19,7 @@ package org.opensearch.geometry; -import org.elasticsearch.geo.GeometryTestUtils; +import org.opensearch.geo.GeometryTestUtils; import org.opensearch.geometry.utils.GeographyValidator; import org.opensearch.geometry.utils.GeometryValidator; import org.opensearch.geometry.utils.StandardValidator; diff --git a/libs/geo/src/test/java/org/opensearch/geometry/MultiLineTests.java b/libs/geo/src/test/java/org/opensearch/geometry/MultiLineTests.java index a9504689dc0..355034ca3b3 100644 --- a/libs/geo/src/test/java/org/opensearch/geometry/MultiLineTests.java +++ b/libs/geo/src/test/java/org/opensearch/geometry/MultiLineTests.java @@ -19,7 +19,7 @@ package org.opensearch.geometry; -import org.elasticsearch.geo.GeometryTestUtils; +import org.opensearch.geo.GeometryTestUtils; import org.opensearch.geometry.utils.GeographyValidator; import org.opensearch.geometry.utils.StandardValidator; import org.opensearch.geometry.utils.WellKnownText; diff --git a/libs/geo/src/test/java/org/opensearch/geometry/MultiPointTests.java b/libs/geo/src/test/java/org/opensearch/geometry/MultiPointTests.java index 71819da9f2f..ad3d1ac0fc1 100644 --- a/libs/geo/src/test/java/org/opensearch/geometry/MultiPointTests.java +++ b/libs/geo/src/test/java/org/opensearch/geometry/MultiPointTests.java @@ -19,7 +19,7 @@ package org.opensearch.geometry; -import org.elasticsearch.geo.GeometryTestUtils; +import org.opensearch.geo.GeometryTestUtils; import org.opensearch.geometry.utils.GeographyValidator; import org.opensearch.geometry.utils.StandardValidator; import org.opensearch.geometry.utils.WellKnownText; diff --git a/libs/geo/src/test/java/org/opensearch/geometry/MultiPolygonTests.java b/libs/geo/src/test/java/org/opensearch/geometry/MultiPolygonTests.java index f3b6119c429..22e87ab76c4 100644 --- a/libs/geo/src/test/java/org/opensearch/geometry/MultiPolygonTests.java +++ b/libs/geo/src/test/java/org/opensearch/geometry/MultiPolygonTests.java @@ -19,7 +19,7 @@ package org.opensearch.geometry; -import org.elasticsearch.geo.GeometryTestUtils; +import org.opensearch.geo.GeometryTestUtils; import org.opensearch.geometry.utils.GeographyValidator; import org.opensearch.geometry.utils.StandardValidator; import org.opensearch.geometry.utils.WellKnownText; diff --git a/libs/geo/src/test/java/org/opensearch/geometry/PointTests.java b/libs/geo/src/test/java/org/opensearch/geometry/PointTests.java index de341e0384c..f43189aab4c 100644 --- a/libs/geo/src/test/java/org/opensearch/geometry/PointTests.java +++ b/libs/geo/src/test/java/org/opensearch/geometry/PointTests.java @@ -19,7 +19,7 @@ package org.opensearch.geometry; -import org.elasticsearch.geo.GeometryTestUtils; +import org.opensearch.geo.GeometryTestUtils; import org.opensearch.geometry.utils.GeographyValidator; import org.opensearch.geometry.utils.GeometryValidator; import org.opensearch.geometry.utils.StandardValidator; diff --git a/libs/geo/src/test/java/org/opensearch/geometry/PolygonTests.java b/libs/geo/src/test/java/org/opensearch/geometry/PolygonTests.java index 1ab8af7b611..77807dbc91e 100644 --- a/libs/geo/src/test/java/org/opensearch/geometry/PolygonTests.java +++ b/libs/geo/src/test/java/org/opensearch/geometry/PolygonTests.java @@ -19,7 +19,7 @@ package org.opensearch.geometry; -import org.elasticsearch.geo.GeometryTestUtils; +import org.opensearch.geo.GeometryTestUtils; import org.opensearch.geometry.utils.GeographyValidator; import org.opensearch.geometry.utils.StandardValidator; import org.opensearch.geometry.utils.WellKnownText; diff --git a/libs/geo/src/test/java/org/opensearch/geometry/RectangleTests.java b/libs/geo/src/test/java/org/opensearch/geometry/RectangleTests.java index ed673da2d93..a2575306d61 100644 --- a/libs/geo/src/test/java/org/opensearch/geometry/RectangleTests.java +++ b/libs/geo/src/test/java/org/opensearch/geometry/RectangleTests.java @@ -19,7 +19,7 @@ package org.opensearch.geometry; -import org.elasticsearch.geo.GeometryTestUtils; +import org.opensearch.geo.GeometryTestUtils; import org.opensearch.geometry.utils.GeographyValidator; import org.opensearch.geometry.utils.GeometryValidator; import org.opensearch.geometry.utils.StandardValidator; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisFactoryTests.java index 5053588e9f8..2dc857e2655 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CommonAnalysisFactoryTests.java @@ -24,7 +24,7 @@ import org.apache.lucene.analysis.en.PorterStemFilterFactory; import org.apache.lucene.analysis.miscellaneous.LimitTokenCountFilterFactory; import org.apache.lucene.analysis.reverse.ReverseStringFilterFactory; import org.apache.lucene.analysis.snowball.SnowballPorterFilterFactory; -import org.elasticsearch.indices.analysis.AnalysisFactoryTestCase; +import org.opensearch.indices.analysis.AnalysisFactoryTestCase; import java.util.List; import java.util.Map; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java index ac171cc53f9..6426ba1e1c1 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/CompoundAnalysisTests.java @@ -26,7 +26,7 @@ import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.analysis.MyFilterTokenFilterFactory; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java index 1cddfacf8e7..0252f9139af 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/EdgeNGramTokenizerTests.java @@ -24,7 +24,7 @@ import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.Index; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.IndexAnalyzers; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MultiplexerTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MultiplexerTokenFilterTests.java index e43185dc750..656e843c686 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MultiplexerTokenFilterTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/MultiplexerTokenFilterTests.java @@ -23,7 +23,7 @@ import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.analysis.NamedAnalyzer; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterTests.java index 21682f7f30f..cd6e04eff01 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/ScriptedConditionTokenFilterTests.java @@ -23,7 +23,7 @@ import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.IndexAnalyzers; import org.elasticsearch.index.analysis.NamedAnalyzer; diff --git a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java index e5e0c590b62..6438fd5ed27 100644 --- a/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java +++ b/modules/analysis-common/src/test/java/org/opensearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java @@ -24,7 +24,7 @@ import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.AnalysisTestsHelper; import org.elasticsearch.index.analysis.IndexAnalyzers; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorFactoryTestCase.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorFactoryTestCase.java index aaf9aff84e3..dc9250cd2ab 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorFactoryTestCase.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorFactoryTestCase.java @@ -20,7 +20,7 @@ package org.opensearch.ingest.common; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.RandomDocumentPicks; import org.elasticsearch.test.ESTestCase; import java.util.HashMap; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorTestCase.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorTestCase.java index 45fc0431da7..8fb1d04ee7f 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorTestCase.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AbstractStringProcessorTestCase.java @@ -21,7 +21,7 @@ package org.opensearch.ingest.common; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.RandomDocumentPicks; import org.elasticsearch.test.ESTestCase; import java.util.ArrayList; @@ -29,7 +29,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; -import static org.elasticsearch.ingest.IngestDocumentMatcher.assertIngestDocument; +import static org.opensearch.ingest.IngestDocumentMatcher.assertIngestDocument; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorFactoryTests.java index d1114b50773..78acd902d6d 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorFactoryTests.java @@ -21,7 +21,7 @@ package org.opensearch.ingest.common; import org.opensearch.OpenSearchException; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.ingest.TestTemplateService; +import org.opensearch.ingest.TestTemplateService; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorTests.java index 95448f12c55..e8fc86ddbe7 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/AppendProcessorTests.java @@ -23,8 +23,8 @@ import org.opensearch.common.util.set.Sets; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.IngestDocument.Metadata; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.ingest.RandomDocumentPicks; -import org.elasticsearch.ingest.TestTemplateService; +import org.opensearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.TestTemplateService; import org.elasticsearch.ingest.ValueSource; import org.elasticsearch.test.ESTestCase; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/BytesProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/BytesProcessorTests.java index 80de07b1d1c..f602eefba96 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/BytesProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/BytesProcessorTests.java @@ -24,7 +24,7 @@ import org.opensearch.common.unit.ByteSizeUnit; import org.opensearch.common.unit.ByteSizeValue; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.RandomDocumentPicks; import org.hamcrest.CoreMatchers; import static org.hamcrest.Matchers.equalTo; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ConvertProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ConvertProcessorTests.java index 37f21cc60f6..c436e0a4999 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ConvertProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ConvertProcessorTests.java @@ -28,10 +28,10 @@ import java.util.Map; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.RandomDocumentPicks; import org.elasticsearch.test.ESTestCase; -import static org.elasticsearch.ingest.IngestDocumentMatcher.assertIngestDocument; +import static org.opensearch.ingest.IngestDocumentMatcher.assertIngestDocument; import static org.opensearch.ingest.common.ConvertProcessor.Type; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CsvProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CsvProcessorTests.java index 5e3567b12a3..9c1a5043af6 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CsvProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CsvProcessorTests.java @@ -22,7 +22,7 @@ package org.opensearch.ingest.common; import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.RandomDocumentPicks; import org.elasticsearch.test.ESTestCase; import java.util.Arrays; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameFactoryTests.java index 66542dca216..7c9055b3e58 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameFactoryTests.java @@ -20,7 +20,7 @@ package org.opensearch.ingest.common; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.ingest.TestTemplateService; +import org.opensearch.ingest.TestTemplateService; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameProcessorTests.java index 735b43768f5..84fcdb0a66e 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateIndexNameProcessorTests.java @@ -20,7 +20,7 @@ package org.opensearch.ingest.common; import org.opensearch.common.time.DateFormatter; import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.TestTemplateService; +import org.opensearch.ingest.TestTemplateService; import org.elasticsearch.test.ESTestCase; import java.time.ZoneId; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorFactoryTests.java index 9841a89e2a1..a693b7f29f8 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorFactoryTests.java @@ -20,7 +20,7 @@ package org.opensearch.ingest.common; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.ingest.TestTemplateService; +import org.opensearch.ingest.TestTemplateService; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorTests.java index 429bec28dbd..dd898470776 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DateProcessorTests.java @@ -20,8 +20,8 @@ package org.opensearch.ingest.common; import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.RandomDocumentPicks; -import org.elasticsearch.ingest.TestTemplateService; +import org.opensearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.TestTemplateService; import org.opensearch.script.TemplateScript; import org.elasticsearch.test.ESTestCase; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorFactoryTests.java index 4e9a1174719..cb01b621ea1 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorFactoryTests.java @@ -21,7 +21,7 @@ package org.opensearch.ingest.common; import org.opensearch.OpenSearchParseException; import org.opensearch.dissect.DissectException; -import org.elasticsearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.RandomDocumentPicks; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorTests.java index d14920ea827..1a19b590fec 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DissectProcessorTests.java @@ -23,14 +23,14 @@ import org.opensearch.common.collect.MapBuilder; import org.opensearch.dissect.DissectException; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.RandomDocumentPicks; import org.elasticsearch.test.ESTestCase; import org.hamcrest.CoreMatchers; import java.util.Collections; import java.util.HashMap; -import static org.elasticsearch.ingest.IngestDocumentMatcher.assertIngestDocument; +import static org.opensearch.ingest.IngestDocumentMatcher.assertIngestDocument; import static org.hamcrest.Matchers.equalTo; /** diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DotExpanderProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DotExpanderProcessorTests.java index 0ec1e462de9..8a76dfac321 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DotExpanderProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/DotExpanderProcessorTests.java @@ -21,7 +21,7 @@ package org.opensearch.ingest.common; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.ingest.TestTemplateService; +import org.opensearch.ingest.TestTemplateService; import org.elasticsearch.test.ESTestCase; import java.util.Collections; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorFactoryTests.java index 41b0bffa47c..13bbd90817a 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorFactoryTests.java @@ -21,7 +21,7 @@ package org.opensearch.ingest.common; import org.opensearch.OpenSearchException; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.ingest.TestTemplateService; +import org.opensearch.ingest.TestTemplateService; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorTests.java index fa5cae9681b..3a0ee7183f9 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/FailProcessorTests.java @@ -21,8 +21,8 @@ package org.opensearch.ingest.common; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.ingest.RandomDocumentPicks; -import org.elasticsearch.ingest.TestTemplateService; +import org.opensearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.TestTemplateService; import org.elasticsearch.test.ESTestCase; import static org.hamcrest.Matchers.equalTo; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorFactoryTests.java index cc5f310fd3b..32f678dff8e 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorFactoryTests.java @@ -21,7 +21,7 @@ package org.opensearch.ingest.common; import org.opensearch.OpenSearchParseException; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.ingest.TestProcessor; +import org.opensearch.ingest.TestProcessor; import org.opensearch.script.ScriptService; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java index 48495f43677..36c48684b33 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ForEachProcessorTests.java @@ -22,8 +22,8 @@ package org.opensearch.ingest.common; import org.elasticsearch.ingest.CompoundProcessor; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.ingest.TestProcessor; -import org.elasticsearch.ingest.TestTemplateService; +import org.opensearch.ingest.TestProcessor; +import org.opensearch.ingest.TestTemplateService; import org.opensearch.script.TemplateScript; import org.elasticsearch.test.ESTestCase; @@ -38,7 +38,7 @@ import java.util.function.BiConsumer; import java.util.stream.Collectors; import java.util.stream.IntStream; -import static org.elasticsearch.ingest.IngestDocumentMatcher.assertIngestDocument; +import static org.opensearch.ingest.IngestDocumentMatcher.assertIngestDocument; import static org.hamcrest.Matchers.equalTo; public class ForEachProcessorTests extends ESTestCase { diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorTests.java index f741cdf52c7..dfdd3226016 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/GrokProcessorTests.java @@ -21,7 +21,7 @@ package org.opensearch.ingest.common; import org.opensearch.grok.MatcherWatchdog; import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.RandomDocumentPicks; import org.elasticsearch.test.ESTestCase; import java.util.Arrays; @@ -29,7 +29,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import static org.elasticsearch.ingest.IngestDocumentMatcher.assertIngestDocument; +import static org.opensearch.ingest.IngestDocumentMatcher.assertIngestDocument; import static org.hamcrest.Matchers.equalTo; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JoinProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JoinProcessorTests.java index d50485e2ba0..c90fc46fd42 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JoinProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JoinProcessorTests.java @@ -21,7 +21,7 @@ package org.opensearch.ingest.common; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.RandomDocumentPicks; import org.elasticsearch.test.ESTestCase; import java.util.ArrayList; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JsonProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JsonProcessorTests.java index b7d8c596bbf..b352d0bebcb 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JsonProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/JsonProcessorTests.java @@ -25,7 +25,7 @@ import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentType; import org.opensearch.common.xcontent.json.JsonXContent; import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.RandomDocumentPicks; import org.elasticsearch.test.ESTestCase; import java.util.Arrays; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/KeyValueProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/KeyValueProcessorTests.java index 4a6150af405..d9bb7e2dfed 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/KeyValueProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/KeyValueProcessorTests.java @@ -22,7 +22,7 @@ package org.opensearch.ingest.common; import org.opensearch.common.util.set.Sets; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.RandomDocumentPicks; import org.elasticsearch.test.ESTestCase; import java.util.ArrayList; @@ -33,7 +33,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.elasticsearch.ingest.IngestDocumentMatcher.assertIngestDocument; +import static org.opensearch.ingest.IngestDocumentMatcher.assertIngestDocument; import static org.hamcrest.Matchers.equalTo; public class KeyValueProcessorTests extends ESTestCase { diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorFactoryTests.java index ef31a58c498..b32c57fd417 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorFactoryTests.java @@ -21,7 +21,7 @@ package org.opensearch.ingest.common; import org.opensearch.OpenSearchException; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.ingest.TestTemplateService; +import org.opensearch.ingest.TestTemplateService; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorTests.java index e240d24b96c..669526f3b77 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorTests.java @@ -21,8 +21,8 @@ package org.opensearch.ingest.common; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.ingest.RandomDocumentPicks; -import org.elasticsearch.ingest.TestTemplateService; +import org.opensearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.TestTemplateService; import org.elasticsearch.test.ESTestCase; import java.util.Collections; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorFactoryTests.java index d36d6cf03fe..62626b75e48 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorFactoryTests.java @@ -20,7 +20,7 @@ package org.opensearch.ingest.common; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.ingest.TestTemplateService; +import org.opensearch.ingest.TestTemplateService; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorTests.java index 1d55ac41a41..5e6f9bbfd5a 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RenameProcessorTests.java @@ -21,8 +21,8 @@ package org.opensearch.ingest.common; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.ingest.RandomDocumentPicks; -import org.elasticsearch.ingest.TestTemplateService; +import org.opensearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.TestTemplateService; import org.elasticsearch.test.ESTestCase; import java.util.ArrayList; @@ -31,7 +31,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.elasticsearch.ingest.IngestDocumentMatcher.assertIngestDocument; +import static org.opensearch.ingest.IngestDocumentMatcher.assertIngestDocument; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.nullValue; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorTests.java index d722f51d0c8..7d4aa30ad8e 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/ScriptProcessorTests.java @@ -21,7 +21,7 @@ package org.opensearch.ingest.common; import org.opensearch.common.settings.Settings; import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.script.IngestScript; import org.opensearch.script.MockScriptEngine; import org.opensearch.script.Script; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorFactoryTests.java index ae34cc1964a..5ce831262e2 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorFactoryTests.java @@ -21,7 +21,7 @@ package org.opensearch.ingest.common; import org.opensearch.OpenSearchException; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.ingest.TestTemplateService; +import org.opensearch.ingest.TestTemplateService; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorTests.java index eae299d0c81..bf1a9d97bf3 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SetProcessorTests.java @@ -22,8 +22,8 @@ package org.opensearch.ingest.common; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.IngestDocument.Metadata; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.ingest.RandomDocumentPicks; -import org.elasticsearch.ingest.TestTemplateService; +import org.opensearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.TestTemplateService; import org.elasticsearch.ingest.ValueSource; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorFactoryTests.java index 6fd4d989b9c..253c1054534 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorFactoryTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorFactoryTests.java @@ -20,7 +20,7 @@ package org.opensearch.ingest.common; import org.opensearch.OpenSearchParseException; -import org.elasticsearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.RandomDocumentPicks; import org.elasticsearch.test.ESTestCase; import java.util.HashMap; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorTests.java index e97bc07c38e..7166c1bf0ba 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SortProcessorTests.java @@ -21,7 +21,7 @@ package org.opensearch.ingest.common; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.ingest.common.SortProcessor.SortOrder; import org.elasticsearch.test.ESTestCase; diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SplitProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SplitProcessorTests.java index 399a5eea3c8..6f3b09fe143 100644 --- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SplitProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/SplitProcessorTests.java @@ -21,7 +21,7 @@ package org.opensearch.ingest.common; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; -import org.elasticsearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.RandomDocumentPicks; import org.elasticsearch.test.ESTestCase; import java.util.Arrays; @@ -30,7 +30,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.elasticsearch.ingest.IngestDocumentMatcher.assertIngestDocument; +import static org.opensearch.ingest.IngestDocumentMatcher.assertIngestDocument; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; diff --git a/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java index 0445efd7a00..a36f908a898 100644 --- a/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java +++ b/modules/ingest-geoip/src/test/java/org/opensearch/ingest/geoip/GeoIpProcessorTests.java @@ -23,7 +23,7 @@ import com.maxmind.geoip2.DatabaseReader; import org.opensearch.common.CheckedSupplier; import org.opensearch.common.io.PathUtils; import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.ingest.geoip.IngestGeoIpPlugin.GeoIpCache; import org.elasticsearch.test.ESTestCase; @@ -37,7 +37,7 @@ import java.util.List; import java.util.Map; import java.util.function.Supplier; -import static org.elasticsearch.ingest.IngestDocumentMatcher.assertIngestDocument; +import static org.opensearch.ingest.IngestDocumentMatcher.assertIngestDocument; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; diff --git a/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorTests.java b/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorTests.java index 1faf2faafce..01a65d50127 100644 --- a/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorTests.java +++ b/modules/ingest-user-agent/src/test/java/org/opensearch/ingest/useragent/UserAgentProcessorTests.java @@ -19,7 +19,7 @@ package org.opensearch.ingest.useragent; -import org.elasticsearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.RandomDocumentPicks; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.test.ESTestCase; import org.junit.BeforeClass; @@ -31,7 +31,7 @@ import java.util.EnumSet; import java.util.HashMap; import java.util.Map; -import static org.elasticsearch.ingest.IngestDocumentMatcher.assertIngestDocument; +import static org.opensearch.ingest.IngestDocumentMatcher.assertIngestDocument; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasKey; import static org.hamcrest.Matchers.is; diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java index cd13895732a..264c3a24ed8 100644 --- a/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java +++ b/modules/percolator/src/test/java/org/opensearch/percolator/PercolateQueryBuilderTests.java @@ -39,7 +39,7 @@ import org.elasticsearch.index.mapper.MapperService; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryShardContext; import org.elasticsearch.index.query.Rewriteable; -import org.elasticsearch.ingest.RandomDocumentPicks; +import org.opensearch.ingest.RandomDocumentPicks; import org.opensearch.plugins.Plugin; import org.elasticsearch.test.AbstractQueryTestCase; import org.elasticsearch.test.TestGeoShapeFieldMapperPlugin; diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java index b6dc6aa1e4d..3368a956b95 100644 --- a/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java +++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/CancelTests.java @@ -41,7 +41,7 @@ import org.elasticsearch.index.reindex.ReindexAction; import org.elasticsearch.index.reindex.UpdateByQueryAction; import org.elasticsearch.index.shard.IndexingOperationListener; import org.elasticsearch.index.shard.ShardId; -import org.elasticsearch.ingest.IngestTestPlugin; +import org.opensearch.ingest.IngestTestPlugin; import org.opensearch.plugins.Plugin; import org.opensearch.tasks.TaskCancelledException; import org.opensearch.tasks.TaskInfo; diff --git a/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java b/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java index 195b0e69064..e628563410d 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexModuleTests.java @@ -53,7 +53,7 @@ import org.opensearch.core.internal.io.IOUtils; import org.opensearch.env.Environment; import org.opensearch.env.NodeEnvironment; import org.opensearch.env.ShardLock; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.TestEnvironment; import org.opensearch.index.analysis.AnalysisRegistry; import org.opensearch.index.analysis.AnalyzerProvider; import org.opensearch.index.analysis.AnalyzerScope; diff --git a/server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java b/server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java index ed176a50af7..2738a49ba7e 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/AnalysisRegistryTests.java @@ -33,7 +33,7 @@ import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.mapper.MapperException; import org.elasticsearch.indices.analysis.AnalysisModule; diff --git a/server/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java b/server/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java index c672102a314..e7d27c0697d 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/AnalysisTests.java @@ -22,7 +22,7 @@ package org.elasticsearch.index.analysis; import org.apache.lucene.analysis.CharArraySet; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.TestEnvironment; import org.elasticsearch.test.ESTestCase; import java.io.BufferedWriter; diff --git a/server/src/test/java/org/elasticsearch/index/analysis/CoreAnalysisFactoryTests.java b/server/src/test/java/org/elasticsearch/index/analysis/CoreAnalysisFactoryTests.java index 3b4897b5889..43be8413079 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/CoreAnalysisFactoryTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/CoreAnalysisFactoryTests.java @@ -19,7 +19,7 @@ package org.elasticsearch.index.analysis; -import org.elasticsearch.indices.analysis.AnalysisFactoryTestCase; +import org.opensearch.indices.analysis.AnalysisFactoryTestCase; import org.elasticsearch.plugins.AnalysisPlugin; /** diff --git a/server/src/test/java/org/elasticsearch/index/analysis/PreConfiguredTokenFilterTests.java b/server/src/test/java/org/elasticsearch/index/analysis/PreConfiguredTokenFilterTests.java index ef658eeab90..3fb6e112811 100644 --- a/server/src/test/java/org/elasticsearch/index/analysis/PreConfiguredTokenFilterTests.java +++ b/server/src/test/java/org/elasticsearch/index/analysis/PreConfiguredTokenFilterTests.java @@ -23,7 +23,7 @@ import org.opensearch.Version; import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.IndexSettingsModule; diff --git a/server/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java b/server/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java index 59723c6dc31..2b87094c35d 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/NewPathForShardTests.java @@ -27,7 +27,7 @@ import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.env.NodeEnvironment; import org.elasticsearch.env.NodeEnvironment.NodePath; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.IndexSettingsModule; diff --git a/server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java b/server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java index 26aa33ca81c..7b8467b924e 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java @@ -41,7 +41,7 @@ import org.opensearch.common.settings.Settings; import org.opensearch.common.util.BigArrays; import org.opensearch.env.Environment; import org.opensearch.env.NodeEnvironment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.TestEnvironment; import org.opensearch.gateway.PersistedClusterStateService; import org.opensearch.index.IndexSettings; import org.opensearch.index.MergePolicyConfig; diff --git a/server/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java b/server/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java index c1030f0878d..6a7a17ff39f 100644 --- a/server/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java +++ b/server/src/test/java/org/elasticsearch/indices/analysis/AnalysisModuleTests.java @@ -36,7 +36,7 @@ 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.elasticsearch.env.TestEnvironment; +import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.analysis.Analysis; import org.elasticsearch.index.analysis.AnalysisRegistry; diff --git a/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java b/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java index f7e2b363cf8..06f5e798a8d 100644 --- a/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java +++ b/server/src/test/java/org/elasticsearch/indices/cluster/ClusterStateChanges.java @@ -84,7 +84,7 @@ import org.elasticsearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.env.Environment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.TestEnvironment; import org.opensearch.index.Index; import org.opensearch.index.IndexService; import org.opensearch.index.mapper.MapperService; diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java index 9d159ac22cd..2faffe8d9a2 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java @@ -83,6 +83,7 @@ import org.elasticsearch.test.DummyShardLock; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.IndexSettingsModule; import org.elasticsearch.test.VersionUtils; +import org.opensearch.indices.recovery.AsyncRecoveryTarget; import org.opensearch.threadpool.FixedExecutorBuilder; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; diff --git a/server/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java b/server/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java index 173a5b771ed..4569596454c 100644 --- a/server/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java +++ b/server/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java @@ -24,6 +24,7 @@ import org.opensearch.action.admin.cluster.node.info.PluginsAndModules; import org.opensearch.common.io.stream.ByteBufferStreamInput; import org.opensearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.test.ESTestCase; +import org.opensearch.plugins.PluginTestUtil; import java.nio.ByteBuffer; import java.nio.file.Path; diff --git a/server/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java b/server/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java index c8d4612ee90..569b9ee4057 100644 --- a/server/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java +++ b/server/src/test/java/org/elasticsearch/plugins/PluginsServiceTests.java @@ -28,10 +28,11 @@ import org.opensearch.common.collect.Tuple; import org.opensearch.common.io.PathUtils; import org.opensearch.common.settings.Settings; import org.elasticsearch.env.Environment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.IndexModule; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; +import org.opensearch.plugins.PluginTestUtil; import java.io.IOException; import java.io.InputStream; diff --git a/server/src/test/java/org/opensearch/common/geo/GeoBoundingBoxTests.java b/server/src/test/java/org/opensearch/common/geo/GeoBoundingBoxTests.java index e971ad4e621..ec35abc1e4d 100644 --- a/server/src/test/java/org/opensearch/common/geo/GeoBoundingBoxTests.java +++ b/server/src/test/java/org/opensearch/common/geo/GeoBoundingBoxTests.java @@ -24,10 +24,7 @@ import org.opensearch.OpenSearchParseException; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.geo.GeometryTestUtils; -import org.opensearch.common.geo.GeoBoundingBox; -import org.opensearch.common.geo.GeoPoint; -import org.opensearch.common.geo.GeoUtils; +import org.opensearch.geo.GeometryTestUtils; import org.opensearch.geometry.Rectangle; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/opensearch/common/geo/GeoJsonSerializationTests.java b/server/src/test/java/org/opensearch/common/geo/GeoJsonSerializationTests.java index a1c3cbe7166..0b839d11981 100644 --- a/server/src/test/java/org/opensearch/common/geo/GeoJsonSerializationTests.java +++ b/server/src/test/java/org/opensearch/common/geo/GeoJsonSerializationTests.java @@ -29,8 +29,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.geo.GeometryTestUtils; -import org.opensearch.common.geo.GeoJson; +import org.opensearch.geo.GeometryTestUtils; import org.opensearch.geometry.Geometry; import org.opensearch.geometry.utils.GeographyValidator; import org.elasticsearch.test.AbstractXContentTestCase; @@ -41,14 +40,14 @@ import java.util.Map; import java.util.Objects; import java.util.function.Supplier; -import static org.elasticsearch.geo.GeometryTestUtils.randomCircle; -import static org.elasticsearch.geo.GeometryTestUtils.randomGeometryCollection; -import static org.elasticsearch.geo.GeometryTestUtils.randomLine; -import static org.elasticsearch.geo.GeometryTestUtils.randomMultiLine; -import static org.elasticsearch.geo.GeometryTestUtils.randomMultiPoint; -import static org.elasticsearch.geo.GeometryTestUtils.randomMultiPolygon; -import static org.elasticsearch.geo.GeometryTestUtils.randomPoint; -import static org.elasticsearch.geo.GeometryTestUtils.randomPolygon; +import static org.opensearch.geo.GeometryTestUtils.randomCircle; +import static org.opensearch.geo.GeometryTestUtils.randomGeometryCollection; +import static org.opensearch.geo.GeometryTestUtils.randomLine; +import static org.opensearch.geo.GeometryTestUtils.randomMultiLine; +import static org.opensearch.geo.GeometryTestUtils.randomMultiPoint; +import static org.opensearch.geo.GeometryTestUtils.randomMultiPolygon; +import static org.opensearch.geo.GeometryTestUtils.randomPoint; +import static org.opensearch.geo.GeometryTestUtils.randomPolygon; import static org.hamcrest.Matchers.equalTo; public class GeoJsonSerializationTests extends ESTestCase { 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 ee50c14c63e..cac77f02ba8 100644 --- a/server/src/test/java/org/opensearch/common/geo/GeometryIOTests.java +++ b/server/src/test/java/org/opensearch/common/geo/GeometryIOTests.java @@ -19,8 +19,6 @@ package org.opensearch.common.geo; -import org.opensearch.common.geo.GeoShapeType; -import org.opensearch.common.geo.GeometryIO; import org.opensearch.common.geo.builders.ShapeBuilder; import org.opensearch.common.io.stream.BytesStreamOutput; import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput; @@ -31,7 +29,7 @@ import org.opensearch.geometry.GeometryCollection; import org.opensearch.geometry.ShapeType; import org.elasticsearch.test.ESTestCase; -import static org.elasticsearch.geo.GeometryTestUtils.randomGeometry; +import static org.opensearch.geo.GeometryTestUtils.randomGeometry; import static org.elasticsearch.index.query.LegacyGeoShapeQueryProcessor.geometryToShapeBuilder; public class GeometryIOTests extends ESTestCase { 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 332b834b406..b76ca048c0e 100644 --- a/server/src/test/java/org/opensearch/common/geo/GeometryIndexerTests.java +++ b/server/src/test/java/org/opensearch/common/geo/GeometryIndexerTests.java @@ -34,10 +34,7 @@ import org.apache.lucene.index.IndexableField; import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; import org.opensearch.common.xcontent.XContentParser; -import org.elasticsearch.geo.GeometryTestUtils; -import org.opensearch.common.geo.GeoShapeType; -import org.opensearch.common.geo.GeoUtils; -import org.opensearch.common.geo.GeometryParser; +import org.opensearch.geo.GeometryTestUtils; import org.opensearch.geometry.Circle; import org.opensearch.geometry.Geometry; import org.opensearch.geometry.GeometryCollection; 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 749dd7257f6..fd432a8776c 100644 --- a/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java +++ b/server/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryRestoreTests.java @@ -34,7 +34,7 @@ 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.elasticsearch.env.TestEnvironment; +import org.opensearch.env.TestEnvironment; import org.elasticsearch.index.engine.InternalEngineFactory; import org.elasticsearch.index.seqno.RetentionLeaseSyncer; import org.elasticsearch.index.shard.IndexShard; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java index 1e53880eb20..6ffc249a5e6 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoHashGridParserTests.java @@ -27,7 +27,7 @@ import org.opensearch.common.unit.DistanceUnit; import org.opensearch.common.xcontent.XContentParseException; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.geo.GeometryTestUtils; +import org.opensearch.geo.GeometryTestUtils; import org.opensearch.geometry.Rectangle; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoTileGridParserTests.java b/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoTileGridParserTests.java index 5d2e6e9b0ae..934dcc8291c 100644 --- a/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoTileGridParserTests.java +++ b/server/src/test/java/org/opensearch/search/aggregations/bucket/geogrid/GeoTileGridParserTests.java @@ -22,7 +22,7 @@ import org.opensearch.ExceptionsHelper; import org.opensearch.common.xcontent.XContentParseException; import org.opensearch.common.xcontent.XContentParser; import org.opensearch.common.xcontent.json.JsonXContent; -import org.elasticsearch.geo.GeometryTestUtils; +import org.opensearch.geo.GeometryTestUtils; import org.opensearch.geometry.Rectangle; import org.elasticsearch.test.ESTestCase; diff --git a/server/src/test/java/org/opensearch/search/suggest/AbstractSuggestionBuilderTestCase.java b/server/src/test/java/org/opensearch/search/suggest/AbstractSuggestionBuilderTestCase.java index f35d2b50be1..da18a38f2d8 100644 --- a/server/src/test/java/org/opensearch/search/suggest/AbstractSuggestionBuilderTestCase.java +++ b/server/src/test/java/org/opensearch/search/suggest/AbstractSuggestionBuilderTestCase.java @@ -41,7 +41,7 @@ import org.opensearch.index.mapper.MapperService; import org.opensearch.index.mapper.TextFieldMapper; import org.opensearch.index.mapper.TextSearchInfo; import org.opensearch.index.query.QueryShardContext; -import org.elasticsearch.ingest.TestTemplateService; +import org.opensearch.ingest.TestTemplateService; import org.opensearch.script.Script; import org.opensearch.script.ScriptService; import org.opensearch.search.SearchModule; diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java index 22433dedd04..35b8394c155 100644 --- a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java +++ b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java @@ -149,7 +149,7 @@ import org.opensearch.common.util.concurrent.ThreadContext; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.env.Environment; import org.opensearch.env.NodeEnvironment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.TestEnvironment; import org.opensearch.gateway.MetaStateService; import org.opensearch.gateway.TransportNodesListGatewayStartedShards; import org.opensearch.index.Index; diff --git a/test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java index f31459c0b37..b05c1dc7341 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/shard/IndexShardTestCase.java @@ -68,7 +68,7 @@ import org.opensearch.index.store.Store; import org.opensearch.index.translog.Translog; import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.indices.breaker.HierarchyCircuitBreakerService; -import org.elasticsearch.indices.recovery.AsyncRecoveryTarget; +import org.opensearch.indices.recovery.AsyncRecoveryTarget; import org.opensearch.indices.recovery.PeerRecoveryTargetService; import org.opensearch.indices.recovery.RecoveryFailedException; import org.opensearch.indices.recovery.RecoveryResponse; diff --git a/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java index 2a67044ee68..f1304c7d718 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/AbstractBuilderTestCase.java @@ -46,7 +46,7 @@ import org.opensearch.common.util.BigArrays; import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.core.internal.io.IOUtils; import org.opensearch.env.Environment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.TestEnvironment; import org.opensearch.index.Index; import org.opensearch.index.IndexSettings; import org.opensearch.index.analysis.IndexAnalyzers; diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java index dcdb412d838..1c087d50cdf 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java @@ -113,7 +113,7 @@ import org.opensearch.discovery.Discovery; import org.opensearch.discovery.zen.ElectMasterService; import org.opensearch.discovery.zen.ZenDiscovery; import org.opensearch.env.Environment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.TestEnvironment; import org.opensearch.http.HttpInfo; import org.opensearch.index.Index; import org.opensearch.index.IndexModule; diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java index f72a89cf0e0..48e3ad0fdf3 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java @@ -92,7 +92,7 @@ import org.opensearch.common.xcontent.XContentParser.Token; import org.opensearch.common.xcontent.XContentType; import org.opensearch.env.Environment; import org.opensearch.env.NodeEnvironment; -import org.elasticsearch.env.TestEnvironment; +import org.opensearch.env.TestEnvironment; import org.opensearch.index.Index; import org.opensearch.index.IndexSettings; import org.opensearch.index.analysis.AnalysisRegistry; diff --git a/test/framework/src/main/java/org/elasticsearch/env/TestEnvironment.java b/test/framework/src/main/java/org/opensearch/env/TestEnvironment.java similarity index 94% rename from test/framework/src/main/java/org/elasticsearch/env/TestEnvironment.java rename to test/framework/src/main/java/org/opensearch/env/TestEnvironment.java index 25a32bf0065..6f4e6bae2e7 100644 --- a/test/framework/src/main/java/org/elasticsearch/env/TestEnvironment.java +++ b/test/framework/src/main/java/org/opensearch/env/TestEnvironment.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.env; +package org.opensearch.env; import org.opensearch.common.settings.Settings; diff --git a/test/framework/src/main/java/org/elasticsearch/gateway/MockGatewayMetaState.java b/test/framework/src/main/java/org/opensearch/gateway/MockGatewayMetaState.java similarity index 100% rename from test/framework/src/main/java/org/elasticsearch/gateway/MockGatewayMetaState.java rename to test/framework/src/main/java/org/opensearch/gateway/MockGatewayMetaState.java diff --git a/test/framework/src/main/java/org/elasticsearch/geo/GeometryTestUtils.java b/test/framework/src/main/java/org/opensearch/geo/GeometryTestUtils.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/geo/GeometryTestUtils.java rename to test/framework/src/main/java/org/opensearch/geo/GeometryTestUtils.java index 074f0fdc13b..09ed5bc1eb1 100644 --- a/test/framework/src/main/java/org/elasticsearch/geo/GeometryTestUtils.java +++ b/test/framework/src/main/java/org/opensearch/geo/GeometryTestUtils.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.geo; +package org.opensearch.geo; import org.apache.lucene.geo.GeoTestUtil; import org.opensearch.geometry.Circle; diff --git a/test/framework/src/main/java/org/elasticsearch/http/NullDispatcher.java b/test/framework/src/main/java/org/opensearch/http/NullDispatcher.java similarity index 100% rename from test/framework/src/main/java/org/elasticsearch/http/NullDispatcher.java rename to test/framework/src/main/java/org/opensearch/http/NullDispatcher.java diff --git a/test/framework/src/main/java/org/elasticsearch/indices/analysis/AnalysisFactoryTestCase.java b/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/indices/analysis/AnalysisFactoryTestCase.java rename to test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java index 5cedfe47c37..e3a6b1d68b2 100644 --- a/test/framework/src/main/java/org/elasticsearch/indices/analysis/AnalysisFactoryTestCase.java +++ b/test/framework/src/main/java/org/opensearch/indices/analysis/AnalysisFactoryTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.indices.analysis; +package org.opensearch.indices.analysis; import org.apache.lucene.analysis.util.TokenFilterFactory; import org.apache.lucene.analysis.util.TokenizerFactory; diff --git a/test/framework/src/main/java/org/elasticsearch/indices/recovery/AsyncRecoveryTarget.java b/test/framework/src/main/java/org/opensearch/indices/recovery/AsyncRecoveryTarget.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/indices/recovery/AsyncRecoveryTarget.java rename to test/framework/src/main/java/org/opensearch/indices/recovery/AsyncRecoveryTarget.java index 5a8afb8c5a7..ea0935390e4 100644 --- a/test/framework/src/main/java/org/elasticsearch/indices/recovery/AsyncRecoveryTarget.java +++ b/test/framework/src/main/java/org/opensearch/indices/recovery/AsyncRecoveryTarget.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.indices.recovery; +package org.opensearch.indices.recovery; import org.apache.lucene.util.BytesRef; import org.opensearch.action.ActionListener; diff --git a/test/framework/src/main/java/org/elasticsearch/ingest/IngestDocumentMatcher.java b/test/framework/src/main/java/org/opensearch/ingest/IngestDocumentMatcher.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/ingest/IngestDocumentMatcher.java rename to test/framework/src/main/java/org/opensearch/ingest/IngestDocumentMatcher.java index a7a8a3f11b1..e830f16028f 100644 --- a/test/framework/src/main/java/org/elasticsearch/ingest/IngestDocumentMatcher.java +++ b/test/framework/src/main/java/org/opensearch/ingest/IngestDocumentMatcher.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest; +package org.opensearch.ingest; import java.util.List; import java.util.Map; diff --git a/test/framework/src/main/java/org/elasticsearch/ingest/IngestTestPlugin.java b/test/framework/src/main/java/org/opensearch/ingest/IngestTestPlugin.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/ingest/IngestTestPlugin.java rename to test/framework/src/main/java/org/opensearch/ingest/IngestTestPlugin.java index c96f0e88a5b..552d7380d9b 100644 --- a/test/framework/src/main/java/org/elasticsearch/ingest/IngestTestPlugin.java +++ b/test/framework/src/main/java/org/opensearch/ingest/IngestTestPlugin.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest; +package org.opensearch.ingest; import java.util.Collections; import java.util.Map; diff --git a/test/framework/src/main/java/org/elasticsearch/ingest/RandomDocumentPicks.java b/test/framework/src/main/java/org/opensearch/ingest/RandomDocumentPicks.java similarity index 99% rename from test/framework/src/main/java/org/elasticsearch/ingest/RandomDocumentPicks.java rename to test/framework/src/main/java/org/opensearch/ingest/RandomDocumentPicks.java index 58eb1df1292..263b639cdce 100644 --- a/test/framework/src/main/java/org/elasticsearch/ingest/RandomDocumentPicks.java +++ b/test/framework/src/main/java/org/opensearch/ingest/RandomDocumentPicks.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest; +package org.opensearch.ingest; import com.carrotsearch.randomizedtesting.generators.RandomNumbers; import com.carrotsearch.randomizedtesting.generators.RandomPicks; diff --git a/test/framework/src/main/java/org/elasticsearch/ingest/TestProcessor.java b/test/framework/src/main/java/org/opensearch/ingest/TestProcessor.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/ingest/TestProcessor.java rename to test/framework/src/main/java/org/opensearch/ingest/TestProcessor.java index b0ab3ebc069..aa0f71c79fb 100644 --- a/test/framework/src/main/java/org/elasticsearch/ingest/TestProcessor.java +++ b/test/framework/src/main/java/org/opensearch/ingest/TestProcessor.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest; +package org.opensearch.ingest; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; diff --git a/test/framework/src/main/java/org/elasticsearch/ingest/TestTemplateService.java b/test/framework/src/main/java/org/opensearch/ingest/TestTemplateService.java similarity index 97% rename from test/framework/src/main/java/org/elasticsearch/ingest/TestTemplateService.java rename to test/framework/src/main/java/org/opensearch/ingest/TestTemplateService.java index 0bddabc2f99..0cacacd3271 100644 --- a/test/framework/src/main/java/org/elasticsearch/ingest/TestTemplateService.java +++ b/test/framework/src/main/java/org/opensearch/ingest/TestTemplateService.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest; +package org.opensearch.ingest; import org.opensearch.common.settings.Settings; import org.opensearch.script.MockScriptEngine; diff --git a/test/framework/src/main/java/org/elasticsearch/plugins/PluginTestUtil.java b/test/framework/src/main/java/org/opensearch/plugins/PluginTestUtil.java similarity index 95% rename from test/framework/src/main/java/org/elasticsearch/plugins/PluginTestUtil.java rename to test/framework/src/main/java/org/opensearch/plugins/PluginTestUtil.java index ff996c800b5..1cbe1fb25a1 100644 --- a/test/framework/src/main/java/org/elasticsearch/plugins/PluginTestUtil.java +++ b/test/framework/src/main/java/org/opensearch/plugins/PluginTestUtil.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.plugins; +package org.opensearch.plugins; import java.io.IOException; import java.io.OutputStream; diff --git a/test/framework/src/main/java/org/elasticsearch/upgrades/AbstractFullClusterRestartTestCase.java b/test/framework/src/main/java/org/opensearch/upgrades/AbstractFullClusterRestartTestCase.java similarity index 98% rename from test/framework/src/main/java/org/elasticsearch/upgrades/AbstractFullClusterRestartTestCase.java rename to test/framework/src/main/java/org/opensearch/upgrades/AbstractFullClusterRestartTestCase.java index 492822903c8..f8136fa7f12 100644 --- a/test/framework/src/main/java/org/elasticsearch/upgrades/AbstractFullClusterRestartTestCase.java +++ b/test/framework/src/main/java/org/opensearch/upgrades/AbstractFullClusterRestartTestCase.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.upgrades; +package org.opensearch.upgrades; import org.opensearch.Version; import org.opensearch.client.Request; diff --git a/test/framework/src/test/java/org/elasticsearch/ingest/IngestDocumentMatcherTests.java b/test/framework/src/test/java/org/elasticsearch/ingest/IngestDocumentMatcherTests.java index bff9a923b9f..51e4f44d401 100644 --- a/test/framework/src/test/java/org/elasticsearch/ingest/IngestDocumentMatcherTests.java +++ b/test/framework/src/test/java/org/elasticsearch/ingest/IngestDocumentMatcherTests.java @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import static org.elasticsearch.ingest.IngestDocumentMatcher.assertIngestDocument; +import static org.opensearch.ingest.IngestDocumentMatcher.assertIngestDocument; public class IngestDocumentMatcherTests extends ESTestCase { diff --git a/test/framework/src/test/java/org/elasticsearch/cluster/coordination/DeterministicTaskQueueTests.java b/test/framework/src/test/java/org/opensearch/cluster/coordination/DeterministicTaskQueueTests.java similarity index 99% rename from test/framework/src/test/java/org/elasticsearch/cluster/coordination/DeterministicTaskQueueTests.java rename to test/framework/src/test/java/org/opensearch/cluster/coordination/DeterministicTaskQueueTests.java index d0666f5fbf1..23aaa55f439 100644 --- a/test/framework/src/test/java/org/elasticsearch/cluster/coordination/DeterministicTaskQueueTests.java +++ b/test/framework/src/test/java/org/opensearch/cluster/coordination/DeterministicTaskQueueTests.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.cluster.coordination; +package org.opensearch.cluster.coordination; import org.opensearch.cluster.coordination.DeterministicTaskQueue; import org.opensearch.common.settings.Settings; diff --git a/test/framework/src/test/java/org/elasticsearch/cluster/coordination/MockSinglePrioritizingExecutorTests.java b/test/framework/src/test/java/org/opensearch/cluster/coordination/MockSinglePrioritizingExecutorTests.java similarity index 96% rename from test/framework/src/test/java/org/elasticsearch/cluster/coordination/MockSinglePrioritizingExecutorTests.java rename to test/framework/src/test/java/org/opensearch/cluster/coordination/MockSinglePrioritizingExecutorTests.java index dcab92e9ad6..94ec19f4f5f 100644 --- a/test/framework/src/test/java/org/elasticsearch/cluster/coordination/MockSinglePrioritizingExecutorTests.java +++ b/test/framework/src/test/java/org/opensearch/cluster/coordination/MockSinglePrioritizingExecutorTests.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.cluster.coordination; +package org.opensearch.cluster.coordination; import org.opensearch.cluster.coordination.DeterministicTaskQueue; import org.opensearch.cluster.coordination.MockSinglePrioritizingExecutor; diff --git a/test/framework/src/test/java/org/elasticsearch/cluster/service/FakeThreadPoolMasterServiceTests.java b/test/framework/src/test/java/org/opensearch/cluster/service/FakeThreadPoolMasterServiceTests.java similarity index 98% rename from test/framework/src/test/java/org/elasticsearch/cluster/service/FakeThreadPoolMasterServiceTests.java rename to test/framework/src/test/java/org/opensearch/cluster/service/FakeThreadPoolMasterServiceTests.java index a84c148e8ba..93b76b60bc8 100644 --- a/test/framework/src/test/java/org/elasticsearch/cluster/service/FakeThreadPoolMasterServiceTests.java +++ b/test/framework/src/test/java/org/opensearch/cluster/service/FakeThreadPoolMasterServiceTests.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.cluster.service; +package org.opensearch.cluster.service; import org.opensearch.Version; import org.opensearch.action.ActionListener; diff --git a/test/framework/src/test/java/org/elasticsearch/common/logging/TestThreadInfoPatternConverterTests.java b/test/framework/src/test/java/org/opensearch/common/logging/TestThreadInfoPatternConverterTests.java similarity index 95% rename from test/framework/src/test/java/org/elasticsearch/common/logging/TestThreadInfoPatternConverterTests.java rename to test/framework/src/test/java/org/opensearch/common/logging/TestThreadInfoPatternConverterTests.java index 256968e0921..ba6fc1f2ca3 100644 --- a/test/framework/src/test/java/org/elasticsearch/common/logging/TestThreadInfoPatternConverterTests.java +++ b/test/framework/src/test/java/org/opensearch/common/logging/TestThreadInfoPatternConverterTests.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.logging; +package org.opensearch.common.logging; import org.opensearch.common.util.concurrent.EsExecutors; import org.elasticsearch.test.ESTestCase; diff --git a/test/framework/src/test/java/org/elasticsearch/common/util/NamedFormatterTests.java b/test/framework/src/test/java/org/opensearch/common/util/NamedFormatterTests.java similarity index 96% rename from test/framework/src/test/java/org/elasticsearch/common/util/NamedFormatterTests.java rename to test/framework/src/test/java/org/opensearch/common/util/NamedFormatterTests.java index e56496ef698..162a30c6b08 100644 --- a/test/framework/src/test/java/org/elasticsearch/common/util/NamedFormatterTests.java +++ b/test/framework/src/test/java/org/opensearch/common/util/NamedFormatterTests.java @@ -7,7 +7,7 @@ * not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.common.util; +package org.opensearch.common.util; import org.elasticsearch.test.ESTestCase; import org.junit.Rule;