Skip to content

Commit d181d1b

Browse files
lipsillnik9000
authored andcommitted
Remove deprecated url parameters _source_include and _source_exclude (#35097)
Removes `_source_include` and `_source_exclude` url parameters. These parameters have been deprecated in #33475. Closes #22792
1 parent f87a534 commit d181d1b

File tree

3 files changed

+5
-48
lines changed

3 files changed

+5
-48
lines changed

docs/reference/migration/migrate_7_0/api.asciidoc

+5
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,8 @@ status 200 - OK is now returned instead at all times.
102102
The Put User API response was changed in 6.5.0 to add the `created` field
103103
outside of the user object where it previously had been. In 7.0.0 the user
104104
object has been removed in favor of the top level `created` field.
105+
106+
[float]
107+
==== Source filtering url parameters `_source_include` and `_source_exclude` have been removed
108+
109+
The deprecated in 6.x url parameters are now removed. Use `_source_includes` and `_source_excludes` instead.

rest-api-spec/src/main/resources/rest-api-spec/test/get/70_source_filtering.yml

-34
Original file line numberDiff line numberDiff line change
@@ -70,37 +70,3 @@
7070
- match: { _id: "1" }
7171
- match: { fields.count: [1] }
7272
- match: { _source.include.field1: v1 }
73-
74-
---
75-
"Deprecated _source_include and _source_exclude":
76-
77-
- skip:
78-
version: " - 6.5.99"
79-
reason: _source_include and _source_exclude are deprecated from 6.6.0
80-
features: "warnings"
81-
82-
- do:
83-
indices.create:
84-
index: test_1
85-
body:
86-
mappings:
87-
_doc:
88-
properties:
89-
count:
90-
type: integer
91-
store: true
92-
93-
- do:
94-
index:
95-
index: test_1
96-
type: _doc
97-
id: 1
98-
body: { "include": { "field1": "v1", "field2": "v2" }, "count": 1 }
99-
- do:
100-
get: { index: test_1, type: _doc, id: 1, _source_include: include.field1 }
101-
warnings:
102-
- "Deprecated parameter [_source_include] used, expected [_source_includes] instead"
103-
- do:
104-
get: { index: test_1, type: _doc, id: 1, _source_includes: include, _source_exclude: "*.field2" }
105-
warnings:
106-
- "Deprecated parameter [_source_exclude] used, expected [_source_excludes] instead"

server/src/main/java/org/elasticsearch/search/fetch/subphase/FetchSourceContext.java

-14
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,13 @@
1919

2020
package org.elasticsearch.search.fetch.subphase;
2121

22-
import org.apache.logging.log4j.LogManager;
2322
import org.elasticsearch.common.Booleans;
2423
import org.elasticsearch.common.ParseField;
2524
import org.elasticsearch.common.ParsingException;
2625
import org.elasticsearch.common.Strings;
2726
import org.elasticsearch.common.io.stream.StreamInput;
2827
import org.elasticsearch.common.io.stream.StreamOutput;
2928
import org.elasticsearch.common.io.stream.Writeable;
30-
import org.elasticsearch.common.logging.DeprecationLogger;
3129
import org.elasticsearch.common.xcontent.ToXContentObject;
3230
import org.elasticsearch.common.xcontent.XContentBuilder;
3331
import org.elasticsearch.common.xcontent.XContentParser;
@@ -46,8 +44,6 @@
4644
*/
4745
public class FetchSourceContext implements Writeable, ToXContentObject {
4846

49-
private static final DeprecationLogger DEPRECATION_LOGGER = new DeprecationLogger(LogManager.getLogger(FetchSourceContext.class));
50-
5147
public static final ParseField INCLUDES_FIELD = new ParseField("includes", "include");
5248
public static final ParseField EXCLUDES_FIELD = new ParseField("excludes", "exclude");
5349

@@ -110,21 +106,11 @@ public static FetchSourceContext parseFromRestRequest(RestRequest request) {
110106
}
111107

112108
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-
}
118109
if (sIncludes != null) {
119110
sourceIncludes = Strings.splitStringByCommaToArray(sIncludes);
120111
}
121112

122113
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-
}
128114
if (sExcludes != null) {
129115
sourceExcludes = Strings.splitStringByCommaToArray(sExcludes);
130116
}

0 commit comments

Comments
 (0)