testfix

wylgeek · Jun 12, 2016 · c2a27ef · c2a27ef
1 parent 9e6507a
commit c2a27ef
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/jest-common/src/test/java/io/searchbox/snapshot/CreateSnapshotRepositoryTest.java b/jest-common/src/test/java/io/searchbox/snapshot/CreateSnapshotRepositoryTest.java
@@ -1,6 +1,7 @@
 package io.searchbox.snapshot;
 
 import com.google.gson.Gson;
+import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.junit.Test;
 
@@ -15,14 +16,14 @@ public class CreateSnapshotRepositoryTest {
 
  @Test
  public void testBasicUriGeneration() {
- final Settings.Builder registerRepositorySettings = Settings.settingsBuilder();
- registerRepositorySettings.put("type", "fs");
- registerRepositorySettings.put("settings.compress", "true");
- registerRepositorySettings.put("settings.location", "/mount/backups/my_backup");
- registerRepositorySettings.put("settings.chunk_size", "10m");
- registerRepositorySettings.put("settings.max_restore_bytes_per_sec", "40mb");
- registerRepositorySettings.put("settings.max_snapshot_bytes_per_sec", "40mb");
- registerRepositorySettings.put("settings.readonly", "false");
+ final Settings.Builder registerRepositorySettings = ImmutableSettings.settingsBuilder()
+  .put("settings.chunk_size", "10m")
+  .put("settings.compress", "true")
+  .put("settings.location", "/mount/backups/my_backup")
+  .put("settings.max_restore_bytes_per_sec", "40mb")
+  .put("settings.max_snapshot_bytes_per_sec", "40mb")
+  .put("settings.readonly", "false")
+  .put("type", "fs");
 
  CreateSnapshotRepository createSnapshotRepository = new CreateSnapshotRepository.Builder(repository).settings(registerRepositorySettings.build().getAsMap()).build();
 

diff --git a/jest-common/src/test/java/io/searchbox/snapshot/CreateSnapshotTest.java b/jest-common/src/test/java/io/searchbox/snapshot/CreateSnapshotTest.java
@@ -1,6 +1,7 @@
 package io.searchbox.snapshot;
 
 import com.google.gson.Gson;
+import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.junit.Test;
 
@@ -24,10 +25,10 @@ public void testSnapshot() {
  @Test
  public void testSnapshotWithSettings() {
 
- final Settings.Builder registerRepositorySettings = Settings.settingsBuilder();
- registerRepositorySettings.put("indices", "index_1,index_2");
- registerRepositorySettings.put("ignore_unavailable", "true");
- registerRepositorySettings.put("include_global_state", "false");
+ final Settings.Builder registerRepositorySettings = ImmutableSettings.settingsBuilder()
+  .put("ignore_unavailable", "true")
+  .put("include_global_state", "false")
+  .put("indices", "index_1,index_2");
 
  CreateSnapshot createSnapshot = new CreateSnapshot.Builder(repository, snapshot)
  .settings(registerRepositorySettings.build().getAsMap())

diff --git a/jest-common/src/test/java/io/searchbox/snapshot/RestoreSnapshotTest.java b/jest-common/src/test/java/io/searchbox/snapshot/RestoreSnapshotTest.java
@@ -1,6 +1,7 @@
 package io.searchbox.snapshot;
 
 import com.google.gson.Gson;
+import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.junit.Test;
 
@@ -16,12 +17,12 @@ public class RestoreSnapshotTest {
 
  @Test
  public void testSnapshot() {
- final Settings.Builder registerRepositorySettings = Settings.settingsBuilder();
- registerRepositorySettings.put("indices", "index_1,index_2");
- registerRepositorySettings.put("ignore_unavailable", "true");
- registerRepositorySettings.put("include_global_state", "false");
- registerRepositorySettings.put("rename_pattern", "index_(.+)");
- registerRepositorySettings.put("rename_replacement", "restored_index_$1");
+ final Settings.Builder registerRepositorySettings = ImmutableSettings.settingsBuilder()
+  .put("ignore_unavailable", "true")
+  .put("include_global_state", "false")
+  .put("indices", "index_1,index_2")
+  .put("rename_pattern", "index_(.+)")
+  .put("rename_replacement", "restored_index_$1");
 
  RestoreSnapshot restoreSnapshot = new RestoreSnapshot.Builder(repository, snapshot)
  .settings(registerRepositorySettings.build().getAsMap()).build();