From e7863b929222c93c9163c6c509d8cb268f303f7a Mon Sep 17 00:00:00 2001 From: Rishikesh1159 Date: Sat, 20 Jan 2024 01:10:13 +0000 Subject: [PATCH] Resolve conflicts on PR. Signed-off-by: Rishikesh1159 --- .../java/org/opensearch/snapshots/SearchableSnapshotIT.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/server/src/internalClusterTest/java/org/opensearch/snapshots/SearchableSnapshotIT.java b/server/src/internalClusterTest/java/org/opensearch/snapshots/SearchableSnapshotIT.java index 2bcea7188bca6..9a92ddc81852a 100644 --- a/server/src/internalClusterTest/java/org/opensearch/snapshots/SearchableSnapshotIT.java +++ b/server/src/internalClusterTest/java/org/opensearch/snapshots/SearchableSnapshotIT.java @@ -53,7 +53,6 @@ import static org.opensearch.action.admin.cluster.node.stats.NodesStatsRequest.Metric.FS; import static org.opensearch.core.common.util.CollectionUtils.iterableAsArrayList; -import static org.opensearch.index.IndexModule.INDEX_STORE_TYPE_SETTING; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; @@ -347,7 +346,7 @@ private void createIndexWithDocsAndEnsureGreen(int numReplicasIndex, int numOfDo Settings.builder() .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, Integer.toString(numReplicasIndex)) .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, "1") - .put(INDEX_STORE_TYPE_SETTING.getKey(), IndexModule.Type.FS.getSettingsKey()) + .put(IndexModule.INDEX_STORE_TYPE_SETTING.getKey(), IndexModule.Type.FS.getSettingsKey()) .build() ); ensureGreen(); @@ -409,7 +408,7 @@ private void assertRemoteSnapshotIndexSettings(Client client, String... snapshot for (String snapshotIndexName : snapshotIndexNames) { assertEquals( IndexModule.Type.REMOTE_SNAPSHOT.getSettingsKey(), - settingsResponse.getSetting(snapshotIndexName, INDEX_STORE_TYPE_SETTING.getKey()) + settingsResponse.getSetting(snapshotIndexName, IndexModule.INDEX_STORE_TYPE_SETTING.getKey()) ); } }