diff --git a/benchmarks/src/main/java/org/opensearch/benchmark/time/RoundingBenchmark.java b/benchmarks/src/main/java/org/opensearch/benchmark/time/RoundingBenchmark.java
index 059c247215a..6cbcb4903f5 100644
--- a/benchmarks/src/main/java/org/opensearch/benchmark/time/RoundingBenchmark.java
+++ b/benchmarks/src/main/java/org/opensearch/benchmark/time/RoundingBenchmark.java
@@ -117,8 +117,10 @@ public class RoundingBenchmark {
return timeUnitRoundingUtcDayOfMonthJoda.round(timestamp);
}
- private final org.opensearch.common.rounding.Rounding timeUnitRoundingUtcQuarterOfYearJoda =
- org.opensearch.common.rounding.Rounding.builder(DateTimeUnit.QUARTER).timeZone(DateTimeZone.UTC).build();
+ private final org.opensearch.common.rounding.Rounding timeUnitRoundingUtcQuarterOfYearJoda = org.opensearch.common.rounding.Rounding
+ .builder(DateTimeUnit.QUARTER)
+ .timeZone(DateTimeZone.UTC)
+ .build();
private final Rounding timeUnitRoundingUtcQuarterOfYearJava = Rounding.builder(QUARTER_OF_YEAR).timeZone(ZoneOffset.UTC).build();
@Benchmark
@@ -147,8 +149,10 @@ public class RoundingBenchmark {
return timeUnitRoundingUtcMonthOfYearJoda.round(timestamp);
}
- private final org.opensearch.common.rounding.Rounding timeUnitRoundingUtcYearOfCenturyJoda =
- org.opensearch.common.rounding.Rounding.builder(DateTimeUnit.YEAR_OF_CENTURY).timeZone(DateTimeZone.UTC).build();
+ private final org.opensearch.common.rounding.Rounding timeUnitRoundingUtcYearOfCenturyJoda = org.opensearch.common.rounding.Rounding
+ .builder(DateTimeUnit.YEAR_OF_CENTURY)
+ .timeZone(DateTimeZone.UTC)
+ .build();
private final Rounding timeUnitRoundingUtcYearOfCenturyJava = Rounding.builder(YEAR_OF_CENTURY).timeZone(ZoneOffset.UTC).build();
@Benchmark
diff --git a/benchmarks/src/main/java/org/opensearch/common/RoundingBenchmark.java b/benchmarks/src/main/java/org/opensearch/common/RoundingBenchmark.java
index 8c7a15b22a4..f27c2fcc26d 100644
--- a/benchmarks/src/main/java/org/opensearch/common/RoundingBenchmark.java
+++ b/benchmarks/src/main/java/org/opensearch/common/RoundingBenchmark.java
@@ -19,7 +19,6 @@
package org.opensearch.common;
-import org.opensearch.common.Rounding;
import org.opensearch.common.time.DateFormatter;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
diff --git a/buildSrc/src/main/groovy/org/opensearch/gradle/plugin/PluginBuildPlugin.groovy b/buildSrc/src/main/groovy/org/opensearch/gradle/plugin/PluginBuildPlugin.groovy
index 8fcc9fb3dd6..bf12e4170e0 100644
--- a/buildSrc/src/main/groovy/org/opensearch/gradle/plugin/PluginBuildPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/opensearch/gradle/plugin/PluginBuildPlugin.groovy
@@ -115,9 +115,9 @@ class PluginBuildPlugin implements Plugin<Project> {
baseClass 'org.apache.lucene.util.LuceneTestCase'
}
IT {
- baseClass 'org.opensearch.test.ESIntegTestCase'
- baseClass 'org.opensearch.test.rest.ESRestTestCase'
- baseClass 'org.opensearch.test.ESSingleNodeTestCase'
+ baseClass 'org.opensearch.test.OpenSearchIntegTestCase'
+ baseClass 'org.opensearch.test.rest.OpenSearchRestTestCase'
+ baseClass 'org.opensearch.test.OpenSearchSingleNodeTestCase'
}
}
}
diff --git a/buildSrc/src/main/groovy/org/opensearch/gradle/test/TestWithSslPlugin.java b/buildSrc/src/main/groovy/org/opensearch/gradle/test/TestWithSslPlugin.java
index ba0f1a3e059..e92cd8c4737 100644
--- a/buildSrc/src/main/groovy/org/opensearch/gradle/test/TestWithSslPlugin.java
+++ b/buildSrc/src/main/groovy/org/opensearch/gradle/test/TestWithSslPlugin.java
@@ -64,8 +64,7 @@ public class TestWithSslPlugin implements Plugin<Project> {
File keystoreDir = new File(project.getBuildDir(), "keystore/test/ssl");
File nodeKeystore = new File(keystoreDir, "test-node.jks");
File clientKeyStore = new File(keystoreDir, "test-client.jks");
- NamedDomainObjectContainer<OpenSearchCluster> clusters = (NamedDomainObjectContainer<OpenSearchCluster>) project
- .getExtensions()
+ NamedDomainObjectContainer<OpenSearchCluster> clusters = (NamedDomainObjectContainer<OpenSearchCluster>) project.getExtensions()
.getByName(TestClustersPlugin.EXTENSION_NAME);
clusters.all(c -> {
// copy keystores & certs into config/
diff --git a/buildSrc/src/main/java/org/opensearch/gradle/precommit/LoggerUsageTask.java b/buildSrc/src/main/java/org/opensearch/gradle/precommit/LoggerUsageTask.java
index 2dc98cf65fc..060988894e3 100644
--- a/buildSrc/src/main/java/org/opensearch/gradle/precommit/LoggerUsageTask.java
+++ b/buildSrc/src/main/java/org/opensearch/gradle/precommit/LoggerUsageTask.java
@@ -48,7 +48,7 @@ public class LoggerUsageTask extends PrecommitTask {
@TaskAction
public void runLoggerUsageTask() {
LoggedExec.javaexec(getProject(), spec -> {
- spec.setMain("org.opensearch.test.loggerusage.ESLoggerUsageChecker");
+ spec.setMain("org.opensearch.test.loggerusage.OpenSearchLoggerUsageChecker");
spec.classpath(getClasspath());
getClassDirectories().forEach(spec::args);
});
diff --git a/buildSrc/src/main/java/org/opensearch/gradle/precommit/TestingConventionsPrecommitPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/precommit/TestingConventionsPrecommitPlugin.java
index cbe41ccea2f..d07bd4cac94 100644
--- a/buildSrc/src/main/java/org/opensearch/gradle/precommit/TestingConventionsPrecommitPlugin.java
+++ b/buildSrc/src/main/java/org/opensearch/gradle/precommit/TestingConventionsPrecommitPlugin.java
@@ -32,8 +32,8 @@ public class TestingConventionsPrecommitPlugin extends PrecommitPlugin {
TestingConventionRule testsRule = t.getNaming().maybeCreate("Tests");
testsRule.baseClass("org.apache.lucene.util.LuceneTestCase");
TestingConventionRule itRule = t.getNaming().maybeCreate("IT");
- itRule.baseClass("org.opensearch.test.ESIntegTestCase");
- itRule.baseClass("org.opensearch.test.rest.ESRestTestCase");
+ itRule.baseClass("org.opensearch.test.OpenSearchIntegTestCase");
+ itRule.baseClass("org.opensearch.test.rest.OpenSearchRestTestCase");
});
return testingConventions;
}
diff --git a/buildSrc/src/main/java/org/opensearch/gradle/test/DistroTestPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/test/DistroTestPlugin.java
index a19086878ce..b09c77afddf 100644
--- a/buildSrc/src/main/java/org/opensearch/gradle/test/DistroTestPlugin.java
+++ b/buildSrc/src/main/java/org/opensearch/gradle/test/DistroTestPlugin.java
@@ -124,7 +124,8 @@ public class DistroTestPlugin implements Plugin<Project> {
System.out.println(ex.getMessage());
}
- if ((distribution.getType() == OpenSearchDistribution.Type.DEB || distribution.getType() == OpenSearchDistribution.Type.RPM) && distribution.getBundledJdk()) {
+ if ((distribution.getType() == OpenSearchDistribution.Type.DEB || distribution.getType() == OpenSearchDistribution.Type.RPM)
+ && distribution.getBundledJdk()) {
for (Version version : BuildParams.getBwcVersions().getIndexCompatible()) {
if (version.before("6.3.0")) {
continue; // before opening xpack
@@ -204,7 +205,8 @@ public class DistroTestPlugin implements Plugin<Project> {
// auto-detection doesn't work.
//
// The shouldTestDocker property could be null, hence we use Boolean.TRUE.equals()
- boolean shouldExecute = (type != OpenSearchDistribution.Type.DOCKER) || Boolean.TRUE.equals(vmProject.findProperty("shouldTestDocker"));
+ boolean shouldExecute = (type != OpenSearchDistribution.Type.DOCKER)
+ || Boolean.TRUE.equals(vmProject.findProperty("shouldTestDocker"));
if (shouldExecute) {
distroTest.configure(t -> t.dependsOn(wrapperTask));
@@ -359,7 +361,11 @@ public class DistroTestPlugin implements Plugin<Project> {
List<OpenSearchDistribution> currentDistros = new ArrayList<>();
for (Architecture architecture : Architecture.values()) {
- for (OpenSearchDistribution.Type type : Arrays.asList(OpenSearchDistribution.Type.DEB, OpenSearchDistribution.Type.RPM, OpenSearchDistribution.Type.DOCKER)) {
+ for (OpenSearchDistribution.Type type : Arrays.asList(
+ OpenSearchDistribution.Type.DEB,
+ OpenSearchDistribution.Type.RPM,
+ OpenSearchDistribution.Type.DOCKER
+ )) {
for (boolean bundledJdk : Arrays.asList(true, false)) {
if (bundledJdk == false) {
// We'll never publish an ARM (aarch64) build without a bundled JDK.
@@ -380,7 +386,10 @@ public class DistroTestPlugin implements Plugin<Project> {
}
for (Architecture architecture : Architecture.values()) {
- for (OpenSearchDistribution.Platform platform : Arrays.asList(OpenSearchDistribution.Platform.LINUX, OpenSearchDistribution.Platform.WINDOWS)) {
+ for (OpenSearchDistribution.Platform platform : Arrays.asList(
+ OpenSearchDistribution.Platform.LINUX,
+ OpenSearchDistribution.Platform.WINDOWS
+ )) {
for (boolean bundledJdk : Arrays.asList(true, false)) {
if (bundledJdk == false && architecture != Architecture.X64) {
// We will never publish distributions for non-x86 (amd64) platforms
@@ -389,7 +398,14 @@ public class DistroTestPlugin implements Plugin<Project> {
}
currentDistros.add(
- createDistro(distributions, architecture, OpenSearchDistribution.Type.ARCHIVE, platform, bundledJdk, VersionProperties.getOpenSearch())
+ createDistro(
+ distributions,
+ architecture,
+ OpenSearchDistribution.Type.ARCHIVE,
+ platform,
+ bundledJdk,
+ VersionProperties.getOpenSearch()
+ )
);
}
}
@@ -434,10 +450,14 @@ public class DistroTestPlugin implements Plugin<Project> {
return project.getName().contains("windows");
}
- private static String distroId(OpenSearchDistribution.Type type, OpenSearchDistribution.Platform platform, boolean bundledJdk, Architecture architecture) {
- return (type == OpenSearchDistribution.Type.ARCHIVE ? platform + "-" : "") + type + (bundledJdk ? "" : "-no-jdk") + (architecture == Architecture.X64
- ? ""
- : "-" + architecture.toString().toLowerCase());
+ private static String distroId(
+ OpenSearchDistribution.Type type,
+ OpenSearchDistribution.Platform platform,
+ boolean bundledJdk,
+ Architecture architecture
+ ) {
+ return (type == OpenSearchDistribution.Type.ARCHIVE ? platform + "-" : "") + type + (bundledJdk ? "" : "-no-jdk")
+ + (architecture == Architecture.X64 ? "" : "-" + architecture.toString().toLowerCase());
}
private static String destructiveDistroTestTaskName(OpenSearchDistribution distro) {
diff --git a/buildSrc/src/main/java/org/opensearch/gradle/test/GradleDistroTestTask.java b/buildSrc/src/main/java/org/opensearch/gradle/test/GradleDistroTestTask.java
index dca9a51c3b8..433b72832b3 100644
--- a/buildSrc/src/main/java/org/opensearch/gradle/test/GradleDistroTestTask.java
+++ b/buildSrc/src/main/java/org/opensearch/gradle/test/GradleDistroTestTask.java
@@ -76,7 +76,9 @@ public class GradleDistroTestTask extends VagrantShellTask {
line.append(isWindows ? "& .\\gradlew " : "./gradlew ");
line.append(taskName);
line.append(" --project-cache-dir ");
- line.append(isWindows ? VagrantMachine.convertWindowsPath(getProject(), cacheDir) : VagrantMachine.convertLinuxPath(getProject(), cacheDir));
+ line.append(
+ isWindows ? VagrantMachine.convertWindowsPath(getProject(), cacheDir) : VagrantMachine.convertLinuxPath(getProject(), cacheDir)
+ );
line.append(" -S");
line.append(" --parallel");
line.append(" -D'org.gradle.logging.level'=" + getProject().getGradle().getStartParameter().getLogLevel());
diff --git a/buildSrc/src/main/java/org/opensearch/gradle/test/rest/RestTestUtil.java b/buildSrc/src/main/java/org/opensearch/gradle/test/rest/RestTestUtil.java
index 95db7c0e87a..3eaf77e93d7 100644
--- a/buildSrc/src/main/java/org/opensearch/gradle/test/rest/RestTestUtil.java
+++ b/buildSrc/src/main/java/org/opensearch/gradle/test/rest/RestTestUtil.java
@@ -41,8 +41,7 @@ public class RestTestUtil {
static OpenSearchCluster createTestCluster(Project project, SourceSet sourceSet) {
// eagerly create the testCluster container so it is easily available for configuration
@SuppressWarnings("unchecked")
- NamedDomainObjectContainer<OpenSearchCluster> testClusters = (NamedDomainObjectContainer<OpenSearchCluster>) project
- .getExtensions()
+ NamedDomainObjectContainer<OpenSearchCluster> testClusters = (NamedDomainObjectContainer<OpenSearchCluster>) project.getExtensions()
.getByName(TestClustersPlugin.EXTENSION_NAME);
return testClusters.create(sourceSet.getName());
}
@@ -81,10 +80,7 @@ public class RestTestUtil {
project.getDependencies().add(sourceSet.getImplementationConfigurationName(), project.project(":test:framework"));
} else {
project.getDependencies()
- .add(
- sourceSet.getImplementationConfigurationName(),
- "org.opensearch.test:framework:" + VersionProperties.getOpenSearch()
- );
+ .add(sourceSet.getImplementationConfigurationName(), "org.opensearch.test:framework:" + VersionProperties.getOpenSearch());
}
}
diff --git a/buildSrc/src/main/java/org/opensearch/gradle/testclusters/OpenSearchCluster.java b/buildSrc/src/main/java/org/opensearch/gradle/testclusters/OpenSearchCluster.java
index 7fd1fbbb4e5..24675868140 100644
--- a/buildSrc/src/main/java/org/opensearch/gradle/testclusters/OpenSearchCluster.java
+++ b/buildSrc/src/main/java/org/opensearch/gradle/testclusters/OpenSearchCluster.java
@@ -91,16 +91,7 @@ public class OpenSearchCluster implements TestClusterConfiguration, Named {
this.bwcJdk = bwcJdk;
this.nodes.add(
- new OpenSearchNode(
- path,
- clusterName + "-0",
- project,
- reaper,
- fileSystemOperations,
- archiveOperations,
- workingDirBase,
- bwcJdk
- )
+ new OpenSearchNode(path, clusterName + "-0", project, reaper, fileSystemOperations, archiveOperations, workingDirBase, bwcJdk)
);
// configure the cluster name eagerly so nodes know about it
this.nodes.all((node) -> node.defaultConfig.put("cluster.name", safeName(clusterName)));
diff --git a/buildSrc/src/main/java/org/opensearch/gradle/testclusters/StandaloneRestIntegTestTask.java b/buildSrc/src/main/java/org/opensearch/gradle/testclusters/StandaloneRestIntegTestTask.java
index 1fc8738d9c4..3847f54f1ae 100644
--- a/buildSrc/src/main/java/org/opensearch/gradle/testclusters/StandaloneRestIntegTestTask.java
+++ b/buildSrc/src/main/java/org/opensearch/gradle/testclusters/StandaloneRestIntegTestTask.java
@@ -89,7 +89,10 @@ public class StandaloneRestIntegTestTask extends Test implements TestClustersAwa
public List<ResourceLock> getSharedResources() {
List<ResourceLock> locks = new ArrayList<>(super.getSharedResources());
BuildServiceRegistryInternal serviceRegistry = getServices().get(BuildServiceRegistryInternal.class);
- Provider<TestClustersThrottle> throttleProvider = GradleUtils.getBuildService(serviceRegistry, TestClustersPlugin.THROTTLE_SERVICE_NAME);
+ Provider<TestClustersThrottle> throttleProvider = GradleUtils.getBuildService(
+ serviceRegistry,
+ TestClustersPlugin.THROTTLE_SERVICE_NAME
+ );
SharedResource resource = serviceRegistry.forService(throttleProvider);
int nodeCount = clusters.stream().mapToInt(cluster -> cluster.getNodes().size()).sum();
diff --git a/buildSrc/src/test/java/org/opensearch/gradle/DistributionDownloadPluginTests.java b/buildSrc/src/test/java/org/opensearch/gradle/DistributionDownloadPluginTests.java
index 53f8ce91074..730ee6ae85e 100644
--- a/buildSrc/src/test/java/org/opensearch/gradle/DistributionDownloadPluginTests.java
+++ b/buildSrc/src/test/java/org/opensearch/gradle/DistributionDownloadPluginTests.java
@@ -101,14 +101,7 @@ public class DistributionDownloadPluginTests extends GradleUnitTestCase {
}
public void testBundledJdkDefault() {
- OpenSearchDistribution distro = checkDistro(
- createProject(null, false),
- "testdistro",
- "5.0.0",
- Type.ARCHIVE,
- Platform.LINUX,
- true
- );
+ OpenSearchDistribution distro = checkDistro(createProject(null, false), "testdistro", "5.0.0", Type.ARCHIVE, Platform.LINUX, true);
assertTrue(distro.getBundledJdk());
}
diff --git a/buildSrc/src/test/java/org/opensearch/gradle/doc/RestTestFromSnippetsTaskTests.java b/buildSrc/src/test/java/org/opensearch/gradle/doc/RestTestFromSnippetsTaskTests.java
index ad07bb7e349..9d1a701695d 100644
--- a/buildSrc/src/test/java/org/opensearch/gradle/doc/RestTestFromSnippetsTaskTests.java
+++ b/buildSrc/src/test/java/org/opensearch/gradle/doc/RestTestFromSnippetsTaskTests.java
@@ -18,7 +18,6 @@
*/
package org.opensearch.gradle.doc;
-import org.opensearch.gradle.doc.RestTestsFromSnippetsTask;
import org.opensearch.gradle.test.GradleUnitTestCase;
import org.gradle.api.InvalidUserDataException;
import org.junit.Rule;
diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/IndicesRequestConvertersTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/IndicesRequestConvertersTests.java
index 7b89abf839b..2ca1551e76a 100644
--- a/client/rest-high-level/src/test/java/org/opensearch/client/IndicesRequestConvertersTests.java
+++ b/client/rest-high-level/src/test/java/org/opensearch/client/IndicesRequestConvertersTests.java
@@ -1061,7 +1061,8 @@ public class IndicesRequestConvertersTests extends OpenSearchTestCase {
putTemplateRequest.version(OpenSearchTestCase.randomInt());
}
if (OpenSearchTestCase.randomBoolean()) {
- putTemplateRequest.settings(Settings.builder().put("setting-" + OpenSearchTestCase.randomInt(), OpenSearchTestCase.randomTimeValue()));
+ putTemplateRequest.settings(
+ Settings.builder().put("setting-" + OpenSearchTestCase.randomInt(), OpenSearchTestCase.randomTimeValue()));
}
Map<String, String> expectedParams = new HashMap<>();
if (OpenSearchTestCase.randomBoolean()) {
@@ -1106,7 +1107,8 @@ public class IndicesRequestConvertersTests extends OpenSearchTestCase {
putTemplateRequest.version(OpenSearchTestCase.randomInt());
}
if (OpenSearchTestCase.randomBoolean()) {
- putTemplateRequest.settings(Settings.builder().put("setting-" + OpenSearchTestCase.randomInt(), OpenSearchTestCase.randomTimeValue()));
+ putTemplateRequest.settings(
+ Settings.builder().put("setting-" + OpenSearchTestCase.randomInt(), OpenSearchTestCase.randomTimeValue()));
}
Map<String, String> expectedParams = new HashMap<>();
if (OpenSearchTestCase.randomBoolean()) {
diff --git a/distribution/docker/src/test/java/org/elasticsearch/docker/test/DockerYmlTestSuiteIT.java b/distribution/docker/src/test/java/org/opensearch/docker/test/DockerYmlTestSuiteIT.java
similarity index 100%
rename from distribution/docker/src/test/java/org/elasticsearch/docker/test/DockerYmlTestSuiteIT.java
rename to distribution/docker/src/test/java/org/opensearch/docker/test/DockerYmlTestSuiteIT.java
diff --git a/distribution/tools/launchers/src/main/java/org/opensearch/tools/launchers/JvmOptionsParser.java b/distribution/tools/launchers/src/main/java/org/opensearch/tools/launchers/JvmOptionsParser.java
index a189ea0e7a8..7802155bab2 100644
--- a/distribution/tools/launchers/src/main/java/org/opensearch/tools/launchers/JvmOptionsParser.java
+++ b/distribution/tools/launchers/src/main/java/org/opensearch/tools/launchers/JvmOptionsParser.java
@@ -79,7 +79,9 @@ final class JvmOptionsParser {
*/
public static void main(final String[] args) throws InterruptedException, IOException {
if (args.length != 1) {
- throw new IllegalArgumentException("expected one argument specifying path to OPENSEARCH_PATH_CONF but was " + Arrays.toString(args));
+ throw new IllegalArgumentException(
+ "expected one argument specifying path to OPENSEARCH_PATH_CONF but was " + Arrays.toString(args)
+ );
}
final JvmOptionsParser parser = new JvmOptionsParser();
diff --git a/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/ListPluginsCommand.java b/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/ListPluginsCommand.java
index 5cbc70b2b03..949e9137571 100644
--- a/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/ListPluginsCommand.java
+++ b/distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/ListPluginsCommand.java
@@ -65,7 +65,7 @@ class ListPluginsCommand extends EnvironmentAwareCommand {
terminal.println(Terminal.Verbosity.SILENT, prefix + plugin.getFileName().toString());
PluginInfo info = PluginInfo.readFromProperties(env.pluginsFile().resolve(plugin));
terminal.println(Terminal.Verbosity.VERBOSE, info.toString(prefix));
- if (info.getElasticsearchVersion().equals(Version.CURRENT) == false) {
+ if (info.getOpenSearchVersion().equals(Version.CURRENT) == false) {
terminal.errorPrintln(
"WARNING: plugin ["
+ info.getName()
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 0b009ab9a12..b9bd05c6716 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
@@ -1023,10 +1023,7 @@ public class InstallPluginCommandTests extends OpenSearchTestCase {
() -> assertInstallPluginFromUrl("analysis-icu", "analysis-icu", url, null, true)
);
assertThat(e.exitCode, equalTo(ExitCodes.CONFIG));
- assertThat(
- e,
- hasToString(containsString("attempted to install release build of official plugin on snapshot build of OpenSearch"))
- );
+ assertThat(e, hasToString(containsString("attempted to install release build of official plugin on snapshot build of OpenSearch")));
}
@AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/100")
diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java
index e3f94f6f4e0..2daa797e496 100644
--- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java
+++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisPlugin.java
@@ -357,9 +357,9 @@ public class CommonAnalysisPlugin extends Plugin implements AnalysisPlugin, Scri
public List<PreBuiltAnalyzerProviderFactory> getPreBuiltAnalyzerProviderFactories() {
List<PreBuiltAnalyzerProviderFactory> analyzers = new ArrayList<>();
// TODO remove in 8.0
- analyzers.add(new PreBuiltAnalyzerProviderFactory("standard_html_strip", CachingStrategy.ELASTICSEARCH,
+ analyzers.add(new PreBuiltAnalyzerProviderFactory("standard_html_strip", CachingStrategy.OPENSEARCH,
() -> new StandardHtmlStripAnalyzer(CharArraySet.EMPTY_SET)));
- analyzers.add(new PreBuiltAnalyzerProviderFactory("pattern", CachingStrategy.ELASTICSEARCH,
+ analyzers.add(new PreBuiltAnalyzerProviderFactory("pattern", CachingStrategy.OPENSEARCH,
() -> new PatternAnalyzer(Regex.compile("\\W+" /*PatternAnalyzer.NON_WORD_PATTERN*/, null), true,
CharArraySet.EMPTY_SET)));
analyzers.add(new PreBuiltAnalyzerProviderFactory("snowball", CachingStrategy.LUCENE,
diff --git a/modules/opensearch-dashboards/src/main/java/org/opensearch/dashboards/OpenSearchDashboardsPlugin.java b/modules/opensearch-dashboards/src/main/java/org/opensearch/dashboards/OpenSearchDashboardsPlugin.java
index 4bcf0ef0667..d148b06191f 100644
--- a/modules/opensearch-dashboards/src/main/java/org/opensearch/dashboards/OpenSearchDashboardsPlugin.java
+++ b/modules/opensearch-dashboards/src/main/java/org/opensearch/dashboards/OpenSearchDashboardsPlugin.java
@@ -66,7 +66,15 @@ public class OpenSearchDashboardsPlugin extends Plugin implements SystemIndexPlu
public static final Setting<List<String>> OPENSEARCH_DASHBOARDS_INDEX_NAMES_SETTING = Setting.listSetting(
"opensearch_dashboards.system_indices",
- unmodifiableList(Arrays.asList(".opensearch_dashboards", ".opensearch_dashboards_*", ".reporting-*", ".apm-agent-configuration", ".apm-custom-link")),
+ unmodifiableList(
+ Arrays.asList(
+ ".opensearch_dashboards",
+ ".opensearch_dashboards_*",
+ ".reporting-*",
+ ".apm-agent-configuration",
+ ".apm-custom-link"
+ )
+ ),
Function.identity(),
Property.NodeScope
);
diff --git a/modules/opensearch-dashboards/src/test/java/org/opensearch/dashboards/OpenSearchDashboardsPluginTests.java b/modules/opensearch-dashboards/src/test/java/org/opensearch/dashboards/OpenSearchDashboardsPluginTests.java
index ecaa8aad55f..bd9603c0135 100644
--- a/modules/opensearch-dashboards/src/test/java/org/opensearch/dashboards/OpenSearchDashboardsPluginTests.java
+++ b/modules/opensearch-dashboards/src/test/java/org/opensearch/dashboards/OpenSearchDashboardsPluginTests.java
@@ -34,7 +34,10 @@ import static org.hamcrest.Matchers.is;
public class OpenSearchDashboardsPluginTests extends OpenSearchTestCase {
public void testOpenSearchDashboardsIndexNames() {
- assertThat(new OpenSearchDashboardsPlugin().getSettings(), contains(OpenSearchDashboardsPlugin.OPENSEARCH_DASHBOARDS_INDEX_NAMES_SETTING));
+ assertThat(
+ new OpenSearchDashboardsPlugin().getSettings(),
+ contains(OpenSearchDashboardsPlugin.OPENSEARCH_DASHBOARDS_INDEX_NAMES_SETTING)
+ );
assertThat(
new OpenSearchDashboardsPlugin().getSystemIndexDescriptors(Settings.EMPTY)
.stream()
diff --git a/modules/percolator/src/test/java/org/opensearch/percolator/QueryAnalyzerTests.java b/modules/percolator/src/test/java/org/opensearch/percolator/QueryAnalyzerTests.java
index 8ae28e6b37e..3682a26e671 100644
--- a/modules/percolator/src/test/java/org/opensearch/percolator/QueryAnalyzerTests.java
+++ b/modules/percolator/src/test/java/org/opensearch/percolator/QueryAnalyzerTests.java
@@ -1202,7 +1202,8 @@ public class QueryAnalyzerTests extends OpenSearchTestCase {
public void testToParentBlockJoinQuery() {
TermQuery termQuery = new TermQuery(new Term("field", "value"));
QueryBitSetProducer queryBitSetProducer = new QueryBitSetProducer(new TermQuery(new Term("_type", "child")));
- OpenSearchToParentBlockJoinQuery query = new OpenSearchToParentBlockJoinQuery(termQuery, queryBitSetProducer, ScoreMode.None, "child");
+ OpenSearchToParentBlockJoinQuery query =
+ new OpenSearchToParentBlockJoinQuery(termQuery, queryBitSetProducer, ScoreMode.None, "child");
Result result = analyze(query, Version.CURRENT);
assertFalse(result.verified);
assertThat(result.minimumShouldMatch, equalTo(1));
diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/DiscountedCumulativeGainTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/DiscountedCumulativeGainTests.java
index c42065a5607..4ca3424714d 100644
--- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/DiscountedCumulativeGainTests.java
+++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/DiscountedCumulativeGainTests.java
@@ -312,7 +312,8 @@ public class DiscountedCumulativeGainTests extends OpenSearchTestCase {
public void testSerialization() throws IOException {
DiscountedCumulativeGain original = createTestItem();
- DiscountedCumulativeGain deserialized = OpenSearchTestCase.copyWriteable(original, new NamedWriteableRegistry(Collections.emptyList()),
+ DiscountedCumulativeGain deserialized =
+ OpenSearchTestCase.copyWriteable(original, new NamedWriteableRegistry(Collections.emptyList()),
DiscountedCumulativeGain::new);
assertEquals(deserialized, original);
assertEquals(deserialized.hashCode(), original.hashCode());
diff --git a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/ExpectedReciprocalRankTests.java b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/ExpectedReciprocalRankTests.java
index 4559f9f0593..0339d769e6f 100644
--- a/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/ExpectedReciprocalRankTests.java
+++ b/modules/rank-eval/src/test/java/org/opensearch/index/rankeval/ExpectedReciprocalRankTests.java
@@ -190,7 +190,8 @@ public class ExpectedReciprocalRankTests extends OpenSearchTestCase {
public void testSerialization() throws IOException {
ExpectedReciprocalRank original = createTestItem();
- ExpectedReciprocalRank deserialized = OpenSearchTestCase.copyWriteable(original, new NamedWriteableRegistry(Collections.emptyList()),
+ ExpectedReciprocalRank deserialized =
+ OpenSearchTestCase.copyWriteable(original, new NamedWriteableRegistry(Collections.emptyList()),
ExpectedReciprocalRank::new);
assertEquals(deserialized, original);
assertEquals(deserialized.hashCode(), original.hashCode());
diff --git a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java
index 62eeed6eb68..8a24c8b67a6 100644
--- a/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java
+++ b/modules/reindex/src/main/java/org/opensearch/index/reindex/remote/RemoteScrollableHitSource.java
@@ -26,7 +26,7 @@ import org.apache.http.util.EntityUtils;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.ParameterizedMessage;
import org.apache.logging.log4j.util.Supplier;
-import org.opensearch.OpenSearchException;;
+import org.opensearch.OpenSearchException;
import org.opensearch.OpenSearchStatusException;
import org.opensearch.Version;
import org.opensearch.action.bulk.BackoffPolicy;
diff --git a/modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java b/modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java
index 6771c649d11..f3cb93b852e 100644
--- a/modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java
+++ b/modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java
@@ -902,7 +902,8 @@ public class AsyncBulkByScrollActionTests extends OpenSearchTestCase {
}
if (i == toReject) {
responses[i] = new BulkItemResponse(i, item.opType(),
- new Failure(response.getIndex(), response.getType(), response.getId(), new OpenSearchRejectedExecutionException()));
+ new Failure(response.getIndex(), response.getType(), response.getId(),
+ new OpenSearchRejectedExecutionException()));
} else {
responses[i] = new BulkItemResponse(i, item.opType(), response);
}
diff --git a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/rest/discovery/Zen2RestApiIT.java b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/rest/discovery/Zen2RestApiIT.java
index f492236df9c..d2503868e69 100644
--- a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/rest/discovery/Zen2RestApiIT.java
+++ b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/rest/discovery/Zen2RestApiIT.java
@@ -47,7 +47,8 @@ import static org.hamcrest.core.Is.is;
// These tests are here today so they have access to a proper REST client. They cannot be in :server:integTest since the REST client needs a
// proper transport implementation, and they cannot be REST tests today since they need to restart nodes. When #35599 and friends land we
// should be able to move these tests to run against a proper cluster instead. TODO do this.
-@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0, transportClientRatio = 0, autoManageMasterNodes = false)
+@OpenSearchIntegTestCase.ClusterScope(
+ scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0, transportClientRatio = 0, autoManageMasterNodes = false)
public class Zen2RestApiIT extends OpenSearchNetty4IntegTestCase {
@Override
diff --git a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/OpenSearchLoggingHandlerIT.java b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/OpenSearchLoggingHandlerIT.java
index 6e86a202e6b..fb096569622 100644
--- a/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/OpenSearchLoggingHandlerIT.java
+++ b/modules/transport-netty4/src/internalClusterTest/java/org/opensearch/transport/netty4/OpenSearchLoggingHandlerIT.java
@@ -71,7 +71,8 @@ public class OpenSearchLoggingHandlerIT extends OpenSearchNetty4IntegTestCase {
"hot threads request", TransportLogger.class.getCanonicalName(), Level.TRACE, writePattern);
final MockLogAppender.LoggingExpectation flushExpectation =
- new MockLogAppender.SeenEventExpectation("flush", OpenSearchLoggingHandler.class.getCanonicalName(), Level.TRACE, "*FLUSH*");
+ new MockLogAppender.SeenEventExpectation(
+ "flush", OpenSearchLoggingHandler.class.getCanonicalName(), Level.TRACE, "*FLUSH*");
final String readPattern =
".*\\[length: \\d+" +
diff --git a/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/cloud/azure/classic/AbstractAzureComputeServiceTestCase.java b/plugins/discovery-azure-classic/src/internalClusterTest/java/org/opensearch/cloud/azure/classic/AbstractAzureComputeServiceTestCase.java
similarity index 100%
rename from plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/cloud/azure/classic/AbstractAzureComputeServiceTestCase.java
rename to plugins/discovery-azure-classic/src/internalClusterTest/java/org/opensearch/cloud/azure/classic/AbstractAzureComputeServiceTestCase.java
diff --git a/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureDiscoveryClusterFormationTests.java b/plugins/discovery-azure-classic/src/internalClusterTest/java/org/opensearch/discovery/azure/classic/AzureDiscoveryClusterFormationTests.java
similarity index 97%
rename from plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureDiscoveryClusterFormationTests.java
rename to plugins/discovery-azure-classic/src/internalClusterTest/java/org/opensearch/discovery/azure/classic/AzureDiscoveryClusterFormationTests.java
index 07a418edb91..1c93d928b88 100644
--- a/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureDiscoveryClusterFormationTests.java
+++ b/plugins/discovery-azure-classic/src/internalClusterTest/java/org/opensearch/discovery/azure/classic/AzureDiscoveryClusterFormationTests.java
@@ -33,7 +33,7 @@ import org.opensearch.common.settings.Setting;
import org.opensearch.common.settings.Settings;
import org.opensearch.discovery.DiscoveryModule;
import org.opensearch.env.Environment;
-import org.opensearch.mocksocket.MockHttpServer;
+import org.elasticsearch.mocksocket.MockHttpServer;
import org.opensearch.node.Node;
import org.opensearch.plugin.discovery.azure.classic.AzureDiscoveryPlugin;
import org.opensearch.plugins.Plugin;
@@ -125,14 +125,16 @@ public class AzureDiscoveryClusterFormationTests extends OpenSearchIntegTestCase
.put(AzureComputeService.Management.ENDPOINT_SETTING.getKey(), "https://" + InetAddress.getLoopbackAddress().getHostAddress() +
":" + httpsServer.getAddress().getPort())
.put(AzureComputeService.Management.KEYSTORE_PATH_SETTING.getKey(), keyStoreFile.toAbsolutePath())
- .put(AzureComputeService.Discovery.HOST_TYPE_SETTING.getKey(), AzureSeedHostsProvider.HostType.PUBLIC_IP.name())
+ .put(AzureComputeService.Discovery.HOST_TYPE_SETTING.getKey(),
+ org.opensearch.discovery.azure.classic.AzureSeedHostsProvider.HostType.PUBLIC_IP.name())
.put(AzureComputeService.Management.KEYSTORE_PASSWORD_SETTING.getKey(), "keypass")
.put(AzureComputeService.Management.KEYSTORE_TYPE_SETTING.getKey(), "jks")
.put(AzureComputeService.Management.SERVICE_NAME_SETTING.getKey(), "myservice")
.put(AzureComputeService.Management.SUBSCRIPTION_ID_SETTING.getKey(), "subscription")
.put(AzureComputeService.Discovery.DEPLOYMENT_NAME_SETTING.getKey(), "mydeployment")
.put(AzureComputeService.Discovery.ENDPOINT_NAME_SETTING.getKey(), "myendpoint")
- .put(AzureComputeService.Discovery.DEPLOYMENT_SLOT_SETTING.getKey(), AzureSeedHostsProvider.Deployment.PRODUCTION.name())
+ .put(AzureComputeService.Discovery.DEPLOYMENT_SLOT_SETTING.getKey(),
+ org.opensearch.discovery.azure.classic.AzureSeedHostsProvider.Deployment.PRODUCTION.name())
.build();
}
diff --git a/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureSimpleTests.java b/plugins/discovery-azure-classic/src/internalClusterTest/java/org/opensearch/discovery/azure/classic/AzureSimpleTests.java
similarity index 100%
rename from plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureSimpleTests.java
rename to plugins/discovery-azure-classic/src/internalClusterTest/java/org/opensearch/discovery/azure/classic/AzureSimpleTests.java
diff --git a/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureTwoStartedNodesTests.java b/plugins/discovery-azure-classic/src/internalClusterTest/java/org/opensearch/discovery/azure/classic/AzureTwoStartedNodesTests.java
similarity index 94%
rename from plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureTwoStartedNodesTests.java
rename to plugins/discovery-azure-classic/src/internalClusterTest/java/org/opensearch/discovery/azure/classic/AzureTwoStartedNodesTests.java
index 214c5578f1d..0116bc2d65e 100644
--- a/plugins/discovery-azure-classic/src/internalClusterTest/java/org/elasticsearch/discovery/azure/classic/AzureTwoStartedNodesTests.java
+++ b/plugins/discovery-azure-classic/src/internalClusterTest/java/org/opensearch/discovery/azure/classic/AzureTwoStartedNodesTests.java
@@ -32,7 +32,8 @@ import org.opensearch.test.OpenSearchIntegTestCase;
public class AzureTwoStartedNodesTests extends AbstractAzureComputeServiceTestCase {
public void testTwoNodesShouldRunUsingPrivateOrPublicIp() {
- final String hostType = randomFrom(AzureSeedHostsProvider.HostType.values()).getType();
+ final String hostType =
+ randomFrom(org.opensearch.discovery.azure.classic.AzureSeedHostsProvider.HostType.values()).getType();
logger.info("--> using azure host type " + hostType);
final Settings settings = Settings.builder()
diff --git a/plugins/discovery-azure-classic/src/main/java/org/elasticsearch/cloud/azure/classic/AzureServiceDisableException.java b/plugins/discovery-azure-classic/src/main/java/org/opensearch/cloud/azure/classic/AzureServiceDisableException.java
similarity index 100%
rename from plugins/discovery-azure-classic/src/main/java/org/elasticsearch/cloud/azure/classic/AzureServiceDisableException.java
rename to plugins/discovery-azure-classic/src/main/java/org/opensearch/cloud/azure/classic/AzureServiceDisableException.java
diff --git a/plugins/discovery-azure-classic/src/main/java/org/elasticsearch/cloud/azure/classic/AzureServiceRemoteException.java b/plugins/discovery-azure-classic/src/main/java/org/opensearch/cloud/azure/classic/AzureServiceRemoteException.java
similarity index 100%
rename from plugins/discovery-azure-classic/src/main/java/org/elasticsearch/cloud/azure/classic/AzureServiceRemoteException.java
rename to plugins/discovery-azure-classic/src/main/java/org/opensearch/cloud/azure/classic/AzureServiceRemoteException.java
diff --git a/plugins/discovery-azure-classic/src/main/java/org/elasticsearch/cloud/azure/classic/management/AzureComputeService.java b/plugins/discovery-azure-classic/src/main/java/org/opensearch/cloud/azure/classic/management/AzureComputeService.java
similarity index 100%
rename from plugins/discovery-azure-classic/src/main/java/org/elasticsearch/cloud/azure/classic/management/AzureComputeService.java
rename to plugins/discovery-azure-classic/src/main/java/org/opensearch/cloud/azure/classic/management/AzureComputeService.java
diff --git a/plugins/discovery-azure-classic/src/main/java/org/elasticsearch/cloud/azure/classic/management/AzureComputeServiceImpl.java b/plugins/discovery-azure-classic/src/main/java/org/opensearch/cloud/azure/classic/management/AzureComputeServiceImpl.java
similarity index 100%
rename from plugins/discovery-azure-classic/src/main/java/org/elasticsearch/cloud/azure/classic/management/AzureComputeServiceImpl.java
rename to plugins/discovery-azure-classic/src/main/java/org/opensearch/cloud/azure/classic/management/AzureComputeServiceImpl.java
diff --git a/plugins/discovery-azure-classic/src/main/java/org/elasticsearch/discovery/azure/classic/AzureSeedHostsProvider.java b/plugins/discovery-azure-classic/src/main/java/org/opensearch/discovery/azure/classic/AzureSeedHostsProvider.java
similarity index 100%
rename from plugins/discovery-azure-classic/src/main/java/org/elasticsearch/discovery/azure/classic/AzureSeedHostsProvider.java
rename to plugins/discovery-azure-classic/src/main/java/org/opensearch/discovery/azure/classic/AzureSeedHostsProvider.java
diff --git a/plugins/discovery-azure-classic/src/main/java/org/elasticsearch/plugin/discovery/azure/classic/AzureDiscoveryPlugin.java b/plugins/discovery-azure-classic/src/main/java/org/opensearch/plugin/discovery/azure/classic/AzureDiscoveryPlugin.java
similarity index 100%
rename from plugins/discovery-azure-classic/src/main/java/org/elasticsearch/plugin/discovery/azure/classic/AzureDiscoveryPlugin.java
rename to plugins/discovery-azure-classic/src/main/java/org/opensearch/plugin/discovery/azure/classic/AzureDiscoveryPlugin.java
diff --git a/plugins/discovery-azure-classic/src/yamlRestTest/java/org/elasticsearch/discovery/azure/classic/DiscoveryAzureClassicClientYamlTestSuiteIT.java b/plugins/discovery-azure-classic/src/yamlRestTest/java/org/opensearch/discovery/azure/classic/DiscoveryAzureClassicClientYamlTestSuiteIT.java
similarity index 100%
rename from plugins/discovery-azure-classic/src/yamlRestTest/java/org/elasticsearch/discovery/azure/classic/DiscoveryAzureClassicClientYamlTestSuiteIT.java
rename to plugins/discovery-azure-classic/src/yamlRestTest/java/org/opensearch/discovery/azure/classic/DiscoveryAzureClassicClientYamlTestSuiteIT.java
diff --git a/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/AbstractEC2MockAPITestCase.java b/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/AbstractEC2MockAPITestCase.java
index 7f49dce8d55..bc908f671f1 100644
--- a/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/AbstractEC2MockAPITestCase.java
+++ b/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/AbstractEC2MockAPITestCase.java
@@ -27,7 +27,7 @@ import org.opensearch.common.network.NetworkService;
import org.opensearch.common.settings.MockSecureSettings;
import org.opensearch.common.settings.Settings;
import org.opensearch.core.internal.io.IOUtils;
-import org.opensearch.mocksocket.MockHttpServer;
+import org.elasticsearch.mocksocket.MockHttpServer;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.transport.MockTransportService;
import org.opensearch.threadpool.TestThreadPool;
diff --git a/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/Ec2NetworkTests.java b/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/Ec2NetworkTests.java
index 19f13f69edf..87d4672e471 100644
--- a/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/Ec2NetworkTests.java
+++ b/plugins/discovery-ec2/src/test/java/org/opensearch/discovery/ec2/Ec2NetworkTests.java
@@ -25,7 +25,7 @@ import org.opensearch.common.Strings;
import org.opensearch.common.SuppressForbidden;
import org.opensearch.common.network.NetworkService;
import org.opensearch.common.settings.Settings;
-import org.opensearch.mocksocket.MockHttpServer;
+import org.elasticsearch.mocksocket.MockHttpServer;
import org.opensearch.rest.RestStatus;
import org.opensearch.test.OpenSearchTestCase;
diff --git a/plugins/examples/custom-suggester/src/yamlRestTest/java/org/javasearch/example/customsuggester/CustomSuggesterClientYamlTestSuiteIT.java b/plugins/examples/custom-suggester/src/yamlRestTest/java/org/opensearch/example/customsuggester/CustomSuggesterClientYamlTestSuiteIT.java
similarity index 100%
rename from plugins/examples/custom-suggester/src/yamlRestTest/java/org/javasearch/example/customsuggester/CustomSuggesterClientYamlTestSuiteIT.java
rename to plugins/examples/custom-suggester/src/yamlRestTest/java/org/opensearch/example/customsuggester/CustomSuggesterClientYamlTestSuiteIT.java
diff --git a/plugins/examples/rescore/src/test/java/org/opensearch/example/rescore/ExampleRescoreBuilderTests.java b/plugins/examples/rescore/src/test/java/org/opensearch/example/rescore/ExampleRescoreBuilderTests.java
index 02a3480f688..73dcf9092e9 100644
--- a/plugins/examples/rescore/src/test/java/org/opensearch/example/rescore/ExampleRescoreBuilderTests.java
+++ b/plugins/examples/rescore/src/test/java/org/opensearch/example/rescore/ExampleRescoreBuilderTests.java
@@ -48,7 +48,8 @@ public class ExampleRescoreBuilderTests extends AbstractWireSerializingTestCase<
Supplier<ExampleRescoreBuilder> supplier = randomFrom(
() -> new ExampleRescoreBuilder(instance.factor(), instance.factorField())
.windowSize(randomValueOtherThan(instance.windowSize(), () -> between(0, Integer.MAX_VALUE))),
- () -> new ExampleRescoreBuilder(randomValueOtherThan(instance.factor(), OpenSearchTestCase::randomFloat), instance.factorField())
+ () -> new ExampleRescoreBuilder(
+ randomValueOtherThan(instance.factor(), OpenSearchTestCase::randomFloat), instance.factorField())
.windowSize(instance.windowSize()),
() -> new ExampleRescoreBuilder(
instance.factor(), randomValueOtherThan(instance.factorField(), () -> randomAlphaOfLength(5)))
diff --git a/plugins/examples/rest-handler/src/javaRestTest/java/org/opensearch/example/resthandler/ExampleFixtureIT.java b/plugins/examples/rest-handler/src/javaRestTest/java/org/opensearch/example/resthandler/ExampleFixtureIT.java
index 75ca18281c8..496606f62c1 100644
--- a/plugins/examples/rest-handler/src/javaRestTest/java/org/opensearch/example/resthandler/ExampleFixtureIT.java
+++ b/plugins/examples/rest-handler/src/javaRestTest/java/org/opensearch/example/resthandler/ExampleFixtureIT.java
@@ -19,7 +19,7 @@
package org.opensearch.example.resthandler;
-import org.opensearch.mocksocket.MockSocket;
+import org.elasticsearch.mocksocket.MockSocket;
import org.opensearch.test.OpenSearchTestCase;
import java.io.BufferedReader;
diff --git a/plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java b/plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java
index ffd17dc9e98..c9d45967049 100644
--- a/plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java
+++ b/plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java
@@ -43,7 +43,7 @@ import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.common.util.concurrent.CountDown;
-import org.opensearch.mocksocket.MockHttpServer;
+import org.elasticsearch.mocksocket.MockHttpServer;
import org.opensearch.rest.RestStatus;
import org.opensearch.rest.RestUtils;
import org.opensearch.test.OpenSearchTestCase;
diff --git a/plugins/transport-nio/src/internalClusterTest/java/org/opensearch/NioIntegTestCase.java b/plugins/transport-nio/src/internalClusterTest/java/org/opensearch/NioIntegTestCase.java
index 43f53470d37..36f570878e5 100644
--- a/plugins/transport-nio/src/internalClusterTest/java/org/opensearch/NioIntegTestCase.java
+++ b/plugins/transport-nio/src/internalClusterTest/java/org/opensearch/NioIntegTestCase.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.opensearch
+package org.opensearch;
import org.opensearch.common.network.NetworkModule;
import org.opensearch.common.settings.Settings;
diff --git a/qa/evil-tests/src/test/java/org/opensearch/bootstrap/EvilOpenSearchCliTests.java b/qa/evil-tests/src/test/java/org/opensearch/bootstrap/EvilOpenSearchCliTests.java
index 0a6aaee15ac..39b5df6b312 100644
--- a/qa/evil-tests/src/test/java/org/opensearch/bootstrap/EvilOpenSearchCliTests.java
+++ b/qa/evil-tests/src/test/java/org/opensearch/bootstrap/EvilOpenSearchCliTests.java
@@ -29,7 +29,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.hasSize;
-public class EvilOpenSearchCliTests extends BaseOpenSearchCliTestCase {
+public class EvilOpenSearchCliTests extends OpenSearchCliTestCase {
@SuppressForbidden(reason = "manipulates system properties for testing")
public void testPathHome() throws Exception {
diff --git a/qa/evil-tests/src/test/java/org/opensearch/bootstrap/OpenSearchPolicyUnitTests.java b/qa/evil-tests/src/test/java/org/opensearch/bootstrap/OpenSearchPolicyUnitTests.java
index 834867ec830..56444310e0e 100644
--- a/qa/evil-tests/src/test/java/org/opensearch/bootstrap/OpenSearchPolicyUnitTests.java
+++ b/qa/evil-tests/src/test/java/org/opensearch/bootstrap/OpenSearchPolicyUnitTests.java
@@ -34,7 +34,7 @@ import java.security.cert.Certificate;
import java.util.Collections;
/**
- * Unit tests for ESPolicy: these cannot run with security manager,
+ * Unit tests for OpenSearchPolicy: these cannot run with security manager,
* we don't allow messing with the policy
*/
public class OpenSearchPolicyUnitTests extends OpenSearchTestCase {
@@ -52,7 +52,8 @@ public class OpenSearchPolicyUnitTests extends OpenSearchTestCase {
Permission all = new AllPermission();
PermissionCollection allCollection = all.newPermissionCollection();
allCollection.add(all);
- ESPolicy policy = new ESPolicy(Collections.emptyMap(), allCollection, Collections.emptyMap(), true, new Permissions());
+ OpenSearchPolicy policy =
+ new OpenSearchPolicy(Collections.emptyMap(), allCollection, Collections.emptyMap(), true, new Permissions());
// restrict ourselves to NoPermission
PermissionCollection noPermissions = new Permissions();
assertFalse(policy.implies(new ProtectionDomain(null, noPermissions), new FilePermission("foo", "read")));
@@ -67,7 +68,8 @@ public class OpenSearchPolicyUnitTests extends OpenSearchTestCase {
public void testNullLocation() throws Exception {
assumeTrue("test cannot run with security manager", System.getSecurityManager() == null);
PermissionCollection noPermissions = new Permissions();
- ESPolicy policy = new ESPolicy(Collections.emptyMap(), noPermissions, Collections.emptyMap(), true, new Permissions());
+ OpenSearchPolicy policy =
+ new OpenSearchPolicy(Collections.emptyMap(), noPermissions, Collections.emptyMap(), true, new Permissions());
assertFalse(policy.implies(new ProtectionDomain(new CodeSource(null, (Certificate[]) null), noPermissions),
new FilePermission("foo", "read")));
}
@@ -75,7 +77,8 @@ public class OpenSearchPolicyUnitTests extends OpenSearchTestCase {
public void testListen() {
assumeTrue("test cannot run with security manager", System.getSecurityManager() == null);
final PermissionCollection noPermissions = new Permissions();
- final ESPolicy policy = new ESPolicy(Collections.emptyMap(), noPermissions, Collections.emptyMap(), true, new Permissions());
+ final OpenSearchPolicy policy =
+ new OpenSearchPolicy(Collections.emptyMap(), noPermissions, Collections.emptyMap(), true, new Permissions());
assertFalse(
policy.implies(
new ProtectionDomain(OpenSearchPolicyUnitTests.class.getProtectionDomain().getCodeSource(), noPermissions),
@@ -87,7 +90,8 @@ public class OpenSearchPolicyUnitTests extends OpenSearchTestCase {
assumeTrue("test cannot run with security manager", System.getSecurityManager() == null);
final PermissionCollection dataPathPermission = new Permissions();
dataPathPermission.add(new FilePermission("/home/opensearch/data/-", "read"));
- final ESPolicy policy = new ESPolicy(Collections.emptyMap(), new Permissions(), Collections.emptyMap(), true, dataPathPermission);
+ final OpenSearchPolicy policy =
+ new OpenSearchPolicy(Collections.emptyMap(), new Permissions(), Collections.emptyMap(), true, dataPathPermission);
assertTrue(
policy.implies(
new ProtectionDomain(new CodeSource(null, (Certificate[]) null), new Permissions()),
diff --git a/qa/os/src/test/java/org/opensearch/packaging/test/KeystoreManagementTests.java b/qa/os/src/test/java/org/opensearch/packaging/test/KeystoreManagementTests.java
index edd3d79508b..04d6a9f1abe 100644
--- a/qa/os/src/test/java/org/opensearch/packaging/test/KeystoreManagementTests.java
+++ b/qa/os/src/test/java/org/opensearch/packaging/test/KeystoreManagementTests.java
@@ -161,7 +161,7 @@ public class KeystoreManagementTests extends PackagingTestCase {
assertPasswordProtectedKeystore();
- awaitElasticsearchStartup(runOpenSearchStartCommand(password, true, false));
+ awaitOpenSearchStartup(runOpenSearchStartCommand(password, true, false));
ServerUtils.runOpenSearchTests();
stopOpenSearch();
}
@@ -192,7 +192,7 @@ public class KeystoreManagementTests extends PackagingTestCase {
assertPasswordProtectedKeystore();
- awaitElasticsearchStartup(runOpenSearchStartCommand(password, false, true));
+ awaitOpenSearchStartup(runOpenSearchStartCommand(password, false, true));
ServerUtils.runOpenSearchTests();
stopOpenSearch();
}
diff --git a/qa/os/src/test/java/org/opensearch/packaging/util/Archives.java b/qa/os/src/test/java/org/opensearch/packaging/util/Archives.java
index b998cd07298..9c6d770bf98 100644
--- a/qa/os/src/test/java/org/opensearch/packaging/util/Archives.java
+++ b/qa/os/src/test/java/org/opensearch/packaging/util/Archives.java
@@ -169,21 +169,15 @@ public class Archives {
assertThat(es.lib, file(Directory, owner, owner, p755));
assertThat(Files.exists(es.config("opensearch.keystore")), is(false));
- Stream.of(
- "opensearch",
- "opensearch-env",
- "opensearch-keystore",
- "opensearch-plugin",
- "opensearch-shard",
- "opensearch-node"
- ).forEach(executable -> {
+ Stream.of("opensearch", "opensearch-env", "opensearch-keystore", "opensearch-plugin", "opensearch-shard", "opensearch-node")
+ .forEach(executable -> {
- assertThat(es.bin(executable), file(File, owner, owner, p755));
+ assertThat(es.bin(executable), file(File, owner, owner, p755));
- if (distribution.packaging == Distribution.Packaging.ZIP) {
- assertThat(es.bin(executable + ".bat"), file(File, owner));
- }
- });
+ if (distribution.packaging == Distribution.Packaging.ZIP) {
+ assertThat(es.bin(executable + ".bat"), file(File, owner));
+ }
+ });
if (distribution.packaging == Distribution.Packaging.ZIP) {
Stream.of("opensearch-service.bat", "opensearch-service-mgr.exe", "opensearch-service-x64.exe")
@@ -237,12 +231,7 @@ public class Archives {
return sh.runIgnoreExitCode(script);
}
- public static Shell.Result runOpenSearchStartCommand(
- Installation installation,
- Shell sh,
- String keystorePassword,
- boolean daemonize
- ) {
+ public static Shell.Result runOpenSearchStartCommand(Installation installation, Shell sh, String keystorePassword, boolean daemonize) {
final Path pidFile = installation.home.resolve("opensearch.pid");
assertThat(pidFile, fileDoesNotExist());
diff --git a/qa/os/src/test/java/org/opensearch/packaging/util/Installation.java b/qa/os/src/test/java/org/opensearch/packaging/util/Installation.java
index 31392b484df..c174bbbd77a 100644
--- a/qa/os/src/test/java/org/opensearch/packaging/util/Installation.java
+++ b/qa/os/src/test/java/org/opensearch/packaging/util/Installation.java
@@ -188,7 +188,7 @@ public class Installation {
public class Executables {
- public final Executable elasticsearch = new Executable("opensearch");
+ public final Executable opensearch = new Executable("opensearch");
public final Executable pluginTool = new Executable("opensearch-plugin");
public final Executable keystoreTool = new Executable("opensearch-keystore");
public final Executable shardTool = new Executable("opensearch-shard");
diff --git a/qa/os/src/test/java/org/opensearch/packaging/util/Packages.java b/qa/os/src/test/java/org/opensearch/packaging/util/Packages.java
index 3b65c3543ca..a2181d42c9d 100644
--- a/qa/os/src/test/java/org/opensearch/packaging/util/Packages.java
+++ b/qa/os/src/test/java/org/opensearch/packaging/util/Packages.java
@@ -236,7 +236,7 @@ public class Packages {
return sh.runIgnoreExitCode("service opensearch start");
}
- public static void assertOpenSearchearchStarted(Shell sh, Installation installation) throws Exception {
+ public static void assertOpenSearchStarted(Shell sh, Installation installation) throws Exception {
waitForOpenSearch(installation);
if (isSystemd()) {
@@ -261,7 +261,7 @@ public class Packages {
} else {
sh.run("service opensearch restart");
}
- assertOpenSearchearchStarted(sh, installation);
+ assertOpenSearchStarted(sh, installation);
}
/**
diff --git a/qa/smoke-test-client/build.gradle b/qa/smoke-test-client/build.gradle
index 2865514badd..610c2dd814b 100644
--- a/qa/smoke-test-client/build.gradle
+++ b/qa/smoke-test-client/build.gradle
@@ -47,7 +47,7 @@ testingConventions {
naming.clear()
naming {
IT {
- baseClass 'org.opensearch.smoketest.ESSmokeClientTestCase'
+ baseClass 'org.opensearch.smoketest.OpenSearchSmokeClientTestCase'
}
}
}
diff --git a/server/build.gradle b/server/build.gradle
index da9a56fcd95..31d2776a68b 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -167,8 +167,8 @@ tasks.named("testingConventions").configure {
baseClass "org.apache.lucene.util.LuceneTestCase"
}
IT {
- baseClass "org.opensearch.test.ESIntegTestCase"
- baseClass "org.opensearch.test.ESSingleNodeTestCase"
+ baseClass "org.opensearch.test.OpenSearchIntegTestCase"
+ baseClass "org.opensearch.test.OpenSearchSingleNodeTestCase"
}
}
}
diff --git a/server/src/internalClusterTest/java/org/opensearch/action/admin/indices/alias/ValidateIndicesAliasesRequestIT.java b/server/src/internalClusterTest/java/org/opensearch/action/admin/indices/alias/ValidateIndicesAliasesRequestIT.java
index 40cffc99d48..b00242ebe45 100644
--- a/server/src/internalClusterTest/java/org/opensearch/action/admin/indices/alias/ValidateIndicesAliasesRequestIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/action/admin/indices/alias/ValidateIndicesAliasesRequestIT.java
@@ -81,12 +81,12 @@ public class ValidateIndicesAliasesRequestIT extends OpenSearchSingleNodeTestCas
@Override
protected Collection<Class<? extends Plugin>> getPlugins() {
- return Collections.singletonList(IndicesAliasopensearchplugin.class);
+ return Collections.singletonList(IndicesAliasesPlugin.class);
}
public void testAllowed() {
final Settings settings = Settings.builder()
- .putList(IndicesAliasopensearchplugin.ALLOWED_ORIGINS_SETTING.getKey(), Collections.singletonList("allowed"))
+ .putList(IndicesAliasesPlugin.ALLOWED_ORIGINS_SETTING.getKey(), Collections.singletonList("allowed"))
.build();
createIndex("index", settings);
final IndicesAliasesRequest request = new IndicesAliasesRequest().origin("allowed");
@@ -102,7 +102,7 @@ public class ValidateIndicesAliasesRequestIT extends OpenSearchSingleNodeTestCas
public void testNotAllowed() {
final Settings settings = Settings.builder()
- .putList(IndicesAliasopensearchplugin.ALLOWED_ORIGINS_SETTING.getKey(), Collections.singletonList("allowed"))
+ .putList(IndicesAliasesPlugin.ALLOWED_ORIGINS_SETTING.getKey(), Collections.singletonList("allowed"))
.build();
createIndex("index", settings);
final String origin = randomFrom("", "not-allowed");
@@ -114,11 +114,11 @@ public class ValidateIndicesAliasesRequestIT extends OpenSearchSingleNodeTestCas
public void testSomeAllowed() {
final Settings fooIndexSettings = Settings.builder()
- .putList(IndicesAliasopensearchplugin.ALLOWED_ORIGINS_SETTING.getKey(), Collections.singletonList("foo_allowed"))
+ .putList(IndicesAliasesPlugin.ALLOWED_ORIGINS_SETTING.getKey(), Collections.singletonList("foo_allowed"))
.build();
createIndex("foo", fooIndexSettings);
final Settings barIndexSettings = Settings.builder()
- .putList(IndicesAliasopensearchplugin.ALLOWED_ORIGINS_SETTING.getKey(), Collections.singletonList("bar_allowed"))
+ .putList(IndicesAliasesPlugin.ALLOWED_ORIGINS_SETTING.getKey(), Collections.singletonList("bar_allowed"))
.build();
createIndex("bar", barIndexSettings);
final String origin = randomFrom("foo_allowed", "bar_allowed");
diff --git a/server/src/internalClusterTest/java/org/opensearch/bwcompat/RecoveryWithUnsupportedIndicesIT.java b/server/src/internalClusterTest/java/org/opensearch/bwcompat/RecoveryWithUnsupportedIndicesIT.java
index ebeafe5b8c9..145feda1d9d 100644
--- a/server/src/internalClusterTest/java/org/opensearch/bwcompat/RecoveryWithUnsupportedIndicesIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/bwcompat/RecoveryWithUnsupportedIndicesIT.java
@@ -38,7 +38,8 @@ import org.opensearch.test.OpenSearchIntegTestCase;
import static org.hamcrest.Matchers.containsString;
@LuceneTestCase.SuppressCodecs("*")
-@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0, minNumDataNodes = 0, maxNumDataNodes = 0)
+@OpenSearchIntegTestCase.ClusterScope(
+ scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0, minNumDataNodes = 0, maxNumDataNodes = 0)
public class RecoveryWithUnsupportedIndicesIT extends OpenSearchIntegTestCase {
/**
diff --git a/server/src/internalClusterTest/java/org/opensearch/cluster/coordination/RareClusterStateIT.java b/server/src/internalClusterTest/java/org/opensearch/cluster/coordination/RareClusterStateIT.java
index b8a887c24b0..30de04a9a18 100644
--- a/server/src/internalClusterTest/java/org/opensearch/cluster/coordination/RareClusterStateIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/cluster/coordination/RareClusterStateIT.java
@@ -69,7 +69,8 @@ import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.instanceOf;
-@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0, numClientNodes = 0, transportClientRatio = 0)
+@OpenSearchIntegTestCase.ClusterScope(
+ scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0, numClientNodes = 0, transportClientRatio = 0)
public class RareClusterStateIT extends OpenSearchIntegTestCase {
@Override
diff --git a/server/src/internalClusterTest/java/org/opensearch/index/IndexingPressureIT.java b/server/src/internalClusterTest/java/org/opensearch/index/IndexingPressureIT.java
index 409818dae98..b012daaa81c 100644
--- a/server/src/internalClusterTest/java/org/opensearch/index/IndexingPressureIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/index/IndexingPressureIT.java
@@ -53,7 +53,8 @@ import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.instanceOf;
-@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 2, numClientNodes = 1, transportClientRatio = 0.0D)
+@OpenSearchIntegTestCase.ClusterScope(
+ scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 2, numClientNodes = 1, transportClientRatio = 0.0D)
public class IndexingPressureIT extends OpenSearchIntegTestCase {
public static final String INDEX_NAME = "test";
diff --git a/server/src/internalClusterTest/java/org/opensearch/indices/mapping/SimpleGetFieldMappingsIT.java b/server/src/internalClusterTest/java/org/opensearch/indices/mapping/SimpleGetFieldMappingsIT.java
index 56ea3d92f88..e96e5cee16a 100644
--- a/server/src/internalClusterTest/java/org/opensearch/indices/mapping/SimpleGetFieldMappingsIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/indices/mapping/SimpleGetFieldMappingsIT.java
@@ -64,7 +64,7 @@ public class SimpleGetFieldMappingsIT extends OpenSearchIntegTestCase {
assertThat(response.mappings().size(), equalTo(1));
assertThat(response.mappings().get("index").size(), equalTo(0));
- assertThat(response.fieldMappings("index", "type", "field"), Matchers.nullValue());
+ assertThat(response.fieldMappings("index", "type", "field"), nullValue());
}
private XContentBuilder getMappingForType(String type) throws IOException {
diff --git a/server/src/main/java/org/opensearch/OpenSearchException.java b/server/src/main/java/org/opensearch/OpenSearchException.java
index 83420cb1166..ec1e39269c2 100644
--- a/server/src/main/java/org/opensearch/OpenSearchException.java
+++ b/server/src/main/java/org/opensearch/OpenSearchException.java
@@ -153,7 +153,8 @@ public class OpenSearchException extends RuntimeException implements ToXContentF
* If the provided key is already present, the corresponding metadata will be replaced
*/
public void addMetadata(String key, List<String> values) {
- //we need to enforce this otherwise bw comp doesn't work properly, as "opensearch." was the previous criteria to split headers in two sets
+ // we need to enforce this otherwise bw comp doesn't work properly, as "opensearch."
+ // was the previous criteria to split headers in two sets
if (key.startsWith("opensearch.") == false) {
throw new IllegalArgumentException("exception metadata must start with [opensearch.], found [" + key + "] instead");
}
@@ -184,7 +185,8 @@ public class OpenSearchException extends RuntimeException implements ToXContentF
* This method will replace existing header if a header with the same key already exists
*/
public void addHeader(String key, List<String> value) {
- //we need to enforce this otherwise bw comp doesn't work properly, as "opensearch." was the previous criteria to split headers in two sets
+ // we need to enforce this otherwise bw comp doesn't work properly, as "opensearch."
+ // was the previous criteria to split headers in two sets
if (key.startsWith("opensearch.")) {
throw new IllegalArgumentException("exception headers must not start with [opensearch.], found [" + key + "] instead");
}
diff --git a/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java b/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java
index e42bd079b7d..2a09a22a345 100644
--- a/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java
+++ b/server/src/main/java/org/opensearch/action/admin/indices/mapping/get/TransportGetFieldMappingsIndexAction.java
@@ -21,6 +21,7 @@ package org.opensearch.action.admin.indices.mapping.get;
import org.opensearch.OpenSearchException;
import org.opensearch.Version;
+import org.opensearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetadata;
import org.opensearch.action.support.ActionFilters;
import org.opensearch.action.support.single.shard.TransportSingleShardAction;
import org.opensearch.cluster.ClusterState;
@@ -111,10 +112,10 @@ public class TransportGetFieldMappingsIndexAction
}
}
- Map<String, Map<String, GetFieldMappingsResponse.FieldMappingMetadata>> typeMappings = new HashMap<>();
+ Map<String, Map<String, FieldMappingMetadata>> typeMappings = new HashMap<>();
for (String type : typeIntersection) {
DocumentMapper documentMapper = indexService.mapperService().documentMapper(type);
- Map<String, GetFieldMappingsResponse.FieldMappingMetadata> fieldMapping = findFieldMappingsByType(fieldPredicate, documentMapper, request);
+ Map<String, FieldMappingMetadata> fieldMapping = findFieldMappingsByType(fieldPredicate, documentMapper, request);
if (!fieldMapping.isEmpty()) {
typeMappings.put(type, fieldMapping);
}
@@ -169,10 +170,10 @@ public class TransportGetFieldMappingsIndexAction
}
};
- private static Map<String, GetFieldMappingsResponse.FieldMappingMetadata> findFieldMappingsByType(Predicate<String> fieldPredicate,
- DocumentMapper documentMapper,
- GetFieldMappingsIndexRequest request) {
- Map<String, GetFieldMappingsResponse.FieldMappingMetadata> fieldMappings = new HashMap<>();
+ private static Map<String, FieldMappingMetadata> findFieldMappingsByType(Predicate<String> fieldPredicate,
+ DocumentMapper documentMapper,
+ GetFieldMappingsIndexRequest request) {
+ Map<String, FieldMappingMetadata> fieldMappings = new HashMap<>();
final MappingLookup allFieldMappers = documentMapper.mappers();
for (String field : request.fields()) {
if (Regex.isMatchAllPattern(field)) {
@@ -192,7 +193,7 @@ public class TransportGetFieldMappingsIndexAction
if (fieldMapper != null) {
addFieldMapper(fieldPredicate, field, fieldMapper, fieldMappings, request.includeDefaults());
} else if (request.probablySingleFieldRequest()) {
- fieldMappings.put(field, GetFieldMappingsResponse.FieldMappingMetadata.NULL);
+ fieldMappings.put(field, FieldMappingMetadata.NULL);
}
}
}
@@ -200,7 +201,7 @@ public class TransportGetFieldMappingsIndexAction
}
private static void addFieldMapper(Predicate<String> fieldPredicate,
- String field, Mapper fieldMapper, Map<String, GetFieldMappingsResponse.FieldMappingMetadata> fieldMappings,
+ String field, Mapper fieldMapper, Map<String, FieldMappingMetadata> fieldMappings,
boolean includeDefaults) {
if (fieldMappings.containsKey(field)) {
return;
@@ -209,7 +210,7 @@ public class TransportGetFieldMappingsIndexAction
try {
BytesReference bytes = XContentHelper.toXContent(fieldMapper, XContentType.JSON,
includeDefaults ? includeDefaultsParams : ToXContent.EMPTY_PARAMS, false);
- fieldMappings.put(field, new GetFieldMappingsResponse.FieldMappingMetadata(fieldMapper.name(), bytes));
+ fieldMappings.put(field, new FieldMappingMetadata(fieldMapper.name(), bytes));
} catch (IOException e) {
throw new OpenSearchException("failed to serialize XContent of field [" + field + "]", e);
}
diff --git a/server/src/main/java/org/opensearch/action/search/SearchResponseMerger.java b/server/src/main/java/org/opensearch/action/search/SearchResponseMerger.java
index 6257f0919e6..1212fdc4e70 100644
--- a/server/src/main/java/org/opensearch/action/search/SearchResponseMerger.java
+++ b/server/src/main/java/org/opensearch/action/search/SearchResponseMerger.java
@@ -89,7 +89,8 @@ final class SearchResponseMerger {
/**
* Add a search response to the list of responses to be merged together into one.
- * Merges currently happen at once when all responses are available and {@link #getMergedResponse(SearchResponse.Clusters)} )} is called.
+ * Merges currently happen at once when all responses are available and
+ * {@link #getMergedResponse(SearchResponse.Clusters)} )} is called.
* That may change in the future as it's possible to introduce incremental merges as responses come in if necessary.
*/
void add(SearchResponse searchResponse) {
diff --git a/server/src/main/java/org/opensearch/action/search/SearchScrollAsyncAction.java b/server/src/main/java/org/opensearch/action/search/SearchScrollAsyncAction.java
index c4a50bdaa9e..c23e17c9d35 100644
--- a/server/src/main/java/org/opensearch/action/search/SearchScrollAsyncAction.java
+++ b/server/src/main/java/org/opensearch/action/search/SearchScrollAsyncAction.java
@@ -135,7 +135,8 @@ abstract class SearchScrollAsyncAction<T extends SearchPhaseResult> implements R
ex, null, () -> SearchScrollAsyncAction.this.moveToNextPhase(clusterNodeLookup));
continue;
}
- final InternalScrollSearchRequest internalRequest = TransportSearchHelper.internalScrollSearchRequest(target.getSearchContextId(), request);
+ final InternalScrollSearchRequest internalRequest =
+ TransportSearchHelper.internalScrollSearchRequest(target.getSearchContextId(), request);
// we can't create a SearchShardTarget here since we don't know the index and shard ID we are talking to
// we only know the node and the search context ID. Yet, the response will contain the SearchShardTarget
// from the target node instead...that's why we pass null here
diff --git a/server/src/main/java/org/opensearch/bootstrap/BootstrapChecks.java b/server/src/main/java/org/opensearch/bootstrap/BootstrapChecks.java
index a4339bf98ee..5d4335db791 100644
--- a/server/src/main/java/org/opensearch/bootstrap/BootstrapChecks.java
+++ b/server/src/main/java/org/opensearch/bootstrap/BootstrapChecks.java
@@ -57,8 +57,8 @@ import static org.opensearch.discovery.SettingsBasedSeedHostsProvider.DISCOVERY_
/**
* We enforce bootstrap checks once a node has the transport protocol bound to a non-loopback interface or if the system property {@code
- * opensearch.enforce.bootstrap.checks} is set to {@true}. In this case we assume the node is running in production and all bootstrap checks must
- * pass.
+ * opensearch.enforce.bootstrap.checks} is set to {@true}. In this case we assume the node is running in production and
+ * all bootstrap checks must pass.
*/
final class BootstrapChecks {
@@ -69,8 +69,8 @@ final class BootstrapChecks {
/**
* Executes the bootstrap checks if the node has the transport protocol bound to a non-loopback interface. If the system property
- * {@code opensearch.enforce.bootstrap.checks} is set to {@code true} then the bootstrap checks will be enforced regardless of whether or not
- * the transport protocol is bound to a non-loopback interface.
+ * {@code opensearch.enforce.bootstrap.checks} is set to {@code true} then the bootstrap checks will be enforced regardless
+ * of whether or not the transport protocol is bound to a non-loopback interface.
*
* @param context the current node bootstrap context
* @param boundTransportAddress the node network bindings
@@ -87,8 +87,8 @@ final class BootstrapChecks {
/**
* Executes the provided checks and fails the node if {@code enforceLimits} is {@code true}, otherwise logs warnings. If the system
- * property {@code opensearch.enforce.bootstrap.checks} is set to {@code true} then the bootstrap checks will be enforced regardless of whether
- * or not the transport protocol is bound to a non-loopback interface.
+ * property {@code opensearch.enforce.bootstrap.checks} is set to {@code true} then the bootstrap checks will be enforced
+ * regardless of whether or not the transport protocol is bound to a non-loopback interface.
*
* @param context the current node boostrap context
* @param enforceLimits {@code true} if the checks should be enforced or otherwise warned
@@ -103,8 +103,8 @@ final class BootstrapChecks {
/**
* Executes the provided checks and fails the node if {@code enforceLimits} is {@code true}, otherwise logs warnings. If the system
- * property {@code opensearch.enforce.bootstrap.checks }is set to {@code true} then the bootstrap checks will be enforced regardless of whether
- * or not the transport protocol is bound to a non-loopback interface.
+ * property {@code opensearch.enforce.bootstrap.checks }is set to {@code true} then the bootstrap checks will be enforced
+ * regardless of whether or not the transport protocol is bound to a non-loopback interface.
*
* @param context the current node boostrap context
* @param enforceLimits {@code true} if the checks should be enforced or otherwise warned
diff --git a/server/src/main/java/org/opensearch/bootstrap/Security.java b/server/src/main/java/org/opensearch/bootstrap/Security.java
index d7dee72c170..2c45f42cf12 100644
--- a/server/src/main/java/org/opensearch/bootstrap/Security.java
+++ b/server/src/main/java/org/opensearch/bootstrap/Security.java
@@ -118,7 +118,8 @@ final class Security {
// enable security policy: union of template and environment-based paths, and possibly plugin permissions
Map<String, URL> codebases = getCodebaseJarMap(JarHell.parseClassPath());
- Policy.setPolicy(new OpenSearchPolicy(codebases, createPermissions(environment), getPluginPermissions(environment), filterBadDefaults,
+ Policy.setPolicy(new OpenSearchPolicy(codebases, createPermissions(environment),
+ getPluginPermissions(environment), filterBadDefaults,
createRecursiveDataPathPermission(environment)));
// enable security manager
diff --git a/server/src/main/java/org/opensearch/cluster/InternalClusterInfoService.java b/server/src/main/java/org/opensearch/cluster/InternalClusterInfoService.java
index 5ca437bd23e..f748bcea541 100644
--- a/server/src/main/java/org/opensearch/cluster/InternalClusterInfoService.java
+++ b/server/src/main/java/org/opensearch/cluster/InternalClusterInfoService.java
@@ -445,7 +445,8 @@ public class InternalClusterInfoService implements ClusterInfoService, ClusterSt
@Override
public void onRejection(Exception e) {
- final boolean shutDown = e instanceof OpenSearchRejectedExecutionException && ((OpenSearchRejectedExecutionException) e).isExecutorShutdown();
+ final boolean shutDown = e instanceof OpenSearchRejectedExecutionException &&
+ ((OpenSearchRejectedExecutionException) e).isExecutorShutdown();
logger.log(shutDown ? Level.DEBUG : Level.WARN, "refreshing cluster info rejected [{}]", reason, e);
}
}
diff --git a/server/src/main/java/org/opensearch/cluster/coordination/Coordinator.java b/server/src/main/java/org/opensearch/cluster/coordination/Coordinator.java
index 5d5f8c5b5a9..3f0ebddca2d 100644
--- a/server/src/main/java/org/opensearch/cluster/coordination/Coordinator.java
+++ b/server/src/main/java/org/opensearch/cluster/coordination/Coordinator.java
@@ -1073,7 +1073,8 @@ public class Coordinator extends AbstractLifecycleComponent implements Discovery
}
@Override
- public void publish(ClusterChangedEvent clusterChangedEvent, ActionListener<Void> publishListener, ClusterStatePublisher.AckListener ackListener) {
+ public void publish(ClusterChangedEvent clusterChangedEvent,
+ ActionListener<Void> publishListener, ClusterStatePublisher.AckListener ackListener) {
try {
synchronized (mutex) {
if (mode != Mode.LEADER || getCurrentTerm() != clusterChangedEvent.state().term()) {
@@ -1302,7 +1303,8 @@ public class Coordinator extends AbstractLifecycleComponent implements Discovery
private boolean receivedJoinsProcessed;
CoordinatorPublication(PublishRequest publishRequest, PublicationTransportHandler.PublicationContext publicationContext,
- ListenableFuture<Void> localNodeAckEvent, ClusterStatePublisher.AckListener ackListener, ActionListener<Void> publishListener) {
+ ListenableFuture<Void> localNodeAckEvent, ClusterStatePublisher.AckListener ackListener,
+ ActionListener<Void> publishListener) {
super(publishRequest,
new ClusterStatePublisher.AckListener() {
@Override
diff --git a/server/src/main/java/org/opensearch/common/settings/SecureSetting.java b/server/src/main/java/org/opensearch/common/settings/SecureSetting.java
index fd8bcfe025c..20d1622dea3 100644
--- a/server/src/main/java/org/opensearch/common/settings/SecureSetting.java
+++ b/server/src/main/java/org/opensearch/common/settings/SecureSetting.java
@@ -35,7 +35,8 @@ import java.util.Set;
public abstract class SecureSetting<T> extends Setting<T> {
/** Determines whether legacy settings with sensitive values should be allowed. */
- private static final boolean ALLOW_INSECURE_SETTINGS = Booleans.parseBoolean(System.getProperty("opensearch.allow_insecure_settings", "false"));
+ private static final boolean ALLOW_INSECURE_SETTINGS =
+ Booleans.parseBoolean(System.getProperty("opensearch.allow_insecure_settings", "false"));
private static final Set<Property> ALLOWED_PROPERTIES = EnumSet.of(Property.Deprecated, Property.Consistent);
diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/OpenSearchExecutors.java b/server/src/main/java/org/opensearch/common/util/concurrent/OpenSearchExecutors.java
index 4ba91b2cfac..fd6ab56485e 100644
--- a/server/src/main/java/org/opensearch/common/util/concurrent/OpenSearchExecutors.java
+++ b/server/src/main/java/org/opensearch/common/util/concurrent/OpenSearchExecutors.java
@@ -97,7 +97,8 @@ public class OpenSearchExecutors {
}
public static PrioritizedOpenSearchThreadPoolExecutor newSinglePrioritizing(String name, ThreadFactory threadFactory,
- ThreadContext contextHolder, ScheduledExecutorService timer) {
+ ThreadContext contextHolder,
+ ScheduledExecutorService timer) {
return new PrioritizedOpenSearchThreadPoolExecutor(name, 1, 1, 0L, TimeUnit.MILLISECONDS, threadFactory, contextHolder, timer);
}
@@ -105,7 +106,8 @@ public class OpenSearchExecutors {
ThreadFactory threadFactory, ThreadContext contextHolder) {
ExecutorScalingQueue<Runnable> queue = new ExecutorScalingQueue<>();
OpenSearchThreadPoolExecutor executor =
- new OpenSearchThreadPoolExecutor(name, min, max, keepAliveTime, unit, queue, threadFactory, new ForceQueuePolicy(), contextHolder);
+ new OpenSearchThreadPoolExecutor(name, min, max, keepAliveTime, unit, queue, threadFactory,
+ new ForceQueuePolicy(), contextHolder);
queue.executor = executor;
return executor;
}
diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/OpenSearchThreadPoolExecutor.java b/server/src/main/java/org/opensearch/common/util/concurrent/OpenSearchThreadPoolExecutor.java
index bb1a26611bb..0090465d506 100644
--- a/server/src/main/java/org/opensearch/common/util/concurrent/OpenSearchThreadPoolExecutor.java
+++ b/server/src/main/java/org/opensearch/common/util/concurrent/OpenSearchThreadPoolExecutor.java
@@ -47,7 +47,8 @@ public class OpenSearchThreadPoolExecutor extends ThreadPoolExecutor {
OpenSearchThreadPoolExecutor(String name, int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit,
BlockingQueue<Runnable> workQueue, ThreadFactory threadFactory, ThreadContext contextHolder) {
- this(name, corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory, new OpenSearchAbortPolicy(), contextHolder);
+ this(name, corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, threadFactory,
+ new OpenSearchAbortPolicy(), contextHolder);
}
@SuppressForbidden(reason = "properly rethrowing errors, see OpenSearchExecutors.rethrowErrors")
diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/PrioritizedOpenSearchThreadPoolExecutor.java b/server/src/main/java/org/opensearch/common/util/concurrent/PrioritizedOpenSearchThreadPoolExecutor.java
index 8dc596ae0f1..45fd5be92cb 100644
--- a/server/src/main/java/org/opensearch/common/util/concurrent/PrioritizedOpenSearchThreadPoolExecutor.java
+++ b/server/src/main/java/org/opensearch/common/util/concurrent/PrioritizedOpenSearchThreadPoolExecutor.java
@@ -49,7 +49,8 @@ public class PrioritizedOpenSearchThreadPoolExecutor extends OpenSearchThreadPoo
private final ScheduledExecutorService timer;
public PrioritizedOpenSearchThreadPoolExecutor(String name, int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit,
- ThreadFactory threadFactory, ThreadContext contextHolder, ScheduledExecutorService timer) {
+ ThreadFactory threadFactory, ThreadContext contextHolder,
+ ScheduledExecutorService timer) {
super(name, corePoolSize, maximumPoolSize, keepAliveTime, unit, new PriorityBlockingQueue<>(), threadFactory, contextHolder);
this.timer = timer;
}
diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/QueueResizingOpenSearchThreadPoolExecutor.java b/server/src/main/java/org/opensearch/common/util/concurrent/QueueResizingOpenSearchThreadPoolExecutor.java
index c791564b698..c3b5347d653 100644
--- a/server/src/main/java/org/opensearch/common/util/concurrent/QueueResizingOpenSearchThreadPoolExecutor.java
+++ b/server/src/main/java/org/opensearch/common/util/concurrent/QueueResizingOpenSearchThreadPoolExecutor.java
@@ -61,8 +61,8 @@ public final class QueueResizingOpenSearchThreadPoolExecutor extends OpenSearchT
QueueResizingOpenSearchThreadPoolExecutor(String name, int corePoolSize, int maximumPoolSize, long keepAliveTime, TimeUnit unit,
ResizableBlockingQueue<Runnable> workQueue, int minQueueSize, int maxQueueSize,
Function<Runnable, WrappedRunnable> runnableWrapper, final int tasksPerFrame,
- TimeValue targetedResponseTime, ThreadFactory threadFactory, XRejectedExecutionHandler handler,
- ThreadContext contextHolder) {
+ TimeValue targetedResponseTime, ThreadFactory threadFactory,
+ XRejectedExecutionHandler handler, ThreadContext contextHolder) {
super(name, corePoolSize, maximumPoolSize, keepAliveTime, unit,
workQueue, threadFactory, handler, contextHolder);
this.runnableWrapper = runnableWrapper;
diff --git a/server/src/main/java/org/opensearch/gateway/TransportNodesListGatewayStartedShards.java b/server/src/main/java/org/opensearch/gateway/TransportNodesListGatewayStartedShards.java
index 2f89ea2bee1..73676631dab 100644
--- a/server/src/main/java/org/opensearch/gateway/TransportNodesListGatewayStartedShards.java
+++ b/server/src/main/java/org/opensearch/gateway/TransportNodesListGatewayStartedShards.java
@@ -125,7 +125,8 @@ public class TransportNodesListGatewayStartedShards extends
if (request.getCustomDataPath() != null) {
customDataPath = request.getCustomDataPath();
} else {
- // TODO: Fallback for BWC with older OpenSearch versions. Remove once request.getCustomDataPath() always returns non-null
+ // TODO: Fallback for BWC with older OpenSearch versions.
+ // Remove once request.getCustomDataPath() always returns non-null
final IndexMetadata metadata = clusterService.state().metadata().index(shardId.getIndex());
if (metadata != null) {
customDataPath = new IndexSettings(metadata, settings).customDataPath();
diff --git a/server/src/main/java/org/opensearch/index/engine/ReadOnlyEngine.java b/server/src/main/java/org/opensearch/index/engine/ReadOnlyEngine.java
index c5ed76d3d73..67ebb31263e 100644
--- a/server/src/main/java/org/opensearch/index/engine/ReadOnlyEngine.java
+++ b/server/src/main/java/org/opensearch/index/engine/ReadOnlyEngine.java
@@ -170,8 +170,9 @@ public class ReadOnlyEngine extends Engine {
// reopened as an internal engine, which would be the path to fix the issue.
}
- protected final OpenSearchDirectoryReader wrapReader(DirectoryReader reader,
- Function<DirectoryReader, DirectoryReader> readerWrapperFunction) throws IOException {
+ protected final OpenSearchDirectoryReader wrapReader(
+ DirectoryReader reader,
+ Function<DirectoryReader, DirectoryReader> readerWrapperFunction) throws IOException {
if (engineConfig.getIndexSettings().isSoftDeleteEnabled()) {
reader = new SoftDeletesDirectoryReaderWrapper(reader, Lucene.SOFT_DELETES_FIELD);
}
diff --git a/server/src/main/java/org/opensearch/indices/analysis/AnalysisModule.java b/server/src/main/java/org/opensearch/indices/analysis/AnalysisModule.java
index e77c23646ad..0d055d70974 100644
--- a/server/src/main/java/org/opensearch/indices/analysis/AnalysisModule.java
+++ b/server/src/main/java/org/opensearch/indices/analysis/AnalysisModule.java
@@ -180,7 +180,7 @@ public final class AnalysisModule {
preConfiguredTokenFilters.register("lowercase", PreConfiguredTokenFilter.singleton("lowercase", true, LowerCaseFilter::new));
// Add "standard" for old indices (bwc)
preConfiguredTokenFilters.register( "standard",
- PreConfiguredTokenFilter.opensearchVersion("standard", true, (reader, version) -> {
+ PreConfiguredTokenFilter.openSearchVersion("standard", true, (reader, version) -> {
// This was originally removed in 7_0_0 but due to a cacheing bug it was still possible
// in certain circumstances to create a new index referencing the standard token filter
// until version 7_5_2
diff --git a/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadata.java b/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadata.java
index c2ac09b2534..c01b5b523e7 100644
--- a/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadata.java
+++ b/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadata.java
@@ -148,7 +148,8 @@ public class TransportNodesListShardStoreMetadata extends TransportNodesAction<T
if (request.getCustomDataPath() != null) {
customDataPath = request.getCustomDataPath();
} else {
- // TODO: Fallback for BWC with older predecessor (ES) versions. Remove this once request.getCustomDataPath() always returns non-null
+ // TODO: Fallback for BWC with older predecessor (ES) versions.
+ // Remove this once request.getCustomDataPath() always returns non-null
if (indexService != null) {
customDataPath = indexService.getIndexSettings().customDataPath();
} else {
diff --git a/server/src/main/java/org/opensearch/repositories/blobstore/package-info.java b/server/src/main/java/org/opensearch/repositories/blobstore/package-info.java
index 36cb4cf629c..6620b5900e1 100644
--- a/server/src/main/java/org/opensearch/repositories/blobstore/package-info.java
+++ b/server/src/main/java/org/opensearch/repositories/blobstore/package-info.java
@@ -70,8 +70,8 @@
* | | |- snap-20131011.dat - SMILE serialized {@link org.opensearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshot} for
* | | | snapshot "20131011"
* | | |- index-123 - SMILE serialized {@link org.opensearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshots} for
- * | | | the shard (files with numeric suffixes were created by older versions, newer OpenSearch versions use a uuid
- * | | | suffix instead)
+ * | | | the shard (files with numeric suffixes were created by older versions, newer OpenSearch
+ * | | | versions use a uuid suffix instead)
* | |
* | |- 1/ - data for shard "1" of index "foo"
* | | |- __1
diff --git a/server/src/main/java/org/opensearch/rest/RestHeaderDefinition.java b/server/src/main/java/org/opensearch/rest/RestHeaderDefinition.java
index 2028dea404d..2015b2d7c65 100644
--- a/server/src/main/java/org/opensearch/rest/RestHeaderDefinition.java
+++ b/server/src/main/java/org/opensearch/rest/RestHeaderDefinition.java
@@ -19,7 +19,6 @@
package org.opensearch.rest;
-import org.opensearch.common.util.concurrent.ThreadContext;
/**
* A definition for an http header that should be copied to the {@link org.opensearch.common.util.concurrent.ThreadContext} when
diff --git a/server/src/main/java/org/opensearch/rest/RestResponse.java b/server/src/main/java/org/opensearch/rest/RestResponse.java
index 284f9406b3b..dd74d23b498 100644
--- a/server/src/main/java/org/opensearch/rest/RestResponse.java
+++ b/server/src/main/java/org/opensearch/rest/RestResponse.java
@@ -21,7 +21,6 @@ package org.opensearch.rest;
import org.opensearch.OpenSearchException;
import org.opensearch.common.bytes.BytesReference;
-import org.opensearch.common.lease.Releasable;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/server/src/main/java/org/opensearch/rest/RestUtils.java b/server/src/main/java/org/opensearch/rest/RestUtils.java
index 1e4bf5810ea..b502c621e00 100644
--- a/server/src/main/java/org/opensearch/rest/RestUtils.java
+++ b/server/src/main/java/org/opensearch/rest/RestUtils.java
@@ -34,7 +34,8 @@ public class RestUtils {
/**
* Sets whether we decode a '+' in an url as a space or not.
*/
- private static final boolean DECODE_PLUS_AS_SPACE = Booleans.parseBoolean(System.getProperty("opensearch.rest.url_plus_as_space", "false"));
+ private static final boolean DECODE_PLUS_AS_SPACE =
+ Booleans.parseBoolean(System.getProperty("opensearch.rest.url_plus_as_space", "false"));
public static final PathTrie.Decoder REST_DECODER = new PathTrie.Decoder() {
@Override
diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/AbstractHistogramAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/AbstractHistogramAggregator.java
index eede20ab2c2..a37c49e9e15 100644
--- a/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/AbstractHistogramAggregator.java
+++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/histogram/AbstractHistogramAggregator.java
@@ -97,9 +97,9 @@ public abstract class AbstractHistogramAggregator extends BucketsAggregator {
// the contract of the histogram aggregation is that shards must return buckets ordered by key in ascending order
CollectionUtil.introSort(buckets, BucketOrder.key(true).comparator());
- EmptyBucketInfo emptyBucketInfo = null;
+ InternalHistogram.EmptyBucketInfo emptyBucketInfo = null;
if (minDocCount == 0) {
- emptyBucketInfo = new EmptyBucketInfo(interval, offset, getEffectiveMin(extendedBounds),
+ emptyBucketInfo = new InternalHistogram.EmptyBucketInfo(interval, offset, getEffectiveMin(extendedBounds),
getEffectiveMax(extendedBounds), buildEmptySubAggregations());
}
return new InternalHistogram(name, buckets, order, minDocCount, emptyBucketInfo, formatter, keyed, metadata());
diff --git a/server/src/main/java/org/opensearch/threadpool/AutoQueueAdjustingExecutorBuilder.java b/server/src/main/java/org/opensearch/threadpool/AutoQueueAdjustingExecutorBuilder.java
index 5b9f178e8b6..299f44e5fb5 100644
--- a/server/src/main/java/org/opensearch/threadpool/AutoQueueAdjustingExecutorBuilder.java
+++ b/server/src/main/java/org/opensearch/threadpool/AutoQueueAdjustingExecutorBuilder.java
@@ -160,7 +160,8 @@ public final class AutoQueueAdjustingExecutorBuilder extends ExecutorBuilder<Aut
int maxQueueSize = settings.maxQueueSize;
int frameSize = settings.frameSize;
TimeValue targetedResponseTime = settings.targetedResponseTime;
- final ThreadFactory threadFactory = OpenSearchExecutors.daemonThreadFactory(OpenSearchExecutors.threadName(settings.nodeName, name()));
+ final ThreadFactory threadFactory =
+ OpenSearchExecutors.daemonThreadFactory(OpenSearchExecutors.threadName(settings.nodeName, name()));
final ExecutorService executor =
OpenSearchExecutors.newAutoQueueFixed(
settings.nodeName + "/" + name(),
diff --git a/server/src/main/java/org/opensearch/threadpool/FixedExecutorBuilder.java b/server/src/main/java/org/opensearch/threadpool/FixedExecutorBuilder.java
index 517b8cf7dd8..c91d04ebd32 100644
--- a/server/src/main/java/org/opensearch/threadpool/FixedExecutorBuilder.java
+++ b/server/src/main/java/org/opensearch/threadpool/FixedExecutorBuilder.java
@@ -137,7 +137,8 @@ public final class FixedExecutorBuilder extends ExecutorBuilder<FixedExecutorBui
ThreadPool.ExecutorHolder build(final FixedExecutorSettings settings, final ThreadContext threadContext) {
int size = settings.size;
int queueSize = settings.queueSize;
- final ThreadFactory threadFactory = OpenSearchExecutors.daemonThreadFactory(OpenSearchExecutors.threadName(settings.nodeName, name()));
+ final ThreadFactory threadFactory =
+ OpenSearchExecutors.daemonThreadFactory(OpenSearchExecutors.threadName(settings.nodeName, name()));
final ExecutorService executor =
OpenSearchExecutors.newFixed(settings.nodeName + "/" + name(), size, queueSize, threadFactory, threadContext);
final ThreadPool.Info info =
diff --git a/server/src/main/java/org/opensearch/threadpool/ScalingExecutorBuilder.java b/server/src/main/java/org/opensearch/threadpool/ScalingExecutorBuilder.java
index e0e86fedeb7..2c3771c92aa 100644
--- a/server/src/main/java/org/opensearch/threadpool/ScalingExecutorBuilder.java
+++ b/server/src/main/java/org/opensearch/threadpool/ScalingExecutorBuilder.java
@@ -95,7 +95,8 @@ public final class ScalingExecutorBuilder extends ExecutorBuilder<ScalingExecuto
int core = settings.core;
int max = settings.max;
final ThreadPool.Info info = new ThreadPool.Info(name(), ThreadPool.ThreadPoolType.SCALING, core, max, keepAlive, null);
- final ThreadFactory threadFactory = OpenSearchExecutors.daemonThreadFactory(OpenSearchExecutors.threadName(settings.nodeName, name()));
+ final ThreadFactory threadFactory =
+ OpenSearchExecutors.daemonThreadFactory(OpenSearchExecutors.threadName(settings.nodeName, name()));
final ExecutorService executor =
OpenSearchExecutors.newScaling(
settings.nodeName + "/" + name(),
diff --git a/server/src/test/java/org/opensearch/ExceptionSerializationTests.java b/server/src/test/java/org/opensearch/ExceptionSerializationTests.java
index ca99fd5ae1d..b044c7e86c9 100644
--- a/server/src/test/java/org/opensearch/ExceptionSerializationTests.java
+++ b/server/src/test/java/org/opensearch/ExceptionSerializationTests.java
@@ -709,7 +709,7 @@ public class ExceptionSerializationTests extends OpenSearchTestCase {
ids.put(32, org.opensearch.indices.InvalidIndexNameException.class);
ids.put(33, org.opensearch.indices.IndexPrimaryShardNotAllocatedException.class);
ids.put(34, org.opensearch.transport.TransportException.class);
- ids.put(35, org.opensearch.OpenearchParseException.class);
+ ids.put(35, org.opensearch.OpenSearchParseException.class);
ids.put(36, org.opensearch.search.SearchException.class);
ids.put(37, org.opensearch.index.mapper.MapperException.class);
ids.put(38, org.opensearch.indices.InvalidTypeNameException.class);
diff --git a/server/src/test/java/org/opensearch/action/admin/cluster/state/ClusterStateApiTests.java b/server/src/test/java/org/opensearch/action/admin/cluster/state/ClusterStateApiTests.java
index 12b0bc2e21c..16363bbbffe 100644
--- a/server/src/test/java/org/opensearch/action/admin/cluster/state/ClusterStateApiTests.java
+++ b/server/src/test/java/org/opensearch/action/admin/cluster/state/ClusterStateApiTests.java
@@ -24,15 +24,13 @@ import org.opensearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest
import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
-import org.opensearch.action.admin.cluster.state.ClusterStateRequest;
-import org.opensearch.action.admin.cluster.state.ClusterStateResponse;
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
-public class ClusterStateApiTests extends ESSingleNodeTestCase {
+public class ClusterStateApiTests extends OpenSearchSingleNodeTestCase {
public void testWaitForMetadataVersion() throws Exception {
ClusterStateRequest clusterStateRequest = new ClusterStateRequest();
diff --git a/server/src/test/java/org/opensearch/action/admin/indices/get/GetIndexActionTests.java b/server/src/test/java/org/opensearch/action/admin/indices/get/GetIndexActionTests.java
index 57503bca6e9..2616b6e4c14 100644
--- a/server/src/test/java/org/opensearch/action/admin/indices/get/GetIndexActionTests.java
+++ b/server/src/test/java/org/opensearch/action/admin/indices/get/GetIndexActionTests.java
@@ -40,16 +40,13 @@ import org.opensearch.threadpool.ThreadPool;
import org.opensearch.transport.TransportService;
import org.junit.After;
import org.junit.Before;
-import org.opensearch.action.admin.indices.get.GetIndexRequest;
-import org.opensearch.action.admin.indices.get.GetIndexResponse;
-import org.opensearch.action.admin.indices.get.TransportGetIndexAction;
import java.util.concurrent.TimeUnit;
import static java.util.Collections.emptyList;
import static java.util.Collections.emptySet;
-public class GetIndexActionTests extends ESSingleNodeTestCase {
+public class GetIndexActionTests extends OpenSearchSingleNodeTestCase {
private TransportService transportService;
private ClusterService clusterService;
diff --git a/server/src/test/java/org/opensearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java b/server/src/test/java/org/opensearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java
index 91bb00443e7..613c09b6e3c 100644
--- a/server/src/test/java/org/opensearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java
+++ b/server/src/test/java/org/opensearch/action/admin/indices/segments/IndicesSegmentsRequestTests.java
@@ -28,15 +28,13 @@ import org.opensearch.plugins.Plugin;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
import org.opensearch.test.InternalSettingsPlugin;
import org.junit.Before;
-import org.opensearch.action.admin.indices.segments.IndicesSegmentResponse;
-import org.opensearch.action.admin.indices.segments.IndicesSegmentsRequest;
import java.util.Collection;
import java.util.List;
import static org.hamcrest.Matchers.is;
-public class IndicesSegmentsRequestTests extends ESSingleNodeTestCase {
+public class IndicesSegmentsRequestTests extends OpenSearchSingleNodeTestCase {
@Override
protected Collection<Class<? extends Plugin>> getPlugins() {
diff --git a/server/src/test/java/org/opensearch/action/admin/indices/shrink/TransportResizeActionTests.java b/server/src/test/java/org/opensearch/action/admin/indices/shrink/TransportResizeActionTests.java
index 2dc4f10741f..301e299951b 100644
--- a/server/src/test/java/org/opensearch/action/admin/indices/shrink/TransportResizeActionTests.java
+++ b/server/src/test/java/org/opensearch/action/admin/indices/shrink/TransportResizeActionTests.java
@@ -121,7 +121,7 @@ public class TransportResizeActionTests extends OpenSearchTestCase {
RoutingTable routingTable = service.reroute(clusterState, "reroute").routingTable();
clusterState = ClusterState.builder(clusterState).routingTable(routingTable).build();
// now we start the shard
- routingTable = ESAllocationTestCase.startInitializingShardsAndReroute(service, clusterState, "source").routingTable();
+ routingTable = OpenSearchAllocationTestCase.startInitializingShardsAndReroute(service, clusterState, "source").routingTable();
clusterState = ClusterState.builder(clusterState).routingTable(routingTable).build();
TransportResizeAction.prepareCreateIndexRequest(new ResizeRequest("target", "source"), clusterState,
@@ -140,7 +140,7 @@ public class TransportResizeActionTests extends OpenSearchTestCase {
RoutingTable routingTable = service.reroute(clusterState, "reroute").routingTable();
clusterState = ClusterState.builder(clusterState).routingTable(routingTable).build();
// now we start the shard
- routingTable = ESAllocationTestCase.startInitializingShardsAndReroute(service, clusterState, "source").routingTable();
+ routingTable = OpenSearchAllocationTestCase.startInitializingShardsAndReroute(service, clusterState, "source").routingTable();
clusterState = ClusterState.builder(clusterState).routingTable(routingTable).build();
ResizeRequest resizeRequest = new ResizeRequest("target", "source");
@@ -170,7 +170,7 @@ public class TransportResizeActionTests extends OpenSearchTestCase {
RoutingTable routingTable = service.reroute(clusterState, "reroute").routingTable();
clusterState = ClusterState.builder(clusterState).routingTable(routingTable).build();
// now we start the shard
- routingTable = ESAllocationTestCase.startInitializingShardsAndReroute(service, clusterState, "source").routingTable();
+ routingTable = OpenSearchAllocationTestCase.startInitializingShardsAndReroute(service, clusterState, "source").routingTable();
clusterState = ClusterState.builder(clusterState).routingTable(routingTable).build();
ResizeRequest resizeRequest = new ResizeRequest("target", "source");
@@ -205,7 +205,7 @@ public class TransportResizeActionTests extends OpenSearchTestCase {
RoutingTable routingTable = service.reroute(clusterState, "reroute").routingTable();
clusterState = ClusterState.builder(clusterState).routingTable(routingTable).build();
// now we start the shard
- routingTable = ESAllocationTestCase.startInitializingShardsAndReroute(service, clusterState, indexName).routingTable();
+ routingTable = OpenSearchAllocationTestCase.startInitializingShardsAndReroute(service, clusterState, indexName).routingTable();
clusterState = ClusterState.builder(clusterState).routingTable(routingTable).build();
int numSourceShards = clusterState.metadata().index(indexName).getNumberOfShards();
DocsStats stats = new DocsStats(between(0, (IndexWriter.MAX_DOCS) / numSourceShards), between(1, 1000), between(1, 10000));
diff --git a/server/src/test/java/org/opensearch/action/admin/indices/stats/IndicesStatsTests.java b/server/src/test/java/org/opensearch/action/admin/indices/stats/IndicesStatsTests.java
index c0882e42e89..e336434baa1 100644
--- a/server/src/test/java/org/opensearch/action/admin/indices/stats/IndicesStatsTests.java
+++ b/server/src/test/java/org/opensearch/action/admin/indices/stats/IndicesStatsTests.java
@@ -32,9 +32,6 @@ import org.opensearch.index.engine.CommitStats;
import org.opensearch.index.engine.SegmentsStats;
import org.opensearch.index.translog.Translog;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
-import org.opensearch.action.admin.indices.stats.CommonStats;
-import org.opensearch.action.admin.indices.stats.IndicesStatsResponse;
-import org.opensearch.action.admin.indices.stats.ShardStats;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -44,7 +41,7 @@ import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.hasKey;
import static org.hamcrest.Matchers.notNullValue;
-public class IndicesStatsTests extends ESSingleNodeTestCase {
+public class IndicesStatsTests extends OpenSearchSingleNodeTestCase {
public void testSegmentStatsEmptyIndex() {
createIndex("test");
diff --git a/server/src/test/java/org/opensearch/action/admin/indices/validate/query/TransportValidateQueryActionTests.java b/server/src/test/java/org/opensearch/action/admin/indices/validate/query/TransportValidateQueryActionTests.java
index a54fcbaef80..4e5d2477cd5 100644
--- a/server/src/test/java/org/opensearch/action/admin/indices/validate/query/TransportValidateQueryActionTests.java
+++ b/server/src/test/java/org/opensearch/action/admin/indices/validate/query/TransportValidateQueryActionTests.java
@@ -21,15 +21,13 @@ package org.opensearch.action.admin.indices.validate.query;
import org.opensearch.action.ActionListener;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
-import org.opensearch.action.admin.indices.validate.query.ValidateQueryRequest;
-import org.opensearch.action.admin.indices.validate.query.ValidateQueryResponse;
import java.util.concurrent.atomic.AtomicBoolean;
import static org.hamcrest.Matchers.equalTo;
-public class TransportValidateQueryActionTests extends ESSingleNodeTestCase {
+public class TransportValidateQueryActionTests extends OpenSearchSingleNodeTestCase {
/*
* This test covers a fallthrough bug that we had, where if the index we were validating against did not exist, we would invoke the
diff --git a/server/src/test/java/org/opensearch/action/search/QueryPhaseResultConsumerTests.java b/server/src/test/java/org/opensearch/action/search/QueryPhaseResultConsumerTests.java
index 9501e22fa8e..2d53c81a219 100644
--- a/server/src/test/java/org/opensearch/action/search/QueryPhaseResultConsumerTests.java
+++ b/server/src/test/java/org/opensearch/action/search/QueryPhaseResultConsumerTests.java
@@ -72,7 +72,8 @@ public class QueryPhaseResultConsumerTests extends OpenSearchTestCase {
};
});
threadPool = new TestThreadPool(SearchPhaseControllerTests.class.getName());
- executor = OpenSearchExecutors.newFixed("test", 1, 10, OpenSearchExecutors.daemonThreadFactory("test"), threadPool.getThreadContext());
+ executor = OpenSearchExecutors.newFixed(
+ "test", 1, 10, OpenSearchExecutors.daemonThreadFactory("test"), threadPool.getThreadContext());
}
@After
diff --git a/server/src/test/java/org/opensearch/action/support/replication/TransportReplicationActionTests.java b/server/src/test/java/org/opensearch/action/support/replication/TransportReplicationActionTests.java
index 6bba2d80490..4a8886d4b12 100644
--- a/server/src/test/java/org/opensearch/action/support/replication/TransportReplicationActionTests.java
+++ b/server/src/test/java/org/opensearch/action/support/replication/TransportReplicationActionTests.java
@@ -470,8 +470,8 @@ public class TransportReplicationActionTests extends OpenSearchTestCase {
// finish relocation
ShardRouting relocationTarget = clusterService.state().getRoutingTable().shardRoutingTable(shardId)
.shardsWithState(ShardRoutingState.INITIALIZING).get(0);
- AllocationService allocationService = ESAllocationTestCase.createAllocationService();
- ClusterState updatedState = ESAllocationTestCase.startShardsAndReroute(allocationService, state, relocationTarget);
+ AllocationService allocationService = OpenSearchAllocationTestCase.createAllocationService();
+ ClusterState updatedState = OpenSearchAllocationTestCase.startShardsAndReroute(allocationService, state, relocationTarget);
setState(clusterService, updatedState);
logger.debug("--> relocation complete state:\n{}", clusterService.state());
diff --git a/server/src/test/java/org/opensearch/action/termvectors/GetTermVectorsTests.java b/server/src/test/java/org/opensearch/action/termvectors/GetTermVectorsTests.java
index 4da6baf437b..8a513f322f3 100644
--- a/server/src/test/java/org/opensearch/action/termvectors/GetTermVectorsTests.java
+++ b/server/src/test/java/org/opensearch/action/termvectors/GetTermVectorsTests.java
@@ -56,7 +56,7 @@ import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
-public class GetTermVectorsTests extends ESSingleNodeTestCase {
+public class GetTermVectorsTests extends OpenSearchSingleNodeTestCase {
@Override
protected Collection<Class<? extends Plugin>> getPlugins() {
diff --git a/server/src/test/java/org/opensearch/bootstrap/OpenSearchCliTests.java b/server/src/test/java/org/opensearch/bootstrap/OpenSearchCliTests.java
index 3d5ea1e4291..9208ad36595 100644
--- a/server/src/test/java/org/opensearch/bootstrap/OpenSearchCliTests.java
+++ b/server/src/test/java/org/opensearch/bootstrap/OpenSearchCliTests.java
@@ -32,7 +32,7 @@ import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.Matchers.allOf;
-public class OpenSearchCliTests extends BaseOpenSearchCliTestCase {
+public class OpenSearchCliTests extends OpenSearchCliTestCase {
public void testVersion() throws Exception {
runTestThatVersionIsMutuallyExclusiveToOtherOptions("-V", "-d");
diff --git a/server/src/test/java/org/opensearch/cluster/coordination/MessagesTests.java b/server/src/test/java/org/opensearch/cluster/coordination/MessagesTests.java
index b73b1073330..8914c7f1a74 100644
--- a/server/src/test/java/org/opensearch/cluster/coordination/MessagesTests.java
+++ b/server/src/test/java/org/opensearch/cluster/coordination/MessagesTests.java
@@ -88,7 +88,8 @@ public class MessagesTests extends OpenSearchTestCase {
switch (randomInt(1)) {
case 0:
// change term
- return new PublishResponse(randomValueOtherThan(publishResponse.getTerm(), OpenSearchTestCase::randomNonNegativeLong),
+ return new PublishResponse(
+ randomValueOtherThan(publishResponse.getTerm(), OpenSearchTestCase::randomNonNegativeLong),
publishResponse.getVersion());
case 1:
// change version
@@ -164,7 +165,8 @@ public class MessagesTests extends OpenSearchTestCase {
case 1:
// change term
return new ApplyCommitRequest(applyCommit.getSourceNode(),
- randomValueOtherThan(applyCommit.getTerm(), OpenSearchTestCase::randomNonNegativeLong), applyCommit.getVersion());
+ randomValueOtherThan(applyCommit.getTerm(), OpenSearchTestCase::randomNonNegativeLong),
+ applyCommit.getVersion());
case 2:
// change version
return new ApplyCommitRequest(applyCommit.getSourceNode(), applyCommit.getTerm(),
diff --git a/server/src/test/java/org/opensearch/cluster/metadata/ComponentTemplateTests.java b/server/src/test/java/org/opensearch/cluster/metadata/ComponentTemplateTests.java
index 63914510a2b..d587e132b55 100644
--- a/server/src/test/java/org/opensearch/cluster/metadata/ComponentTemplateTests.java
+++ b/server/src/test/java/org/opensearch/cluster/metadata/ComponentTemplateTests.java
@@ -156,7 +156,8 @@ public class ComponentTemplateTests extends AbstractDiffableSerializationTestCas
throw new IllegalStateException("illegal randomization branch");
}
case 1:
- return new ComponentTemplate(orig.template(), randomValueOtherThan(orig.version(), OpenSearchTestCase::randomNonNegativeLong),
+ return new ComponentTemplate(orig.template(),
+ randomValueOtherThan(orig.version(), OpenSearchTestCase::randomNonNegativeLong),
orig.metadata());
case 2:
return new ComponentTemplate(orig.template(), orig.version(),
diff --git a/server/src/test/java/org/opensearch/cluster/routing/allocation/AllocationCommandsTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/AllocationCommandsTests.java
index b7d5373d96f..88dfb6f236a 100644
--- a/server/src/test/java/org/opensearch/cluster/routing/allocation/AllocationCommandsTests.java
+++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/AllocationCommandsTests.java
@@ -54,7 +54,7 @@ import org.opensearch.common.settings.Settings;
import org.opensearch.common.xcontent.NamedXContentRegistry;
import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.common.xcontent.json.JsonXContent;
-import org.opensearch.index.Index;routing/allocation/AllocationPriorityTests.javarouting/allocation/AllocationPriorityTests.java
+import org.opensearch.index.Index;
import org.opensearch.index.IndexNotFoundException;
import org.opensearch.index.shard.ShardId;
import org.opensearch.index.shard.ShardNotFoundException;
diff --git a/server/src/test/java/org/opensearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java
index 807ef6b0b52..b38af1a39e4 100644
--- a/server/src/test/java/org/opensearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java
+++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/NodeVersionAllocationDeciderTests.java
@@ -468,7 +468,8 @@ public class NodeVersionAllocationDeciderTests extends OpenSearchAllocationTestC
RoutingNode newNode = new RoutingNode("newNode", newNode("newNode", Version.CURRENT));
RoutingNode oldNode = new RoutingNode("oldNode", newNode("oldNode", VersionUtils.getPreviousVersion()));
- final org.opensearch.cluster.ClusterName clusterName = org.opensearch.cluster.ClusterName.CLUSTER_NAME_SETTING.getDefault(Settings.EMPTY);
+ final org.opensearch.cluster.ClusterName clusterName =
+ org.opensearch.cluster.ClusterName.CLUSTER_NAME_SETTING.getDefault(Settings.EMPTY);
ClusterState clusterState = ClusterState.builder(clusterName).metadata(metadata).routingTable(initialRoutingTable)
.nodes(DiscoveryNodes.builder().add(newNode.node()).add(oldNode.node())).build();
diff --git a/server/src/test/java/org/opensearch/cluster/routing/allocation/TrackFailedAllocationNodesTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/TrackFailedAllocationNodesTests.java
index 71f4784c19a..3cf4a80ac2f 100644
--- a/server/src/test/java/org/opensearch/cluster/routing/allocation/TrackFailedAllocationNodesTests.java
+++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/TrackFailedAllocationNodesTests.java
@@ -51,7 +51,7 @@ public class TrackFailedAllocationNodesTests extends OpenSearchAllocationTestCas
for (int i = 0; i < 5; i++) {
discoNodes.add(newNode("node-" + i));
}
- ClusterState clusterState = ClusterState.builder(ClusterName.DEFAULT.CLUSTER_NAME_SETTING.getDefault(Settings.EMPTY))
+ ClusterState clusterState = ClusterState.builder(ClusterName.CLUSTER_NAME_SETTING.getDefault(Settings.EMPTY))
.nodes(discoNodes)
.metadata(metadata).routingTable(RoutingTable.builder().addAsNew(metadata.index("idx")).build())
.build();
diff --git a/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java
index a3aca88c65e..faa54fc9ae5 100644
--- a/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java
+++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/decider/DiskThresholdDeciderUnitTests.java
@@ -283,7 +283,8 @@ public class DiskThresholdDeciderUnitTests extends OpenSearchAllocationTestCase
shardSizes.put("[test][1][r]", 100L);
shardSizes.put("[test][2][r]", 1000L);
shardSizes.put("[other][0][p]", 10000L);
- ClusterInfo info = new DiskThresholdDeciderTests.DevNullClusterInfo(ImmutableOpenMap.of(), ImmutableOpenMap.of(), shardSizes.build());
+ ClusterInfo info =
+ new DiskThresholdDeciderTests.DevNullClusterInfo(ImmutableOpenMap.of(), ImmutableOpenMap.of(), shardSizes.build());
Metadata.Builder metaBuilder = Metadata.builder();
metaBuilder.put(IndexMetadata.builder("test").settings(settings(Version.CURRENT)
.put("index.uuid", "1234")).numberOfShards(3).numberOfReplicas(1));
@@ -362,7 +363,8 @@ public class DiskThresholdDeciderUnitTests extends OpenSearchAllocationTestCase
shardSizes.put("[test][2][p]", 500L);
shardSizes.put("[test][3][p]", 500L);
- ClusterInfo info = new DiskThresholdDeciderTests.DevNullClusterInfo(ImmutableOpenMap.of(), ImmutableOpenMap.of(), shardSizes.build());
+ ClusterInfo info =
+ new DiskThresholdDeciderTests.DevNullClusterInfo(ImmutableOpenMap.of(), ImmutableOpenMap.of(), shardSizes.build());
Metadata.Builder metaBuilder = Metadata.builder();
metaBuilder.put(IndexMetadata.builder("test").settings(settings(Version.CURRENT).put("index.uuid", "1234"))
.numberOfShards(4).numberOfReplicas(0));
diff --git a/server/src/test/java/org/opensearch/common/settings/ConsistentSettingsServiceTests.java b/server/src/test/java/org/opensearch/common/settings/ConsistentSettingsServiceTests.java
index 8e3ffb39c17..0bfa71c7443 100644
--- a/server/src/test/java/org/opensearch/common/settings/ConsistentSettingsServiceTests.java
+++ b/server/src/test/java/org/opensearch/common/settings/ConsistentSettingsServiceTests.java
@@ -19,7 +19,6 @@
package org.opensearch.common.settings;
-import org.opensearch.common.settings.MockSecureSettings;
import org.opensearch.cluster.ClusterState;
import org.opensearch.cluster.ClusterStateUpdateTask;
import org.opensearch.cluster.service.ClusterService;
diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/ListenableFutureTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/ListenableFutureTests.java
index 19c6d846831..339a8984f09 100644
--- a/server/src/test/java/org/opensearch/common/util/concurrent/ListenableFutureTests.java
+++ b/server/src/test/java/org/opensearch/common/util/concurrent/ListenableFutureTests.java
@@ -50,7 +50,8 @@ public class ListenableFutureTests extends OpenSearchTestCase {
AtomicInteger notifications = new AtomicInteger(0);
final int numberOfListeners = scaledRandomIntBetween(1, 12);
for (int i = 0; i < numberOfListeners; i++) {
- future.addListener(ActionListener.wrap(notifications::incrementAndGet), OpenSearchExecutors.newDirectExecutorService(), threadContext);
+ future.addListener(
+ ActionListener.wrap(notifications::incrementAndGet), OpenSearchExecutors.newDirectExecutorService(), threadContext);
}
future.onResponse("");
diff --git a/server/src/test/java/org/opensearch/env/ESFileStoreTests.java b/server/src/test/java/org/opensearch/env/OpenSearchFileStoreTests.java
similarity index 100%
rename from server/src/test/java/org/opensearch/env/ESFileStoreTests.java
rename to server/src/test/java/org/opensearch/env/OpenSearchFileStoreTests.java
diff --git a/server/src/test/java/org/opensearch/index/IndexServiceTests.java b/server/src/test/java/org/opensearch/index/IndexServiceTests.java
index 70dcdc46771..488690cbc55 100644
--- a/server/src/test/java/org/opensearch/index/IndexServiceTests.java
+++ b/server/src/test/java/org/opensearch/index/IndexServiceTests.java
@@ -31,12 +31,12 @@ import org.opensearch.common.xcontent.ToXContent;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.common.xcontent.XContentType;
-import org.elasticsearch.index.engine.Engine;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.shard.IndexShard;
+import org.opensearch.index.engine.Engine;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.shard.IndexShard;
import org.opensearch.index.shard.IndexShardTestCase;
-import org.elasticsearch.index.translog.Translog;
-import org.elasticsearch.indices.IndicesService;
+import org.opensearch.index.translog.Translog;
+import org.opensearch.indices.IndicesService;
import org.opensearch.plugins.Plugin;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
import org.opensearch.test.InternalSettingsPlugin;
diff --git a/server/src/test/java/org/opensearch/index/IndexSettingsTests.java b/server/src/test/java/org/opensearch/index/IndexSettingsTests.java
index 78440294634..266ae2ea9e9 100644
--- a/server/src/test/java/org/opensearch/index/IndexSettingsTests.java
+++ b/server/src/test/java/org/opensearch/index/IndexSettingsTests.java
@@ -29,7 +29,7 @@ import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.TimeValue;
-import org.elasticsearch.index.translog.Translog;
+import org.opensearch.index.translog.Translog;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.VersionUtils;
diff --git a/server/src/test/java/org/opensearch/index/IndexingPressureTests.java b/server/src/test/java/org/opensearch/index/IndexingPressureTests.java
index 244a68ce631..583088f5908 100644
--- a/server/src/test/java/org/opensearch/index/IndexingPressureTests.java
+++ b/server/src/test/java/org/opensearch/index/IndexingPressureTests.java
@@ -20,7 +20,7 @@
package org.opensearch.index;
import org.opensearch.common.lease.Releasable;
-import org.elasticsearch.common.settings.Settings;
+import org.opensearch.common.settings.Settings;
import org.opensearch.common.util.concurrent.OpenSearchRejectedExecutionException;
import org.opensearch.index.stats.IndexingPressureStats;
import org.opensearch.test.OpenSearchTestCase;
@@ -78,12 +78,14 @@ public class IndexingPressureTests extends OpenSearchTestCase {
Releasable primary = indexingPressure.markPrimaryOperationStarted(1024 * 3, false);
Releasable replica = indexingPressure.markReplicaOperationStarted(1024 * 3, false)) {
if (randomBoolean()) {
- expectThrows(OpenSearchRejectedExecutionException.class, () -> indexingPressure.markCoordinatingOperationStarted(1024 * 2, false));
+ expectThrows(OpenSearchRejectedExecutionException.class,
+ () -> indexingPressure.markCoordinatingOperationStarted(1024 * 2, false));
IndexingPressureStats stats = indexingPressure.stats();
assertEquals(1, stats.getCoordinatingRejections());
assertEquals(1024 * 6, stats.getCurrentCombinedCoordinatingAndPrimaryBytes());
} else {
- expectThrows(OpenSearchRejectedExecutionException.class, () -> indexingPressure.markPrimaryOperationStarted(1024 * 2, false));
+ expectThrows(OpenSearchRejectedExecutionException.class,
+ () -> indexingPressure.markPrimaryOperationStarted(1024 * 2, false));
IndexingPressureStats stats = indexingPressure.stats();
assertEquals(1, stats.getPrimaryRejections());
assertEquals(1024 * 6, stats.getCurrentCombinedCoordinatingAndPrimaryBytes());
diff --git a/server/src/test/java/org/opensearch/index/IndexingSlowLogTests.java b/server/src/test/java/org/opensearch/index/IndexingSlowLogTests.java
index 5ebd7b16bd4..8a99057fef1 100644
--- a/server/src/test/java/org/opensearch/index/IndexingSlowLogTests.java
+++ b/server/src/test/java/org/opensearch/index/IndexingSlowLogTests.java
@@ -36,13 +36,13 @@ import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.common.xcontent.XContentType;
import org.opensearch.common.xcontent.json.JsonXContent;
-import org.elasticsearch.index.IndexingSlowLog.IndexingSlowLogMessage;
-import org.elasticsearch.index.engine.Engine;
+import org.opensearch.index.IndexingSlowLog.IndexingSlowLogMessage;
+import org.opensearch.index.engine.Engine;
import org.opensearch.index.engine.InternalEngineTests;
-import org.elasticsearch.index.mapper.ParsedDocument;
-import org.elasticsearch.index.mapper.SeqNoFieldMapper;
-import org.elasticsearch.index.mapper.Uid;
-import org.elasticsearch.index.shard.ShardId;
+import org.opensearch.index.mapper.ParsedDocument;
+import org.opensearch.index.mapper.SeqNoFieldMapper;
+import org.opensearch.index.mapper.Uid;
+import org.opensearch.index.shard.ShardId;
import org.opensearch.test.OpenSearchTestCase;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -345,7 +345,7 @@ public class IndexingSlowLogTests extends OpenSearchTestCase {
assertNotNull(ex.getCause());
assertThat(ex.getCause(), instanceOf(IllegalArgumentException.class));
final IllegalArgumentException cause = (IllegalArgumentException) ex.getCause();
- assertThat(cause, hasToString(containsString("No enum constant org.elasticsearch.index.SlowLogLevel.NOT A LEVEL")));
+ assertThat(cause, hasToString(containsString("No enum constant org.opensearch.index.SlowLogLevel.NOT A LEVEL")));
}
assertEquals(SlowLogLevel.TRACE, log.getLevel());
diff --git a/server/src/test/java/org/opensearch/index/MergePolicySettingsTests.java b/server/src/test/java/org/opensearch/index/MergePolicySettingsTests.java
index 926b9e6f57d..8b25099ed12 100644
--- a/server/src/test/java/org/opensearch/index/MergePolicySettingsTests.java
+++ b/server/src/test/java/org/opensearch/index/MergePolicySettingsTests.java
@@ -22,7 +22,7 @@ import org.apache.lucene.index.NoMergePolicy;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.ByteSizeUnit;
import org.opensearch.common.unit.ByteSizeValue;
-import org.elasticsearch.index.shard.ShardId;
+import org.opensearch.index.shard.ShardId;
import org.opensearch.test.OpenSearchTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/SearchSlowLogTests.java b/server/src/test/java/org/opensearch/index/SearchSlowLogTests.java
index 6ae704c58b8..a0e00ffd5dd 100644
--- a/server/src/test/java/org/opensearch/index/SearchSlowLogTests.java
+++ b/server/src/test/java/org/opensearch/index/SearchSlowLogTests.java
@@ -31,8 +31,8 @@ import org.opensearch.common.logging.MockAppender;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.common.util.BigArrays;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.shard.ShardId;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.index.shard.ShardId;
import org.opensearch.search.builder.SearchSourceBuilder;
import org.opensearch.search.internal.SearchContext;
import org.opensearch.search.internal.ShardSearchRequest;
diff --git a/server/src/test/java/org/opensearch/index/analysis/AnalysisRegistryTests.java b/server/src/test/java/org/opensearch/index/analysis/AnalysisRegistryTests.java
index fa02f4ae3b1..387aeee6e8f 100644
--- a/server/src/test/java/org/opensearch/index/analysis/AnalysisRegistryTests.java
+++ b/server/src/test/java/org/opensearch/index/analysis/AnalysisRegistryTests.java
@@ -32,13 +32,13 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.opensearch.Version;
import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.env.Environment;
+import org.opensearch.env.Environment;
import org.opensearch.env.TestEnvironment;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.mapper.MapperException;
-import org.elasticsearch.indices.analysis.AnalysisModule;
-import org.elasticsearch.indices.analysis.AnalysisModule.AnalysisProvider;
-import org.elasticsearch.indices.analysis.PreBuiltAnalyzers;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.mapper.MapperException;
+import org.opensearch.indices.analysis.AnalysisModule;
+import org.opensearch.indices.analysis.AnalysisModule.AnalysisProvider;
+import org.opensearch.indices.analysis.PreBuiltAnalyzers;
import org.opensearch.plugins.AnalysisPlugin;
import org.opensearch.plugins.Plugin;
import org.opensearch.test.OpenSearchTestCase;
diff --git a/server/src/test/java/org/opensearch/index/analysis/AnalysisTests.java b/server/src/test/java/org/opensearch/index/analysis/AnalysisTests.java
index 254a1811af9..e03815fb24e 100644
--- a/server/src/test/java/org/opensearch/index/analysis/AnalysisTests.java
+++ b/server/src/test/java/org/opensearch/index/analysis/AnalysisTests.java
@@ -21,7 +21,7 @@ package org.opensearch.index.analysis;
import org.apache.lucene.analysis.CharArraySet;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.env.Environment;
+import org.opensearch.env.Environment;
import org.opensearch.env.TestEnvironment;
import org.opensearch.test.OpenSearchTestCase;
diff --git a/server/src/test/java/org/opensearch/index/analysis/CustomNormalizerTests.java b/server/src/test/java/org/opensearch/index/analysis/CustomNormalizerTests.java
index 5c89888af07..4377ea5ac51 100644
--- a/server/src/test/java/org/opensearch/index/analysis/CustomNormalizerTests.java
+++ b/server/src/test/java/org/opensearch/index/analysis/CustomNormalizerTests.java
@@ -23,8 +23,8 @@ import org.apache.lucene.analysis.MockLowerCaseFilter;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.util.BytesRef;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.env.Environment;
-import org.elasticsearch.indices.analysis.AnalysisModule.AnalysisProvider;
+import org.opensearch.env.Environment;
+import org.opensearch.indices.analysis.AnalysisModule.AnalysisProvider;
import org.opensearch.plugins.AnalysisPlugin;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.OpenSearchTokenStreamTestCase;
diff --git a/server/src/test/java/org/opensearch/index/analysis/HunspellTokenFilterFactoryTests.java b/server/src/test/java/org/opensearch/index/analysis/HunspellTokenFilterFactoryTests.java
index 707253b9651..85b8bb92fdf 100644
--- a/server/src/test/java/org/opensearch/index/analysis/HunspellTokenFilterFactoryTests.java
+++ b/server/src/test/java/org/opensearch/index/analysis/HunspellTokenFilterFactoryTests.java
@@ -19,7 +19,7 @@
package org.opensearch.index.analysis;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.env.Environment;
+import org.opensearch.env.Environment;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.index.analysis.AnalysisTestsHelper;
diff --git a/server/src/test/java/org/opensearch/index/analysis/NamedAnalyzerTests.java b/server/src/test/java/org/opensearch/index/analysis/NamedAnalyzerTests.java
index 54d78a7a8fa..6e6bf895be9 100644
--- a/server/src/test/java/org/opensearch/index/analysis/NamedAnalyzerTests.java
+++ b/server/src/test/java/org/opensearch/index/analysis/NamedAnalyzerTests.java
@@ -21,8 +21,8 @@ package org.opensearch.index.analysis;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
-import org.elasticsearch.index.mapper.MapperException;
-import org.elasticsearch.index.mapper.TextFieldMapper;
+import org.opensearch.index.mapper.MapperException;
+import org.opensearch.index.mapper.TextFieldMapper;
import org.opensearch.test.OpenSearchTestCase;
public class NamedAnalyzerTests extends OpenSearchTestCase {
diff --git a/server/src/test/java/org/opensearch/index/analysis/PreBuiltAnalyzerTests.java b/server/src/test/java/org/opensearch/index/analysis/PreBuiltAnalyzerTests.java
index d56a6c21d65..c2d61d5c66c 100644
--- a/server/src/test/java/org/opensearch/index/analysis/PreBuiltAnalyzerTests.java
+++ b/server/src/test/java/org/opensearch/index/analysis/PreBuiltAnalyzerTests.java
@@ -24,9 +24,9 @@ import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentFactory;
-import org.elasticsearch.index.mapper.MappedFieldType;
-import org.elasticsearch.index.mapper.MapperService;
-import org.elasticsearch.indices.analysis.PreBuiltAnalyzers;
+import org.opensearch.index.mapper.MappedFieldType;
+import org.opensearch.index.mapper.MapperService;
+import org.opensearch.indices.analysis.PreBuiltAnalyzers;
import org.opensearch.plugins.Plugin;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
import org.opensearch.test.InternalSettingsPlugin;
diff --git a/server/src/test/java/org/opensearch/index/analysis/PreConfiguredTokenFilterTests.java b/server/src/test/java/org/opensearch/index/analysis/PreConfiguredTokenFilterTests.java
index 5b68c3cdbcc..c291f40ca49 100644
--- a/server/src/test/java/org/opensearch/index/analysis/PreConfiguredTokenFilterTests.java
+++ b/server/src/test/java/org/opensearch/index/analysis/PreConfiguredTokenFilterTests.java
@@ -22,9 +22,9 @@ import org.apache.lucene.analysis.TokenFilter;
import org.opensearch.Version;
import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.env.Environment;
+import org.opensearch.env.Environment;
import org.opensearch.env.TestEnvironment;
-import org.elasticsearch.index.IndexSettings;
+import org.opensearch.index.IndexSettings;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.IndexSettingsModule;
import org.opensearch.test.VersionUtils;
@@ -69,7 +69,7 @@ public class PreConfiguredTokenFilterTests extends OpenSearchTestCase {
public void testCachingWithElasticsearchVersion() throws IOException {
PreConfiguredTokenFilter pctf =
- PreConfiguredTokenFilter.elasticsearchVersion("elasticsearch_version", randomBoolean(),
+ PreConfiguredTokenFilter.openSearchVersion("elasticsearch_version", randomBoolean(),
(tokenStream, esVersion) -> new TokenFilter(tokenStream) {
@Override
public boolean incrementToken() {
diff --git a/server/src/test/java/org/opensearch/index/analysis/ReloadableCustomAnalyzerTests.java b/server/src/test/java/org/opensearch/index/analysis/ReloadableCustomAnalyzerTests.java
index c92bfa64cee..19d90bbdc3f 100644
--- a/server/src/test/java/org/opensearch/index/analysis/ReloadableCustomAnalyzerTests.java
+++ b/server/src/test/java/org/opensearch/index/analysis/ReloadableCustomAnalyzerTests.java
@@ -26,7 +26,7 @@ import org.opensearch.ExceptionsHelper;
import org.opensearch.Version;
import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.index.Index;
+import org.opensearch.index.Index;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.IndexSettingsModule;
import org.junit.BeforeClass;
@@ -38,7 +38,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import static org.elasticsearch.index.analysis.AnalyzerComponents.createComponents;
+import static org.opensearch.index.analysis.AnalyzerComponents.createComponents;
public class ReloadableCustomAnalyzerTests extends OpenSearchTestCase {
diff --git a/server/src/test/java/org/opensearch/index/analysis/ShingleTokenFilterFactoryTests.java b/server/src/test/java/org/opensearch/index/analysis/ShingleTokenFilterFactoryTests.java
index e900e586851..cd1fad9d594 100644
--- a/server/src/test/java/org/opensearch/index/analysis/ShingleTokenFilterFactoryTests.java
+++ b/server/src/test/java/org/opensearch/index/analysis/ShingleTokenFilterFactoryTests.java
@@ -27,7 +27,7 @@ import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.WhitespaceTokenizer;
import org.apache.lucene.analysis.miscellaneous.DisableGraphAttribute;
-import org.elasticsearch.index.IndexSettings;
+import org.opensearch.index.IndexSettings;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.OpenSearchTokenStreamTestCase;
diff --git a/server/src/test/java/org/opensearch/index/analysis/StopAnalyzerTests.java b/server/src/test/java/org/opensearch/index/analysis/StopAnalyzerTests.java
index 4074c56716f..8e8f6ca69fc 100644
--- a/server/src/test/java/org/opensearch/index/analysis/StopAnalyzerTests.java
+++ b/server/src/test/java/org/opensearch/index/analysis/StopAnalyzerTests.java
@@ -22,8 +22,8 @@ package org.opensearch.index.analysis;
import org.opensearch.Version;
import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.env.Environment;
-import org.elasticsearch.index.IndexSettings;
+import org.opensearch.env.Environment;
+import org.opensearch.index.IndexSettings;
import org.opensearch.test.OpenSearchTokenStreamTestCase;
import org.opensearch.test.IndexSettingsModule;
diff --git a/server/src/test/java/org/opensearch/index/analysis/StopTokenFilterTests.java b/server/src/test/java/org/opensearch/index/analysis/StopTokenFilterTests.java
index ae7101ed158..72112bc9f91 100644
--- a/server/src/test/java/org/opensearch/index/analysis/StopTokenFilterTests.java
+++ b/server/src/test/java/org/opensearch/index/analysis/StopTokenFilterTests.java
@@ -27,7 +27,7 @@ import org.apache.lucene.search.suggest.analyzing.SuggestStopFilter;
import org.apache.lucene.util.Version;
import org.opensearch.common.settings.Settings.Builder;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.env.Environment;
+import org.opensearch.env.Environment;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.OpenSearchTokenStreamTestCase;
import org.opensearch.index.analysis.AnalysisTestsHelper;
diff --git a/server/src/test/java/org/opensearch/index/codec/CodecTests.java b/server/src/test/java/org/opensearch/index/codec/CodecTests.java
index da419083529..2bd4578d72b 100644
--- a/server/src/test/java/org/opensearch/index/codec/CodecTests.java
+++ b/server/src/test/java/org/opensearch/index/codec/CodecTests.java
@@ -32,12 +32,12 @@ import org.apache.lucene.index.SegmentReader;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.env.Environment;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.analysis.IndexAnalyzers;
-import org.elasticsearch.index.mapper.MapperService;
-import org.elasticsearch.index.similarity.SimilarityService;
-import org.elasticsearch.indices.mapper.MapperRegistry;
+import org.opensearch.env.Environment;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.analysis.IndexAnalyzers;
+import org.opensearch.index.mapper.MapperService;
+import org.opensearch.index.similarity.SimilarityService;
+import org.opensearch.indices.mapper.MapperRegistry;
import org.opensearch.plugins.MapperPlugin;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.IndexSettingsModule;
diff --git a/server/src/test/java/org/opensearch/index/engine/CombinedDeletionPolicyTests.java b/server/src/test/java/org/opensearch/index/engine/CombinedDeletionPolicyTests.java
index d87d2e59754..cced685dec5 100644
--- a/server/src/test/java/org/opensearch/index/engine/CombinedDeletionPolicyTests.java
+++ b/server/src/test/java/org/opensearch/index/engine/CombinedDeletionPolicyTests.java
@@ -22,10 +22,10 @@ package org.opensearch.index.engine;
import com.carrotsearch.hppc.LongArrayList;
import org.apache.lucene.index.IndexCommit;
import org.apache.lucene.store.Directory;
-import org.elasticsearch.index.seqno.RetentionLeases;
-import org.elasticsearch.index.seqno.SequenceNumbers;
-import org.elasticsearch.index.translog.Translog;
-import org.elasticsearch.index.translog.TranslogDeletionPolicy;
+import org.opensearch.index.seqno.RetentionLeases;
+import org.opensearch.index.seqno.SequenceNumbers;
+import org.opensearch.index.translog.Translog;
+import org.opensearch.index.translog.TranslogDeletionPolicy;
import org.opensearch.test.OpenSearchTestCase;
import java.io.IOException;
@@ -37,7 +37,7 @@ import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
-import static org.elasticsearch.index.seqno.SequenceNumbers.NO_OPS_PERFORMED;
+import static org.opensearch.index.seqno.SequenceNumbers.NO_OPS_PERFORMED;
import static org.opensearch.index.translog.TranslogDeletionPolicies.createTranslogDeletionPolicy;
import static org.hamcrest.Matchers.equalTo;
import static org.mockito.Mockito.doAnswer;
diff --git a/server/src/test/java/org/opensearch/index/engine/InternalEngineSettingsTests.java b/server/src/test/java/org/opensearch/index/engine/InternalEngineSettingsTests.java
index 9d580d57a84..9ddf63d1dc8 100644
--- a/server/src/test/java/org/opensearch/index/engine/InternalEngineSettingsTests.java
+++ b/server/src/test/java/org/opensearch/index/engine/InternalEngineSettingsTests.java
@@ -20,8 +20,8 @@ package org.opensearch.index.engine;
import org.apache.lucene.index.LiveIndexWriterConfig;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.IndexSettings;
+import org.opensearch.index.IndexService;
+import org.opensearch.index.IndexSettings;
import org.opensearch.index.shard.EngineAccess;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
diff --git a/server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java
index 8cd13ca12d3..7ea29db5982 100644
--- a/server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java
+++ b/server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java
@@ -2707,7 +2707,7 @@ public class InternalEngineTests extends EngineTestCase {
MockAppender mockAppender = new MockAppender("testIndexWriterIFDInfoStream");
mockAppender.start();
- final Logger iwIFDLogger = LogManager.getLogger("org.elasticsearch.index.engine.Engine.IFD");
+ final Logger iwIFDLogger = LogManager.getLogger("org.opensearch.index.engine.Engine.IFD");
Loggers.addAppender(iwIFDLogger, mockAppender);
Loggers.setLevel(iwIFDLogger, Level.DEBUG);
diff --git a/server/src/test/java/org/opensearch/index/engine/LiveVersionMapTests.java b/server/src/test/java/org/opensearch/index/engine/LiveVersionMapTests.java
index 54de2d022a0..57caf500618 100644
--- a/server/src/test/java/org/opensearch/index/engine/LiveVersionMapTests.java
+++ b/server/src/test/java/org/opensearch/index/engine/LiveVersionMapTests.java
@@ -25,7 +25,7 @@ import org.apache.lucene.util.Constants;
import org.apache.lucene.util.RamUsageTester;
import org.apache.lucene.util.TestUtil;
import org.opensearch.common.lease.Releasable;
-import org.elasticsearch.index.translog.Translog;
+import org.opensearch.index.translog.Translog;
import org.opensearch.test.OpenSearchTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/engine/LuceneChangesSnapshotTests.java b/server/src/test/java/org/opensearch/index/engine/LuceneChangesSnapshotTests.java
index 3060bae3084..fe2ea900fa3 100644
--- a/server/src/test/java/org/opensearch/index/engine/LuceneChangesSnapshotTests.java
+++ b/server/src/test/java/org/opensearch/index/engine/LuceneChangesSnapshotTests.java
@@ -21,11 +21,11 @@ package org.opensearch.index.engine;
import org.opensearch.common.settings.Settings;
import org.opensearch.core.internal.io.IOUtils;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.mapper.MapperService;
-import org.elasticsearch.index.mapper.ParsedDocument;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.mapper.MapperService;
+import org.opensearch.index.mapper.ParsedDocument;
import org.opensearch.index.translog.SnapshotMatchers;
-import org.elasticsearch.index.translog.Translog;
+import org.opensearch.index.translog.Translog;
import org.opensearch.test.IndexSettingsModule;
import org.junit.Before;
diff --git a/server/src/test/java/org/opensearch/index/engine/NoOpEngineRecoveryTests.java b/server/src/test/java/org/opensearch/index/engine/NoOpEngineRecoveryTests.java
index b64d4c7b4e4..69875263907 100644
--- a/server/src/test/java/org/opensearch/index/engine/NoOpEngineRecoveryTests.java
+++ b/server/src/test/java/org/opensearch/index/engine/NoOpEngineRecoveryTests.java
@@ -21,7 +21,7 @@ package org.opensearch.index.engine;
import org.opensearch.cluster.routing.RecoverySource.ExistingStoreRecoverySource;
import org.opensearch.cluster.routing.ShardRouting;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.index.shard.IndexShard;
+import org.opensearch.index.shard.IndexShard;
import org.opensearch.index.shard.IndexShardTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/engine/NoOpEngineTests.java b/server/src/test/java/org/opensearch/index/engine/NoOpEngineTests.java
index 868641ee1b1..095654fdef3 100644
--- a/server/src/test/java/org/opensearch/index/engine/NoOpEngineTests.java
+++ b/server/src/test/java/org/opensearch/index/engine/NoOpEngineTests.java
@@ -32,13 +32,13 @@ import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.ByteSizeValue;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.core.internal.io.IOUtils;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.mapper.ParsedDocument;
-import org.elasticsearch.index.seqno.ReplicationTracker;
-import org.elasticsearch.index.seqno.SequenceNumbers;
-import org.elasticsearch.index.shard.DocsStats;
-import org.elasticsearch.index.store.Store;
-import org.elasticsearch.index.translog.Translog;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.mapper.ParsedDocument;
+import org.opensearch.index.seqno.ReplicationTracker;
+import org.opensearch.index.seqno.SequenceNumbers;
+import org.opensearch.index.shard.DocsStats;
+import org.opensearch.index.store.Store;
+import org.opensearch.index.translog.Translog;
import org.opensearch.test.IndexSettingsModule;
import org.opensearch.index.engine.EngineTestCase;
diff --git a/server/src/test/java/org/opensearch/index/engine/ReadOnlyEngineTests.java b/server/src/test/java/org/opensearch/index/engine/ReadOnlyEngineTests.java
index 4d0dad19c3c..6d7c9c36643 100644
--- a/server/src/test/java/org/opensearch/index/engine/ReadOnlyEngineTests.java
+++ b/server/src/test/java/org/opensearch/index/engine/ReadOnlyEngineTests.java
@@ -25,11 +25,11 @@ import org.opensearch.Version;
import org.opensearch.common.bytes.BytesArray;
import org.opensearch.common.lucene.index.OpenSearchDirectoryReader;
import org.opensearch.core.internal.io.IOUtils;
-import org.elasticsearch.index.mapper.ParsedDocument;
-import org.elasticsearch.index.seqno.SeqNoStats;
-import org.elasticsearch.index.seqno.SequenceNumbers;
-import org.elasticsearch.index.store.Store;
-import org.elasticsearch.index.translog.TranslogStats;
+import org.opensearch.index.mapper.ParsedDocument;
+import org.opensearch.index.seqno.SeqNoStats;
+import org.opensearch.index.seqno.SequenceNumbers;
+import org.opensearch.index.store.Store;
+import org.opensearch.index.translog.TranslogStats;
import org.opensearch.index.engine.DocIdSeqNoAndSource;
import org.opensearch.index.engine.EngineTestCase;
import org.opensearch.index.engine.TranslogHandler;
diff --git a/server/src/test/java/org/opensearch/index/engine/SoftDeletesPolicyTests.java b/server/src/test/java/org/opensearch/index/engine/SoftDeletesPolicyTests.java
index e787be12e3e..9fd486f8059 100644
--- a/server/src/test/java/org/opensearch/index/engine/SoftDeletesPolicyTests.java
+++ b/server/src/test/java/org/opensearch/index/engine/SoftDeletesPolicyTests.java
@@ -23,8 +23,8 @@ import org.apache.lucene.document.LongPoint;
import org.apache.lucene.search.PointRangeQuery;
import org.apache.lucene.search.Query;
import org.opensearch.common.lease.Releasable;
-import org.elasticsearch.index.seqno.RetentionLease;
-import org.elasticsearch.index.seqno.RetentionLeases;
+import org.opensearch.index.seqno.RetentionLease;
+import org.opensearch.index.seqno.RetentionLeases;
import org.opensearch.test.OpenSearchTestCase;
import java.util.ArrayList;
@@ -36,7 +36,7 @@ import java.util.OptionalLong;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Supplier;
-import static org.elasticsearch.index.seqno.SequenceNumbers.NO_OPS_PERFORMED;
+import static org.opensearch.index.seqno.SequenceNumbers.NO_OPS_PERFORMED;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
diff --git a/server/src/test/java/org/opensearch/index/engine/VersionValueTests.java b/server/src/test/java/org/opensearch/index/engine/VersionValueTests.java
index c9da8797c9d..c110505dda2 100644
--- a/server/src/test/java/org/opensearch/index/engine/VersionValueTests.java
+++ b/server/src/test/java/org/opensearch/index/engine/VersionValueTests.java
@@ -20,7 +20,7 @@
package org.opensearch.index.engine;
import org.apache.lucene.util.RamUsageTester;
-import org.elasticsearch.index.translog.Translog;
+import org.opensearch.index.translog.Translog;
import org.opensearch.test.OpenSearchTestCase;
public class VersionValueTests extends OpenSearchTestCase {
diff --git a/server/src/test/java/org/opensearch/index/fielddata/AbstractStringFieldDataTestCase.java b/server/src/test/java/org/opensearch/index/fielddata/AbstractStringFieldDataTestCase.java
index 97e3c685de9..962c5f810ed 100644
--- a/server/src/test/java/org/opensearch/index/fielddata/AbstractStringFieldDataTestCase.java
+++ b/server/src/test/java/org/opensearch/index/fielddata/AbstractStringFieldDataTestCase.java
@@ -49,10 +49,10 @@ import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.UnicodeUtil;
import org.opensearch.common.lucene.index.OpenSearchDirectoryReader;
import org.opensearch.common.lucene.search.Queries;
-import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
-import org.elasticsearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource;
-import org.elasticsearch.index.fielddata.ordinals.GlobalOrdinalsIndexFieldData;
-import org.elasticsearch.index.shard.ShardId;
+import org.opensearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
+import org.opensearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource;
+import org.opensearch.index.fielddata.ordinals.GlobalOrdinalsIndexFieldData;
+import org.opensearch.index.shard.ShardId;
import org.opensearch.search.MultiValueMode;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/fielddata/BinaryDVFieldDataTests.java b/server/src/test/java/org/opensearch/index/fielddata/BinaryDVFieldDataTests.java
index 804c37a0b28..be4fa94c4c2 100644
--- a/server/src/test/java/org/opensearch/index/fielddata/BinaryDVFieldDataTests.java
+++ b/server/src/test/java/org/opensearch/index/fielddata/BinaryDVFieldDataTests.java
@@ -27,9 +27,9 @@ import org.opensearch.common.compress.CompressedXContent;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.common.xcontent.XContentType;
-import org.elasticsearch.index.mapper.DocumentMapper;
-import org.elasticsearch.index.mapper.ParsedDocument;
-import org.elasticsearch.index.mapper.SourceToParse;
+import org.opensearch.index.mapper.DocumentMapper;
+import org.opensearch.index.mapper.ParsedDocument;
+import org.opensearch.index.mapper.SourceToParse;
import java.util.ArrayList;
import java.util.List;
diff --git a/server/src/test/java/org/opensearch/index/fielddata/FieldDataCacheTests.java b/server/src/test/java/org/opensearch/index/fielddata/FieldDataCacheTests.java
index 6d5a7b5fe2a..9157e4ceed4 100644
--- a/server/src/test/java/org/opensearch/index/fielddata/FieldDataCacheTests.java
+++ b/server/src/test/java/org/opensearch/index/fielddata/FieldDataCacheTests.java
@@ -31,12 +31,12 @@ import org.apache.lucene.index.NoMergePolicy;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.opensearch.common.lucene.index.OpenSearchDirectoryReader;
-import org.elasticsearch.index.fielddata.plain.AbstractLeafOrdinalsFieldData;
-import org.elasticsearch.index.fielddata.plain.PagedBytesIndexFieldData;
-import org.elasticsearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData;
-import org.elasticsearch.index.mapper.TextFieldMapper;
-import org.elasticsearch.index.shard.ShardId;
-import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
+import org.opensearch.index.fielddata.plain.AbstractLeafOrdinalsFieldData;
+import org.opensearch.index.fielddata.plain.PagedBytesIndexFieldData;
+import org.opensearch.index.fielddata.plain.SortedSetOrdinalsIndexFieldData;
+import org.opensearch.index.mapper.TextFieldMapper;
+import org.opensearch.index.shard.ShardId;
+import org.opensearch.indices.breaker.NoneCircuitBreakerService;
import org.opensearch.search.aggregations.support.CoreValuesSourceType;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.FieldMaskingReader;
diff --git a/server/src/test/java/org/opensearch/index/fielddata/FilterFieldDataTests.java b/server/src/test/java/org/opensearch/index/fielddata/FilterFieldDataTests.java
index 0e4b951d29a..2a1392d875a 100644
--- a/server/src/test/java/org/opensearch/index/fielddata/FilterFieldDataTests.java
+++ b/server/src/test/java/org/opensearch/index/fielddata/FilterFieldDataTests.java
@@ -23,10 +23,10 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.SortedSetDocValues;
-import org.elasticsearch.index.mapper.ContentPath;
-import org.elasticsearch.index.mapper.MappedFieldType;
-import org.elasticsearch.index.mapper.Mapper.BuilderContext;
-import org.elasticsearch.index.mapper.TextFieldMapper;
+import org.opensearch.index.mapper.ContentPath;
+import org.opensearch.index.mapper.MappedFieldType;
+import org.opensearch.index.mapper.Mapper.BuilderContext;
+import org.opensearch.index.mapper.TextFieldMapper;
import java.util.List;
import java.util.Random;
diff --git a/server/src/test/java/org/opensearch/index/fielddata/GeoFieldDataTests.java b/server/src/test/java/org/opensearch/index/fielddata/GeoFieldDataTests.java
index d60c4399e7e..67cf47549f2 100644
--- a/server/src/test/java/org/opensearch/index/fielddata/GeoFieldDataTests.java
+++ b/server/src/test/java/org/opensearch/index/fielddata/GeoFieldDataTests.java
@@ -23,7 +23,7 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.Term;
-import org.elasticsearch.index.fielddata.plain.AbstractLeafGeoPointFieldData;
+import org.opensearch.index.fielddata.plain.AbstractLeafGeoPointFieldData;
import java.util.List;
diff --git a/server/src/test/java/org/opensearch/index/fielddata/NoOrdinalsStringFieldDataTests.java b/server/src/test/java/org/opensearch/index/fielddata/NoOrdinalsStringFieldDataTests.java
index 6cc0e75e6e0..b4e72d45cea 100644
--- a/server/src/test/java/org/opensearch/index/fielddata/NoOrdinalsStringFieldDataTests.java
+++ b/server/src/test/java/org/opensearch/index/fielddata/NoOrdinalsStringFieldDataTests.java
@@ -23,8 +23,8 @@ import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.search.SortField;
import org.opensearch.common.Nullable;
import org.opensearch.common.util.BigArrays;
-import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
-import org.elasticsearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource;
+import org.opensearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
+import org.opensearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource;
import org.opensearch.search.DocValueFormat;
import org.opensearch.search.MultiValueMode;
import org.opensearch.search.aggregations.support.ValuesSourceType;
diff --git a/server/src/test/java/org/opensearch/index/fielddata/ScriptDocValuesGeoPointsTests.java b/server/src/test/java/org/opensearch/index/fielddata/ScriptDocValuesGeoPointsTests.java
index 9250cb3ece2..7cda10185ce 100644
--- a/server/src/test/java/org/opensearch/index/fielddata/ScriptDocValuesGeoPointsTests.java
+++ b/server/src/test/java/org/opensearch/index/fielddata/ScriptDocValuesGeoPointsTests.java
@@ -19,7 +19,7 @@
package org.opensearch.index.fielddata;
-import org.elasticsearch.index.fielddata.ScriptDocValues.GeoPoints;
+import org.opensearch.index.fielddata.ScriptDocValues.GeoPoints;
import org.opensearch.common.geo.GeoPoint;
import org.opensearch.common.geo.GeoUtils;
import org.opensearch.test.OpenSearchTestCase;
diff --git a/server/src/test/java/org/opensearch/index/fielddata/ScriptDocValuesLongsTests.java b/server/src/test/java/org/opensearch/index/fielddata/ScriptDocValuesLongsTests.java
index 1ee949e01e9..bf332627666 100644
--- a/server/src/test/java/org/opensearch/index/fielddata/ScriptDocValuesLongsTests.java
+++ b/server/src/test/java/org/opensearch/index/fielddata/ScriptDocValuesLongsTests.java
@@ -19,7 +19,7 @@
package org.opensearch.index.fielddata;
-import org.elasticsearch.index.fielddata.ScriptDocValues.Longs;
+import org.opensearch.index.fielddata.ScriptDocValues.Longs;
import org.opensearch.test.OpenSearchTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/fielddata/plain/HalfFloatFielddataTests.java b/server/src/test/java/org/opensearch/index/fielddata/plain/HalfFloatFielddataTests.java
index 432e8296f4c..c4c1c205b4c 100644
--- a/server/src/test/java/org/opensearch/index/fielddata/plain/HalfFloatFielddataTests.java
+++ b/server/src/test/java/org/opensearch/index/fielddata/plain/HalfFloatFielddataTests.java
@@ -28,9 +28,9 @@ import org.apache.lucene.index.LeafReader;
import org.apache.lucene.store.Directory;
import org.opensearch.core.internal.io.IOUtils;
import org.apache.lucene.util.TestUtil;
-import org.elasticsearch.index.fielddata.FieldData;
-import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;
-import org.elasticsearch.index.mapper.NumberFieldMapper;
+import org.opensearch.index.fielddata.FieldData;
+import org.opensearch.index.fielddata.SortedNumericDoubleValues;
+import org.opensearch.index.mapper.NumberFieldMapper;
import org.opensearch.test.OpenSearchTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/get/DocumentFieldTests.java b/server/src/test/java/org/opensearch/index/get/DocumentFieldTests.java
index 499a19c8f49..1e31634600b 100644
--- a/server/src/test/java/org/opensearch/index/get/DocumentFieldTests.java
+++ b/server/src/test/java/org/opensearch/index/get/DocumentFieldTests.java
@@ -27,8 +27,8 @@ import org.opensearch.common.document.DocumentField;
import org.opensearch.common.xcontent.ToXContent;
import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.common.xcontent.XContentType;
-import org.elasticsearch.index.mapper.IgnoredFieldMapper;
-import org.elasticsearch.indices.IndicesModule;
+import org.opensearch.index.mapper.IgnoredFieldMapper;
+import org.opensearch.indices.IndicesModule;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.RandomObjects;
diff --git a/server/src/test/java/org/opensearch/index/get/GetResultTests.java b/server/src/test/java/org/opensearch/index/get/GetResultTests.java
index 83d5c4de332..6ee3977e33f 100644
--- a/server/src/test/java/org/opensearch/index/get/GetResultTests.java
+++ b/server/src/test/java/org/opensearch/index/get/GetResultTests.java
@@ -29,12 +29,12 @@ import org.opensearch.common.xcontent.ToXContent;
import org.opensearch.common.xcontent.XContentHelper;
import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.common.xcontent.XContentType;
-import org.elasticsearch.index.mapper.IdFieldMapper;
-import org.elasticsearch.index.mapper.IndexFieldMapper;
-import org.elasticsearch.index.mapper.SeqNoFieldMapper;
-import org.elasticsearch.index.mapper.SourceFieldMapper;
-import org.elasticsearch.index.mapper.TypeFieldMapper;
-import org.elasticsearch.index.mapper.VersionFieldMapper;
+import org.opensearch.index.mapper.IdFieldMapper;
+import org.opensearch.index.mapper.IndexFieldMapper;
+import org.opensearch.index.mapper.SeqNoFieldMapper;
+import org.opensearch.index.mapper.SourceFieldMapper;
+import org.opensearch.index.mapper.TypeFieldMapper;
+import org.opensearch.index.mapper.VersionFieldMapper;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.RandomObjects;
@@ -52,8 +52,8 @@ import static java.util.Collections.singletonMap;
import static org.opensearch.common.xcontent.XContentHelper.toXContent;
import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
import static org.opensearch.index.get.DocumentFieldTests.randomDocumentField;
-import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_PRIMARY_TERM;
-import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO;
+import static org.opensearch.index.seqno.SequenceNumbers.UNASSIGNED_PRIMARY_TERM;
+import static org.opensearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO;
import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode;
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertToXContentEquivalent;
diff --git a/server/src/test/java/org/opensearch/index/mapper/AllFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/AllFieldMapperTests.java
index 4a34f98109b..bcd5c8e4f7f 100644
--- a/server/src/test/java/org/opensearch/index/mapper/AllFieldMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/AllFieldMapperTests.java
@@ -25,8 +25,8 @@ import org.opensearch.common.Strings;
import org.opensearch.common.compress.CompressedXContent;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.xcontent.XContentFactory;
-import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.mapper.MapperService.MergeReason;
+import org.opensearch.index.IndexService;
+import org.opensearch.index.mapper.MapperService.MergeReason;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
import org.opensearch.test.VersionUtils;
diff --git a/server/src/test/java/org/opensearch/index/mapper/BooleanFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/BooleanFieldMapperTests.java
index ff27582a23d..98c19814380 100644
--- a/server/src/test/java/org/opensearch/index/mapper/BooleanFieldMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/BooleanFieldMapperTests.java
@@ -31,7 +31,7 @@ import org.opensearch.common.Strings;
import org.opensearch.common.xcontent.ToXContent;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentFactory;
-import org.elasticsearch.index.mapper.ParseContext.Document;
+import org.opensearch.index.mapper.ParseContext.Document;
import org.opensearch.index.mapper.MapperTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/mapper/CompletionFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/CompletionFieldMapperTests.java
index 032e24dc607..39d6aa1d39e 100644
--- a/server/src/test/java/org/opensearch/index/mapper/CompletionFieldMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/CompletionFieldMapperTests.java
@@ -39,10 +39,10 @@ import org.opensearch.common.unit.Fuzziness;
import org.opensearch.common.xcontent.ToXContent;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.json.JsonXContent;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.analysis.AnalyzerScope;
-import org.elasticsearch.index.analysis.IndexAnalyzers;
-import org.elasticsearch.index.analysis.NamedAnalyzer;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.analysis.AnalyzerScope;
+import org.opensearch.index.analysis.IndexAnalyzers;
+import org.opensearch.index.analysis.NamedAnalyzer;
import org.hamcrest.FeatureMatcher;
import org.hamcrest.Matcher;
import org.hamcrest.Matchers;
diff --git a/server/src/test/java/org/opensearch/index/mapper/CompletionFieldTypeTests.java b/server/src/test/java/org/opensearch/index/mapper/CompletionFieldTypeTests.java
index d565062c06e..2568167beea 100644
--- a/server/src/test/java/org/opensearch/index/mapper/CompletionFieldTypeTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/CompletionFieldTypeTests.java
@@ -20,8 +20,8 @@
package org.opensearch.index.mapper;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.elasticsearch.index.analysis.AnalyzerScope;
-import org.elasticsearch.index.analysis.NamedAnalyzer;
+import org.opensearch.index.analysis.AnalyzerScope;
+import org.opensearch.index.analysis.NamedAnalyzer;
import org.opensearch.index.mapper.FieldTypeTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/mapper/CopyToMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/CopyToMapperTests.java
index 73fe7274672..8c191309395 100644
--- a/server/src/test/java/org/opensearch/index/mapper/CopyToMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/CopyToMapperTests.java
@@ -25,7 +25,7 @@ import org.opensearch.common.xcontent.ToXContent;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.common.xcontent.json.JsonXContent;
-import org.elasticsearch.index.mapper.ParseContext.Document;
+import org.opensearch.index.mapper.ParseContext.Document;
import org.hamcrest.Matchers;
import org.opensearch.index.mapper.MapperServiceTestCase;
diff --git a/server/src/test/java/org/opensearch/index/mapper/DateFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/DateFieldMapperTests.java
index 07d264c69d8..c5bb1223461 100644
--- a/server/src/test/java/org/opensearch/index/mapper/DateFieldMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/DateFieldMapperTests.java
@@ -25,7 +25,7 @@ import org.opensearch.bootstrap.JavaVersion;
import org.opensearch.common.collect.List;
import org.opensearch.common.time.DateFormatter;
import org.opensearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.index.termvectors.TermVectorsService;
+import org.opensearch.index.termvectors.TermVectorsService;
import org.opensearch.index.mapper.MapperTestCase;
import org.opensearch.search.DocValueFormat;
diff --git a/server/src/test/java/org/opensearch/index/mapper/DateFieldTypeTests.java b/server/src/test/java/org/opensearch/index/mapper/DateFieldTypeTests.java
index eda04802318..30323c2c355 100644
--- a/server/src/test/java/org/opensearch/index/mapper/DateFieldTypeTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/DateFieldTypeTests.java
@@ -40,17 +40,17 @@ import org.opensearch.common.time.DateFormatters;
import org.opensearch.common.time.DateMathParser;
import org.opensearch.common.util.BigArrays;
import org.opensearch.core.internal.io.IOUtils;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.fielddata.IndexNumericFieldData;
-import org.elasticsearch.index.fielddata.LeafNumericFieldData;
-import org.elasticsearch.index.fielddata.plain.SortedNumericIndexFieldData;
-import org.elasticsearch.index.mapper.DateFieldMapper.DateFieldType;
-import org.elasticsearch.index.mapper.DateFieldMapper.Resolution;
-import org.elasticsearch.index.mapper.MappedFieldType.Relation;
-import org.elasticsearch.index.mapper.ParseContext.Document;
-import org.elasticsearch.index.query.DateRangeIncludingNowQuery;
-import org.elasticsearch.index.query.QueryRewriteContext;
-import org.elasticsearch.index.query.QueryShardContext;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.fielddata.IndexNumericFieldData;
+import org.opensearch.index.fielddata.LeafNumericFieldData;
+import org.opensearch.index.fielddata.plain.SortedNumericIndexFieldData;
+import org.opensearch.index.mapper.DateFieldMapper.DateFieldType;
+import org.opensearch.index.mapper.DateFieldMapper.Resolution;
+import org.opensearch.index.mapper.MappedFieldType.Relation;
+import org.opensearch.index.mapper.ParseContext.Document;
+import org.opensearch.index.query.DateRangeIncludingNowQuery;
+import org.opensearch.index.query.QueryRewriteContext;
+import org.opensearch.index.query.QueryShardContext;
import org.joda.time.DateTimeZone;
import org.opensearch.index.mapper.FieldTypeTestCase;
diff --git a/server/src/test/java/org/opensearch/index/mapper/DefaultAnalyzersTests.java b/server/src/test/java/org/opensearch/index/mapper/DefaultAnalyzersTests.java
index 50172ea4c10..cb8763a5b1f 100644
--- a/server/src/test/java/org/opensearch/index/mapper/DefaultAnalyzersTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/DefaultAnalyzersTests.java
@@ -20,11 +20,11 @@
package org.opensearch.index.mapper;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.analysis.AnalysisRegistry;
-import org.elasticsearch.index.analysis.AnalyzerScope;
-import org.elasticsearch.index.analysis.IndexAnalyzers;
-import org.elasticsearch.index.analysis.NamedAnalyzer;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.analysis.AnalysisRegistry;
+import org.opensearch.index.analysis.AnalyzerScope;
+import org.opensearch.index.analysis.IndexAnalyzers;
+import org.opensearch.index.analysis.NamedAnalyzer;
import org.opensearch.index.mapper.MapperServiceTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/mapper/DocumentFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/DocumentFieldMapperTests.java
index 5bcdb91e0ec..830b14ffccd 100644
--- a/server/src/test/java/org/opensearch/index/mapper/DocumentFieldMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/DocumentFieldMapperTests.java
@@ -24,8 +24,8 @@ import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.util.LuceneTestCase;
-import org.elasticsearch.index.analysis.AnalyzerScope;
-import org.elasticsearch.index.analysis.NamedAnalyzer;
+import org.opensearch.index.analysis.AnalyzerScope;
+import org.opensearch.index.analysis.NamedAnalyzer;
import org.opensearch.search.lookup.SearchLookup;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/mapper/DocumentMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/DocumentMapperTests.java
index 02fcbaea693..ee46d93eff0 100644
--- a/server/src/test/java/org/opensearch/index/mapper/DocumentMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/DocumentMapperTests.java
@@ -23,11 +23,11 @@ import org.apache.lucene.analysis.core.KeywordAnalyzer;
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.opensearch.common.compress.CompressedXContent;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.analysis.AnalyzerScope;
-import org.elasticsearch.index.analysis.IndexAnalyzers;
-import org.elasticsearch.index.analysis.NamedAnalyzer;
-import org.elasticsearch.index.mapper.MapperService.MergeReason;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.analysis.AnalyzerScope;
+import org.opensearch.index.analysis.IndexAnalyzers;
+import org.opensearch.index.analysis.NamedAnalyzer;
+import org.opensearch.index.mapper.MapperService.MergeReason;
import org.opensearch.index.mapper.MapperServiceTestCase;
import java.io.IOException;
@@ -260,9 +260,9 @@ public class DocumentMapperTests extends MapperServiceTestCase {
b.endObject();
}));
- Map<String, Object> expected = org.elasticsearch.common.collect.Map.of(
+ Map<String, Object> expected = org.opensearch.common.collect.Map.of(
"field", "value",
- "object", org.elasticsearch.common.collect.Map.of("field1", "value1", "field2", "value2"));
+ "object", org.opensearch.common.collect.Map.of("field1", "value1", "field2", "value2"));
assertThat(initMapper.meta(), equalTo(expected));
DocumentMapper updatedMapper = createDocumentMapper(fieldMapping(b -> b.field("type", "text")));
@@ -284,9 +284,9 @@ public class DocumentMapperTests extends MapperServiceTestCase {
}));
mergedMapper = mergedMapper.merge(updatedMapper.mapping(), MergeReason.INDEX_TEMPLATE);
- expected = org.elasticsearch.common.collect.Map.of(
+ expected = org.opensearch.common.collect.Map.of(
"field", "value",
- "object", org.elasticsearch.common.collect.Map.of("field1", "value1", "field2", "new_value", "field3", "value3"));
+ "object", org.opensearch.common.collect.Map.of("field1", "value1", "field2", "new_value", "field3", "value3"));
assertThat(mergedMapper.meta(), equalTo(expected));
}
}
diff --git a/server/src/test/java/org/opensearch/index/mapper/DocumentParserTests.java b/server/src/test/java/org/opensearch/index/mapper/DocumentParserTests.java
index 11b185bd360..676b6ab8903 100644
--- a/server/src/test/java/org/opensearch/index/mapper/DocumentParserTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/DocumentParserTests.java
@@ -29,8 +29,8 @@ import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.common.xcontent.XContentType;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.mapper.ParseContext.Document;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.mapper.ParseContext.Document;
import org.opensearch.plugins.Plugin;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/mapper/DoubleIndexingDocTests.java b/server/src/test/java/org/opensearch/index/mapper/DoubleIndexingDocTests.java
index a2858da9e36..0484741548e 100644
--- a/server/src/test/java/org/opensearch/index/mapper/DoubleIndexingDocTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/DoubleIndexingDocTests.java
@@ -20,7 +20,7 @@ package org.opensearch.index.mapper;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TopDocs;
-import org.elasticsearch.index.query.QueryShardContext;
+import org.opensearch.index.query.QueryShardContext;
import org.opensearch.index.mapper.MapperServiceTestCase;
import static org.hamcrest.Matchers.equalTo;
diff --git a/server/src/test/java/org/opensearch/index/mapper/DynamicTemplateTests.java b/server/src/test/java/org/opensearch/index/mapper/DynamicTemplateTests.java
index 52d731e3b8b..61b71a653c4 100644
--- a/server/src/test/java/org/opensearch/index/mapper/DynamicTemplateTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/DynamicTemplateTests.java
@@ -24,7 +24,7 @@ import org.opensearch.common.Strings;
import org.opensearch.common.xcontent.ToXContent;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.json.JsonXContent;
-import org.elasticsearch.index.mapper.DynamicTemplate.XContentFieldType;
+import org.opensearch.index.mapper.DynamicTemplate.XContentFieldType;
import org.opensearch.test.OpenSearchTestCase;
import java.util.Collections;
diff --git a/server/src/test/java/org/opensearch/index/mapper/DynamicTemplatesTests.java b/server/src/test/java/org/opensearch/index/mapper/DynamicTemplatesTests.java
index 60c8481a045..9a3c4c9710e 100644
--- a/server/src/test/java/org/opensearch/index/mapper/DynamicTemplatesTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/DynamicTemplatesTests.java
@@ -22,7 +22,7 @@ package org.opensearch.index.mapper;
import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.util.BytesRef;
-import org.elasticsearch.index.mapper.ParseContext.Document;
+import org.opensearch.index.mapper.ParseContext.Document;
import static org.opensearch.test.StreamsUtils.copyToStringFromClasspath;
import static org.hamcrest.Matchers.equalTo;
diff --git a/server/src/test/java/org/opensearch/index/mapper/ExternalMapper.java b/server/src/test/java/org/opensearch/index/mapper/ExternalMapper.java
index f2601dad4e8..477427ad078 100644
--- a/server/src/test/java/org/opensearch/index/mapper/ExternalMapper.java
+++ b/server/src/test/java/org/opensearch/index/mapper/ExternalMapper.java
@@ -25,9 +25,9 @@ import org.opensearch.common.collect.Iterators;
import org.opensearch.common.geo.GeoPoint;
import org.opensearch.common.geo.builders.PointBuilder;
import org.opensearch.geometry.Point;
-import org.elasticsearch.index.analysis.AnalyzerScope;
-import org.elasticsearch.index.analysis.IndexAnalyzers;
-import org.elasticsearch.index.analysis.NamedAnalyzer;
+import org.opensearch.index.analysis.AnalyzerScope;
+import org.opensearch.index.analysis.IndexAnalyzers;
+import org.opensearch.index.analysis.NamedAnalyzer;
import org.opensearch.search.lookup.SearchLookup;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/mapper/ExternalMapperPlugin.java b/server/src/test/java/org/opensearch/index/mapper/ExternalMapperPlugin.java
index cfd012b05ea..d416d0fe4c5 100644
--- a/server/src/test/java/org/opensearch/index/mapper/ExternalMapperPlugin.java
+++ b/server/src/test/java/org/opensearch/index/mapper/ExternalMapperPlugin.java
@@ -23,8 +23,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.elasticsearch.index.mapper.Mapper;
-import org.elasticsearch.index.mapper.MetadataFieldMapper;
+import org.opensearch.index.mapper.Mapper;
+import org.opensearch.index.mapper.MetadataFieldMapper;
import org.opensearch.plugins.MapperPlugin;
import org.opensearch.plugins.Plugin;
diff --git a/server/src/test/java/org/opensearch/index/mapper/FieldFilterMapperPluginTests.java b/server/src/test/java/org/opensearch/index/mapper/FieldFilterMapperPluginTests.java
index 7c3aadb104e..007dbc7dad8 100644
--- a/server/src/test/java/org/opensearch/index/mapper/FieldFilterMapperPluginTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/FieldFilterMapperPluginTests.java
@@ -29,7 +29,7 @@ import org.opensearch.action.fieldcaps.FieldCapabilitiesResponse;
import org.opensearch.cluster.metadata.MappingMetadata;
import org.opensearch.common.collect.ImmutableOpenMap;
import org.opensearch.common.xcontent.XContentType;
-import org.elasticsearch.indices.IndicesModule;
+import org.opensearch.indices.IndicesModule;
import org.opensearch.plugins.MapperPlugin;
import org.opensearch.plugins.Plugin;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
diff --git a/server/src/test/java/org/opensearch/index/mapper/FieldNamesFieldTypeTests.java b/server/src/test/java/org/opensearch/index/mapper/FieldNamesFieldTypeTests.java
index ad7dccf4f6d..d42416405f9 100644
--- a/server/src/test/java/org/opensearch/index/mapper/FieldNamesFieldTypeTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/FieldNamesFieldTypeTests.java
@@ -23,7 +23,7 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.opensearch.Version;
import org.opensearch.cluster.metadata.IndexMetadata;
-import org.elasticsearch.common.settings.Settings;
+import org.opensearch.common.settings.Settings;
import org.opensearch.common.util.BigArrays;
import org.opensearch.index.IndexSettings;
import org.opensearch.index.query.QueryShardContext;
diff --git a/server/src/test/java/org/opensearch/index/mapper/GenericStoreDynamicTemplateTests.java b/server/src/test/java/org/opensearch/index/mapper/GenericStoreDynamicTemplateTests.java
index 80007669718..8509b428bcc 100644
--- a/server/src/test/java/org/opensearch/index/mapper/GenericStoreDynamicTemplateTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/GenericStoreDynamicTemplateTests.java
@@ -22,8 +22,8 @@ package org.opensearch.index.mapper;
import org.apache.lucene.index.IndexableField;
import org.opensearch.common.bytes.BytesArray;
import org.opensearch.common.xcontent.XContentType;
-import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.mapper.ParseContext.Document;
+import org.opensearch.index.IndexService;
+import org.opensearch.index.mapper.ParseContext.Document;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
import static org.opensearch.test.StreamsUtils.copyToBytesFromClasspath;
diff --git a/server/src/test/java/org/opensearch/index/mapper/GeoPointFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/GeoPointFieldMapperTests.java
index 04d35196bb8..9302264b295 100644
--- a/server/src/test/java/org/opensearch/index/mapper/GeoPointFieldMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/GeoPointFieldMapperTests.java
@@ -44,7 +44,7 @@ public class GeoPointFieldMapperTests extends FieldMapperTestCase2<GeoPointField
@Override
protected Set<String> unsupportedProperties() {
- return org.elasticsearch.common.collect.Set.of("analyzer", "similarity", "doc_values");
+ return org.opensearch.common.collect.Set.of("analyzer", "similarity", "doc_values");
}
@Override
diff --git a/server/src/test/java/org/opensearch/index/mapper/GeoShapeFieldTypeTests.java b/server/src/test/java/org/opensearch/index/mapper/GeoShapeFieldTypeTests.java
index 45144836d79..13bd1973fb9 100644
--- a/server/src/test/java/org/opensearch/index/mapper/GeoShapeFieldTypeTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/GeoShapeFieldTypeTests.java
@@ -37,10 +37,10 @@ public class GeoShapeFieldTypeTests extends FieldTypeTestCase {
MappedFieldType mapper = new GeoShapeFieldMapper.Builder("field").build(context).fieldType();
- Map<String, Object> jsonLineString = org.elasticsearch.common.collect.Map.of(
+ Map<String, Object> jsonLineString = org.opensearch.common.collect.Map.of(
"type", "LineString",
"coordinates", Arrays.asList(Arrays.asList(42.0, 27.1), Arrays.asList(30.0, 50.0)));
- Map<String, Object> jsonPoint = org.elasticsearch.common.collect.Map.of(
+ Map<String, Object> jsonPoint = org.opensearch.common.collect.Map.of(
"type", "Point",
"coordinates", Arrays.asList(14.0, 15.0));
String wktLineString = "LINESTRING (42.0 27.1, 30.0 50.0)";
diff --git a/server/src/test/java/org/opensearch/index/mapper/IdFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/IdFieldMapperTests.java
index 83027994a95..fd089c8f2c6 100644
--- a/server/src/test/java/org/opensearch/index/mapper/IdFieldMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/IdFieldMapperTests.java
@@ -28,9 +28,9 @@ import org.opensearch.common.compress.CompressedXContent;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.common.xcontent.XContentType;
-import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.mapper.MapperService.MergeReason;
-import org.elasticsearch.indices.IndicesService;
+import org.opensearch.index.IndexService;
+import org.opensearch.index.mapper.MapperService.MergeReason;
+import org.opensearch.indices.IndicesService;
import org.opensearch.plugins.Plugin;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
import org.opensearch.test.InternalSettingsPlugin;
@@ -39,7 +39,7 @@ import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
-import static org.elasticsearch.index.mapper.IdFieldMapper.ID_FIELD_DATA_DEPRECATION_MESSAGE;
+import static org.opensearch.index.mapper.IdFieldMapper.ID_FIELD_DATA_DEPRECATION_MESSAGE;
import static org.hamcrest.Matchers.containsString;
public class IdFieldMapperTests extends OpenSearchSingleNodeTestCase {
diff --git a/server/src/test/java/org/opensearch/index/mapper/IdFieldTypeTests.java b/server/src/test/java/org/opensearch/index/mapper/IdFieldTypeTests.java
index 4f90a6de50e..de41e490d49 100644
--- a/server/src/test/java/org/opensearch/index/mapper/IdFieldTypeTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/IdFieldTypeTests.java
@@ -24,8 +24,8 @@ import org.opensearch.Version;
import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.common.UUIDs;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.query.QueryShardContext;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.query.QueryShardContext;
import org.opensearch.test.OpenSearchTestCase;
import org.mockito.Mockito;
diff --git a/server/src/test/java/org/opensearch/index/mapper/IndexFieldTypeTests.java b/server/src/test/java/org/opensearch/index/mapper/IndexFieldTypeTests.java
index 76870168753..5594004e882 100644
--- a/server/src/test/java/org/opensearch/index/mapper/IndexFieldTypeTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/IndexFieldTypeTests.java
@@ -24,9 +24,9 @@ import org.opensearch.Version;
import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.common.regex.Regex;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.query.QueryShardContext;
-import org.elasticsearch.index.query.QueryShardException;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.query.QueryShardContext;
+import org.opensearch.index.query.QueryShardException;
import org.opensearch.test.OpenSearchTestCase;
import java.util.function.Predicate;
diff --git a/server/src/test/java/org/opensearch/index/mapper/IpFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/IpFieldMapperTests.java
index a1b06319b40..ae072a22e2a 100644
--- a/server/src/test/java/org/opensearch/index/mapper/IpFieldMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/IpFieldMapperTests.java
@@ -28,7 +28,7 @@ import org.apache.lucene.search.TermQuery;
import org.apache.lucene.util.BytesRef;
import org.opensearch.common.network.InetAddresses;
import org.opensearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.index.termvectors.TermVectorsService;
+import org.opensearch.index.termvectors.TermVectorsService;
import org.opensearch.index.mapper.MapperTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/mapper/IpRangeFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/IpRangeFieldMapperTests.java
index bac7a6ee7a6..fc8e7240542 100644
--- a/server/src/test/java/org/opensearch/index/mapper/IpRangeFieldMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/IpRangeFieldMapperTests.java
@@ -27,7 +27,7 @@ import org.opensearch.common.network.InetAddresses;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.common.xcontent.XContentType;
-import org.elasticsearch.index.IndexService;
+import org.opensearch.index.IndexService;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
import org.junit.Before;
diff --git a/server/src/test/java/org/opensearch/index/mapper/IpRangeFieldTypeTests.java b/server/src/test/java/org/opensearch/index/mapper/IpRangeFieldTypeTests.java
index dc28eda4b42..6faed7dd60c 100644
--- a/server/src/test/java/org/opensearch/index/mapper/IpRangeFieldTypeTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/IpRangeFieldTypeTests.java
@@ -35,8 +35,8 @@ public class IpRangeFieldTypeTests extends FieldTypeTestCase {
Mapper.BuilderContext context = new Mapper.BuilderContext(settings, new ContentPath());
RangeFieldMapper mapper = new RangeFieldMapper.Builder("field", RangeType.IP, true).build(context);
- Map<String, Object> range = org.elasticsearch.common.collect.Map.of("gte", "2001:db8:0:0:0:0:2:1");
- assertEquals(Collections.singletonList(org.elasticsearch.common.collect.Map.of("gte", "2001:db8::2:1")),
+ Map<String, Object> range = org.opensearch.common.collect.Map.of("gte", "2001:db8:0:0:0:0:2:1");
+ assertEquals(Collections.singletonList(org.opensearch.common.collect.Map.of("gte", "2001:db8::2:1")),
fetchSourceValue(mapper.fieldType(), range));
assertEquals(Collections.singletonList("2001:db8::2:1/32"), fetchSourceValue(mapper.fieldType(), "2001:db8:0:0:0:0:2:1/32"));
}
diff --git a/server/src/test/java/org/opensearch/index/mapper/JavaMultiFieldMergeTests.java b/server/src/test/java/org/opensearch/index/mapper/JavaMultiFieldMergeTests.java
index b157631f11e..c6209decce5 100644
--- a/server/src/test/java/org/opensearch/index/mapper/JavaMultiFieldMergeTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/JavaMultiFieldMergeTests.java
@@ -24,7 +24,7 @@ import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.compress.CompressedXContent;
import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.common.xcontent.XContentType;
-import org.elasticsearch.index.mapper.ParseContext.Document;
+import org.opensearch.index.mapper.ParseContext.Document;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
import static org.opensearch.test.StreamsUtils.copyToStringFromClasspath;
diff --git a/server/src/test/java/org/opensearch/index/mapper/KeywordFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/KeywordFieldMapperTests.java
index 7767e55bd84..2244c561d46 100644
--- a/server/src/test/java/org/opensearch/index/mapper/KeywordFieldMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/KeywordFieldMapperTests.java
@@ -33,18 +33,18 @@ import org.apache.lucene.index.IndexableFieldType;
import org.apache.lucene.util.BytesRef;
import org.opensearch.common.Strings;
import org.opensearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.analysis.AnalyzerScope;
-import org.elasticsearch.index.analysis.CharFilterFactory;
-import org.elasticsearch.index.analysis.CustomAnalyzer;
-import org.elasticsearch.index.analysis.IndexAnalyzers;
-import org.elasticsearch.index.analysis.LowercaseNormalizer;
-import org.elasticsearch.index.analysis.NamedAnalyzer;
-import org.elasticsearch.index.analysis.PreConfiguredTokenFilter;
-import org.elasticsearch.index.analysis.TokenFilterFactory;
-import org.elasticsearch.index.analysis.TokenizerFactory;
-import org.elasticsearch.index.termvectors.TermVectorsService;
-import org.elasticsearch.indices.analysis.AnalysisModule;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.analysis.AnalyzerScope;
+import org.opensearch.index.analysis.CharFilterFactory;
+import org.opensearch.index.analysis.CustomAnalyzer;
+import org.opensearch.index.analysis.IndexAnalyzers;
+import org.opensearch.index.analysis.LowercaseNormalizer;
+import org.opensearch.index.analysis.NamedAnalyzer;
+import org.opensearch.index.analysis.PreConfiguredTokenFilter;
+import org.opensearch.index.analysis.TokenFilterFactory;
+import org.opensearch.index.analysis.TokenizerFactory;
+import org.opensearch.index.termvectors.TermVectorsService;
+import org.opensearch.indices.analysis.AnalysisModule;
import org.opensearch.plugins.AnalysisPlugin;
import org.opensearch.plugins.Plugin;
import org.opensearch.index.mapper.MapperTestCase;
diff --git a/server/src/test/java/org/opensearch/index/mapper/KeywordFieldTypeTests.java b/server/src/test/java/org/opensearch/index/mapper/KeywordFieldTypeTests.java
index 9c7411c676a..6b1a072f1ee 100644
--- a/server/src/test/java/org/opensearch/index/mapper/KeywordFieldTypeTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/KeywordFieldTypeTests.java
@@ -217,14 +217,14 @@ public class KeywordFieldTypeTests extends FieldTypeTestCase {
private static IndexAnalyzers createIndexAnalyzers() {
return new IndexAnalyzers(
- org.elasticsearch.common.collect.Map.of("default", new NamedAnalyzer("default", AnalyzerScope.INDEX, new StandardAnalyzer())),
- org.elasticsearch.common.collect.Map.ofEntries(
- org.elasticsearch.common.collect.Map.entry("lowercase",
+ org.opensearch.common.collect.Map.of("default", new NamedAnalyzer("default", AnalyzerScope.INDEX, new StandardAnalyzer())),
+ org.opensearch.common.collect.Map.ofEntries(
+ org.opensearch.common.collect.Map.entry("lowercase",
new NamedAnalyzer("lowercase", AnalyzerScope.INDEX, new LowercaseNormalizer())),
- org.elasticsearch.common.collect.Map.entry("other_lowercase",
+ org.opensearch.common.collect.Map.entry("other_lowercase",
new NamedAnalyzer("other_lowercase", AnalyzerScope.INDEX, new LowercaseNormalizer()))
),
- org.elasticsearch.common.collect.Map.of(
+ org.opensearch.common.collect.Map.of(
"lowercase",
new NamedAnalyzer(
"lowercase",
diff --git a/server/src/test/java/org/opensearch/index/mapper/LegacyGeoShapeFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/LegacyGeoShapeFieldMapperTests.java
index c95be0d8b20..28034250b54 100644
--- a/server/src/test/java/org/opensearch/index/mapper/LegacyGeoShapeFieldMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/LegacyGeoShapeFieldMapperTests.java
@@ -34,7 +34,7 @@ import org.opensearch.common.geo.builders.ShapeBuilder;
import org.opensearch.common.xcontent.ToXContent;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.geometry.Point;
-import org.elasticsearch.index.query.QueryShardContext;
+import org.opensearch.index.query.QueryShardContext;
import org.opensearch.plugins.Plugin;
import org.opensearch.test.TestGeoShapeFieldMapperPlugin;
import org.opensearch.index.mapper.FieldMapperTestCase2;
diff --git a/server/src/test/java/org/opensearch/index/mapper/LegacyGeoShapeFieldTypeTests.java b/server/src/test/java/org/opensearch/index/mapper/LegacyGeoShapeFieldTypeTests.java
index e7c3f2ea417..a0131d86028 100644
--- a/server/src/test/java/org/opensearch/index/mapper/LegacyGeoShapeFieldTypeTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/LegacyGeoShapeFieldTypeTests.java
@@ -22,8 +22,7 @@ import org.opensearch.Version;
import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.common.geo.SpatialStrategy;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.index.mapper.LegacyGeoShapeFieldMapper.GeoShapeFieldType;
-import org.opensearch.index.mapper.FieldTypeTestCase;
+import org.opensearch.index.mapper.LegacyGeoShapeFieldMapper.GeoShapeFieldType;
import java.io.IOException;
import java.util.Arrays;
diff --git a/server/src/test/java/org/opensearch/index/mapper/LegacyMapperServiceTests.java b/server/src/test/java/org/opensearch/index/mapper/LegacyMapperServiceTests.java
index 067488e5167..f7154828417 100644
--- a/server/src/test/java/org/opensearch/index/mapper/LegacyMapperServiceTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/LegacyMapperServiceTests.java
@@ -28,7 +28,7 @@ import org.opensearch.common.settings.Settings;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.common.xcontent.json.JsonXContent;
-import org.elasticsearch.index.IndexService;
+import org.opensearch.index.IndexService;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/mapper/MapperServiceTests.java b/server/src/test/java/org/opensearch/index/mapper/MapperServiceTests.java
index 313a4017a47..9120764b034 100644
--- a/server/src/test/java/org/opensearch/index/mapper/MapperServiceTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/MapperServiceTests.java
@@ -29,20 +29,20 @@ import org.opensearch.common.settings.Settings;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.common.xcontent.XContentType;
-import org.elasticsearch.env.Environment;
-import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.analysis.AnalysisMode;
-import org.elasticsearch.index.analysis.AnalysisRegistry;
-import org.elasticsearch.index.analysis.IndexAnalyzers;
-import org.elasticsearch.index.analysis.NamedAnalyzer;
-import org.elasticsearch.index.analysis.ReloadableCustomAnalyzer;
-import org.elasticsearch.index.analysis.TokenFilterFactory;
-import org.elasticsearch.index.mapper.KeywordFieldMapper.KeywordFieldType;
-import org.elasticsearch.index.mapper.MapperService.MergeReason;
-import org.elasticsearch.index.mapper.NumberFieldMapper.NumberFieldType;
-import org.elasticsearch.indices.InvalidTypeNameException;
-import org.elasticsearch.indices.analysis.AnalysisModule.AnalysisProvider;
+import org.opensearch.env.Environment;
+import org.opensearch.index.IndexService;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.analysis.AnalysisMode;
+import org.opensearch.index.analysis.AnalysisRegistry;
+import org.opensearch.index.analysis.IndexAnalyzers;
+import org.opensearch.index.analysis.NamedAnalyzer;
+import org.opensearch.index.analysis.ReloadableCustomAnalyzer;
+import org.opensearch.index.analysis.TokenFilterFactory;
+import org.opensearch.index.mapper.KeywordFieldMapper.KeywordFieldType;
+import org.opensearch.index.mapper.MapperService.MergeReason;
+import org.opensearch.index.mapper.NumberFieldMapper.NumberFieldType;
+import org.opensearch.indices.InvalidTypeNameException;
+import org.opensearch.indices.analysis.AnalysisModule.AnalysisProvider;
import org.opensearch.plugins.AnalysisPlugin;
import org.opensearch.plugins.Plugin;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
diff --git a/server/src/test/java/org/opensearch/index/mapper/MultiFieldTests.java b/server/src/test/java/org/opensearch/index/mapper/MultiFieldTests.java
index 39e9791a3aa..1b52872ebbd 100644
--- a/server/src/test/java/org/opensearch/index/mapper/MultiFieldTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/MultiFieldTests.java
@@ -30,9 +30,9 @@ import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentHelper;
import org.opensearch.common.xcontent.XContentType;
import org.opensearch.common.xcontent.support.XContentMapValues;
-import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.mapper.ParseContext.Document;
-import org.elasticsearch.index.mapper.TextFieldMapper.TextFieldType;
+import org.opensearch.index.IndexService;
+import org.opensearch.index.mapper.ParseContext.Document;
+import org.opensearch.index.mapper.TextFieldMapper.TextFieldType;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/mapper/NestedObjectMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/NestedObjectMapperTests.java
index 2996298531c..416a1a6ce2e 100644
--- a/server/src/test/java/org/opensearch/index/mapper/NestedObjectMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/NestedObjectMapperTests.java
@@ -29,8 +29,8 @@ import org.opensearch.common.settings.Settings;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.common.xcontent.XContentType;
-import org.elasticsearch.index.mapper.MapperService.MergeReason;
-import org.elasticsearch.index.mapper.ObjectMapper.Dynamic;
+import org.opensearch.index.mapper.MapperService.MergeReason;
+import org.opensearch.index.mapper.ObjectMapper.Dynamic;
import org.opensearch.plugins.Plugin;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
import org.opensearch.test.InternalSettingsPlugin;
diff --git a/server/src/test/java/org/opensearch/index/mapper/NumberFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/NumberFieldMapperTests.java
index c2d7f1e45c1..f71dc2fa423 100644
--- a/server/src/test/java/org/opensearch/index/mapper/NumberFieldMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/NumberFieldMapperTests.java
@@ -25,9 +25,9 @@ import org.opensearch.common.Strings;
import org.opensearch.common.bytes.BytesArray;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentType;
-import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType;
+import org.opensearch.index.mapper.NumberFieldMapper.NumberType;
import org.opensearch.index.mapper.NumberFieldTypeTests.OutOfRangeSpec;
-import org.elasticsearch.index.termvectors.TermVectorsService;
+import org.opensearch.index.termvectors.TermVectorsService;
import java.io.IOException;
import java.math.BigInteger;
@@ -42,12 +42,12 @@ public class NumberFieldMapperTests extends AbstractNumericFieldMapperTestCase {
@Override
protected Set<String> types() {
- return org.elasticsearch.common.collect.Set.of("byte", "short", "integer", "long", "float", "double", "half_float");
+ return org.opensearch.common.collect.Set.of("byte", "short", "integer", "long", "float", "double", "half_float");
}
@Override
protected Set<String> wholeTypes() {
- return org.elasticsearch.common.collect.Set.of("byte", "short", "integer", "long");
+ return org.opensearch.common.collect.Set.of("byte", "short", "integer", "long");
}
@Override
diff --git a/server/src/test/java/org/opensearch/index/mapper/ObjectMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/ObjectMapperTests.java
index 3d4b0891965..508e5d3c5e1 100644
--- a/server/src/test/java/org/opensearch/index/mapper/ObjectMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/ObjectMapperTests.java
@@ -24,8 +24,8 @@ import org.opensearch.common.bytes.BytesArray;
import org.opensearch.common.compress.CompressedXContent;
import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.common.xcontent.XContentType;
-import org.elasticsearch.index.mapper.MapperService.MergeReason;
-import org.elasticsearch.index.mapper.ObjectMapper.Dynamic;
+import org.opensearch.index.mapper.MapperService.MergeReason;
+import org.opensearch.index.mapper.ObjectMapper.Dynamic;
import org.opensearch.plugins.Plugin;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
import org.opensearch.test.InternalSettingsPlugin;
diff --git a/server/src/test/java/org/opensearch/index/mapper/PathMatchDynamicTemplateTests.java b/server/src/test/java/org/opensearch/index/mapper/PathMatchDynamicTemplateTests.java
index 29063c697ef..3a5b7b08f3c 100644
--- a/server/src/test/java/org/opensearch/index/mapper/PathMatchDynamicTemplateTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/PathMatchDynamicTemplateTests.java
@@ -22,8 +22,8 @@ package org.opensearch.index.mapper;
import org.apache.lucene.index.IndexableField;
import org.opensearch.common.bytes.BytesArray;
import org.opensearch.common.xcontent.XContentType;
-import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.mapper.ParseContext.Document;
+import org.opensearch.index.IndexService;
+import org.opensearch.index.mapper.ParseContext.Document;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
import static org.opensearch.test.StreamsUtils.copyToBytesFromClasspath;
diff --git a/server/src/test/java/org/opensearch/index/mapper/RangeFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/RangeFieldMapperTests.java
index db72a9aa684..d8519f95ddf 100644
--- a/server/src/test/java/org/opensearch/index/mapper/RangeFieldMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/RangeFieldMapperTests.java
@@ -35,10 +35,10 @@ import java.net.InetAddress;
import java.util.Locale;
import java.util.Set;
-import static org.elasticsearch.index.query.RangeQueryBuilder.GTE_FIELD;
-import static org.elasticsearch.index.query.RangeQueryBuilder.GT_FIELD;
-import static org.elasticsearch.index.query.RangeQueryBuilder.LTE_FIELD;
-import static org.elasticsearch.index.query.RangeQueryBuilder.LT_FIELD;
+import static org.opensearch.index.query.RangeQueryBuilder.GTE_FIELD;
+import static org.opensearch.index.query.RangeQueryBuilder.GT_FIELD;
+import static org.opensearch.index.query.RangeQueryBuilder.LTE_FIELD;
+import static org.opensearch.index.query.RangeQueryBuilder.LT_FIELD;
import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.containsString;
diff --git a/server/src/test/java/org/opensearch/index/mapper/RangeFieldQueryStringQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/mapper/RangeFieldQueryStringQueryBuilderTests.java
index 3e01c1a571b..cdc3050fb2a 100644
--- a/server/src/test/java/org/opensearch/index/mapper/RangeFieldQueryStringQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/RangeFieldQueryStringQueryBuilderTests.java
@@ -35,8 +35,8 @@ import org.opensearch.common.Strings;
import org.opensearch.common.compress.CompressedXContent;
import org.opensearch.common.network.InetAddresses;
import org.opensearch.common.time.DateMathParser;
-import org.elasticsearch.index.query.QueryShardContext;
-import org.elasticsearch.index.query.QueryStringQueryBuilder;
+import org.opensearch.index.query.QueryShardContext;
+import org.opensearch.index.query.QueryStringQueryBuilder;
import org.opensearch.test.AbstractQueryTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/mapper/RangeFieldTypeTests.java b/server/src/test/java/org/opensearch/index/mapper/RangeFieldTypeTests.java
index d788a4183bc..b7de37b1b0a 100644
--- a/server/src/test/java/org/opensearch/index/mapper/RangeFieldTypeTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/RangeFieldTypeTests.java
@@ -38,11 +38,11 @@ import org.opensearch.common.network.InetAddresses;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.time.DateFormatter;
import org.opensearch.common.util.BigArrays;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.mapper.DateFieldMapper.DateFieldType;
-import org.elasticsearch.index.mapper.RangeFieldMapper.RangeFieldType;
-import org.elasticsearch.index.query.QueryShardContext;
-import org.elasticsearch.index.query.QueryShardException;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.mapper.DateFieldMapper.DateFieldType;
+import org.opensearch.index.mapper.RangeFieldMapper.RangeFieldType;
+import org.opensearch.index.query.QueryShardContext;
+import org.opensearch.index.query.QueryShardException;
import org.opensearch.test.IndexSettingsModule;
import org.joda.time.DateTime;
import org.junit.Before;
@@ -501,16 +501,16 @@ public class RangeFieldTypeTests extends FieldTypeTestCase {
MappedFieldType longMapper = new RangeFieldMapper.Builder("field", RangeType.LONG, true)
.build(context)
.fieldType();
- Map<String, Object> longRange = org.elasticsearch.common.collect.Map.of("gte", 3.14, "lt", "42.9");
- assertEquals(Collections.singletonList(org.elasticsearch.common.collect.Map.of("gte", 3L, "lt", 42L)),
+ Map<String, Object> longRange = org.opensearch.common.collect.Map.of("gte", 3.14, "lt", "42.9");
+ assertEquals(Collections.singletonList(org.opensearch.common.collect.Map.of("gte", 3L, "lt", 42L)),
fetchSourceValue(longMapper, longRange));
MappedFieldType dateMapper = new RangeFieldMapper.Builder("field", RangeType.DATE, true)
.format("yyyy/MM/dd||epoch_millis")
.build(context)
.fieldType();
- Map<String, Object> dateRange = org.elasticsearch.common.collect.Map.of("lt", "1990/12/29", "gte", 597429487111L);
- assertEquals(Collections.singletonList(org.elasticsearch.common.collect.Map.of("lt", "1990/12/29", "gte", "1988/12/06")),
+ Map<String, Object> dateRange = org.opensearch.common.collect.Map.of("lt", "1990/12/29", "gte", 597429487111L);
+ assertEquals(Collections.singletonList(org.opensearch.common.collect.Map.of("lt", "1990/12/29", "gte", "1988/12/06")),
fetchSourceValue(dateMapper, dateRange));
}
@@ -521,18 +521,18 @@ public class RangeFieldTypeTests extends FieldTypeTestCase {
MappedFieldType longMapper = new RangeFieldMapper.Builder("field", RangeType.LONG, true)
.build(context)
.fieldType();
- Map<String, Object> longRange = org.elasticsearch.common.collect.Map.of("gte", 3.14, "lt", "42.9");
- assertEquals(Collections.singletonList(org.elasticsearch.common.collect.Map.of("gte", 3L, "lt", 42L)),
+ Map<String, Object> longRange = org.opensearch.common.collect.Map.of("gte", 3.14, "lt", "42.9");
+ assertEquals(Collections.singletonList(org.opensearch.common.collect.Map.of("gte", 3L, "lt", 42L)),
fetchSourceValue(longMapper, longRange));
MappedFieldType dateMapper = new RangeFieldMapper.Builder("field", RangeType.DATE, true)
.format("strict_date_time")
.build(context)
.fieldType();
- Map<String, Object> dateRange = org.elasticsearch.common.collect.Map.of("lt", "1990-12-29T00:00:00.000Z");
- assertEquals(Collections.singletonList(org.elasticsearch.common.collect.Map.of("lt", "1990/12/29")),
+ Map<String, Object> dateRange = org.opensearch.common.collect.Map.of("lt", "1990-12-29T00:00:00.000Z");
+ assertEquals(Collections.singletonList(org.opensearch.common.collect.Map.of("lt", "1990/12/29")),
fetchSourceValue(dateMapper, dateRange, "yyy/MM/dd"));
- assertEquals(Collections.singletonList(org.elasticsearch.common.collect.Map.of("lt", "662428800000")),
+ assertEquals(Collections.singletonList(org.opensearch.common.collect.Map.of("lt", "662428800000")),
fetchSourceValue(dateMapper, dateRange,"epoch_millis"));
}
}
diff --git a/server/src/test/java/org/opensearch/index/mapper/RootObjectMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/RootObjectMapperTests.java
index 30ee363aba2..3805d3e342d 100644
--- a/server/src/test/java/org/opensearch/index/mapper/RootObjectMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/RootObjectMapperTests.java
@@ -26,7 +26,7 @@ import org.opensearch.common.compress.CompressedXContent;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentFactory;
-import org.elasticsearch.index.mapper.MapperService.MergeReason;
+import org.opensearch.index.mapper.MapperService.MergeReason;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/mapper/TextFieldAnalyzerModeTests.java b/server/src/test/java/org/opensearch/index/mapper/TextFieldAnalyzerModeTests.java
index c3b3bc523dc..a087116dfbb 100644
--- a/server/src/test/java/org/opensearch/index/mapper/TextFieldAnalyzerModeTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/TextFieldAnalyzerModeTests.java
@@ -25,22 +25,22 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.opensearch.Version;
import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.analysis.AbstractTokenFilterFactory;
-import org.elasticsearch.index.analysis.AnalysisMode;
-import org.elasticsearch.index.analysis.AnalyzerScope;
-import org.elasticsearch.index.analysis.CharFilterFactory;
-import org.elasticsearch.index.analysis.CustomAnalyzer;
-import org.elasticsearch.index.analysis.IndexAnalyzers;
-import org.elasticsearch.index.analysis.NamedAnalyzer;
-import org.elasticsearch.index.analysis.TokenFilterFactory;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.analysis.AbstractTokenFilterFactory;
+import org.opensearch.index.analysis.AnalysisMode;
+import org.opensearch.index.analysis.AnalyzerScope;
+import org.opensearch.index.analysis.CharFilterFactory;
+import org.opensearch.index.analysis.CustomAnalyzer;
+import org.opensearch.index.analysis.IndexAnalyzers;
+import org.opensearch.index.analysis.NamedAnalyzer;
+import org.opensearch.index.analysis.TokenFilterFactory;
import org.opensearch.test.OpenSearchTestCase;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import static org.elasticsearch.index.analysis.AnalysisRegistry.DEFAULT_ANALYZER_NAME;
+import static org.opensearch.index.analysis.AnalysisRegistry.DEFAULT_ANALYZER_NAME;
import static org.hamcrest.Matchers.containsString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/server/src/test/java/org/opensearch/index/mapper/TextFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/TextFieldMapperTests.java
index 66f5ffd205f..ddf80779639 100644
--- a/server/src/test/java/org/opensearch/index/mapper/TextFieldMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/TextFieldMapperTests.java
@@ -55,19 +55,19 @@ import org.opensearch.common.lucene.search.MultiPhrasePrefixQuery;
import org.opensearch.common.xcontent.ToXContent;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentFactory;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.analysis.AnalyzerScope;
-import org.elasticsearch.index.analysis.CharFilterFactory;
-import org.elasticsearch.index.analysis.CustomAnalyzer;
-import org.elasticsearch.index.analysis.IndexAnalyzers;
-import org.elasticsearch.index.analysis.NamedAnalyzer;
-import org.elasticsearch.index.analysis.StandardTokenizerFactory;
-import org.elasticsearch.index.analysis.TokenFilterFactory;
-import org.elasticsearch.index.mapper.TextFieldMapper.TextFieldType;
-import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
-import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
-import org.elasticsearch.index.query.QueryShardContext;
-import org.elasticsearch.index.search.MatchQuery;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.analysis.AnalyzerScope;
+import org.opensearch.index.analysis.CharFilterFactory;
+import org.opensearch.index.analysis.CustomAnalyzer;
+import org.opensearch.index.analysis.IndexAnalyzers;
+import org.opensearch.index.analysis.NamedAnalyzer;
+import org.opensearch.index.analysis.StandardTokenizerFactory;
+import org.opensearch.index.analysis.TokenFilterFactory;
+import org.opensearch.index.mapper.TextFieldMapper.TextFieldType;
+import org.opensearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.opensearch.index.query.MatchPhraseQueryBuilder;
+import org.opensearch.index.query.QueryShardContext;
+import org.opensearch.index.search.MatchQuery;
import org.opensearch.index.mapper.MapperTestCase;
import java.io.IOException;
@@ -227,11 +227,11 @@ public class TextFieldMapperTests extends MapperTestCase {
)
);
return new IndexAnalyzers(
- org.elasticsearch.common.collect.Map.of(
+ org.opensearch.common.collect.Map.of(
"default", dflt, "standard", standard, "keyword", keyword, "whitespace", whitespace, "my_stop_analyzer", stop
),
- org.elasticsearch.common.collect.Map.of(),
- org.elasticsearch.common.collect.Map.of()
+ org.opensearch.common.collect.Map.of(),
+ org.opensearch.common.collect.Map.of()
);
}
diff --git a/server/src/test/java/org/opensearch/index/mapper/TextFieldTypeTests.java b/server/src/test/java/org/opensearch/index/mapper/TextFieldTypeTests.java
index 95716db4fc9..d211ac5351c 100644
--- a/server/src/test/java/org/opensearch/index/mapper/TextFieldTypeTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/TextFieldTypeTests.java
@@ -39,7 +39,7 @@ import org.opensearch.common.lucene.BytesRefs;
import org.opensearch.common.lucene.Lucene;
import org.opensearch.common.lucene.search.AutomatonQueries;
import org.opensearch.common.unit.Fuzziness;
-import org.elasticsearch.index.mapper.TextFieldMapper.TextFieldType;
+import org.opensearch.index.mapper.TextFieldMapper.TextFieldType;
import org.opensearch.index.mapper.FieldTypeTestCase;
import java.io.IOException;
@@ -168,18 +168,18 @@ public class TextFieldTypeTests extends FieldTypeTestCase {
TextFieldType fieldType = createFieldType();
fieldType.setIndexAnalyzer(Lucene.STANDARD_ANALYZER);
- assertEquals(org.elasticsearch.common.collect.List.of("value"), fetchSourceValue(fieldType, "value"));
- assertEquals(org.elasticsearch.common.collect.List.of("42"), fetchSourceValue(fieldType, 42L));
- assertEquals(org.elasticsearch.common.collect.List.of("true"), fetchSourceValue(fieldType, true));
+ assertEquals(org.opensearch.common.collect.List.of("value"), fetchSourceValue(fieldType, "value"));
+ assertEquals(org.opensearch.common.collect.List.of("42"), fetchSourceValue(fieldType, 42L));
+ assertEquals(org.opensearch.common.collect.List.of("true"), fetchSourceValue(fieldType, true));
TextFieldMapper.PrefixFieldType prefixFieldType = new TextFieldMapper.PrefixFieldType(fieldType, "field._index_prefix", 2, 10);
- assertEquals(org.elasticsearch.common.collect.List.of("value"), fetchSourceValue(prefixFieldType, "value"));
- assertEquals(org.elasticsearch.common.collect.List.of("42"), fetchSourceValue(prefixFieldType, 42L));
- assertEquals(org.elasticsearch.common.collect.List.of("true"), fetchSourceValue(prefixFieldType, true));
+ assertEquals(org.opensearch.common.collect.List.of("value"), fetchSourceValue(prefixFieldType, "value"));
+ assertEquals(org.opensearch.common.collect.List.of("42"), fetchSourceValue(prefixFieldType, 42L));
+ assertEquals(org.opensearch.common.collect.List.of("true"), fetchSourceValue(prefixFieldType, true));
TextFieldMapper.PhraseFieldType phraseFieldType = new TextFieldMapper.PhraseFieldType(fieldType);
- assertEquals(org.elasticsearch.common.collect.List.of("value"), fetchSourceValue(phraseFieldType, "value"));
- assertEquals(org.elasticsearch.common.collect.List.of("42"), fetchSourceValue(phraseFieldType, 42L));
- assertEquals(org.elasticsearch.common.collect.List.of("true"), fetchSourceValue(phraseFieldType, true));
+ assertEquals(org.opensearch.common.collect.List.of("value"), fetchSourceValue(phraseFieldType, "value"));
+ assertEquals(org.opensearch.common.collect.List.of("42"), fetchSourceValue(phraseFieldType, 42L));
+ assertEquals(org.opensearch.common.collect.List.of("true"), fetchSourceValue(phraseFieldType, true));
}
}
diff --git a/server/src/test/java/org/opensearch/index/mapper/TypeFieldMapperTests.java b/server/src/test/java/org/opensearch/index/mapper/TypeFieldMapperTests.java
index 9cc65198ba1..7357c2c50ac 100644
--- a/server/src/test/java/org/opensearch/index/mapper/TypeFieldMapperTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/TypeFieldMapperTests.java
@@ -29,12 +29,12 @@ import org.opensearch.common.bytes.BytesArray;
import org.opensearch.common.compress.CompressedXContent;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.xcontent.XContentType;
-import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.fielddata.IndexFieldDataCache;
-import org.elasticsearch.index.fielddata.IndexOrdinalsFieldData;
-import org.elasticsearch.index.fielddata.LeafOrdinalsFieldData;
-import org.elasticsearch.index.mapper.MapperService.MergeReason;
-import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
+import org.opensearch.index.IndexService;
+import org.opensearch.index.fielddata.IndexFieldDataCache;
+import org.opensearch.index.fielddata.IndexOrdinalsFieldData;
+import org.opensearch.index.fielddata.LeafOrdinalsFieldData;
+import org.opensearch.index.mapper.MapperService.MergeReason;
+import org.opensearch.indices.breaker.NoneCircuitBreakerService;
import org.opensearch.plugins.Plugin;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
import org.opensearch.test.InternalSettingsPlugin;
diff --git a/server/src/test/java/org/opensearch/index/mapper/TypeFieldTypeTests.java b/server/src/test/java/org/opensearch/index/mapper/TypeFieldTypeTests.java
index 70c3e9e4178..96882e2d9d5 100644
--- a/server/src/test/java/org/opensearch/index/mapper/TypeFieldTypeTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/TypeFieldTypeTests.java
@@ -21,7 +21,7 @@ package org.opensearch.index.mapper;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.MatchNoDocsQuery;
import org.apache.lucene.search.Query;
-import org.elasticsearch.index.query.QueryShardContext;
+import org.opensearch.index.query.QueryShardContext;
import org.opensearch.test.OpenSearchTestCase;
import org.mockito.Mockito;
diff --git a/server/src/test/java/org/opensearch/index/mapper/TypeParsersTests.java b/server/src/test/java/org/opensearch/index/mapper/TypeParsersTests.java
index 0d1984d5b89..fe28294e1b6 100644
--- a/server/src/test/java/org/opensearch/index/mapper/TypeParsersTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/TypeParsersTests.java
@@ -24,9 +24,9 @@ import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.common.xcontent.XContentHelper;
-import org.elasticsearch.index.analysis.AnalyzerScope;
-import org.elasticsearch.index.analysis.IndexAnalyzers;
-import org.elasticsearch.index.analysis.NamedAnalyzer;
+import org.opensearch.index.analysis.AnalyzerScope;
+import org.opensearch.index.analysis.IndexAnalyzers;
+import org.opensearch.index.analysis.NamedAnalyzer;
import org.opensearch.test.OpenSearchTestCase;
import org.hamcrest.Matchers;
@@ -37,9 +37,9 @@ import java.util.Map;
import java.util.stream.IntStream;
import java.util.stream.Collectors;
-import static org.elasticsearch.index.analysis.AnalysisRegistry.DEFAULT_ANALYZER_NAME;
-import static org.elasticsearch.index.analysis.AnalysisRegistry.DEFAULT_SEARCH_ANALYZER_NAME;
-import static org.elasticsearch.index.analysis.AnalysisRegistry.DEFAULT_SEARCH_QUOTED_ANALYZER_NAME;
+import static org.opensearch.index.analysis.AnalysisRegistry.DEFAULT_ANALYZER_NAME;
+import static org.opensearch.index.analysis.AnalysisRegistry.DEFAULT_SEARCH_ANALYZER_NAME;
+import static org.opensearch.index.analysis.AnalysisRegistry.DEFAULT_SEARCH_QUOTED_ANALYZER_NAME;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/server/src/test/java/org/opensearch/index/mapper/UpdateMappingTests.java b/server/src/test/java/org/opensearch/index/mapper/UpdateMappingTests.java
index cbe664d52c8..8c4ae15e223 100644
--- a/server/src/test/java/org/opensearch/index/mapper/UpdateMappingTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/UpdateMappingTests.java
@@ -27,8 +27,8 @@ import org.opensearch.common.compress.CompressedXContent;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentFactory;
-import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.mapper.MapperService.MergeReason;
+import org.opensearch.index.IndexService;
+import org.opensearch.index.mapper.MapperService.MergeReason;
import org.opensearch.plugins.Plugin;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
import org.opensearch.test.InternalSettingsPlugin;
diff --git a/server/src/test/java/org/opensearch/index/mapper/package-info.java b/server/src/test/java/org/opensearch/index/mapper/package-info.java
index e41141a91ba..7d4e91a4060 100644
--- a/server/src/test/java/org/opensearch/index/mapper/package-info.java
+++ b/server/src/test/java/org/opensearch/index/mapper/package-info.java
@@ -20,18 +20,18 @@
/**
* Mappings. Mappings define the way that documents should be translated to
* Lucene indices, for instance whether a string field should be indexed as a
- * {@link org.elasticsearch.index.mapper.TextFieldMapper text} or
- * {@link org.elasticsearch.index.mapper.KeywordFieldMapper keyword} field,
+ * {@link org.opensearch.index.mapper.TextFieldMapper text} or
+ * {@link org.opensearch.index.mapper.KeywordFieldMapper keyword} field,
* etc. This parsing is done by the
- * {@link org.elasticsearch.index.mapper.DocumentParser} class which delegates
- * to various {@link org.elasticsearch.index.mapper.Mapper} implementations for
+ * {@link org.opensearch.index.mapper.DocumentParser} class which delegates
+ * to various {@link org.opensearch.index.mapper.Mapper} implementations for
* per-field handling.
* <p>Mappings support the addition of new fields, so that fields can be added
* to indices even though users had not thought about them at index creation
* time. However, the removal of fields is not supported, as it would allow to
* re-add a field with a different configuration under the same name, which
* Lucene cannot handle. Introduction of new fields into the mappings is handled
- * by the {@link org.elasticsearch.index.mapper.MapperService} class.
+ * by the {@link org.opensearch.index.mapper.MapperService} class.
*/
package org.opensearch.index.mapper;
diff --git a/server/src/test/java/org/opensearch/index/query/AbstractQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/AbstractQueryBuilderTests.java
index d74e45ece37..0458cec275f 100644
--- a/server/src/test/java/org/opensearch/index/query/AbstractQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/AbstractQueryBuilderTests.java
@@ -32,7 +32,7 @@ import org.junit.BeforeClass;
import java.io.IOException;
import static java.util.Collections.emptyList;
-import static org.elasticsearch.index.query.AbstractQueryBuilder.parseInnerQueryBuilder;
+import static org.opensearch.index.query.AbstractQueryBuilder.parseInnerQueryBuilder;
public class AbstractQueryBuilderTests extends OpenSearchTestCase {
diff --git a/server/src/test/java/org/opensearch/index/query/BoolQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/BoolQueryBuilderTests.java
index 38317b19e91..f3369aa3490 100644
--- a/server/src/test/java/org/opensearch/index/query/BoolQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/BoolQueryBuilderTests.java
@@ -39,8 +39,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
-import static org.elasticsearch.index.query.QueryBuilders.termQuery;
+import static org.opensearch.index.query.QueryBuilders.boolQuery;
+import static org.opensearch.index.query.QueryBuilders.termQuery;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.instanceOf;
diff --git a/server/src/test/java/org/opensearch/index/query/CombineIntervalsSourceProviderTests.java b/server/src/test/java/org/opensearch/index/query/CombineIntervalsSourceProviderTests.java
index 0c4a8b8d30c..906fb6cb7c6 100644
--- a/server/src/test/java/org/opensearch/index/query/CombineIntervalsSourceProviderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/CombineIntervalsSourceProviderTests.java
@@ -28,7 +28,7 @@ import org.opensearch.test.AbstractSerializingTestCase;
import java.io.IOException;
import java.util.List;
-import static org.elasticsearch.index.query.IntervalsSourceProvider.Combine;
+import static org.opensearch.index.query.IntervalsSourceProvider.Combine;
public class CombineIntervalsSourceProviderTests extends AbstractSerializingTestCase<Combine> {
diff --git a/server/src/test/java/org/opensearch/index/query/CommonTermsQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/CommonTermsQueryBuilderTests.java
index 1bc77cc80f9..5b0e830662c 100644
--- a/server/src/test/java/org/opensearch/index/query/CommonTermsQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/CommonTermsQueryBuilderTests.java
@@ -30,7 +30,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.elasticsearch.index.query.QueryBuilders.commonTermsQuery;
+import static org.opensearch.index.query.QueryBuilders.commonTermsQuery;
import static org.opensearch.test.StreamsUtils.copyToStringFromClasspath;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
diff --git a/server/src/test/java/org/opensearch/index/query/DisjunctionIntervalsSourceProviderTests.java b/server/src/test/java/org/opensearch/index/query/DisjunctionIntervalsSourceProviderTests.java
index cc53cf4ffcf..088a524fe22 100644
--- a/server/src/test/java/org/opensearch/index/query/DisjunctionIntervalsSourceProviderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/DisjunctionIntervalsSourceProviderTests.java
@@ -28,7 +28,7 @@ import org.opensearch.test.AbstractSerializingTestCase;
import java.io.IOException;
import java.util.List;
-import static org.elasticsearch.index.query.IntervalsSourceProvider.Disjunction;
+import static org.opensearch.index.query.IntervalsSourceProvider.Disjunction;
public class DisjunctionIntervalsSourceProviderTests extends AbstractSerializingTestCase<Disjunction> {
diff --git a/server/src/test/java/org/opensearch/index/query/DistanceFeatureQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/DistanceFeatureQueryBuilderTests.java
index 9e5d35c9b50..d16113fa8b3 100644
--- a/server/src/test/java/org/opensearch/index/query/DistanceFeatureQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/DistanceFeatureQueryBuilderTests.java
@@ -27,10 +27,10 @@ import org.opensearch.common.geo.GeoUtils;
import org.opensearch.common.lucene.search.Queries;
import org.opensearch.common.unit.DistanceUnit;
import org.opensearch.common.unit.TimeValue;
-import org.elasticsearch.index.mapper.DateFieldMapper;
-import org.elasticsearch.index.mapper.DateFieldMapper.DateFieldType;
-import org.elasticsearch.index.mapper.MapperService;
-import org.elasticsearch.index.query.DistanceFeatureQueryBuilder.Origin;
+import org.opensearch.index.mapper.DateFieldMapper;
+import org.opensearch.index.mapper.DateFieldMapper.DateFieldType;
+import org.opensearch.index.mapper.MapperService;
+import org.opensearch.index.query.DistanceFeatureQueryBuilder.Origin;
import org.opensearch.test.AbstractQueryTestCase;
import org.joda.time.DateTime;
diff --git a/server/src/test/java/org/opensearch/index/query/FilterIntervalsSourceProviderTests.java b/server/src/test/java/org/opensearch/index/query/FilterIntervalsSourceProviderTests.java
index 915fb32a7d2..3c5f0ae8c85 100644
--- a/server/src/test/java/org/opensearch/index/query/FilterIntervalsSourceProviderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/FilterIntervalsSourceProviderTests.java
@@ -30,7 +30,7 @@ import org.opensearch.test.AbstractSerializingTestCase;
import java.io.IOException;
import java.util.Collections;
-import static org.elasticsearch.index.query.IntervalsSourceProvider.IntervalFilter;
+import static org.opensearch.index.query.IntervalsSourceProvider.IntervalFilter;
public class FilterIntervalsSourceProviderTests extends AbstractSerializingTestCase<IntervalFilter> {
diff --git a/server/src/test/java/org/opensearch/index/query/FuzzyIntervalsSourceProviderTests.java b/server/src/test/java/org/opensearch/index/query/FuzzyIntervalsSourceProviderTests.java
index 3952ecdd872..df53a1166b7 100644
--- a/server/src/test/java/org/opensearch/index/query/FuzzyIntervalsSourceProviderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/FuzzyIntervalsSourceProviderTests.java
@@ -22,7 +22,7 @@ package org.opensearch.index.query;
import org.opensearch.common.io.stream.Writeable;
import org.opensearch.common.unit.Fuzziness;
import org.opensearch.common.xcontent.XContentParser;
-import org.elasticsearch.index.query.IntervalsSourceProvider.Fuzzy;
+import org.opensearch.index.query.IntervalsSourceProvider.Fuzzy;
import org.opensearch.test.AbstractSerializingTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/query/GeoBoundingBoxQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/GeoBoundingBoxQueryBuilderTests.java
index 598cbe2e367..26e76b9e145 100644
--- a/server/src/test/java/org/opensearch/index/query/GeoBoundingBoxQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/GeoBoundingBoxQueryBuilderTests.java
@@ -27,7 +27,7 @@ import org.apache.lucene.search.Query;
import org.opensearch.OpenSearchParseException;
import org.opensearch.common.geo.GeoPoint;
import org.opensearch.common.geo.GeoUtils;
-import org.elasticsearch.index.mapper.MappedFieldType;
+import org.opensearch.index.mapper.MappedFieldType;
import org.opensearch.test.AbstractQueryTestCase;
import org.opensearch.test.geo.RandomShapeGenerator;
import org.locationtech.spatial4j.io.GeohashUtils;
diff --git a/server/src/test/java/org/opensearch/index/query/GeoPolygonQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/GeoPolygonQueryBuilderTests.java
index d9c9415f62c..8f846db9117 100644
--- a/server/src/test/java/org/opensearch/index/query/GeoPolygonQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/GeoPolygonQueryBuilderTests.java
@@ -27,7 +27,7 @@ import org.apache.lucene.search.Query;
import org.opensearch.common.ParsingException;
import org.opensearch.common.geo.GeoPoint;
import org.opensearch.common.geo.builders.ShapeBuilder;
-import org.elasticsearch.index.mapper.MappedFieldType;
+import org.opensearch.index.mapper.MappedFieldType;
import org.opensearch.test.AbstractQueryTestCase;
import org.opensearch.test.geo.RandomShapeGenerator;
import org.opensearch.test.geo.RandomShapeGenerator.ShapeType;
diff --git a/server/src/test/java/org/opensearch/index/query/GeoShapeQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/GeoShapeQueryBuilderTests.java
index b46b86f0660..6dcf32d1d4d 100644
--- a/server/src/test/java/org/opensearch/index/query/GeoShapeQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/GeoShapeQueryBuilderTests.java
@@ -37,8 +37,8 @@ import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.common.xcontent.json.JsonXContent;
-import org.elasticsearch.index.get.GetResult;
-import org.elasticsearch.index.mapper.MapperService;
+import org.opensearch.index.get.GetResult;
+import org.opensearch.index.mapper.MapperService;
import org.opensearch.test.AbstractQueryTestCase;
import org.opensearch.test.VersionUtils;
import org.opensearch.test.geo.RandomShapeGenerator;
diff --git a/server/src/test/java/org/opensearch/index/query/IdsQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/IdsQueryBuilderTests.java
index 5a2ba34aa1c..4b57b99b0c7 100644
--- a/server/src/test/java/org/opensearch/index/query/IdsQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/IdsQueryBuilderTests.java
@@ -26,7 +26,7 @@ import org.apache.lucene.search.TermInSetQuery;
import org.opensearch.cluster.metadata.Metadata;
import org.opensearch.common.ParsingException;
import org.opensearch.common.xcontent.XContentParser;
-import org.elasticsearch.index.mapper.IdFieldMapper;
+import org.opensearch.index.mapper.IdFieldMapper;
import org.opensearch.test.AbstractQueryTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/query/IntervalQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/IntervalQueryBuilderTests.java
index 44b6530fd8f..8236fe77a9f 100644
--- a/server/src/test/java/org/opensearch/index/query/IntervalQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/IntervalQueryBuilderTests.java
@@ -35,7 +35,7 @@ import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.Fuzziness;
import org.opensearch.common.util.BigArrays;
import org.opensearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.index.mapper.MapperService;
+import org.opensearch.index.mapper.MapperService;
import org.opensearch.script.Script;
import org.opensearch.script.ScriptContext;
import org.opensearch.script.ScriptService;
diff --git a/server/src/test/java/org/opensearch/index/query/MatchBoolPrefixQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/MatchBoolPrefixQueryBuilderTests.java
index e2420c368de..93302fb842a 100644
--- a/server/src/test/java/org/opensearch/index/query/MatchBoolPrefixQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/MatchBoolPrefixQueryBuilderTests.java
@@ -30,7 +30,7 @@ import org.apache.lucene.search.SynonymQuery;
import org.apache.lucene.search.TermQuery;
import org.opensearch.common.ParsingException;
import org.opensearch.common.lucene.search.Queries;
-import org.elasticsearch.index.search.MatchQuery;
+import org.opensearch.index.search.MatchQuery;
import org.opensearch.test.AbstractQueryTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/query/MatchIntervalsSourceProviderTests.java b/server/src/test/java/org/opensearch/index/query/MatchIntervalsSourceProviderTests.java
index 6e7068db6f9..2ed03bc6280 100644
--- a/server/src/test/java/org/opensearch/index/query/MatchIntervalsSourceProviderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/MatchIntervalsSourceProviderTests.java
@@ -27,7 +27,7 @@ import org.opensearch.test.AbstractSerializingTestCase;
import java.io.IOException;
-import static org.elasticsearch.index.query.IntervalsSourceProvider.Match;
+import static org.opensearch.index.query.IntervalsSourceProvider.Match;
public class MatchIntervalsSourceProviderTests extends AbstractSerializingTestCase<Match> {
diff --git a/server/src/test/java/org/opensearch/index/query/MatchPhrasePrefixQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/MatchPhrasePrefixQueryBuilderTests.java
index 8a66c6fc778..e50f82b88c1 100644
--- a/server/src/test/java/org/opensearch/index/query/MatchPhrasePrefixQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/MatchPhrasePrefixQueryBuilderTests.java
@@ -25,7 +25,7 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.SynonymQuery;
import org.opensearch.common.ParsingException;
import org.opensearch.common.lucene.search.MultiPhrasePrefixQuery;
-import org.elasticsearch.index.search.MatchQuery.ZeroTermsQuery;
+import org.opensearch.index.search.MatchQuery.ZeroTermsQuery;
import org.opensearch.test.AbstractQueryTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/query/MatchPhraseQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/MatchPhraseQueryBuilderTests.java
index 844fd762e03..6a2eeb86886 100644
--- a/server/src/test/java/org/opensearch/index/query/MatchPhraseQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/MatchPhraseQueryBuilderTests.java
@@ -28,7 +28,7 @@ import org.apache.lucene.search.PointRangeQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.opensearch.common.ParsingException;
-import org.elasticsearch.index.search.MatchQuery.ZeroTermsQuery;
+import org.opensearch.index.search.MatchQuery.ZeroTermsQuery;
import org.opensearch.test.AbstractQueryTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/query/MatchQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/MatchQueryBuilderTests.java
index b51225b63d0..95b08808cf0 100644
--- a/server/src/test/java/org/opensearch/index/query/MatchQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/MatchQueryBuilderTests.java
@@ -45,11 +45,11 @@ import org.opensearch.common.Strings;
import org.opensearch.common.compress.CompressedXContent;
import org.opensearch.common.lucene.search.MultiPhrasePrefixQuery;
import org.opensearch.common.lucene.search.Queries;
-import org.elasticsearch.index.mapper.MappedFieldType;
-import org.elasticsearch.index.mapper.MapperService;
-import org.elasticsearch.index.search.MatchQuery;
-import org.elasticsearch.index.search.MatchQuery.Type;
-import org.elasticsearch.index.search.MatchQuery.ZeroTermsQuery;
+import org.opensearch.index.mapper.MappedFieldType;
+import org.opensearch.index.mapper.MapperService;
+import org.opensearch.index.search.MatchQuery;
+import org.opensearch.index.search.MatchQuery.Type;
+import org.opensearch.index.search.MatchQuery.ZeroTermsQuery;
import org.opensearch.test.AbstractQueryTestCase;
import org.hamcrest.Matcher;
diff --git a/server/src/test/java/org/opensearch/index/query/NestedQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/NestedQueryBuilderTests.java
index 2a65e5a7476..6b3e194dca7 100644
--- a/server/src/test/java/org/opensearch/index/query/NestedQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/NestedQueryBuilderTests.java
@@ -30,10 +30,10 @@ import org.opensearch.action.admin.indices.mapping.put.PutMappingRequest;
import org.opensearch.common.Strings;
import org.opensearch.common.compress.CompressedXContent;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.mapper.MapperService;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
-import org.elasticsearch.index.search.ESToParentBlockJoinQuery;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.mapper.MapperService;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.opensearch.index.search.OpenSearchToParentBlockJoinQuery;
import org.opensearch.search.fetch.subphase.InnerHitsContext;
import org.opensearch.search.internal.SearchContext;
import org.opensearch.search.sort.FieldSortBuilder;
@@ -92,7 +92,7 @@ public class NestedQueryBuilderTests extends AbstractQueryTestCase<NestedQueryBu
@Override
protected void doAssertLuceneQuery(NestedQueryBuilder queryBuilder, Query query, QueryShardContext context) throws IOException {
- assertThat(query, instanceOf(ESToParentBlockJoinQuery.class));
+ assertThat(query, instanceOf(OpenSearchToParentBlockJoinQuery.class));
// TODO how to assert this?
if (queryBuilder.innerHit() != null) {
// have to rewrite again because the provided queryBuilder hasn't been rewritten (directly returned from
diff --git a/server/src/test/java/org/opensearch/index/query/PrefixIntervalsSourceProviderTests.java b/server/src/test/java/org/opensearch/index/query/PrefixIntervalsSourceProviderTests.java
index 1cad8249918..f75ad283974 100644
--- a/server/src/test/java/org/opensearch/index/query/PrefixIntervalsSourceProviderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/PrefixIntervalsSourceProviderTests.java
@@ -25,7 +25,7 @@ import org.opensearch.test.AbstractSerializingTestCase;
import java.io.IOException;
-import static org.elasticsearch.index.query.IntervalsSourceProvider.Prefix;
+import static org.opensearch.index.query.IntervalsSourceProvider.Prefix;
public class PrefixIntervalsSourceProviderTests extends AbstractSerializingTestCase<Prefix> {
diff --git a/server/src/test/java/org/opensearch/index/query/PrefixQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/PrefixQueryBuilderTests.java
index 8161cb7f46e..bf29ac3dbc5 100644
--- a/server/src/test/java/org/opensearch/index/query/PrefixQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/PrefixQueryBuilderTests.java
@@ -32,7 +32,7 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import static org.elasticsearch.index.query.QueryBuilders.prefixQuery;
+import static org.opensearch.index.query.QueryBuilders.prefixQuery;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
diff --git a/server/src/test/java/org/opensearch/index/query/QueryShardExceptionTests.java b/server/src/test/java/org/opensearch/index/query/QueryShardExceptionTests.java
index a26d97c5838..ba8403edcc5 100644
--- a/server/src/test/java/org/opensearch/index/query/QueryShardExceptionTests.java
+++ b/server/src/test/java/org/opensearch/index/query/QueryShardExceptionTests.java
@@ -19,7 +19,7 @@
package org.opensearch.index.query;
-import org.elasticsearch.index.Index;
+import org.opensearch.index.Index;
import org.opensearch.test.OpenSearchTestCase;
import static org.hamcrest.CoreMatchers.equalTo;
diff --git a/server/src/test/java/org/opensearch/index/query/QueryStringQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/QueryStringQueryBuilderTests.java
index 8210f04c09c..65dc21c82da 100644
--- a/server/src/test/java/org/opensearch/index/query/QueryStringQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/QueryStringQueryBuilderTests.java
@@ -62,9 +62,9 @@ import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.Fuzziness;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.json.JsonXContent;
-import org.elasticsearch.index.mapper.FieldNamesFieldMapper;
-import org.elasticsearch.index.mapper.MapperService;
-import org.elasticsearch.index.search.QueryStringQueryParser;
+import org.opensearch.index.mapper.FieldNamesFieldMapper;
+import org.opensearch.index.mapper.MapperService;
+import org.opensearch.index.search.QueryStringQueryParser;
import org.opensearch.test.AbstractQueryTestCase;
import org.hamcrest.CoreMatchers;
import org.hamcrest.Matchers;
@@ -80,8 +80,8 @@ import java.util.Locale;
import java.util.Map;
import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder;
-import static org.elasticsearch.index.query.AbstractQueryBuilder.parseInnerQueryBuilder;
-import static org.elasticsearch.index.query.QueryBuilders.queryStringQuery;
+import static org.opensearch.index.query.AbstractQueryBuilder.parseInnerQueryBuilder;
+import static org.opensearch.index.query.QueryBuilders.queryStringQuery;
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertBooleanSubQuery;
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertDisjunctionSubQuery;
import static org.hamcrest.CoreMatchers.equalTo;
diff --git a/server/src/test/java/org/opensearch/index/query/RangeQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/RangeQueryBuilderTests.java
index f3a6875759f..a627e43baf5 100644
--- a/server/src/test/java/org/opensearch/index/query/RangeQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/RangeQueryBuilderTests.java
@@ -36,11 +36,11 @@ import org.opensearch.Version;
import org.opensearch.common.ParsingException;
import org.opensearch.common.geo.ShapeRelation;
import org.opensearch.common.lucene.BytesRefs;
-import org.elasticsearch.index.mapper.DateFieldMapper;
-import org.elasticsearch.index.mapper.FieldNamesFieldMapper;
-import org.elasticsearch.index.mapper.MappedFieldType;
-import org.elasticsearch.index.mapper.MappedFieldType.Relation;
-import org.elasticsearch.index.mapper.MapperService;
+import org.opensearch.index.mapper.DateFieldMapper;
+import org.opensearch.index.mapper.FieldNamesFieldMapper;
+import org.opensearch.index.mapper.MappedFieldType;
+import org.opensearch.index.mapper.MappedFieldType.Relation;
+import org.opensearch.index.mapper.MapperService;
import org.opensearch.test.AbstractQueryTestCase;
import org.joda.time.DateTime;
import org.joda.time.chrono.ISOChronology;
@@ -52,7 +52,7 @@ import java.time.ZonedDateTime;
import java.util.HashMap;
import java.util.Map;
-import static org.elasticsearch.index.query.QueryBuilders.rangeQuery;
+import static org.opensearch.index.query.QueryBuilders.rangeQuery;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.sameInstance;
diff --git a/server/src/test/java/org/opensearch/index/query/RangeQueryRewriteTests.java b/server/src/test/java/org/opensearch/index/query/RangeQueryRewriteTests.java
index 6dc6a2a6e78..5a9aeab0b95 100644
--- a/server/src/test/java/org/opensearch/index/query/RangeQueryRewriteTests.java
+++ b/server/src/test/java/org/opensearch/index/query/RangeQueryRewriteTests.java
@@ -26,9 +26,9 @@ import org.opensearch.common.Strings;
import org.opensearch.common.compress.CompressedXContent;
import org.opensearch.common.util.BigArrays;
import org.opensearch.common.xcontent.XContentFactory;
-import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.mapper.MappedFieldType.Relation;
-import org.elasticsearch.index.mapper.MapperService.MergeReason;
+import org.opensearch.index.IndexService;
+import org.opensearch.index.mapper.MappedFieldType.Relation;
+import org.opensearch.index.mapper.MapperService.MergeReason;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
// The purpose of this test case is to test RangeQueryBuilder.getRelation()
diff --git a/server/src/test/java/org/opensearch/index/query/ScriptScoreQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/ScriptScoreQueryBuilderTests.java
index 6d832e90d5f..18c42af7349 100644
--- a/server/src/test/java/org/opensearch/index/query/ScriptScoreQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/ScriptScoreQueryBuilderTests.java
@@ -23,7 +23,7 @@ import org.apache.lucene.search.MatchNoDocsQuery;
import org.apache.lucene.search.Query;
import org.opensearch.OpenSearchException;
import org.opensearch.common.lucene.search.function.ScriptScoreQuery;
-import org.elasticsearch.index.query.functionscore.ScriptScoreQueryBuilder;
+import org.opensearch.index.query.functionscore.ScriptScoreQueryBuilder;
import org.opensearch.script.MockScriptEngine;
import org.opensearch.script.Script;
import org.opensearch.script.ScriptType;
@@ -32,7 +32,7 @@ import org.opensearch.test.AbstractQueryTestCase;
import java.io.IOException;
import java.util.Collections;
-import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
+import static org.opensearch.index.query.QueryBuilders.matchAllQuery;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/server/src/test/java/org/opensearch/index/query/SimpleQueryStringBuilderTests.java b/server/src/test/java/org/opensearch/index/query/SimpleQueryStringBuilderTests.java
index 868c37ffe82..67fd26d4b8b 100644
--- a/server/src/test/java/org/opensearch/index/query/SimpleQueryStringBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/SimpleQueryStringBuilderTests.java
@@ -41,7 +41,7 @@ import org.apache.lucene.util.TestUtil;
import org.opensearch.Version;
import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.index.search.SimpleQueryStringQueryParser;
+import org.opensearch.index.search.SimpleQueryStringQueryParser;
import org.opensearch.test.AbstractQueryTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/query/SpanFirstQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/SpanFirstQueryBuilderTests.java
index a93843080fc..9f1a8ba6712 100644
--- a/server/src/test/java/org/opensearch/index/query/SpanFirstQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/SpanFirstQueryBuilderTests.java
@@ -29,7 +29,7 @@ import org.opensearch.test.AbstractQueryTestCase;
import java.io.IOException;
-import static org.elasticsearch.index.query.QueryBuilders.spanTermQuery;
+import static org.opensearch.index.query.QueryBuilders.spanTermQuery;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.instanceOf;
diff --git a/server/src/test/java/org/opensearch/index/query/SpanGapQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/SpanGapQueryBuilderTests.java
index 4216b21d571..486f911a8ae 100644
--- a/server/src/test/java/org/opensearch/index/query/SpanGapQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/SpanGapQueryBuilderTests.java
@@ -29,7 +29,7 @@ import org.opensearch.test.AbstractQueryTestCase;
import java.io.IOException;
import java.util.Iterator;
-import static org.elasticsearch.index.query.SpanNearQueryBuilder.SpanGapQueryBuilder;
+import static org.opensearch.index.query.SpanNearQueryBuilder.SpanGapQueryBuilder;
import static org.hamcrest.CoreMatchers.either;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.instanceOf;
diff --git a/server/src/test/java/org/opensearch/index/query/SpanMultiTermQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/SpanMultiTermQueryBuilderTests.java
index cdfaf8964d7..a964d26d65a 100644
--- a/server/src/test/java/org/opensearch/index/query/SpanMultiTermQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/SpanMultiTermQueryBuilderTests.java
@@ -44,7 +44,7 @@ import org.opensearch.common.compress.CompressedXContent;
import org.opensearch.common.io.stream.StreamOutput;
import org.opensearch.common.lucene.search.SpanBooleanQueryRewriteWithMaxClause;
import org.opensearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.index.mapper.MapperService;
+import org.opensearch.index.mapper.MapperService;
import org.opensearch.test.AbstractQueryTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/query/SpanNotQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/SpanNotQueryBuilderTests.java
index 9044bb64d5b..047b5f41479 100644
--- a/server/src/test/java/org/opensearch/index/query/SpanNotQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/SpanNotQueryBuilderTests.java
@@ -29,8 +29,8 @@ import org.opensearch.test.AbstractQueryTestCase;
import java.io.IOException;
-import static org.elasticsearch.index.query.QueryBuilders.spanNearQuery;
-import static org.elasticsearch.index.query.QueryBuilders.spanTermQuery;
+import static org.opensearch.index.query.QueryBuilders.spanNearQuery;
+import static org.opensearch.index.query.QueryBuilders.spanTermQuery;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
diff --git a/server/src/test/java/org/opensearch/index/query/SpanTermQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/SpanTermQueryBuilderTests.java
index 2de443d6fb4..3f4636a164b 100644
--- a/server/src/test/java/org/opensearch/index/query/SpanTermQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/SpanTermQueryBuilderTests.java
@@ -26,7 +26,7 @@ import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.opensearch.common.ParsingException;
import org.opensearch.common.lucene.BytesRefs;
-import org.elasticsearch.index.mapper.MappedFieldType;
+import org.opensearch.index.mapper.MappedFieldType;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/query/TermQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/TermQueryBuilderTests.java
index e9f454358ee..b38e567e538 100644
--- a/server/src/test/java/org/opensearch/index/query/TermQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/TermQueryBuilderTests.java
@@ -27,8 +27,8 @@ import org.apache.lucene.search.PointRangeQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.opensearch.common.ParsingException;
-import org.elasticsearch.index.mapper.MappedFieldType;
-import org.elasticsearch.index.mapper.TypeFieldMapper;
+import org.opensearch.index.mapper.MappedFieldType;
+import org.opensearch.index.mapper.TypeFieldMapper;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/query/TermsQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/TermsQueryBuilderTests.java
index 4378390f6bc..df6339ed5fd 100644
--- a/server/src/test/java/org/opensearch/index/query/TermsQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/TermsQueryBuilderTests.java
@@ -36,9 +36,9 @@ import org.opensearch.common.io.stream.BytesStreamOutput;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.common.xcontent.XContentParser;
-import org.elasticsearch.index.get.GetResult;
-import org.elasticsearch.index.mapper.TypeFieldMapper;
-import org.elasticsearch.indices.TermsLookup;
+import org.opensearch.index.get.GetResult;
+import org.opensearch.index.mapper.TypeFieldMapper;
+import org.opensearch.indices.TermsLookup;
import org.opensearch.test.AbstractQueryTestCase;
import org.hamcrest.CoreMatchers;
import org.junit.Before;
diff --git a/server/src/test/java/org/opensearch/index/query/TermsSetQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/TermsSetQueryBuilderTests.java
index 8fb8d8b7052..15d616a770e 100644
--- a/server/src/test/java/org/opensearch/index/query/TermsSetQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/TermsSetQueryBuilderTests.java
@@ -41,8 +41,8 @@ import org.apache.lucene.store.Directory;
import org.opensearch.action.admin.indices.mapping.put.PutMappingRequest;
import org.opensearch.common.Strings;
import org.opensearch.common.compress.CompressedXContent;
-import org.elasticsearch.index.fielddata.ScriptDocValues;
-import org.elasticsearch.index.mapper.MapperService;
+import org.opensearch.index.fielddata.ScriptDocValues;
+import org.opensearch.index.mapper.MapperService;
import org.opensearch.plugins.Plugin;
import org.opensearch.script.MockScriptEngine;
import org.opensearch.script.MockScriptPlugin;
diff --git a/server/src/test/java/org/opensearch/index/query/WildcardIntervalsSourceProviderTests.java b/server/src/test/java/org/opensearch/index/query/WildcardIntervalsSourceProviderTests.java
index 525691a735f..fb8a98d5b16 100644
--- a/server/src/test/java/org/opensearch/index/query/WildcardIntervalsSourceProviderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/WildcardIntervalsSourceProviderTests.java
@@ -25,7 +25,7 @@ import org.opensearch.test.AbstractSerializingTestCase;
import java.io.IOException;
-import static org.elasticsearch.index.query.IntervalsSourceProvider.Wildcard;
+import static org.opensearch.index.query.IntervalsSourceProvider.Wildcard;
public class WildcardIntervalsSourceProviderTests extends AbstractSerializingTestCase<Wildcard> {
diff --git a/server/src/test/java/org/opensearch/index/query/WildcardQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/WildcardQueryBuilderTests.java
index 2dcc61488a5..fe70a9f84f0 100644
--- a/server/src/test/java/org/opensearch/index/query/WildcardQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/WildcardQueryBuilderTests.java
@@ -23,7 +23,7 @@ import org.apache.lucene.search.MatchNoDocsQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.WildcardQuery;
import org.opensearch.common.ParsingException;
-import org.elasticsearch.index.mapper.TypeFieldMapper;
+import org.opensearch.index.mapper.TypeFieldMapper;
import org.opensearch.test.AbstractQueryTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java b/server/src/test/java/org/opensearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java
index f8c320240e4..2f94f4622f2 100644
--- a/server/src/test/java/org/opensearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/functionscore/FunctionScoreQueryBuilderTests.java
@@ -39,15 +39,15 @@ import org.opensearch.common.unit.DistanceUnit;
import org.opensearch.common.xcontent.XContentHelper;
import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.common.xcontent.XContentType;
-import org.elasticsearch.index.mapper.SeqNoFieldMapper;
-import org.elasticsearch.index.query.MatchAllQueryBuilder;
-import org.elasticsearch.index.query.MatchNoneQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryShardContext;
+import org.opensearch.index.mapper.SeqNoFieldMapper;
+import org.opensearch.index.query.MatchAllQueryBuilder;
+import org.opensearch.index.query.MatchNoneQueryBuilder;
+import org.opensearch.index.query.QueryBuilder;
+import org.opensearch.index.query.QueryShardContext;
import org.opensearch.index.query.RandomQueryBuilder;
-import org.elasticsearch.index.query.TermQueryBuilder;
-import org.elasticsearch.index.query.WrapperQueryBuilder;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.WrapperQueryBuilder;
+import org.opensearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
import org.opensearch.plugins.Plugin;
import org.opensearch.plugins.SearchPlugin;
import org.opensearch.script.MockScriptEngine;
@@ -72,12 +72,12 @@ import java.util.Set;
import static java.util.Collections.singletonList;
import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder;
-import static org.elasticsearch.index.query.QueryBuilders.functionScoreQuery;
-import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
-import static org.elasticsearch.index.query.QueryBuilders.termQuery;
-import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.fieldValueFactorFunction;
-import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.randomFunction;
-import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.weightFactorFunction;
+import static org.opensearch.index.query.QueryBuilders.functionScoreQuery;
+import static org.opensearch.index.query.QueryBuilders.matchAllQuery;
+import static org.opensearch.index.query.QueryBuilders.termQuery;
+import static org.opensearch.index.query.functionscore.ScoreFunctionBuilders.fieldValueFactorFunction;
+import static org.opensearch.index.query.functionscore.ScoreFunctionBuilders.randomFunction;
+import static org.opensearch.index.query.functionscore.ScoreFunctionBuilders.weightFactorFunction;
import static org.hamcrest.Matchers.closeTo;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
diff --git a/server/src/test/java/org/opensearch/index/query/functionscore/ScoreFunctionBuilderTests.java b/server/src/test/java/org/opensearch/index/query/functionscore/ScoreFunctionBuilderTests.java
index a5afaa04616..c5c8a2248cf 100644
--- a/server/src/test/java/org/opensearch/index/query/functionscore/ScoreFunctionBuilderTests.java
+++ b/server/src/test/java/org/opensearch/index/query/functionscore/ScoreFunctionBuilderTests.java
@@ -22,12 +22,12 @@ package org.opensearch.index.query.functionscore;
import org.opensearch.Version;
import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.mapper.MappedFieldType;
-import org.elasticsearch.index.mapper.MapperService;
-import org.elasticsearch.index.mapper.NumberFieldMapper;
-import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType;
-import org.elasticsearch.index.query.QueryShardContext;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.mapper.MappedFieldType;
+import org.opensearch.index.mapper.MapperService;
+import org.opensearch.index.mapper.NumberFieldMapper;
+import org.opensearch.index.mapper.NumberFieldMapper.NumberType;
+import org.opensearch.index.query.QueryShardContext;
import org.opensearch.script.Script;
import org.opensearch.test.OpenSearchTestCase;
import org.mockito.Mockito;
diff --git a/server/src/test/java/org/opensearch/index/query/plugin/DummyQueryBuilder.java b/server/src/test/java/org/opensearch/index/query/plugin/DummyQueryBuilder.java
index 27b3b53473e..993f58b8857 100644
--- a/server/src/test/java/org/opensearch/index/query/plugin/DummyQueryBuilder.java
+++ b/server/src/test/java/org/opensearch/index/query/plugin/DummyQueryBuilder.java
@@ -24,9 +24,9 @@ import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.io.stream.StreamOutput;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentParser;
-import org.elasticsearch.index.query.AbstractQueryBuilder;
-import org.elasticsearch.index.query.QueryShardContext;
-import org.elasticsearch.index.query.plugin.DummyQueryParserPlugin.DummyQuery;
+import org.opensearch.index.query.AbstractQueryBuilder;
+import org.opensearch.index.query.QueryShardContext;
+import org.opensearch.index.query.plugin.DummyQueryParserPlugin.DummyQuery;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/reindex/BulkByScrollResponseTests.java b/server/src/test/java/org/opensearch/index/reindex/BulkByScrollResponseTests.java
index 03ffaebc5ff..a7fd4be6af0 100644
--- a/server/src/test/java/org/opensearch/index/reindex/BulkByScrollResponseTests.java
+++ b/server/src/test/java/org/opensearch/index/reindex/BulkByScrollResponseTests.java
@@ -28,7 +28,7 @@ import org.opensearch.common.io.stream.BytesStreamOutput;
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.xcontent.ToXContent;
import org.opensearch.common.xcontent.XContentParser;
-import org.elasticsearch.index.reindex.BulkByScrollTask.Status;
+import org.opensearch.index.reindex.BulkByScrollTask.Status;
import org.opensearch.test.AbstractXContentTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/reindex/BulkByScrollTaskStatusOrExceptionTests.java b/server/src/test/java/org/opensearch/index/reindex/BulkByScrollTaskStatusOrExceptionTests.java
index cc1ecf93a66..f1afc7ceb14 100644
--- a/server/src/test/java/org/opensearch/index/reindex/BulkByScrollTaskStatusOrExceptionTests.java
+++ b/server/src/test/java/org/opensearch/index/reindex/BulkByScrollTaskStatusOrExceptionTests.java
@@ -24,7 +24,7 @@ import org.opensearch.common.Strings;
import org.opensearch.common.xcontent.ToXContent;
import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.test.AbstractXContentTestCase;
-import org.elasticsearch.index.reindex.BulkByScrollTask.StatusOrException;
+import org.opensearch.index.reindex.BulkByScrollTask.StatusOrException;
import java.io.IOException;
import java.util.function.Supplier;
diff --git a/server/src/test/java/org/opensearch/index/reindex/BulkByScrollTaskStatusTests.java b/server/src/test/java/org/opensearch/index/reindex/BulkByScrollTaskStatusTests.java
index 09fd998cdf9..7168b6944a2 100644
--- a/server/src/test/java/org/opensearch/index/reindex/BulkByScrollTaskStatusTests.java
+++ b/server/src/test/java/org/opensearch/index/reindex/BulkByScrollTaskStatusTests.java
@@ -30,7 +30,7 @@ import org.opensearch.common.xcontent.ToXContent;
import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.test.AbstractXContentTestCase;
import org.hamcrest.Matchers;
-import org.elasticsearch.index.reindex.BulkByScrollTask.Status;
+import org.opensearch.index.reindex.BulkByScrollTask.Status;
import java.io.IOException;
import java.util.HashMap;
diff --git a/server/src/test/java/org/opensearch/index/reindex/DeleteByQueryRequestTests.java b/server/src/test/java/org/opensearch/index/reindex/DeleteByQueryRequestTests.java
index 64cca2e9608..b637ea7a2fc 100644
--- a/server/src/test/java/org/opensearch/index/reindex/DeleteByQueryRequestTests.java
+++ b/server/src/test/java/org/opensearch/index/reindex/DeleteByQueryRequestTests.java
@@ -23,7 +23,7 @@ import org.opensearch.action.ActionRequestValidationException;
import org.opensearch.action.search.SearchRequest;
import org.opensearch.action.support.IndicesOptions;
import org.opensearch.common.xcontent.XContentParser;
-import org.elasticsearch.index.query.QueryBuilders;
+import org.opensearch.index.query.QueryBuilders;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/reindex/ReindexRequestTests.java b/server/src/test/java/org/opensearch/index/reindex/ReindexRequestTests.java
index 07976257d61..8a5852eba54 100644
--- a/server/src/test/java/org/opensearch/index/reindex/ReindexRequestTests.java
+++ b/server/src/test/java/org/opensearch/index/reindex/ReindexRequestTests.java
@@ -29,7 +29,7 @@ import org.opensearch.common.xcontent.ToXContent;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.common.xcontent.json.JsonXContent;
-import org.elasticsearch.index.query.TermQueryBuilder;
+import org.opensearch.index.query.TermQueryBuilder;
import org.opensearch.search.SearchModule;
import org.opensearch.search.slice.SliceBuilder;
@@ -41,7 +41,7 @@ import java.util.Map;
import static java.util.Collections.emptyMap;
import static org.opensearch.common.unit.TimeValue.parseTimeValue;
import static org.opensearch.common.unit.TimeValue.timeValueSeconds;
-import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
+import static org.opensearch.index.query.QueryBuilders.matchAllQuery;
/**
* Tests some of the validation of {@linkplain ReindexRequest}. See reindex's rest tests for much more.
diff --git a/server/src/test/java/org/opensearch/index/replication/IndexLevelReplicationTests.java b/server/src/test/java/org/opensearch/index/replication/IndexLevelReplicationTests.java
index 668e02b148a..4edba6b243a 100644
--- a/server/src/test/java/org/opensearch/index/replication/IndexLevelReplicationTests.java
+++ b/server/src/test/java/org/opensearch/index/replication/IndexLevelReplicationTests.java
@@ -36,23 +36,23 @@ import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.common.util.iterable.Iterables;
import org.opensearch.common.xcontent.XContentType;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.engine.Engine;
-import org.elasticsearch.index.engine.EngineFactory;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.engine.Engine;
+import org.opensearch.index.engine.EngineFactory;
import org.opensearch.index.engine.EngineTestCase;
-import org.elasticsearch.index.engine.InternalEngine;
+import org.opensearch.index.engine.InternalEngine;
import org.opensearch.index.engine.InternalEngineTests;
-import org.elasticsearch.index.engine.SegmentsStats;
-import org.elasticsearch.index.engine.VersionConflictEngineException;
-import org.elasticsearch.index.mapper.SeqNoFieldMapper;
-import org.elasticsearch.index.seqno.SeqNoStats;
-import org.elasticsearch.index.seqno.SequenceNumbers;
-import org.elasticsearch.index.shard.IndexShard;
+import org.opensearch.index.engine.SegmentsStats;
+import org.opensearch.index.engine.VersionConflictEngineException;
+import org.opensearch.index.mapper.SeqNoFieldMapper;
+import org.opensearch.index.seqno.SeqNoStats;
+import org.opensearch.index.seqno.SequenceNumbers;
+import org.opensearch.index.shard.IndexShard;
import org.opensearch.index.shard.IndexShardTests;
-import org.elasticsearch.index.store.Store;
+import org.opensearch.index.store.Store;
import org.opensearch.index.translog.SnapshotMatchers;
-import org.elasticsearch.index.translog.Translog;
-import org.elasticsearch.indices.recovery.RecoveryTarget;
+import org.opensearch.index.translog.Translog;
+import org.opensearch.indices.recovery.RecoveryTarget;
import org.opensearch.threadpool.TestThreadPool;
import org.opensearch.threadpool.ThreadPool;
import org.hamcrest.Matcher;
diff --git a/server/src/test/java/org/opensearch/index/replication/RetentionLeasesReplicationTests.java b/server/src/test/java/org/opensearch/index/replication/RetentionLeasesReplicationTests.java
index f22063825a2..5229f4dd906 100644
--- a/server/src/test/java/org/opensearch/index/replication/RetentionLeasesReplicationTests.java
+++ b/server/src/test/java/org/opensearch/index/replication/RetentionLeasesReplicationTests.java
@@ -26,7 +26,7 @@ import org.opensearch.action.support.replication.ReplicationResponse;
import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.common.Randomness;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.index.IndexSettings;
+import org.opensearch.index.IndexSettings;
import org.opensearch.index.replication.OpenSearchIndexLevelReplicationTestCase;
import org.opensearch.index.seqno.RetentionLease;
import org.opensearch.index.seqno.RetentionLeaseSyncAction;
diff --git a/server/src/test/java/org/opensearch/index/search/NestedHelperTests.java b/server/src/test/java/org/opensearch/index/search/NestedHelperTests.java
index 18e0bc60f13..6ed046d668d 100644
--- a/server/src/test/java/org/opensearch/index/search/NestedHelperTests.java
+++ b/server/src/test/java/org/opensearch/index/search/NestedHelperTests.java
@@ -32,12 +32,12 @@ import org.apache.lucene.search.join.ScoreMode;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentFactory;
-import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.mapper.MapperService;
-import org.elasticsearch.index.query.MatchAllQueryBuilder;
-import org.elasticsearch.index.query.NestedQueryBuilder;
-import org.elasticsearch.index.query.QueryShardContext;
-import org.elasticsearch.index.query.TermQueryBuilder;
+import org.opensearch.index.IndexService;
+import org.opensearch.index.mapper.MapperService;
+import org.opensearch.index.query.MatchAllQueryBuilder;
+import org.opensearch.index.query.NestedQueryBuilder;
+import org.opensearch.index.query.QueryShardContext;
+import org.opensearch.index.query.TermQueryBuilder;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
import java.io.IOException;
@@ -331,7 +331,7 @@ public class NestedHelperTests extends OpenSearchSingleNodeTestCase {
public void testNested() throws IOException {
QueryShardContext context = indexService.newQueryShardContext(0, new IndexSearcher(new MultiReader()), () -> 0, null);
NestedQueryBuilder queryBuilder = new NestedQueryBuilder("nested1", new MatchAllQueryBuilder(), ScoreMode.Avg);
- ESToParentBlockJoinQuery query = (ESToParentBlockJoinQuery) queryBuilder.toQuery(context);
+ OpenSearchToParentBlockJoinQuery query = (OpenSearchToParentBlockJoinQuery) queryBuilder.toQuery(context);
Query expectedChildQuery = new BooleanQuery.Builder()
.add(new MatchAllDocsQuery(), Occur.MUST)
@@ -347,7 +347,7 @@ public class NestedHelperTests extends OpenSearchSingleNodeTestCase {
assertTrue(new NestedHelper(mapperService).mightMatchNonNestedDocs(query, "nested_missing"));
queryBuilder = new NestedQueryBuilder("nested1", new TermQueryBuilder("nested1.foo", "bar"), ScoreMode.Avg);
- query = (ESToParentBlockJoinQuery) queryBuilder.toQuery(context);
+ query = (OpenSearchToParentBlockJoinQuery) queryBuilder.toQuery(context);
// this time we do not add a filter since the inner query only matches inner docs
expectedChildQuery = new TermQuery(new Term("nested1.foo", "bar"));
@@ -360,7 +360,7 @@ public class NestedHelperTests extends OpenSearchSingleNodeTestCase {
assertTrue(new NestedHelper(mapperService).mightMatchNonNestedDocs(query, "nested_missing"));
queryBuilder = new NestedQueryBuilder("nested2", new TermQueryBuilder("nested2.foo", "bar"), ScoreMode.Avg);
- query = (ESToParentBlockJoinQuery) queryBuilder.toQuery(context);
+ query = (OpenSearchToParentBlockJoinQuery) queryBuilder.toQuery(context);
// we need to add the filter again because of include_in_parent
expectedChildQuery = new BooleanQuery.Builder()
@@ -376,7 +376,7 @@ public class NestedHelperTests extends OpenSearchSingleNodeTestCase {
assertTrue(new NestedHelper(mapperService).mightMatchNonNestedDocs(query, "nested_missing"));
queryBuilder = new NestedQueryBuilder("nested3", new TermQueryBuilder("nested3.foo", "bar"), ScoreMode.Avg);
- query = (ESToParentBlockJoinQuery) queryBuilder.toQuery(context);
+ query = (OpenSearchToParentBlockJoinQuery) queryBuilder.toQuery(context);
// we need to add the filter again because of include_in_root
expectedChildQuery = new BooleanQuery.Builder()
diff --git a/server/src/test/java/org/opensearch/index/search/nested/AbstractNumberNestedSortingTestCase.java b/server/src/test/java/org/opensearch/index/search/nested/AbstractNumberNestedSortingTestCase.java
index a1f274cbf5e..a656ea5fb4f 100644
--- a/server/src/test/java/org/opensearch/index/search/nested/AbstractNumberNestedSortingTestCase.java
+++ b/server/src/test/java/org/opensearch/index/search/nested/AbstractNumberNestedSortingTestCase.java
@@ -39,10 +39,10 @@ import org.apache.lucene.search.join.ToParentBlockJoinQuery;
import org.opensearch.common.lucene.index.OpenSearchDirectoryReader;
import org.opensearch.common.lucene.search.Queries;
import org.opensearch.index.fielddata.AbstractFieldDataTestCase;
-import org.elasticsearch.index.fielddata.IndexFieldData;
-import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource;
-import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
-import org.elasticsearch.index.shard.ShardId;
+import org.opensearch.index.fielddata.IndexFieldData;
+import org.opensearch.index.fielddata.IndexFieldData.XFieldComparatorSource;
+import org.opensearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
+import org.opensearch.index.shard.ShardId;
import org.opensearch.search.MultiValueMode;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/search/nested/DoubleNestedSortingTests.java b/server/src/test/java/org/opensearch/index/search/nested/DoubleNestedSortingTests.java
index c7fbfbaadf4..b5f67a0d7e4 100644
--- a/server/src/test/java/org/opensearch/index/search/nested/DoubleNestedSortingTests.java
+++ b/server/src/test/java/org/opensearch/index/search/nested/DoubleNestedSortingTests.java
@@ -32,11 +32,11 @@ import org.apache.lucene.search.join.ScoreMode;
import org.apache.lucene.search.join.ToParentBlockJoinQuery;
import org.apache.lucene.util.NumericUtils;
import org.opensearch.common.lucene.search.Queries;
-import org.elasticsearch.index.fielddata.IndexFieldData;
-import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource;
-import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
-import org.elasticsearch.index.fielddata.IndexNumericFieldData;
-import org.elasticsearch.index.fielddata.fieldcomparator.DoubleValuesComparatorSource;
+import org.opensearch.index.fielddata.IndexFieldData;
+import org.opensearch.index.fielddata.IndexFieldData.XFieldComparatorSource;
+import org.opensearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
+import org.opensearch.index.fielddata.IndexNumericFieldData;
+import org.opensearch.index.fielddata.fieldcomparator.DoubleValuesComparatorSource;
import org.opensearch.search.MultiValueMode;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/search/nested/FloatNestedSortingTests.java b/server/src/test/java/org/opensearch/index/search/nested/FloatNestedSortingTests.java
index 6699644427f..6848d480823 100644
--- a/server/src/test/java/org/opensearch/index/search/nested/FloatNestedSortingTests.java
+++ b/server/src/test/java/org/opensearch/index/search/nested/FloatNestedSortingTests.java
@@ -32,11 +32,11 @@ import org.apache.lucene.search.join.ScoreMode;
import org.apache.lucene.search.join.ToParentBlockJoinQuery;
import org.apache.lucene.util.NumericUtils;
import org.opensearch.common.lucene.search.Queries;
-import org.elasticsearch.index.fielddata.IndexFieldData;
-import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource;
-import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
-import org.elasticsearch.index.fielddata.IndexNumericFieldData;
-import org.elasticsearch.index.fielddata.fieldcomparator.FloatValuesComparatorSource;
+import org.opensearch.index.fielddata.IndexFieldData;
+import org.opensearch.index.fielddata.IndexFieldData.XFieldComparatorSource;
+import org.opensearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
+import org.opensearch.index.fielddata.IndexNumericFieldData;
+import org.opensearch.index.fielddata.fieldcomparator.FloatValuesComparatorSource;
import org.opensearch.search.MultiValueMode;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/search/nested/LongNestedSortingTests.java b/server/src/test/java/org/opensearch/index/search/nested/LongNestedSortingTests.java
index 8a13cccce0a..42fdf5de206 100644
--- a/server/src/test/java/org/opensearch/index/search/nested/LongNestedSortingTests.java
+++ b/server/src/test/java/org/opensearch/index/search/nested/LongNestedSortingTests.java
@@ -20,10 +20,10 @@ package org.opensearch.index.search.nested;
import org.apache.lucene.document.SortedNumericDocValuesField;
import org.apache.lucene.index.IndexableField;
-import org.elasticsearch.index.fielddata.IndexFieldData;
-import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
-import org.elasticsearch.index.fielddata.IndexNumericFieldData;
-import org.elasticsearch.index.fielddata.fieldcomparator.LongValuesComparatorSource;
+import org.opensearch.index.fielddata.IndexFieldData;
+import org.opensearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
+import org.opensearch.index.fielddata.IndexNumericFieldData;
+import org.opensearch.index.fielddata.fieldcomparator.LongValuesComparatorSource;
import org.opensearch.search.MultiValueMode;
public class LongNestedSortingTests extends AbstractNumberNestedSortingTestCase {
diff --git a/server/src/test/java/org/opensearch/index/search/stats/SearchStatsTests.java b/server/src/test/java/org/opensearch/index/search/stats/SearchStatsTests.java
index 302aad60168..96f374698e8 100644
--- a/server/src/test/java/org/opensearch/index/search/stats/SearchStatsTests.java
+++ b/server/src/test/java/org/opensearch/index/search/stats/SearchStatsTests.java
@@ -19,7 +19,7 @@
package org.opensearch.index.search.stats;
-import org.elasticsearch.index.search.stats.SearchStats.Stats;
+import org.opensearch.index.search.stats.SearchStats.Stats;
import org.opensearch.test.OpenSearchTestCase;
import java.util.HashMap;
diff --git a/server/src/test/java/org/opensearch/index/seqno/GlobalCheckpointSyncActionTests.java b/server/src/test/java/org/opensearch/index/seqno/GlobalCheckpointSyncActionTests.java
index 2b4ac9d808b..2dc25c3c221 100644
--- a/server/src/test/java/org/opensearch/index/seqno/GlobalCheckpointSyncActionTests.java
+++ b/server/src/test/java/org/opensearch/index/seqno/GlobalCheckpointSyncActionTests.java
@@ -25,12 +25,12 @@ import org.opensearch.cluster.action.shard.ShardStateAction;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.settings.Settings;
import org.opensearch.core.internal.io.IOUtils;
-import org.elasticsearch.index.Index;
-import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.shard.IndexShard;
-import org.elasticsearch.index.shard.ShardId;
-import org.elasticsearch.index.translog.Translog;
-import org.elasticsearch.indices.IndicesService;
+import org.opensearch.index.Index;
+import org.opensearch.index.IndexService;
+import org.opensearch.index.shard.IndexShard;
+import org.opensearch.index.shard.ShardId;
+import org.opensearch.index.translog.Translog;
+import org.opensearch.indices.IndicesService;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.transport.CapturingTransport;
import org.opensearch.threadpool.TestThreadPool;
diff --git a/server/src/test/java/org/opensearch/index/seqno/LocalCheckpointTrackerTests.java b/server/src/test/java/org/opensearch/index/seqno/LocalCheckpointTrackerTests.java
index ca7e09bf377..abe60c318fe 100644
--- a/server/src/test/java/org/opensearch/index/seqno/LocalCheckpointTrackerTests.java
+++ b/server/src/test/java/org/opensearch/index/seqno/LocalCheckpointTrackerTests.java
@@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import static org.elasticsearch.index.seqno.LocalCheckpointTracker.BIT_SET_SIZE;
+import static org.opensearch.index.seqno.LocalCheckpointTracker.BIT_SET_SIZE;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.oneOf;
diff --git a/server/src/test/java/org/opensearch/index/seqno/ReplicationTrackerTestCase.java b/server/src/test/java/org/opensearch/index/seqno/ReplicationTrackerTestCase.java
index b7b06398d92..87b483c7bdb 100644
--- a/server/src/test/java/org/opensearch/index/seqno/ReplicationTrackerTestCase.java
+++ b/server/src/test/java/org/opensearch/index/seqno/ReplicationTrackerTestCase.java
@@ -25,8 +25,8 @@ import org.opensearch.cluster.routing.ShardRouting;
import org.opensearch.cluster.routing.ShardRoutingState;
import org.opensearch.cluster.routing.TestShardRouting;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.index.engine.SafeCommitInfo;
-import org.elasticsearch.index.shard.ShardId;
+import org.opensearch.index.engine.SafeCommitInfo;
+import org.opensearch.index.shard.ShardId;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.IndexSettingsModule;
@@ -35,7 +35,7 @@ import java.util.function.LongConsumer;
import java.util.function.LongSupplier;
import java.util.function.Supplier;
-import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO;
+import static org.opensearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO;
public abstract class ReplicationTrackerTestCase extends OpenSearchTestCase {
diff --git a/server/src/test/java/org/opensearch/index/seqno/RetentionLeaseActionsTests.java b/server/src/test/java/org/opensearch/index/seqno/RetentionLeaseActionsTests.java
index e9ed37bac8c..5d2f17e79a0 100644
--- a/server/src/test/java/org/opensearch/index/seqno/RetentionLeaseActionsTests.java
+++ b/server/src/test/java/org/opensearch/index/seqno/RetentionLeaseActionsTests.java
@@ -26,9 +26,9 @@ import org.opensearch.action.admin.indices.stats.IndicesStatsResponse;
import org.opensearch.common.lease.Releasable;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.TimeValue;
-import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.shard.ShardId;
+import org.opensearch.index.IndexService;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.shard.ShardId;
import org.opensearch.node.Node;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
import org.opensearch.threadpool.ThreadPool;
@@ -37,7 +37,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.function.BiConsumer;
-import static org.elasticsearch.index.seqno.RetentionLeaseActions.RETAIN_ALL;
+import static org.opensearch.index.seqno.RetentionLeaseActions.RETAIN_ALL;
import static org.hamcrest.Matchers.arrayWithSize;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
diff --git a/server/src/test/java/org/opensearch/index/seqno/RetentionLeaseBackgroundSyncActionTests.java b/server/src/test/java/org/opensearch/index/seqno/RetentionLeaseBackgroundSyncActionTests.java
index b70d6f0a620..f30cdd68ddb 100644
--- a/server/src/test/java/org/opensearch/index/seqno/RetentionLeaseBackgroundSyncActionTests.java
+++ b/server/src/test/java/org/opensearch/index/seqno/RetentionLeaseBackgroundSyncActionTests.java
@@ -30,11 +30,11 @@ import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.settings.Settings;
import org.opensearch.core.internal.io.IOUtils;
import org.opensearch.gateway.WriteStateException;
-import org.elasticsearch.index.Index;
-import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.shard.IndexShard;
-import org.elasticsearch.index.shard.ShardId;
-import org.elasticsearch.indices.IndicesService;
+import org.opensearch.index.Index;
+import org.opensearch.index.IndexService;
+import org.opensearch.index.shard.IndexShard;
+import org.opensearch.index.shard.ShardId;
+import org.opensearch.indices.IndicesService;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.transport.CapturingTransport;
import org.opensearch.threadpool.TestThreadPool;
diff --git a/server/src/test/java/org/opensearch/index/seqno/RetentionLeaseStatsTests.java b/server/src/test/java/org/opensearch/index/seqno/RetentionLeaseStatsTests.java
index ba40b748beb..6cd92b5c738 100644
--- a/server/src/test/java/org/opensearch/index/seqno/RetentionLeaseStatsTests.java
+++ b/server/src/test/java/org/opensearch/index/seqno/RetentionLeaseStatsTests.java
@@ -23,10 +23,10 @@ import org.opensearch.action.ActionListener;
import org.opensearch.action.admin.indices.stats.IndicesStatsResponse;
import org.opensearch.action.support.replication.ReplicationResponse;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.shard.IndexShard;
-import org.elasticsearch.index.shard.ShardId;
-import org.elasticsearch.indices.IndicesService;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.shard.IndexShard;
+import org.opensearch.index.shard.ShardId;
+import org.opensearch.indices.IndicesService;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
import org.opensearch.index.seqno.RetentionLeaseUtils;
diff --git a/server/src/test/java/org/opensearch/index/seqno/RetentionLeaseSyncActionTests.java b/server/src/test/java/org/opensearch/index/seqno/RetentionLeaseSyncActionTests.java
index 3c5430045d6..d56fa9529df 100644
--- a/server/src/test/java/org/opensearch/index/seqno/RetentionLeaseSyncActionTests.java
+++ b/server/src/test/java/org/opensearch/index/seqno/RetentionLeaseSyncActionTests.java
@@ -20,7 +20,7 @@
package org.opensearch.index.seqno;
import org.opensearch.action.ActionListener;
-import org.elasticsearch.index.IndexingPressure;
+import org.opensearch.index.IndexingPressure;
import org.opensearch.action.support.ActionFilters;
import org.opensearch.action.support.ActionTestUtils;
import org.opensearch.action.support.PlainActionFuture;
@@ -29,12 +29,12 @@ import org.opensearch.cluster.action.shard.ShardStateAction;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.settings.Settings;
import org.opensearch.core.internal.io.IOUtils;
-import org.elasticsearch.index.Index;
-import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.shard.IndexShard;
-import org.elasticsearch.index.shard.ShardId;
-import org.elasticsearch.indices.IndicesService;
-import org.elasticsearch.indices.SystemIndices;
+import org.opensearch.index.Index;
+import org.opensearch.index.IndexService;
+import org.opensearch.index.shard.IndexShard;
+import org.opensearch.index.shard.ShardId;
+import org.opensearch.indices.IndicesService;
+import org.opensearch.indices.SystemIndices;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.transport.CapturingTransport;
import org.opensearch.threadpool.TestThreadPool;
diff --git a/server/src/test/java/org/opensearch/index/shard/EngineAccess.java b/server/src/test/java/org/opensearch/index/shard/EngineAccess.java
index 70c48837176..d78b5b6631f 100644
--- a/server/src/test/java/org/opensearch/index/shard/EngineAccess.java
+++ b/server/src/test/java/org/opensearch/index/shard/EngineAccess.java
@@ -18,7 +18,7 @@
*/
package org.opensearch.index.shard;
-import org.elasticsearch.index.engine.Engine;
+import org.opensearch.index.engine.Engine;
/**
* Test utility to access the engine of a shard
diff --git a/server/src/test/java/org/opensearch/index/shard/GlobalCheckpointListenersTests.java b/server/src/test/java/org/opensearch/index/shard/GlobalCheckpointListenersTests.java
index 6a64bd9a1e8..f5a27931c11 100644
--- a/server/src/test/java/org/opensearch/index/shard/GlobalCheckpointListenersTests.java
+++ b/server/src/test/java/org/opensearch/index/shard/GlobalCheckpointListenersTests.java
@@ -25,7 +25,7 @@ import org.opensearch.Assertions;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.common.util.concurrent.OpenSearchExecutors;
-import org.elasticsearch.index.Index;
+import org.opensearch.index.Index;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.threadpool.Scheduler;
import org.junit.After;
@@ -51,8 +51,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import static org.elasticsearch.index.seqno.SequenceNumbers.NO_OPS_PERFORMED;
-import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO;
+import static org.opensearch.index.seqno.SequenceNumbers.NO_OPS_PERFORMED;
+import static org.opensearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO;
import static org.hamcrest.Matchers.any;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
diff --git a/server/src/test/java/org/opensearch/index/shard/IndexReaderWrapperTests.java b/server/src/test/java/org/opensearch/index/shard/IndexReaderWrapperTests.java
index 6bb0b4c5a4d..5cdbb14745d 100644
--- a/server/src/test/java/org/opensearch/index/shard/IndexReaderWrapperTests.java
+++ b/server/src/test/java/org/opensearch/index/shard/IndexReaderWrapperTests.java
@@ -36,7 +36,7 @@ import org.apache.lucene.store.Directory;
import org.opensearch.common.CheckedFunction;
import org.opensearch.common.lucene.index.OpenSearchDirectoryReader;
import org.opensearch.core.internal.io.IOUtils;
-import org.elasticsearch.index.engine.Engine;
+import org.opensearch.index.engine.Engine;
import org.opensearch.test.OpenSearchTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/shard/IndexShardOperationPermitsTests.java b/server/src/test/java/org/opensearch/index/shard/IndexShardOperationPermitsTests.java
index 022ee6be55d..5a3e4e6d618 100644
--- a/server/src/test/java/org/opensearch/index/shard/IndexShardOperationPermitsTests.java
+++ b/server/src/test/java/org/opensearch/index/shard/IndexShardOperationPermitsTests.java
@@ -78,8 +78,10 @@ public class IndexShardOperationPermitsTests extends OpenSearchTestCase {
.put("thread_pool." + ThreadPool.Names.WRITE + ".queue_size", writeThreadPoolQueueSize)
.build());
assertThat(threadPool.executor(ThreadPool.Names.WRITE), instanceOf(OpenSearchThreadPoolExecutor.class));
- assertThat(((OpenSearchThreadPoolExecutor) threadPool.executor(ThreadPool.Names.WRITE)).getCorePoolSize(), equalTo(writeThreadPoolSize));
- assertThat(((OpenSearchThreadPoolExecutor) threadPool.executor(ThreadPool.Names.WRITE)).getMaximumPoolSize(), equalTo(writeThreadPoolSize));
+ assertThat(((OpenSearchThreadPoolExecutor) threadPool.executor(ThreadPool.Names.WRITE)).getCorePoolSize(),
+ equalTo(writeThreadPoolSize));
+ assertThat(((OpenSearchThreadPoolExecutor) threadPool.executor(ThreadPool.Names.WRITE)).getMaximumPoolSize(),
+ equalTo(writeThreadPoolSize));
assertThat(((OpenSearchThreadPoolExecutor) threadPool.executor(ThreadPool.Names.WRITE)).getQueue().remainingCapacity(),
equalTo(writeThreadPoolQueueSize));
}
@@ -165,10 +167,12 @@ public class IndexShardOperationPermitsTests extends OpenSearchTestCase {
assertNotNull(future.get(1, TimeUnit.MINUTES));
} catch (ExecutionException e) {
if (closeAfterBlocking) {
- assertThat(e.getCause(), either(instanceOf(DummyException.class)).or(instanceOf(OpenSearchRejectedExecutionException.class))
+ assertThat(e.getCause(), either(instanceOf(DummyException.class))
+ .or(instanceOf(OpenSearchRejectedExecutionException.class))
.or(instanceOf(IndexShardClosedException.class)));
} else {
- assertThat(e.getCause(), either(instanceOf(DummyException.class)).or(instanceOf(OpenSearchRejectedExecutionException.class)));
+ assertThat(e.getCause(), either(instanceOf(DummyException.class))
+ .or(instanceOf(OpenSearchRejectedExecutionException.class)));
}
}
}
diff --git a/server/src/test/java/org/opensearch/index/shard/IndexShardRetentionLeaseTests.java b/server/src/test/java/org/opensearch/index/shard/IndexShardRetentionLeaseTests.java
index 55aa83631af..a506c77148f 100644
--- a/server/src/test/java/org/opensearch/index/shard/IndexShardRetentionLeaseTests.java
+++ b/server/src/test/java/org/opensearch/index/shard/IndexShardRetentionLeaseTests.java
@@ -25,13 +25,13 @@ import org.opensearch.cluster.routing.ShardRoutingHelper;
import org.opensearch.common.collect.Tuple;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.TimeValue;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.engine.InternalEngineFactory;
-import org.elasticsearch.index.seqno.ReplicationTracker;
-import org.elasticsearch.index.seqno.RetentionLease;
-import org.elasticsearch.index.seqno.RetentionLeaseStats;
-import org.elasticsearch.index.seqno.RetentionLeases;
-import org.elasticsearch.index.seqno.SequenceNumbers;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.engine.InternalEngineFactory;
+import org.opensearch.index.seqno.ReplicationTracker;
+import org.opensearch.index.seqno.RetentionLease;
+import org.opensearch.index.seqno.RetentionLeaseStats;
+import org.opensearch.index.seqno.RetentionLeases;
+import org.opensearch.index.seqno.SequenceNumbers;
import org.opensearch.index.shard.IndexShardTestCase;
import org.opensearch.threadpool.TestThreadPool;
import org.opensearch.threadpool.ThreadPool;
diff --git a/server/src/test/java/org/opensearch/index/shard/IndexShardTests.java b/server/src/test/java/org/opensearch/index/shard/IndexShardTests.java
index 82815c4c92a..afe61849611 100644
--- a/server/src/test/java/org/opensearch/index/shard/IndexShardTests.java
+++ b/server/src/test/java/org/opensearch/index/shard/IndexShardTests.java
@@ -173,7 +173,7 @@ import static org.opensearch.cluster.routing.TestShardRouting.newShardRouting;
import static org.opensearch.common.lucene.Lucene.cleanLuceneIndex;
import static org.opensearch.common.xcontent.ToXContent.EMPTY_PARAMS;
import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder;
-import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO;
+import static org.opensearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO;
import static org.opensearch.test.hamcrest.RegexMatcher.matches;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.containsString;
@@ -4091,7 +4091,7 @@ public class IndexShardTests extends IndexShardTestCase {
Engine.IndexResult indexResult = indexDoc(shard, "some_type", "0", "{\"foo\" : \"bar\"}");
assertTrue(indexResult.isCreated());
- org.elasticsearch.index.engine.Engine.GetResult getResult = shard.get(
+ org.opensearch.index.engine.Engine.GetResult getResult = shard.get(
new Engine.Get(true, true, "some_type", "0", new Term("_id", Uid.encodeId("0"))));
assertTrue(getResult.exists());
getResult.close();
diff --git a/server/src/test/java/org/opensearch/index/shard/IndexingOperationListenerTests.java b/server/src/test/java/org/opensearch/index/shard/IndexingOperationListenerTests.java
index 8cc1220b740..b935b6225e5 100644
--- a/server/src/test/java/org/opensearch/index/shard/IndexingOperationListenerTests.java
+++ b/server/src/test/java/org/opensearch/index/shard/IndexingOperationListenerTests.java
@@ -19,12 +19,12 @@
package org.opensearch.index.shard;
import org.apache.lucene.index.Term;
-import org.elasticsearch.index.Index;
-import org.elasticsearch.index.engine.Engine;
+import org.opensearch.index.Index;
+import org.opensearch.index.engine.Engine;
import org.opensearch.index.engine.InternalEngineTests;
-import org.elasticsearch.index.mapper.ParsedDocument;
-import org.elasticsearch.index.mapper.Uid;
-import org.elasticsearch.index.seqno.SequenceNumbers;
+import org.opensearch.index.mapper.ParsedDocument;
+import org.opensearch.index.mapper.Uid;
+import org.opensearch.index.seqno.SequenceNumbers;
import org.hamcrest.Matchers;
import org.opensearch.test.OpenSearchTestCase;
diff --git a/server/src/test/java/org/opensearch/index/shard/NewPathForShardTests.java b/server/src/test/java/org/opensearch/index/shard/NewPathForShardTests.java
index 0d379ecdf04..3637d8ed8ef 100644
--- a/server/src/test/java/org/opensearch/index/shard/NewPathForShardTests.java
+++ b/server/src/test/java/org/opensearch/index/shard/NewPathForShardTests.java
@@ -24,11 +24,11 @@ import org.opensearch.cluster.metadata.IndexMetadata;
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.NodeEnvironment;
-import org.elasticsearch.env.NodeEnvironment.NodePath;
+import org.opensearch.env.Environment;
+import org.opensearch.env.NodeEnvironment;
+import org.opensearch.env.NodeEnvironment.NodePath;
import org.opensearch.env.TestEnvironment;
-import org.elasticsearch.index.IndexSettings;
+import org.opensearch.index.IndexSettings;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.IndexSettingsModule;
import org.junit.AfterClass;
diff --git a/server/src/test/java/org/opensearch/index/shard/PrimaryReplicaSyncerTests.java b/server/src/test/java/org/opensearch/index/shard/PrimaryReplicaSyncerTests.java
index a0bc77165f2..102641df92a 100644
--- a/server/src/test/java/org/opensearch/index/shard/PrimaryReplicaSyncerTests.java
+++ b/server/src/test/java/org/opensearch/index/shard/PrimaryReplicaSyncerTests.java
@@ -39,12 +39,12 @@ import org.opensearch.common.xcontent.ToXContent;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.common.xcontent.XContentType;
-import org.elasticsearch.index.VersionType;
-import org.elasticsearch.index.engine.Engine;
-import org.elasticsearch.index.mapper.SourceToParse;
-import org.elasticsearch.index.seqno.SequenceNumbers;
+import org.opensearch.index.VersionType;
+import org.opensearch.index.engine.Engine;
+import org.opensearch.index.mapper.SourceToParse;
+import org.opensearch.index.seqno.SequenceNumbers;
import org.opensearch.index.translog.TestTranslog;
-import org.elasticsearch.index.translog.Translog;
+import org.opensearch.index.translog.Translog;
import org.opensearch.tasks.Task;
import org.opensearch.tasks.TaskManager;
diff --git a/server/src/test/java/org/opensearch/index/shard/RefreshListenersTests.java b/server/src/test/java/org/opensearch/index/shard/RefreshListenersTests.java
index 54c2e895cef..5903ad5811d 100644
--- a/server/src/test/java/org/opensearch/index/shard/RefreshListenersTests.java
+++ b/server/src/test/java/org/opensearch/index/shard/RefreshListenersTests.java
@@ -40,23 +40,23 @@ import org.opensearch.common.util.BigArrays;
import org.opensearch.common.util.concurrent.ThreadContext;
import org.opensearch.common.xcontent.XContentType;
import org.opensearch.core.internal.io.IOUtils;
-import org.elasticsearch.index.Index;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.codec.CodecService;
-import org.elasticsearch.index.engine.Engine;
-import org.elasticsearch.index.engine.EngineConfig;
+import org.opensearch.index.Index;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.codec.CodecService;
+import org.opensearch.index.engine.Engine;
+import org.opensearch.index.engine.EngineConfig;
import org.opensearch.index.engine.EngineTestCase;
-import org.elasticsearch.index.engine.InternalEngine;
-import org.elasticsearch.index.mapper.IdFieldMapper;
-import org.elasticsearch.index.mapper.ParseContext.Document;
-import org.elasticsearch.index.mapper.ParsedDocument;
-import org.elasticsearch.index.mapper.SeqNoFieldMapper;
-import org.elasticsearch.index.seqno.RetentionLeases;
-import org.elasticsearch.index.seqno.SequenceNumbers;
-import org.elasticsearch.index.store.Store;
-import org.elasticsearch.index.translog.Translog;
-import org.elasticsearch.index.translog.TranslogConfig;
-import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
+import org.opensearch.index.engine.InternalEngine;
+import org.opensearch.index.mapper.IdFieldMapper;
+import org.opensearch.index.mapper.ParseContext.Document;
+import org.opensearch.index.mapper.ParsedDocument;
+import org.opensearch.index.mapper.SeqNoFieldMapper;
+import org.opensearch.index.seqno.RetentionLeases;
+import org.opensearch.index.seqno.SequenceNumbers;
+import org.opensearch.index.store.Store;
+import org.opensearch.index.translog.Translog;
+import org.opensearch.index.translog.TranslogConfig;
+import org.opensearch.indices.breaker.NoneCircuitBreakerService;
import org.opensearch.test.DummyShardLock;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.IndexSettingsModule;
diff --git a/server/src/test/java/org/opensearch/index/shard/ShardGetServiceTests.java b/server/src/test/java/org/opensearch/index/shard/ShardGetServiceTests.java
index fc26e0ea54a..5d913a2c55b 100644
--- a/server/src/test/java/org/opensearch/index/shard/ShardGetServiceTests.java
+++ b/server/src/test/java/org/opensearch/index/shard/ShardGetServiceTests.java
@@ -22,19 +22,18 @@ import org.opensearch.Version;
import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.xcontent.XContentType;
-import org.elasticsearch.index.VersionType;
-import org.elasticsearch.index.engine.Engine;
-import org.elasticsearch.index.engine.VersionConflictEngineException;
-import org.elasticsearch.index.get.GetResult;
-import org.elasticsearch.index.mapper.RoutingFieldMapper;
-import org.opensearch.index.shard.IndexShardTestCase;
+import org.opensearch.index.VersionType;
+import org.opensearch.index.engine.Engine;
+import org.opensearch.index.engine.VersionConflictEngineException;
+import org.opensearch.index.get.GetResult;
+import org.opensearch.index.mapper.RoutingFieldMapper;
import org.opensearch.search.fetch.subphase.FetchSourceContext;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_PRIMARY_TERM;
-import static org.elasticsearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO;
+import static org.opensearch.index.seqno.SequenceNumbers.UNASSIGNED_PRIMARY_TERM;
+import static org.opensearch.index.seqno.SequenceNumbers.UNASSIGNED_SEQ_NO;
public class ShardGetServiceTests extends IndexShardTestCase {
diff --git a/server/src/test/java/org/opensearch/index/shard/ShardIdTests.java b/server/src/test/java/org/opensearch/index/shard/ShardIdTests.java
index f289b568008..36dea51331f 100644
--- a/server/src/test/java/org/opensearch/index/shard/ShardIdTests.java
+++ b/server/src/test/java/org/opensearch/index/shard/ShardIdTests.java
@@ -20,7 +20,7 @@
package org.opensearch.index.shard;
import org.opensearch.cluster.metadata.IndexMetadata;
-import org.elasticsearch.index.Index;
+import org.opensearch.index.Index;
import org.opensearch.test.OpenSearchTestCase;
public class ShardIdTests extends OpenSearchTestCase {
diff --git a/server/src/test/java/org/opensearch/index/shard/ShardPathTests.java b/server/src/test/java/org/opensearch/index/shard/ShardPathTests.java
index ea8e70012d6..c9e652081f0 100644
--- a/server/src/test/java/org/opensearch/index/shard/ShardPathTests.java
+++ b/server/src/test/java/org/opensearch/index/shard/ShardPathTests.java
@@ -20,9 +20,9 @@ package org.opensearch.index.shard;
import org.opensearch.cluster.routing.AllocationId;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.env.Environment;
-import org.elasticsearch.env.NodeEnvironment;
-import org.elasticsearch.index.Index;
+import org.opensearch.env.Environment;
+import org.opensearch.env.NodeEnvironment;
+import org.opensearch.index.Index;
import org.opensearch.test.OpenSearchTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/shard/ShardSplittingQueryTests.java b/server/src/test/java/org/opensearch/index/shard/ShardSplittingQueryTests.java
index 1981d975dad..a2c490cce87 100644
--- a/server/src/test/java/org/opensearch/index/shard/ShardSplittingQueryTests.java
+++ b/server/src/test/java/org/opensearch/index/shard/ShardSplittingQueryTests.java
@@ -38,11 +38,11 @@ import org.opensearch.Version;
import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.cluster.routing.OperationRouting;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.index.mapper.IdFieldMapper;
-import org.elasticsearch.index.mapper.RoutingFieldMapper;
-import org.elasticsearch.index.mapper.SeqNoFieldMapper;
-import org.elasticsearch.index.mapper.TypeFieldMapper;
-import org.elasticsearch.index.mapper.Uid;
+import org.opensearch.index.mapper.IdFieldMapper;
+import org.opensearch.index.mapper.RoutingFieldMapper;
+import org.opensearch.index.mapper.SeqNoFieldMapper;
+import org.opensearch.index.mapper.TypeFieldMapper;
+import org.opensearch.index.mapper.Uid;
import org.opensearch.test.OpenSearchTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/shard/StoreRecoveryTests.java b/server/src/test/java/org/opensearch/index/shard/StoreRecoveryTests.java
index 8345618f667..e3b02a494f5 100644
--- a/server/src/test/java/org/opensearch/index/shard/StoreRecoveryTests.java
+++ b/server/src/test/java/org/opensearch/index/shard/StoreRecoveryTests.java
@@ -44,11 +44,11 @@ import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.cluster.routing.OperationRouting;
import org.opensearch.common.settings.Settings;
import org.opensearch.core.internal.io.IOUtils;
-import org.elasticsearch.index.engine.Engine;
-import org.elasticsearch.index.mapper.IdFieldMapper;
-import org.elasticsearch.index.mapper.Uid;
-import org.elasticsearch.index.seqno.SequenceNumbers;
-import org.elasticsearch.indices.recovery.RecoveryState;
+import org.opensearch.index.engine.Engine;
+import org.opensearch.index.mapper.IdFieldMapper;
+import org.opensearch.index.mapper.Uid;
+import org.opensearch.index.seqno.SequenceNumbers;
+import org.opensearch.indices.recovery.RecoveryState;
import org.opensearch.test.OpenSearchTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/similarity/LegacySimilarityTests.java b/server/src/test/java/org/opensearch/index/similarity/LegacySimilarityTests.java
index ab7803d424f..b867772e10d 100644
--- a/server/src/test/java/org/opensearch/index/similarity/LegacySimilarityTests.java
+++ b/server/src/test/java/org/opensearch/index/similarity/LegacySimilarityTests.java
@@ -27,7 +27,7 @@ import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentFactory;
-import org.elasticsearch.index.mapper.MapperService;
+import org.opensearch.index.mapper.MapperService;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/similarity/SimilarityServiceTests.java b/server/src/test/java/org/opensearch/index/similarity/SimilarityServiceTests.java
index 0907a269ac3..16a1d8c06f6 100644
--- a/server/src/test/java/org/opensearch/index/similarity/SimilarityServiceTests.java
+++ b/server/src/test/java/org/opensearch/index/similarity/SimilarityServiceTests.java
@@ -26,7 +26,7 @@ import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.search.similarity.LegacyBM25Similarity;
import org.opensearch.Version;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.index.IndexSettings;
+import org.opensearch.index.IndexSettings;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.IndexSettingsModule;
import org.hamcrest.Matchers;
diff --git a/server/src/test/java/org/opensearch/index/similarity/SimilarityTests.java b/server/src/test/java/org/opensearch/index/similarity/SimilarityTests.java
index efa0b6de3f4..496ec6c2e31 100644
--- a/server/src/test/java/org/opensearch/index/similarity/SimilarityTests.java
+++ b/server/src/test/java/org/opensearch/index/similarity/SimilarityTests.java
@@ -37,10 +37,10 @@ import org.opensearch.common.compress.CompressedXContent;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentFactory;
-import org.elasticsearch.index.IndexService;
-import org.elasticsearch.index.mapper.MappedFieldType;
-import org.elasticsearch.index.mapper.MapperParsingException;
-import org.elasticsearch.index.mapper.MapperService;
+import org.opensearch.index.IndexService;
+import org.opensearch.index.mapper.MappedFieldType;
+import org.opensearch.index.mapper.MapperParsingException;
+import org.opensearch.index.mapper.MapperService;
import org.opensearch.plugins.Plugin;
import org.opensearch.test.OpenSearchSingleNodeTestCase;
import org.opensearch.test.InternalSettingsPlugin;
diff --git a/server/src/test/java/org/opensearch/index/snapshots/blobstore/FileInfoTests.java b/server/src/test/java/org/opensearch/index/snapshots/blobstore/FileInfoTests.java
index 86345ae7872..d006f61539d 100644
--- a/server/src/test/java/org/opensearch/index/snapshots/blobstore/FileInfoTests.java
+++ b/server/src/test/java/org/opensearch/index/snapshots/blobstore/FileInfoTests.java
@@ -29,8 +29,8 @@ import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.common.xcontent.XContentType;
import org.opensearch.common.xcontent.json.JsonXContent;
-import org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshot.FileInfo;
-import org.elasticsearch.index.store.StoreFileMetadata;
+import org.opensearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshot.FileInfo;
+import org.opensearch.index.store.StoreFileMetadata;
import org.opensearch.test.OpenSearchTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/store/FsDirectoryFactoryTests.java b/server/src/test/java/org/opensearch/index/store/FsDirectoryFactoryTests.java
index a14ba76f0b6..f72b5d35b05 100644
--- a/server/src/test/java/org/opensearch/index/store/FsDirectoryFactoryTests.java
+++ b/server/src/test/java/org/opensearch/index/store/FsDirectoryFactoryTests.java
@@ -30,11 +30,11 @@ import org.apache.lucene.util.Constants;
import org.opensearch.Version;
import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.common.settings.Settings;
-import org.elasticsearch.index.Index;
-import org.elasticsearch.index.IndexModule;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.shard.ShardId;
-import org.elasticsearch.index.shard.ShardPath;
+import org.opensearch.index.Index;
+import org.opensearch.index.IndexModule;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.shard.ShardId;
+import org.opensearch.index.shard.ShardPath;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.IndexSettingsModule;
import org.hamcrest.Matchers;
diff --git a/server/src/test/java/org/opensearch/index/store/StoreUtils.java b/server/src/test/java/org/opensearch/index/store/StoreUtils.java
index c3799077a18..ca1ab11c963 100644
--- a/server/src/test/java/org/opensearch/index/store/StoreUtils.java
+++ b/server/src/test/java/org/opensearch/index/store/StoreUtils.java
@@ -21,8 +21,8 @@ package org.opensearch.index.store;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.elasticsearch.env.NodeEnvironment;
-import org.elasticsearch.index.shard.ShardId;
+import org.opensearch.env.NodeEnvironment;
+import org.opensearch.index.shard.ShardId;
import java.nio.file.Path;
diff --git a/server/src/test/java/org/opensearch/index/termvectors/TermVectorsServiceTests.java b/server/src/test/java/org/opensearch/index/termvectors/TermVectorsServiceTests.java
index 3c4557dfe53..6abbbdfdc15 100644
--- a/server/src/test/java/org/opensearch/index/termvectors/TermVectorsServiceTests.java
+++ b/server/src/test/java/org/opensearch/index/termvectors/TermVectorsServiceTests.java
@@ -24,7 +24,7 @@ import org.apache.lucene.index.TermsEnum;
import org.opensearch.action.bulk.BulkRequestBuilder;
import org.opensearch.action.termvectors.TermVectorsRequest;
import org.opensearch.action.termvectors.TermVectorsResponse;
-import org.elasticsearch.common.settings.Settings;
+import org.opensearch.common.settings.Settings;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.index.IndexService;
import org.opensearch.index.shard.IndexShard;
diff --git a/server/src/test/java/org/opensearch/index/translog/TestTranslog.java b/server/src/test/java/org/opensearch/index/translog/TestTranslog.java
index 1d889dbb9dc..49a5798e6f3 100644
--- a/server/src/test/java/org/opensearch/index/translog/TestTranslog.java
+++ b/server/src/test/java/org/opensearch/index/translog/TestTranslog.java
@@ -44,8 +44,8 @@ import java.util.TreeSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import static org.elasticsearch.index.translog.Translog.CHECKPOINT_FILE_NAME;
-import static org.elasticsearch.index.translog.Translog.TRANSLOG_FILE_SUFFIX;
+import static org.opensearch.index.translog.Translog.CHECKPOINT_FILE_NAME;
+import static org.opensearch.index.translog.Translog.TRANSLOG_FILE_SUFFIX;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.equalTo;
diff --git a/server/src/test/java/org/opensearch/index/translog/TranslogDeletionPolicyTests.java b/server/src/test/java/org/opensearch/index/translog/TranslogDeletionPolicyTests.java
index 57b5b500c28..74556b6e96e 100644
--- a/server/src/test/java/org/opensearch/index/translog/TranslogDeletionPolicyTests.java
+++ b/server/src/test/java/org/opensearch/index/translog/TranslogDeletionPolicyTests.java
@@ -27,7 +27,7 @@ import org.opensearch.common.collect.Tuple;
import org.opensearch.common.lease.Releasable;
import org.opensearch.common.util.BigArrays;
import org.opensearch.core.internal.io.IOUtils;
-import org.elasticsearch.index.shard.ShardId;
+import org.opensearch.index.shard.ShardId;
import org.opensearch.test.OpenSearchTestCase;
import org.mockito.Mockito;
diff --git a/server/src/test/java/org/opensearch/index/translog/TranslogHeaderTests.java b/server/src/test/java/org/opensearch/index/translog/TranslogHeaderTests.java
index 422c0986673..35af467b351 100644
--- a/server/src/test/java/org/opensearch/index/translog/TranslogHeaderTests.java
+++ b/server/src/test/java/org/opensearch/index/translog/TranslogHeaderTests.java
@@ -24,7 +24,7 @@ import org.apache.lucene.store.OutputStreamDataOutput;
import org.apache.lucene.util.BytesRef;
import org.opensearch.common.UUIDs;
import org.opensearch.common.io.stream.OutputStreamStreamOutput;
-import org.elasticsearch.index.seqno.SequenceNumbers;
+import org.opensearch.index.seqno.SequenceNumbers;
import org.opensearch.test.OpenSearchTestCase;
import java.io.IOException;
diff --git a/server/src/test/java/org/opensearch/index/translog/TranslogTests.java b/server/src/test/java/org/opensearch/index/translog/TranslogTests.java
index f0f29942023..6b59d0da60c 100644
--- a/server/src/test/java/org/opensearch/index/translog/TranslogTests.java
+++ b/server/src/test/java/org/opensearch/index/translog/TranslogTests.java
@@ -58,20 +58,20 @@ import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentFactory;
import org.opensearch.common.xcontent.XContentType;
import org.opensearch.core.internal.io.IOUtils;
-import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.VersionType;
-import org.elasticsearch.index.engine.Engine;
-import org.elasticsearch.index.engine.Engine.Operation.Origin;
-import org.elasticsearch.index.mapper.IdFieldMapper;
-import org.elasticsearch.index.mapper.ParseContext.Document;
-import org.elasticsearch.index.mapper.ParsedDocument;
-import org.elasticsearch.index.mapper.SeqNoFieldMapper;
-import org.elasticsearch.index.mapper.Uid;
-import org.elasticsearch.index.seqno.LocalCheckpointTracker;
+import org.opensearch.index.IndexSettings;
+import org.opensearch.index.VersionType;
+import org.opensearch.index.engine.Engine;
+import org.opensearch.index.engine.Engine.Operation.Origin;
+import org.opensearch.index.mapper.IdFieldMapper;
+import org.opensearch.index.mapper.ParseContext.Document;
+import org.opensearch.index.mapper.ParsedDocument;
+import org.opensearch.index.mapper.SeqNoFieldMapper;
+import org.opensearch.index.mapper.Uid;
+import org.opensearch.index.seqno.LocalCheckpointTracker;
import org.opensearch.index.seqno.LocalCheckpointTrackerTests;
-import org.elasticsearch.index.seqno.SequenceNumbers;
-import org.elasticsearch.index.shard.ShardId;
-import org.elasticsearch.index.translog.Translog.Location;
+import org.opensearch.index.seqno.SequenceNumbers;
+import org.opensearch.index.shard.ShardId;
+import org.opensearch.index.translog.Translog.Location;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.test.IndexSettingsModule;
import org.opensearch.test.VersionUtils;
diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotInfoTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotInfoTests.java
index d843912decf..1ef1d939ac4 100644
--- a/server/src/test/java/org/opensearch/snapshots/SnapshotInfoTests.java
+++ b/server/src/test/java/org/opensearch/snapshots/SnapshotInfoTests.java
@@ -96,7 +96,8 @@ public class SnapshotInfoTests extends AbstractWireSerializingTestCase<SnapshotI
instance.totalShards(), instance.shardFailures(), instance.includeGlobalState(), instance.userMetadata());
case 4:
return new SnapshotInfo(instance.snapshotId(), instance.indices(), instance.dataStreams(),
- instance.startTime(), instance.reason(), randomValueOtherThan(instance.endTime(), OpenSearchTestCase::randomNonNegativeLong),
+ instance.startTime(), instance.reason(), randomValueOtherThan(instance.endTime(),
+ OpenSearchTestCase::randomNonNegativeLong),
instance.totalShards(), instance.shardFailures(), instance.includeGlobalState(), instance.userMetadata());
case 5:
int totalShards = randomValueOtherThan(instance.totalShards(), () -> randomIntBetween(0, 100));
diff --git a/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepository.java b/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepository.java
index bc741ebeb2f..4e538950750 100644
--- a/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepository.java
+++ b/server/src/test/java/org/opensearch/snapshots/mockstore/MockEventuallyConsistentRepository.java
@@ -372,7 +372,8 @@ public class MockEventuallyConsistentRepository extends BlobStoreRepository {
}
} else {
if (hasConsistentContent) {
- OpenSearchTestCase.assertArrayEquals("Tried to overwrite blob [" + blobName + "]", relevantActions.get(0).data, data);
+ OpenSearchTestCase.assertArrayEquals(
+ "Tried to overwrite blob [" + blobName + "]", relevantActions.get(0).data, data);
return; // No need to add a write for this since we didn't change content
}
}
diff --git a/server/src/test/java/org/opensearch/test/search/aggregations/bucket/SharedSignificantTermsTestMethods.java b/server/src/test/java/org/opensearch/test/search/aggregations/bucket/SharedSignificantTermsTestMethods.java
index ad48ed2d371..aee817e537a 100644
--- a/server/src/test/java/org/opensearch/test/search/aggregations/bucket/SharedSignificantTermsTestMethods.java
+++ b/server/src/test/java/org/opensearch/test/search/aggregations/bucket/SharedSignificantTermsTestMethods.java
@@ -48,7 +48,8 @@ public class SharedSignificantTermsTestMethods {
public static final String TEXT_FIELD = "text";
public static final String CLASS_FIELD = "class";
- public static void aggregateAndCheckFromSeveralShards(OpenSearchIntegTestCase testCase) throws ExecutionException, InterruptedException {
+ public static void aggregateAndCheckFromSeveralShards(OpenSearchIntegTestCase testCase)
+ throws ExecutionException, InterruptedException {
String type = OpenSearchTestCase.randomBoolean() ? "text" : "keyword";
String settings = "{\"index.number_of_shards\": 7, \"index.number_of_routing_shards\": 7, \"index.number_of_replicas\": 0}";
index01Docs(type, settings, testCase);
@@ -76,7 +77,8 @@ public class SharedSignificantTermsTestMethods {
}
}
- public static void index01Docs(String type, String settings, OpenSearchIntegTestCase testCase) throws ExecutionException, InterruptedException {
+ public static void index01Docs(String type, String settings, OpenSearchIntegTestCase testCase)
+ throws ExecutionException, InterruptedException {
String textMappings = "type=" + type;
if (type.equals("text")) {
textMappings += ",fielddata=true";
diff --git a/server/src/test/java/org/opensearch/threadpool/UpdateThreadPoolSettingsTests.java b/server/src/test/java/org/opensearch/threadpool/UpdateThreadPoolSettingsTests.java
index 8df301101b8..b7df0a088b4 100644
--- a/server/src/test/java/org/opensearch/threadpool/UpdateThreadPoolSettingsTests.java
+++ b/server/src/test/java/org/opensearch/threadpool/UpdateThreadPoolSettingsTests.java
@@ -114,7 +114,8 @@ public class UpdateThreadPoolSettingsTests extends OpenSearchThreadPoolTestCase
assertThat(info(threadPool, threadPoolName).getMin(), equalTo(expectedSize));
assertThat(info(threadPool, threadPoolName).getMax(), equalTo(expectedSize));
// keep alive does not apply to fixed thread pools
- assertThat(((OpenSearchThreadPoolExecutor) threadPool.executor(threadPoolName)).getKeepAliveTime(TimeUnit.MINUTES), equalTo(0L));
+ assertThat(((OpenSearchThreadPoolExecutor) threadPool.executor(threadPoolName)).getKeepAliveTime(TimeUnit.MINUTES),
+ equalTo(0L));
} finally {
terminateThreadPoolIfNeeded(threadPool);
}
diff --git a/test/framework/src/main/java/org/opensearch/common/lucene/store/OpenSearchIndexInputTestCase.java b/test/framework/src/main/java/org/opensearch/common/lucene/store/OpenSearchIndexInputTestCase.java
index fec364ed517..e66adbf266f 100644
--- a/test/framework/src/main/java/org/opensearch/common/lucene/store/OpenSearchIndexInputTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/common/lucene/store/OpenSearchIndexInputTestCase.java
@@ -43,7 +43,8 @@ public class OpenSearchIndexInputTestCase extends OpenSearchTestCase {
@BeforeClass
public static void createExecutor() {
final String name = "TEST-" + getTestClass().getSimpleName() + "#randomReadAndSlice";
- executor = OpenSearchExecutors.newFixed(name, 10, 0, OpenSearchExecutors.daemonThreadFactory(name), new ThreadContext(Settings.EMPTY));
+ executor = OpenSearchExecutors.newFixed(
+ name, 10, 0, OpenSearchExecutors.daemonThreadFactory(name), new ThreadContext(Settings.EMPTY));
}
@AfterClass
diff --git a/test/framework/src/main/java/org/opensearch/index/replication/OpenSearchIndexLevelReplicationTestCase.java b/test/framework/src/main/java/org/opensearch/index/replication/OpenSearchIndexLevelReplicationTestCase.java
index cb0512da659..630c04f9f20 100644
--- a/test/framework/src/main/java/org/opensearch/index/replication/OpenSearchIndexLevelReplicationTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/index/replication/OpenSearchIndexLevelReplicationTestCase.java
@@ -422,8 +422,8 @@ public abstract class OpenSearchIndexLevelReplicationTestCase extends IndexShard
boolean markAsRecovering) throws IOException {
final IndexShardRoutingTable routingTable = routingTable(Function.identity());
final Set<String> inSyncIds = activeIds();
- OpenSearchIndexLevelReplicationTestCase.this.recoverUnstartedReplica(replica, primary, targetSupplier, markAsRecovering, inSyncIds,
- routingTable);
+ OpenSearchIndexLevelReplicationTestCase.this.recoverUnstartedReplica(
+ replica, primary, targetSupplier, markAsRecovering, inSyncIds, routingTable);
OpenSearchIndexLevelReplicationTestCase.this.startReplicaAfterRecovery(replica, primary, inSyncIds, routingTable);
computeReplicationTargets();
}
diff --git a/test/framework/src/main/java/org/opensearch/index/shard/IndexShardTestCase.java b/test/framework/src/main/java/org/opensearch/index/shard/IndexShardTestCase.java
index 7767dcb50f6..7b4df9a19d4 100644
--- a/test/framework/src/main/java/org/opensearch/index/shard/IndexShardTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/index/shard/IndexShardTestCase.java
@@ -814,7 +814,8 @@ public abstract class IndexShardTestCase extends OpenSearchTestCase {
final DiscoveryNode node = getFakeDiscoNode(shard.routingEntry().currentNodeId());
final RecoverySource.SnapshotRecoverySource recoverySource =
new RecoverySource.SnapshotRecoverySource(UUIDs.randomBase64UUID(), snapshot, version, indexId);
- final ShardRouting shardRouting = TestShardRouting.newShardRouting(shardId, node.getId(), true, ShardRoutingState.INITIALIZING, recoverySource);
+ final ShardRouting shardRouting =
+ TestShardRouting.newShardRouting(shardId, node.getId(), true, ShardRoutingState.INITIALIZING, recoverySource);
shard.markAsRecovering("from snapshot", new RecoveryState(shardRouting, node, null));
final PlainActionFuture<Void> future = PlainActionFuture.newFuture();
repository.restoreShard(shard.store(),
diff --git a/test/framework/src/main/java/org/opensearch/test/AbstractQueryTestCase.java b/test/framework/src/main/java/org/opensearch/test/AbstractQueryTestCase.java
index 620dc1819d8..69bb2a8d8ea 100644
--- a/test/framework/src/main/java/org/opensearch/test/AbstractQueryTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/test/AbstractQueryTestCase.java
@@ -71,7 +71,6 @@ import java.util.Map;
import java.util.Set;
import static org.opensearch.index.query.AbstractQueryBuilder.parseInnerQueryBuilder;
-import static org.opensearch.test.EqualsHashCodeTestUtils.checkEqualsAndHashCode;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.either;
diff --git a/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java b/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java
index 3ee6aeaac1d..64af06ff638 100644
--- a/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java
+++ b/test/framework/src/main/java/org/opensearch/test/InternalTestCluster.java
@@ -1720,7 +1720,8 @@ public final class InternalTestCluster extends TestCluster {
ensureOpen();
NodeAndClient nodeAndClient = getRandomNodeAndClient(nc -> filter.test(nc.node.settings()));
if (nodeAndClient != null) {
- if (nodePrefix.equals(OpenSearchIntegTestCase.SUITE_CLUSTER_NODE_PREFIX) && nodeAndClient.nodeAndClientId() < sharedNodesSeeds.length
+ if (nodePrefix.equals(OpenSearchIntegTestCase.SUITE_CLUSTER_NODE_PREFIX)
+ && nodeAndClient.nodeAndClientId() < sharedNodesSeeds.length
&& nodeAndClient.isMasterEligible()
&& autoManageMasterNodes
&& nodes.values().stream()
diff --git a/test/framework/src/main/java/org/opensearch/test/TestCluster.java b/test/framework/src/main/java/org/opensearch/test/TestCluster.java
index 0e542d1cc51..51d3e502d42 100644
--- a/test/framework/src/main/java/org/opensearch/test/TestCluster.java
+++ b/test/framework/src/main/java/org/opensearch/test/TestCluster.java
@@ -43,8 +43,6 @@ import java.net.InetSocketAddress;
import java.util.Random;
import java.util.Set;
-import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
-
/**
* Base test cluster that exposes the basis to run tests against any elasticsearch cluster, whose layout
* (e.g. number of nodes) is predefined and cannot be changed during the tests execution
diff --git a/test/framework/src/main/java/org/opensearch/test/disruption/NetworkDisruption.java b/test/framework/src/main/java/org/opensearch/test/disruption/NetworkDisruption.java
index bccac6613bd..7e8032ddd0b 100644
--- a/test/framework/src/main/java/org/opensearch/test/disruption/NetworkDisruption.java
+++ b/test/framework/src/main/java/org/opensearch/test/disruption/NetworkDisruption.java
@@ -23,6 +23,7 @@ import com.carrotsearch.randomizedtesting.generators.RandomPicks;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.opensearch.cluster.ClusterState;
+import org.opensearch.cluster.NodeConnectionsService;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.common.util.set.Sets;
diff --git a/test/framework/src/main/java/org/opensearch/test/junit/listeners/ReproduceInfoPrinter.java b/test/framework/src/main/java/org/opensearch/test/junit/listeners/ReproduceInfoPrinter.java
index 9c1c8736160..18c3479257a 100644
--- a/test/framework/src/main/java/org/opensearch/test/junit/listeners/ReproduceInfoPrinter.java
+++ b/test/framework/src/main/java/org/opensearch/test/junit/listeners/ReproduceInfoPrinter.java
@@ -176,7 +176,8 @@ public class ReproduceInfoPrinter extends RunListener {
}
public ReproduceErrorMessageBuilder appendClientYamlSuiteProperties() {
- return appendProperties(OpenSearchClientYamlSuiteTestCase.REST_TESTS_SUITE, OpenSearchClientYamlSuiteTestCase.REST_TESTS_BLACKLIST);
+ return appendProperties(OpenSearchClientYamlSuiteTestCase.REST_TESTS_SUITE,
+ OpenSearchClientYamlSuiteTestCase.REST_TESTS_BLACKLIST);
}
protected ReproduceErrorMessageBuilder appendProperties(String... properties) {
diff --git a/test/framework/src/main/java/org/opensearch/test/rest/OpenSearchRestTestCase.java b/test/framework/src/main/java/org/opensearch/test/rest/OpenSearchRestTestCase.java
index c5c66d12d07..0f08b907b18 100644
--- a/test/framework/src/main/java/org/opensearch/test/rest/OpenSearchRestTestCase.java
+++ b/test/framework/src/main/java/org/opensearch/test/rest/OpenSearchRestTestCase.java
@@ -357,8 +357,8 @@ public abstract class OpenSearchRestTestCase extends OpenSearchTestCase {
/**
* Wait for outstanding tasks to complete. The specified admin client is used to check the outstanding tasks and this is done using
- * {@link OpenSearchTestCase#assertBusy(CheckedRunnable)} to give a chance to any outstanding tasks to complete. The specified filter is used
- * to filter out outstanding tasks that are expected to be there.
+ * {@link OpenSearchTestCase#assertBusy(CheckedRunnable)} to give a chance to any outstanding tasks to complete. The specified
+ * filter is used to filter out outstanding tasks that are expected to be there.
*
* @param adminClient the admin client
* @param taskFilter predicate used to filter tasks that are expected to be there
diff --git a/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/MatchAssertion.java b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/MatchAssertion.java
index ebded1fb3f7..dd8f6930a92 100644
--- a/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/MatchAssertion.java
+++ b/test/framework/src/main/java/org/opensearch/test/rest/yaml/section/MatchAssertion.java
@@ -29,7 +29,6 @@ import org.opensearch.test.hamcrest.RegexMatcher;
import java.io.IOException;
import java.util.regex.Pattern;
-import static org.opensearch.test.hamcrest.RegexMatcher.matches;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
import static org.junit.Assert.assertNotNull;
diff --git a/test/framework/src/test/java/org/opensearch/cluster/coordination/MockSinglePrioritizingExecutorTests.java b/test/framework/src/test/java/org/opensearch/cluster/coordination/MockSinglePrioritizingExecutorTests.java
index 9930a7d42b1..2bd9069db80 100644
--- a/test/framework/src/test/java/org/opensearch/cluster/coordination/MockSinglePrioritizingExecutorTests.java
+++ b/test/framework/src/test/java/org/opensearch/cluster/coordination/MockSinglePrioritizingExecutorTests.java
@@ -29,7 +29,8 @@ public class MockSinglePrioritizingExecutorTests extends OpenSearchTestCase {
public void testPrioritizedEsThreadPoolExecutor() {
final DeterministicTaskQueue taskQueue = DeterministicTaskQueueTests.newTaskQueue();
- final PrioritizedOpenSearchThreadPoolExecutor executor = new MockSinglePrioritizingExecutor("test", taskQueue, taskQueue.getThreadPool());
+ final PrioritizedOpenSearchThreadPoolExecutor executor =
+ new MockSinglePrioritizingExecutor("test", taskQueue, taskQueue.getThreadPool());
final AtomicBoolean called1 = new AtomicBoolean();
final AtomicBoolean called2 = new AtomicBoolean();
executor.execute(new PrioritizedRunnable(Priority.NORMAL) {