[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 <nknize@apache.org>

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;
 

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.opensearch.ingest.RandomDocumentPicks;
-import org.elasticsearch.ingest.TestTemplateService;
+import org.opensearch.ingest.TestTemplateService;
 import org.elasticsearch.ingest.ValueSource;
 import org.elasticsearch.test.ESTestCase;
 

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;

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;

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;

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;
 

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;

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;
 

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.opensearch.ingest.RandomDocumentPicks;
-import org.elasticsearch.ingest.TestTemplateService;
+import org.opensearch.ingest.TestTemplateService;
 import org.opensearch.script.TemplateScript;
 import org.elasticsearch.test.ESTestCase;
 

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;
 

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;
 
 /**

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;

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;
 

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.opensearch.ingest.RandomDocumentPicks;
-import org.elasticsearch.ingest.TestTemplateService;
+import org.opensearch.ingest.TestTemplateService;
 import org.elasticsearch.test.ESTestCase;
 
 import static org.hamcrest.Matchers.equalTo;

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;

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.opensearch.ingest.TestProcessor;
-import org.elasticsearch.ingest.TestTemplateService;
+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 {

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;
 
 

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;

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;

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 {

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;
 

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.opensearch.ingest.RandomDocumentPicks;
-import org.elasticsearch.ingest.TestTemplateService;
+import org.opensearch.ingest.TestTemplateService;
 import org.elasticsearch.test.ESTestCase;
 
 import java.util.Collections;

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;
 

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.opensearch.ingest.RandomDocumentPicks;
-import org.elasticsearch.ingest.TestTemplateService;
+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;

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;

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;
 

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.opensearch.ingest.RandomDocumentPicks;
-import org.elasticsearch.ingest.TestTemplateService;
+import org.opensearch.ingest.TestTemplateService;
 import org.elasticsearch.ingest.ValueSource;
 import org.elasticsearch.test.ESTestCase;
 import org.hamcrest.Matchers;

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;

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;
 

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;
 

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;

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;

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;

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;

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;

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;

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;

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;
 
 /**

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;

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;

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;

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;

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;

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;

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;

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;

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.geo.GeometryTestUtils;
-import org.opensearch.common.geo.GeoBoundingBox;
-import org.opensearch.common.geo.GeoPoint;
-import org.opensearch.common.geo.GeoUtils;
 import org.opensearch.geometry.Rectangle;
 import org.elasticsearch.test.ESTestCase;
 

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.geo.GeometryTestUtils;
-import org.opensearch.common.geo.GeoJson;
 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.opensearch.geo.GeometryTestUtils.randomCircle;
-import static org.elasticsearch.geo.GeometryTestUtils.randomGeometryCollection;
+import static org.opensearch.geo.GeometryTestUtils.randomGeometryCollection;
-import static org.elasticsearch.geo.GeometryTestUtils.randomLine;
+import static org.opensearch.geo.GeometryTestUtils.randomLine;
-import static org.elasticsearch.geo.GeometryTestUtils.randomMultiLine;
+import static org.opensearch.geo.GeometryTestUtils.randomMultiLine;
-import static org.elasticsearch.geo.GeometryTestUtils.randomMultiPoint;
+import static org.opensearch.geo.GeometryTestUtils.randomMultiPoint;
-import static org.elasticsearch.geo.GeometryTestUtils.randomMultiPolygon;
+import static org.opensearch.geo.GeometryTestUtils.randomMultiPolygon;
-import static org.elasticsearch.geo.GeometryTestUtils.randomPoint;
+import static org.opensearch.geo.GeometryTestUtils.randomPoint;
-import static org.elasticsearch.geo.GeometryTestUtils.randomPolygon;
+import static org.opensearch.geo.GeometryTestUtils.randomPolygon;
 import static org.hamcrest.Matchers.equalTo;
 
 public class GeoJsonSerializationTests extends ESTestCase {

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 {

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.geo.GeometryTestUtils;
-import org.opensearch.common.geo.GeoShapeType;
-import org.opensearch.common.geo.GeoUtils;
-import org.opensearch.common.geo.GeometryParser;
 import org.opensearch.geometry.Circle;
 import org.opensearch.geometry.Geometry;
 import org.opensearch.geometry.GeometryCollection;

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;

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;
 

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;
 

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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 {
 

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;

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;

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;

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;

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;