From 61535bd1b49ba27c5fd39dd47aa1eab252959157 Mon Sep 17 00:00:00 2001
From: Martijn van Groningen <martijn.v.groningen@gmail.com>
Date: Sun, 5 Jan 2014 23:11:34 +0100
Subject: [PATCH] Renamed old setIgnoreIndices to setIndicesOptions.

---
 .../alias/get/BaseAliasesRequestBuilder.java  |  7 ++++++-
 .../indices/IndicesOptionsTests.java          | 20 +++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/elasticsearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java b/src/main/java/org/elasticsearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java
index 4326549c838..e8a2e8726f0 100644
--- a/src/main/java/org/elasticsearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java
+++ b/src/main/java/org/elasticsearch/action/admin/indices/alias/get/BaseAliasesRequestBuilder.java
@@ -58,8 +58,13 @@ public abstract class BaseAliasesRequestBuilder<Response extends ActionResponse,
         return (Builder) this;
     }
 
+    /**
+     * Specifies what type of requested indices to ignore and wildcard indices expressions.
+     *
+     * For example indices that don't exist.
+     */
     @SuppressWarnings("unchecked")
-    public Builder setIgnoreIndices(IndicesOptions options) {
+    public Builder setIndicesOptions(IndicesOptions options) {
         request.indicesOptions(options);
         return (Builder) this;
     }
diff --git a/src/test/java/org/elasticsearch/indices/IndicesOptionsTests.java b/src/test/java/org/elasticsearch/indices/IndicesOptionsTests.java
index 18068e851ee..9b770799472 100644
--- a/src/test/java/org/elasticsearch/indices/IndicesOptionsTests.java
+++ b/src/test/java/org/elasticsearch/indices/IndicesOptionsTests.java
@@ -110,13 +110,13 @@ public class IndicesOptionsTests extends ElasticsearchIntegrationTest {
         verify(optimize("test1", "test2").setIndicesOptions(options), true);
         verify(refresh("test1", "test2").setIndicesOptions(options), true);
         verify(validateQuery("test1", "test2").setIndicesOptions(options), true);
-        verify(aliasExists("test1", "test2").setIgnoreIndices(options), true);
+        verify(aliasExists("test1", "test2").setIndicesOptions(options), true);
         verify(typesExists("test1", "test2").setIndicesOptions(options), true);
         verify(deleteByQuery("test1", "test2").setIndicesOptions(options), true);
         verify(percolate("test1", "test2").setIndicesOptions(options), true);
         verify(mpercolate(options, "test1", "test2").setIndicesOptions(options), true);
         verify(suggest("test1", "test2").setIndicesOptions(options), true);
-        verify(getAliases("test1", "test2").setIgnoreIndices(options), true);
+        verify(getAliases("test1", "test2").setIndicesOptions(options), true);
         verify(getFieldMapping("test1", "test2").setIndicesOptions(options), true);
         verify(getMapping("test1", "test2").setIndicesOptions(options), true);
         verify(getWarmer("test1", "test2").setIndicesOptions(options), true);
@@ -134,13 +134,13 @@ public class IndicesOptionsTests extends ElasticsearchIntegrationTest {
         verify(optimize("test1", "test2").setIndicesOptions(options), false);
         verify(refresh("test1", "test2").setIndicesOptions(options), false);
         verify(validateQuery("test1", "test2").setIndicesOptions(options), false);
-        verify(aliasExists("test1", "test2").setIgnoreIndices(options), false);
+        verify(aliasExists("test1", "test2").setIndicesOptions(options), false);
         verify(typesExists("test1", "test2").setIndicesOptions(options), false);
         verify(deleteByQuery("test1", "test2").setIndicesOptions(options), false);
         verify(percolate("test1", "test2").setIndicesOptions(options), false);
         verify(mpercolate(options, "test1", "test2").setIndicesOptions(options), false);
         verify(suggest("test1", "test2").setIndicesOptions(options), false);
-        verify(getAliases("test1", "test2").setIgnoreIndices(options), false);
+        verify(getAliases("test1", "test2").setIndicesOptions(options), false);
         verify(getFieldMapping("test1", "test2").setIndicesOptions(options), false);
         verify(getMapping("test1", "test2").setIndicesOptions(options), false);
         verify(getWarmer("test1", "test2").setIndicesOptions(options), false);
@@ -160,13 +160,13 @@ public class IndicesOptionsTests extends ElasticsearchIntegrationTest {
         verify(optimize("test1", "test2").setIndicesOptions(options), false);
         verify(refresh("test1", "test2").setIndicesOptions(options), false);
         verify(validateQuery("test1", "test2").setIndicesOptions(options), false);
-        verify(aliasExists("test1", "test2").setIgnoreIndices(options), false);
+        verify(aliasExists("test1", "test2").setIndicesOptions(options), false);
         verify(typesExists("test1", "test2").setIndicesOptions(options), false);
         verify(deleteByQuery("test1", "test2").setIndicesOptions(options), false);
         verify(percolate("test1", "test2").setIndicesOptions(options), false);
         verify(mpercolate(options, "test1", "test2").setIndicesOptions(options), false);
         verify(suggest("test1", "test2").setIndicesOptions(options), false);
-        verify(getAliases("test1", "test2").setIgnoreIndices(options), false);
+        verify(getAliases("test1", "test2").setIndicesOptions(options), false);
         verify(getFieldMapping("test1", "test2").setIndicesOptions(options), false);
         verify(getMapping("test1", "test2").setIndicesOptions(options), false);
         verify(getWarmer("test1", "test2").setIndicesOptions(options), false);
@@ -241,13 +241,13 @@ public class IndicesOptionsTests extends ElasticsearchIntegrationTest {
         verify(optimize(indices).setIndicesOptions(options), false);
         verify(refresh(indices).setIndicesOptions(options), false);
         verify(validateQuery(indices).setIndicesOptions(options), false);
-        verify(aliasExists(indices).setIgnoreIndices(options), false);
+        verify(aliasExists(indices).setIndicesOptions(options), false);
         verify(typesExists(indices).setIndicesOptions(options), false);
         verify(deleteByQuery(indices).setIndicesOptions(options), false);
         verify(percolate(indices).setIndicesOptions(options), false);
         verify(mpercolate(options, indices), false);
         verify(suggest(indices).setIndicesOptions(options), false);
-        verify(getAliases(indices).setIgnoreIndices(options), false);
+        verify(getAliases(indices).setIndicesOptions(options), false);
         verify(getFieldMapping(indices).setIndicesOptions(options), false);
         verify(getMapping(indices).setIndicesOptions(options), false);
         verify(getWarmer(indices).setIndicesOptions(options), false);
@@ -319,13 +319,13 @@ public class IndicesOptionsTests extends ElasticsearchIntegrationTest {
         verify(optimize(indices).setIndicesOptions(options), false);
         verify(refresh(indices).setIndicesOptions(options), false);
         verify(validateQuery(indices).setIndicesOptions(options), false);
-        verify(aliasExists(indices).setIgnoreIndices(options), false);
+        verify(aliasExists(indices).setIndicesOptions(options), false);
         verify(typesExists(indices).setIndicesOptions(options), false);
         verify(deleteByQuery(indices).setIndicesOptions(options), false);
         verify(percolate(indices).setIndicesOptions(options), false);
         verify(mpercolate(options, indices), false);
         verify(suggest(indices).setIndicesOptions(options), false);
-        verify(getAliases(indices).setIgnoreIndices(options), false);
+        verify(getAliases(indices).setIndicesOptions(options), false);
         verify(getFieldMapping(indices).setIndicesOptions(options), false);
         verify(getMapping(indices).setIndicesOptions(options), false);
         verify(getWarmer(indices).setIndicesOptions(options), false);