Absorb ImmutableSettings into Settings

Author: mikemccand

src/test/java/org/elasticsearch/cloud/aws/AbstractAwsTest.java

@@ -22,7 +22,6 @@
 import com.carrotsearch.randomizedtesting.annotations.TestGroup;
 
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.env.FailedToResolveConfigException;
@@ -79,7 +78,7 @@ public void restoreProperties() {
 
  @Override
  protected Settings nodeSettings(int nodeOrdinal) {
- ImmutableSettings.Builder settings = ImmutableSettings.builder()
+ Settings.Builder settings = Settings.builder()
  .put(super.nodeSettings(nodeOrdinal))
  .put("path.home", createTempDir())
  .put("plugins." + PluginsService.LOAD_PLUGIN_FROM_CLASSPATH, true)

src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryITest.java

@@ -27,7 +27,7 @@
 import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
 import org.junit.Test;
 
-import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
+import static org.elasticsearch.common.settings.Settings.settingsBuilder;
 
 /**
  * Just an empty Node Start test to check eveything if fine when

src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryUpdateSettingsITest.java

@@ -28,7 +28,7 @@
 import org.elasticsearch.test.ElasticsearchIntegrationTest.Scope;
 import org.junit.Test;
 
-import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilder;
+import static org.elasticsearch.common.settings.Settings.settingsBuilder;
 import static org.hamcrest.CoreMatchers.is;
 
 /**

src/test/java/org/elasticsearch/repositories/s3/AbstractS3SnapshotRestoreTest.java

@@ -32,7 +32,6 @@
 import org.elasticsearch.cloud.aws.AbstractAwsTest;
 import org.elasticsearch.cloud.aws.AwsS3Service;
 import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.plugins.PluginsService;
 import org.elasticsearch.repositories.RepositoryMissingException;
@@ -60,7 +59,7 @@ abstract public class AbstractS3SnapshotRestoreTest extends AbstractAwsTest {
  public Settings indexSettings() {
  // During restore we frequently restore index to exactly the same state it was before, that might cause the same
  // checksum file to be written twice during restore operation
- return ImmutableSettings.builder().put(super.indexSettings())
+ return Settings.builder().put(super.indexSettings())
  .put(MockFSDirectoryService.RANDOM_PREVENT_DOUBLE_WRITE, false)
  .put(MockFSDirectoryService.RANDOM_NO_DELETE_OPEN_FILE, false)
  .put("cloud.enabled", true)
@@ -88,7 +87,7 @@ public void testSimpleWorkflow() {
  Client client = client();
  logger.info("--> creating s3 repository with bucket[{}] and path [{}]", internalCluster().getInstance(Settings.class).get("repositories.s3.bucket"), basePath);
  PutRepositoryResponse putRepositoryResponse = client.admin().cluster().preparePutRepository("test-repo")
- .setType("s3").setSettings(ImmutableSettings.settingsBuilder()
+ .setType("s3").setSettings(Settings.settingsBuilder()
  .put("base_path", basePath)
  .put("chunk_size", randomIntBetween(1000, 10000))
  ).get();
@@ -160,7 +159,7 @@ public void testEncryption() {
  Client client = client();
  logger.info("--> creating s3 repository with bucket[{}] and path [{}]", internalCluster().getInstance(Settings.class).get("repositories.s3.bucket"), basePath);
  PutRepositoryResponse putRepositoryResponse = client.admin().cluster().preparePutRepository("test-repo")
- .setType("s3").setSettings(ImmutableSettings.settingsBuilder()
+ .setType("s3").setSettings(Settings.settingsBuilder()
  .put("base_path", basePath)
  .put("chunk_size", randomIntBetween(1000, 10000))
  .put("server_side_encryption", true)
@@ -254,7 +253,7 @@ public void assertRepositoryWithCustomCredentialsIsNotAccessibleByDefaultCredent
  Settings bucketSettings = internalCluster().getInstance(Settings.class).getByPrefix("repositories.s3.private-bucket.");
  logger.info("--> creating s3 repository with bucket[{}] and path [{}]", bucketSettings.get("bucket"), basePath);
  client.admin().cluster().preparePutRepository("test-repo")
- .setType("s3").setSettings(ImmutableSettings.settingsBuilder()
+ .setType("s3").setSettings(Settings.settingsBuilder()
  .put("base_path", basePath)
  .put("bucket", bucketSettings.get("bucket"))
  ).get();
@@ -267,7 +266,7 @@ public void testRepositoryWithCustomCredentials() {
  Settings bucketSettings = internalCluster().getInstance(Settings.class).getByPrefix("repositories.s3.private-bucket.");
  logger.info("--> creating s3 repository with bucket[{}] and path [{}]", bucketSettings.get("bucket"), basePath);
  PutRepositoryResponse putRepositoryResponse = client.admin().cluster().preparePutRepository("test-repo")
- .setType("s3").setSettings(ImmutableSettings.settingsBuilder()
+ .setType("s3").setSettings(Settings.settingsBuilder()
  .put("base_path", basePath)
  .put("region", bucketSettings.get("region"))
  .put("access_key", bucketSettings.get("access_key"))
@@ -285,7 +284,7 @@ public void testRepositoryWithCustomEndpointProtocol() {
  Settings bucketSettings = internalCluster().getInstance(Settings.class).getByPrefix("repositories.s3.external-bucket.");
  logger.info("--> creating s3 repostoriy with endpoint [{}], bucket[{}] and path [{}]", bucketSettings.get("endpoint"), bucketSettings.get("bucket"), basePath);
  PutRepositoryResponse putRepositoryResponse = client.admin().cluster().preparePutRepository("test-repo")
- .setType("s3").setSettings(ImmutableSettings.settingsBuilder()
+ .setType("s3").setSettings(Settings.settingsBuilder()
  .put("bucket", bucketSettings.get("bucket"))
  .put("endpoint", bucketSettings.get("endpoint"))
  .put("access_key", bucketSettings.get("access_key"))
@@ -306,7 +305,7 @@ public void assertRepositoryInRemoteRegionIsRemote() {
  Settings bucketSettings = internalCluster().getInstance(Settings.class).getByPrefix("repositories.s3.remote-bucket.");
  logger.info("--> creating s3 repository with bucket[{}] and path [{}]", bucketSettings.get("bucket"), basePath);
  client.admin().cluster().preparePutRepository("test-repo")
- .setType("s3").setSettings(ImmutableSettings.settingsBuilder()
+ .setType("s3").setSettings(Settings.settingsBuilder()
  .put("base_path", basePath)
  .put("bucket", bucketSettings.get("bucket"))
  // Below setting intentionally omitted to assert bucket is not available in default region.
@@ -323,7 +322,7 @@ public void testRepositoryInRemoteRegion() {
  Settings bucketSettings = settings.getByPrefix("repositories.s3.remote-bucket.");
  logger.info("--> creating s3 repository with bucket[{}] and path [{}]", bucketSettings.get("bucket"), basePath);
  PutRepositoryResponse putRepositoryResponse = client.admin().cluster().preparePutRepository("test-repo")
- .setType("s3").setSettings(ImmutableSettings.settingsBuilder()
+ .setType("s3").setSettings(Settings.settingsBuilder()
  .put("base_path", basePath)
  .put("bucket", bucketSettings.get("bucket"))
  .put("region", bucketSettings.get("region"))
@@ -341,7 +340,7 @@ public void testNonExistingRepo_86() {
  Client client = client();
  logger.info("--> creating s3 repository with bucket[{}] and path [{}]", internalCluster().getInstance(Settings.class).get("repositories.s3.bucket"), basePath);
  PutRepositoryResponse putRepositoryResponse = client.admin().cluster().preparePutRepository("test-repo")
- .setType("s3").setSettings(ImmutableSettings.settingsBuilder()
+ .setType("s3").setSettings(Settings.settingsBuilder()
  .put("base_path", basePath)
  ).get();
  assertThat(putRepositoryResponse.isAcknowledged(), equalTo(true));
@@ -363,7 +362,7 @@ public void testGetDeleteNonExistingSnapshot_86() {
  ClusterAdminClient client = client().admin().cluster();
  logger.info("--> creating s3 repository without any path");
  PutRepositoryResponse putRepositoryResponse = client.preparePutRepository("test-repo")
- .setType("s3").setSettings(ImmutableSettings.settingsBuilder()
+ .setType("s3").setSettings(Settings.settingsBuilder()
  .put("base_path", basePath)
  ).get();
  assertThat(putRepositoryResponse.isAcknowledged(), equalTo(true));

src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreOverHttpTest.java

@@ -19,15 +19,14 @@
 
 package org.elasticsearch.repositories.s3;
 
-import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.common.settings.Settings;
 
 /**
  */
 public class S3SnapshotRestoreOverHttpTest extends AbstractS3SnapshotRestoreTest {
  @Override
  public Settings nodeSettings(int nodeOrdinal) {
- ImmutableSettings.Builder settings = ImmutableSettings.builder()
+ Settings.Builder settings = Settings.builder()
  .put(super.nodeSettings(nodeOrdinal))
  .put("cloud.aws.s3.protocol", "http");
  return settings.build();

src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreOverHttpsTest.java

@@ -19,15 +19,14 @@
 
 package org.elasticsearch.repositories.s3;
 
-import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.common.settings.Settings;
 
 /**
  */
 public class S3SnapshotRestoreOverHttpsTest extends AbstractS3SnapshotRestoreTest {
  @Override
  public Settings nodeSettings(int nodeOrdinal) {
- ImmutableSettings.Builder settings = ImmutableSettings.builder()
+ Settings.Builder settings = Settings.builder()
  .put(super.nodeSettings(nodeOrdinal))
  .put("cloud.aws.s3.protocol", "https");
  return settings.build();