|
19 | 19 |
|
20 | 20 | package org.elasticsearch.search.fetch.subphase;
|
21 | 21 |
|
22 |
| -import org.apache.logging.log4j.LogManager; |
23 | 22 | import org.elasticsearch.common.Booleans;
|
24 | 23 | import org.elasticsearch.common.ParseField;
|
25 | 24 | import org.elasticsearch.common.ParsingException;
|
26 | 25 | import org.elasticsearch.common.Strings;
|
27 | 26 | import org.elasticsearch.common.io.stream.StreamInput;
|
28 | 27 | import org.elasticsearch.common.io.stream.StreamOutput;
|
29 | 28 | import org.elasticsearch.common.io.stream.Writeable;
|
30 |
| -import org.elasticsearch.common.logging.DeprecationLogger; |
31 | 29 | import org.elasticsearch.common.xcontent.ToXContentObject;
|
32 | 30 | import org.elasticsearch.common.xcontent.XContentBuilder;
|
33 | 31 | import org.elasticsearch.common.xcontent.XContentParser;
|
|
46 | 44 | */
|
47 | 45 | public class FetchSourceContext implements Writeable, ToXContentObject {
|
48 | 46 |
|
49 |
| - private static final DeprecationLogger DEPRECATION_LOGGER = new DeprecationLogger(LogManager.getLogger(FetchSourceContext.class)); |
50 |
| - |
51 | 47 | public static final ParseField INCLUDES_FIELD = new ParseField("includes", "include");
|
52 | 48 | public static final ParseField EXCLUDES_FIELD = new ParseField("excludes", "exclude");
|
53 | 49 |
|
@@ -110,21 +106,11 @@ public static FetchSourceContext parseFromRestRequest(RestRequest request) {
|
110 | 106 | }
|
111 | 107 |
|
112 | 108 | String sIncludes = request.param("_source_includes");
|
113 |
| - String sInclude = request.param("_source_include"); |
114 |
| - if (sInclude != null) { |
115 |
| - DEPRECATION_LOGGER.deprecated("Deprecated parameter [_source_include] used, expected [_source_includes] instead"); |
116 |
| - sIncludes = sInclude; |
117 |
| - } |
118 | 109 | if (sIncludes != null) {
|
119 | 110 | sourceIncludes = Strings.splitStringByCommaToArray(sIncludes);
|
120 | 111 | }
|
121 | 112 |
|
122 | 113 | String sExcludes = request.param("_source_excludes");
|
123 |
| - String sExclude = request.param("_source_exclude"); |
124 |
| - if (sExclude != null) { |
125 |
| - DEPRECATION_LOGGER.deprecated("Deprecated parameter [_source_exclude] used, expected [_source_excludes] instead"); |
126 |
| - sExcludes = sExclude; |
127 |
| - } |
128 | 114 | if (sExcludes != null) {
|
129 | 115 | sourceExcludes = Strings.splitStringByCommaToArray(sExcludes);
|
130 | 116 | }
|
|
0 commit comments