Include existing aliases

Author: jasontedor

core/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetAliasesAction.java

@@ -113,49 +113,41 @@ public RestResponse buildResponse(GetAliasesResponse response, XContentBuilder b
                 }
                 difference.removeAll(matches);
 
-                /*
-                 * At this point, differences contains any requested aliases (containing wildcards or not) that are not satisfied by any
-                 * existing aliases.
-                 */
-                if (!difference.isEmpty()) {
-                    final String message;
-                    if (difference.size() == 1) {
-                        message = String.format(Locale.ROOT, "alias [%s] missing", toNamesString(difference.iterator().next()));
-                    } else {
-                        message = String.format(Locale.ROOT, "aliases [%s] missing", toNamesString(difference.toArray(new String[0])));
-                    }
-                    builder.startObject();
-                    {
+                final RestStatus status;
+                builder.startObject();
+                {
+                    if (!difference.isEmpty()) {
+                        status = RestStatus.NOT_FOUND;
+                        final String message;
+                        if (difference.size() == 1) {
+                            message = String.format(Locale.ROOT, "alias [%s] missing", toNamesString(difference.iterator().next()));
+                        } else {
+                            message = String.format(Locale.ROOT, "aliases [%s] missing", toNamesString(difference.toArray(new String[0])));
+                        }
                         builder.field("error", message);
                         builder.field("status", RestStatus.NOT_FOUND.getStatus());
+                    } else {
+                        status = RestStatus.OK;
                     }
-                    builder.endObject();
-                    return new BytesRestResponse(RestStatus.NOT_FOUND, builder);
-                }
 
-                if (aliasMap.isEmpty()) {
-                    return new BytesRestResponse(OK, builder.startObject().endObject());
-                } else {
-                    builder.startObject();
-                    {
-                        for (final ObjectObjectCursor<String, List<AliasMetaData>> entry : response.getAliases()) {
-                            builder.startObject(entry.key);
+                    for (final ObjectObjectCursor<String, List<AliasMetaData>> entry : response.getAliases()) {
+                        builder.startObject(entry.key);
+                        {
+                            builder.startObject("aliases");
                             {
-                                builder.startObject("aliases");
-                                {
-                                    for (final AliasMetaData alias : entry.value) {
-                                        AliasMetaData.Builder.toXContent(alias, builder, ToXContent.EMPTY_PARAMS);
-                                    }
+                                for (final AliasMetaData alias : entry.value) {
+                                    AliasMetaData.Builder.toXContent(alias, builder, ToXContent.EMPTY_PARAMS);
                                 }
-                                builder.endObject();
                             }
                             builder.endObject();
                         }
+                        builder.endObject();
                     }
-                    builder.endObject();
-                    return new BytesRestResponse(OK, builder);
                 }
+                builder.endObject();
+                return new BytesRestResponse(status, builder);
             }
+
         });
     }
 

rest-api-spec/src/main/resources/rest-api-spec/test/indices.delete_alias/10_basic.yml

@@ -1,7 +1,7 @@
 ---
 "Basic test for delete alias":
   - skip:
-      version: " - 5.4.99"
+      version: " - 5.99.99"
       reason: Previous versions did not 404 on missing aliases
 
   - do:

rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_alias/10_basic.yml

@@ -167,7 +167,7 @@ setup:
 ---
 "Non-existent alias on an existing index returns 404":
   - skip:
-      version: " - 5.4.99"
+      version: " - 5.99.99"
       reason: Previous versions did not 404 on missing aliases
 
   - do:
@@ -180,9 +180,9 @@ setup:
   - match: { 'error': 'alias [non-existent] missing' }
 
 ---
-"Existent and non-existent alias returns 404":
+"Existent and non-existent alias returns 404 and the existing alias":
   - skip:
-      version: " - 5.4.99"
+      version: " - 5.99.99"
       reason: Previous versions did not 404 on missing aliases
 
   - do:
@@ -193,11 +193,12 @@ setup:
 
   - match: { 'status': 404 }
   - match: { 'error': 'alias [non-existent] missing' }
+  - match: { test_index.aliases.test_alias: { } }
 
 ---
-"Existent and non-existent aliases returns 404":
+"Existent and non-existent aliases returns 404 and the existing alias":
   - skip:
-      version: " - 5.4.99"
+      version: " - 5.99.99"
       reason: Previous versions did not 404 on missing aliases
 
   - do:
@@ -208,6 +209,7 @@ setup:
 
   - match: { 'status': 404 }
   - match: { 'error': 'aliases [another-non-existent,non-existent] missing' }
+  - match: { test_index.aliases.test_alias: { } }
 
 ---
 "Getting alias on an non-existent index should return 404":