Merge pull request #19271 from LeeDr/fixStoredFieldsMessage

Lee Drengenberg · web-flow · commit dec620c0b082 · 2016-07-05T09:56:31.000-05:00
Fix stored_fields message 'is not longer supported'
diff --git a/core/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java b/core/src/main/java/org/elasticsearch/index/query/InnerHitBuilder.java
@@ -74,7 +74,7 @@ public final class InnerHitBuilder extends ToXContentToBytes implements Writeabl
         PARSER.declareStringArray(InnerHitBuilder::setStoredFieldNames, SearchSourceBuilder.STORED_FIELDS_FIELD);
         PARSER.declareField((p, i, c) -> {
             throw new ParsingException(p.getTokenLocation(), "The field [" +
-                SearchSourceBuilder.FIELDS_FIELD + "] is not longer supported, please use [" +
+                SearchSourceBuilder.FIELDS_FIELD + "] is no longer supported, please use [" +
                 SearchSourceBuilder.STORED_FIELDS_FIELD + "] to retrieve stored fields or _source filtering " +
                 "if the field is not stored");
         }, SearchSourceBuilder.FIELDS_FIELD, ObjectParser.ValueType.STRING_ARRAY);
diff --git a/core/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java b/core/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java
@@ -178,7 +178,7 @@ private static void parseSearchSource(final SearchSourceBuilder searchSourceBuil
 
         if (request.param("fields") != null) {
             throw new IllegalArgumentException("The parameter [" +
-                SearchSourceBuilder.FIELDS_FIELD + "] is not longer supported, please use [" +
+                SearchSourceBuilder.FIELDS_FIELD + "] is no longer supported, please use [" +
                 SearchSourceBuilder.STORED_FIELDS_FIELD + "] to retrieve stored fields or _source filtering " +
                 "if the field is not stored");
         }
diff --git a/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/core/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
@@ -1073,7 +1073,7 @@ public void parseXContent(QueryParseContext context, AggregatorParsers aggParser
                     searchAfterBuilder = SearchAfterBuilder.fromXContent(parser, context.getParseFieldMatcher());
                 } else if (context.getParseFieldMatcher().match(currentFieldName, FIELDS_FIELD)) {
                     throw new ParsingException(parser.getTokenLocation(), "The field [" +
-                        SearchSourceBuilder.FIELDS_FIELD + "] is not longer supported, please use [" +
+                        SearchSourceBuilder.FIELDS_FIELD + "] is no longer supported, please use [" +
                         SearchSourceBuilder.STORED_FIELDS_FIELD + "] to retrieve stored fields or _source filtering " +
                         "if the field is not stored");
                 } else {

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ private static void parseSearchSource(final SearchSourceBuilder searchSourceBuil`
`178`	`178`
`179`	`179`	`if (request.param("fields") != null) {`
`180`	`180`	`throw new IllegalArgumentException("The parameter [" +`
`181`		`- SearchSourceBuilder.FIELDS_FIELD + "] is not longer supported, please use [" +`
	`181`	`+ SearchSourceBuilder.FIELDS_FIELD + "] is no longer supported, please use [" +`
`182`	`182`	`SearchSourceBuilder.STORED_FIELDS_FIELD + "] to retrieve stored fields or _source filtering " +`
`183`	`183`	`"if the field is not stored");`
`184`	`184`	`}`