Skip to content

Commit cc2af67

Browse files
committed
Remove special-case when no fields are found
1 parent 0e910dc commit cc2af67

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

rest-api-spec/src/main/resources/rest-api-spec/test/indices.get_field_mapping/20_missing_field.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
index: test_index
1717
fields: not_existent
1818

19-
- match: { '': {}}
19+
- match: { 'test_index.mappings': {}}

server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetFieldMappingAction.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
6767
@Override
6868
public RestResponse buildResponse(GetFieldMappingsResponse response, XContentBuilder builder) throws Exception {
6969
Map<String, Map<String, FieldMappingMetaData>> mappingsByIndex = response.mappings();
70-
71-
boolean isPossibleSingleFieldRequest = indices.length == 1 && fields.length == 1;
72-
if (isPossibleSingleFieldRequest && isFieldMappingMissingField(mappingsByIndex)) {
73-
return new BytesRestResponse(OK, builder.startObject().endObject());
74-
}
75-
70+
7671
RestStatus status = OK;
7772
if (mappingsByIndex.isEmpty() && fields.length > 0) {
7873
status = NOT_FOUND;

0 commit comments

Comments
 (0)