Remove duplicate methods from RemoteStoreBaseIntegTestCase (#13044)

Signed-off-by: Sachin Kale <kalsac@amazon.com>
(cherry picked from commit 17641f6)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreBaseIntegTestCase.java

@@ -28,7 +28,6 @@
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.UUIDs;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.core.common.unit.ByteSizeUnit;
 import org.opensearch.core.index.Index;
 import org.opensearch.index.IndexModule;
 import org.opensearch.index.IndexService;
@@ -57,11 +56,8 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
-import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_CLUSTER_STATE_REPOSITORY_NAME_ATTRIBUTE_KEY;
 import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_REPOSITORY_SETTINGS_ATTRIBUTE_KEY_PREFIX;
 import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_REPOSITORY_TYPE_ATTRIBUTE_KEY_FORMAT;
-import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_SEGMENT_REPOSITORY_NAME_ATTRIBUTE_KEY;
-import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_TRANSLOG_REPOSITORY_NAME_ATTRIBUTE_KEY;
 import static org.opensearch.repositories.fs.ReloadableFsRepository.REPOSITORIES_FAILRATE_SETTING;
 import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
 
@@ -191,121 +187,6 @@ protected BulkResponse indexBulk(String indexName, int numDocs) {
  return client().bulk(bulkRequest).actionGet();
  }
 
- public static Settings remoteStoreClusterSettings(String name, Path path) {
- return remoteStoreClusterSettings(name, path, name, path);
- }
-
- public static Settings remoteStoreClusterSettings(
- String segmentRepoName,
- Path segmentRepoPath,
- String segmentRepoType,
- String translogRepoName,
- Path translogRepoPath,
- String translogRepoType
- ) {
- Settings.Builder settingsBuilder = Settings.builder();
- settingsBuilder.put(
- buildRemoteStoreNodeAttributes(
- segmentRepoName,
- segmentRepoPath,
- segmentRepoType,
- translogRepoName,
- translogRepoPath,
- translogRepoType,
- false
- )
- );
- return settingsBuilder.build();
- }
-
- public static Settings remoteStoreClusterSettings(
- String segmentRepoName,
- Path segmentRepoPath,
- String translogRepoName,
- Path translogRepoPath
- ) {
- Settings.Builder settingsBuilder = Settings.builder();
- settingsBuilder.put(buildRemoteStoreNodeAttributes(segmentRepoName, segmentRepoPath, translogRepoName, translogRepoPath, false));
- return settingsBuilder.build();
- }
-
- public static Settings buildRemoteStoreNodeAttributes(
- String segmentRepoName,
- Path segmentRepoPath,
- String translogRepoName,
- Path translogRepoPath,
- boolean withRateLimiterAttributes
- ) {
- return buildRemoteStoreNodeAttributes(
- segmentRepoName,
- segmentRepoPath,
- ReloadableFsRepository.TYPE,
- translogRepoName,
- translogRepoPath,
- ReloadableFsRepository.TYPE,
- withRateLimiterAttributes
- );
- }
-
- public static Settings buildRemoteStoreNodeAttributes(
- String segmentRepoName,
- Path segmentRepoPath,
- String segmentRepoType,
- String translogRepoName,
- Path translogRepoPath,
- String translogRepoType,
- boolean withRateLimiterAttributes
- ) {
- String segmentRepoTypeAttributeKey = String.format(
- Locale.getDefault(),
- "node.attr." + REMOTE_STORE_REPOSITORY_TYPE_ATTRIBUTE_KEY_FORMAT,
- segmentRepoName
- );
- String segmentRepoSettingsAttributeKeyPrefix = String.format(
- Locale.getDefault(),
- "node.attr." + REMOTE_STORE_REPOSITORY_SETTINGS_ATTRIBUTE_KEY_PREFIX,
- segmentRepoName
- );
- String translogRepoTypeAttributeKey = String.format(
- Locale.getDefault(),
- "node.attr." + REMOTE_STORE_REPOSITORY_TYPE_ATTRIBUTE_KEY_FORMAT,
- translogRepoName
- );
- String translogRepoSettingsAttributeKeyPrefix = String.format(
- Locale.getDefault(),
- "node.attr." + REMOTE_STORE_REPOSITORY_SETTINGS_ATTRIBUTE_KEY_PREFIX,
- translogRepoName
- );
- String stateRepoTypeAttributeKey = String.format(
- Locale.getDefault(),
- "node.attr." + REMOTE_STORE_REPOSITORY_TYPE_ATTRIBUTE_KEY_FORMAT,
- segmentRepoName
- );
- String stateRepoSettingsAttributeKeyPrefix = String.format(
- Locale.getDefault(),
- "node.attr." + REMOTE_STORE_REPOSITORY_SETTINGS_ATTRIBUTE_KEY_PREFIX,
- segmentRepoName
- );
-
- Settings.Builder settings = Settings.builder()
- .put("node.attr." + REMOTE_STORE_SEGMENT_REPOSITORY_NAME_ATTRIBUTE_KEY, segmentRepoName)
- .put(segmentRepoTypeAttributeKey, segmentRepoType)
- .put(segmentRepoSettingsAttributeKeyPrefix + "location", segmentRepoPath)
- .put("node.attr." + REMOTE_STORE_TRANSLOG_REPOSITORY_NAME_ATTRIBUTE_KEY, translogRepoName)
- .put(translogRepoTypeAttributeKey, translogRepoType)
- .put(translogRepoSettingsAttributeKeyPrefix + "location", translogRepoPath)
- .put("node.attr." + REMOTE_STORE_CLUSTER_STATE_REPOSITORY_NAME_ATTRIBUTE_KEY, segmentRepoName)
- .put(stateRepoTypeAttributeKey, segmentRepoType)
- .put(stateRepoSettingsAttributeKeyPrefix + "location", segmentRepoPath);
-
- if (withRateLimiterAttributes) {
- settings.put(segmentRepoSettingsAttributeKeyPrefix + "compress", randomBoolean())
- .put(segmentRepoSettingsAttributeKeyPrefix + "chunk_size", 200, ByteSizeUnit.BYTES);
- }
-
- return settings.build();
- }
-
  Settings defaultIndexSettings() {
  return Settings.builder()
  .put(super.indexSettings())

test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java

@@ -2581,7 +2581,7 @@ public static Settings buildRemoteStoreNodeAttributes(
  );
  }
 
- public static Settings buildRemoteStoreNodeAttributes(
+ private static Settings buildRemoteStoreNodeAttributes(
  String segmentRepoName,
  Path segmentRepoPath,
  String segmentRepoType,