Indices API: fixes GET Alias API backwards compatibility

For just the case when only the aliases are requested, the default indices options are to ignore missing indexes. When requesting any other feature or any combination of features, the default will be to error on missing indices.

Closes #7793

Author: colings86

docs/reference/indices/aliases.asciidoc

@@ -314,6 +314,9 @@ The rest endpoint is: `/{index}/_alias/{alias}`.
 
 coming[1.4.0.Beta1,The API will always include an `aliases` section, even if there aren't any aliases. Previous versions would not return the `aliases` section]
 
+WARNING: For future versions of Elasticsearch, the default <<multi-index>> options will error if a requested index is unavailable. This is to bring 
+this API in line with the other indices GET APIs
+
 [float]
 ==== Examples:
 

docs/reference/migration/migrate_1_4.asciidoc

@@ -32,7 +32,7 @@ Add or update a mapping via the <<indices-create-index,create index>> or
 [float]
 === Indices APIs
 
-The <<warmer-retrieving, get warmer api>> will return a section for `warmers` even if there are
+The <<warmer-retrieving, get warmer api>> will return a section for `warmers` even if there are 
 no warmers.  This ensures that the following two examples are equivalent:
 
 [source,js]
@@ -42,7 +42,7 @@ curl -XGET 'http://localhost:9200/_all/_warmers'
 curl -XGET 'http://localhost:9200/_warmers'
 --------------------------------------------------
 
-The <<alias-retrieving, get alias api>> will return a section for `aliases` even if there are
+The <<alias-retrieving, get alias api>> will return a section for `aliases` even if there are 
 no aliases.  This ensures that the following two examples are equivalent:
 
 [source,js]
@@ -52,10 +52,7 @@ curl -XGET 'http://localhost:9200/_all/_aliases'
 curl -XGET 'http://localhost:9200/_aliases'
 --------------------------------------------------
 
-In addition, the <<alias-retrieving, get alias api>> now supports <<multi-index>> options and, by default, will
-produce an error response if a requested index does not exist.
-
-The <<indices-get-mapping, get mapping api>> will return a section for `mappings` even if there are
+The <<indices-get-mapping, get mapping api>> will return a section for `mappings` even if there are 
 no mappings.  This ensures that the following two examples are equivalent:
 
 [source,js]

src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java

@@ -21,7 +21,9 @@
 
 import org.elasticsearch.ElasticsearchIllegalArgumentException;
 import org.elasticsearch.action.ActionRequestValidationException;
+import org.elasticsearch.action.support.IndicesOptions;
 import org.elasticsearch.action.support.master.info.ClusterInfoRequest;
+import org.elasticsearch.cluster.metadata.MetaData;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
@@ -33,6 +35,7 @@
 public class GetIndexRequest extends ClusterInfoRequest<GetIndexRequest> {
 
     private String[] features = new String[] { "_settings", "_warmers", "_mappings", "_aliases" };
+    private boolean indicesOptionsSet = false;
 
     public GetIndexRequest features(String[] features) {
         if (features == null) {
@@ -56,12 +59,44 @@ public ActionRequestValidationException validate() {
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
         features = in.readStringArray();
+        indicesOptionsSet = in.readBoolean();
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
         out.writeStringArray(features);
+        out.writeBoolean(indicesOptionsSet);
+    }
+
+    @Override
+    public GetIndexRequest indicesOptions(IndicesOptions indicesOptions) {
+        this.indicesOptionsSet = true;
+        return super.indicesOptions(indicesOptions);
+    }
+
+    @Override
+    public IndicesOptions indicesOptions() {
+        if (!indicesOptionsSet) {
+            indicesOptions(resolveIndicesOptions());
+        }
+        IndicesOptions indicesOptions = super.indicesOptions();
+        return indicesOptions;
+    }
+
+    private IndicesOptions resolveIndicesOptions() {
+        IndicesOptions defaultIndicesOptions = IndicesOptions.strictExpandOpen();
+        String[] indices = indices();
+        // This makes sure that the get aliases API behaves exactly like in previous versions wrt indices options iff only aliases are requested
+        if (features != null && features.length == 1 && features[0] != null && ("_alias".equals(features[0]) || "_aliases".equals(features[0]))) {
+            // If we are asking for all indices we need to return open and closed, if not we only expand to open
+            if (MetaData.isAllIndices(indices)) {
+                defaultIndicesOptions = IndicesOptions.fromOptions(true, true, true, true);
+            } else {
+                defaultIndicesOptions = IndicesOptions.lenientExpandOpen();
+            }
+        }
+        return defaultIndicesOptions;
     }
 
 }

src/main/java/org/elasticsearch/rest/action/admin/indices/get/RestGetIndicesAction.java

@@ -69,7 +69,10 @@ public void handleRequest(final RestRequest request, final RestChannel channel,
         if (features != null) {
             getIndexRequest.features(features);
         }
-        getIndexRequest.indicesOptions(IndicesOptions.fromRequest(request, getIndexRequest.indicesOptions()));
+        // The order of calls to the request is important here. We must set the indices and features before 
+        // we call getIndexRequest.indicesOptions(); or we might get the wrong default indices options
+        IndicesOptions defaultIndicesOptions = getIndexRequest.indicesOptions();
+        getIndexRequest.indicesOptions(IndicesOptions.fromRequest(request, defaultIndicesOptions));
         getIndexRequest.local(request.paramAsBoolean("local", getIndexRequest.local()));
         client.admin().indices().getIndex(getIndexRequest, new RestBuilderListener<GetIndexResponse>(channel) {
 

src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexTests.java

@@ -242,6 +242,58 @@ public void testEmptyMixedFeatures() {
         assertEmptyWarmers(response);
     }
 
+    @Test(expected=IndexMissingException.class)
+    public void testNotFoundMapping() {
+        client().admin().indices().prepareGetIndex().addIndices("non_existent_idx").setFeatures("_mapping").get();
+    }
+
+    @Test(expected=IndexMissingException.class)
+    public void testNotFoundMappings() {
+        client().admin().indices().prepareGetIndex().addIndices("non_existent_idx").setFeatures("_mappings").get();
+    }
+
+    @Test(expected=IndexMissingException.class)
+    public void testNotFoundSettings() {
+        client().admin().indices().prepareGetIndex().addIndices("non_existent_idx").setFeatures("_settings").get();
+    }
+
+    @Test(expected=IndexMissingException.class)
+    public void testNotFoundWarmer() {
+        client().admin().indices().prepareGetIndex().addIndices("non_existent_idx").setFeatures("_warmer").get();
+    }
+
+    @Test(expected=IndexMissingException.class)
+    public void testNotFoundWarmers() {
+        client().admin().indices().prepareGetIndex().addIndices("non_existent_idx").setFeatures("_warmers").get();
+    }
+
+    @Test
+    public void testNotFoundAlias() {
+        GetIndexResponse response = client().admin().indices().prepareGetIndex().addIndices("non_existent_idx").setFeatures("_alias").get();
+        String[] indices = response.indices();
+        assertThat(indices, notNullValue());
+        assertThat(indices.length, equalTo(0));
+    }
+
+    @Test(expected=IndexMissingException.class)
+    public void testNotFoundMixedFeatures() {
+        int numFeatures = randomIntBetween(2, allFeatures.length);
+        List<String> features = new ArrayList<String>(numFeatures);
+        for (int i = 0; i < numFeatures; i++) {
+            features.add(randomFrom(allFeatures));
+        }
+        client().admin().indices().prepareGetIndex().addIndices("non_existent_idx")
+                .setFeatures(features.toArray(new String[features.size()])).get();
+    }
+
+    @Test
+    public void testNotFoundAliases() {
+        GetIndexResponse response = client().admin().indices().prepareGetIndex().addIndices("non_existent_idx").setFeatures("_aliases").get();
+        String[] indices = response.indices();
+        assertThat(indices, notNullValue());
+        assertThat(indices.length, equalTo(0));
+    }
+
     private void assertWarmers(GetIndexResponse response, String indexName) {
         ImmutableOpenMap<String, ImmutableList<Entry>> warmers = response.warmers();
         assertThat(warmers, notNullValue());