Skip to content

Commit df2acb3

Browse files
javannajavanna
committed
Remove some more usages of ParseFieldMatcher in favour of using ParseField directly
Relates to #19552 Relates to #22130
1 parent 6c54cba commit df2acb3

File tree

24 files changed

+109
-109
lines changed

24 files changed

+109
-109
lines changed

‎core/src/main/java/org/elasticsearch/common/xcontent/ParseFieldRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public T lookupReturningNullIfNotFound(String name, ParseFieldMatcher parseField
103103
}
104104
ParseField parseField = parseFieldAndValue.v1();
105105
T value = parseFieldAndValue.v2();
106-
boolean match = parseFieldMatcher.match(name, parseField);
106+
boolean match = parseField.match(name);
107107
//this is always expected to match, ParseField is useful for deprecation warnings etc. here
108108
assert match : "ParseField did not match registered name [" + name + "][" + registryName + "]";
109109
return value;

‎core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -359,15 +359,15 @@ public static Item parse(XContentParser parser, ParseFieldMatcher parseFieldMatc
359359
if (token == XContentParser.Token.FIELD_NAME) {
360360
currentFieldName = parser.currentName();
361361
} else if (currentFieldName != null) {
362-
if (parseFieldMatcher.match(currentFieldName, Field.INDEX)) {
362+
if (Field.INDEX.match(currentFieldName)) {
363363
item.index = parser.text();
364-
} else if (parseFieldMatcher.match(currentFieldName, Field.TYPE)) {
364+
} else if (Field.TYPE.match(currentFieldName)) {
365365
item.type = parser.text();
366-
} else if (parseFieldMatcher.match(currentFieldName, Field.ID)) {
366+
} else if (Field.ID.match(currentFieldName)) {
367367
item.id = parser.text();
368-
} else if (parseFieldMatcher.match(currentFieldName, Field.DOC)) {
368+
} else if (Field.DOC.match(currentFieldName)) {
369369
item.doc = jsonBuilder().copyCurrentStructure(parser).bytes();
370-
} else if (parseFieldMatcher.match(currentFieldName, Field.FIELDS)) {
370+
} else if (Field.FIELDS.match(currentFieldName)) {
371371
if (token == XContentParser.Token.START_ARRAY) {
372372
List<String> fields = new ArrayList<>();
373373
while (parser.nextToken() != XContentParser.Token.END_ARRAY) {
@@ -378,7 +378,7 @@ public static Item parse(XContentParser parser, ParseFieldMatcher parseFieldMatc
378378
throw new ElasticsearchParseException(
379379
"failed to parse More Like This item. field [fields] must be an array");
380380
}
381-
} else if (parseFieldMatcher.match(currentFieldName, Field.PER_FIELD_ANALYZER)) {
381+
} else if (Field.PER_FIELD_ANALYZER.match(currentFieldName)) {
382382
item.perFieldAnalyzer(TermVectorsRequest.readPerFieldAnalyzer(parser.map()));
383383
} else if ("_routing".equals(currentFieldName) || "routing".equals(currentFieldName)) {
384384
item.routing = parser.text();

‎core/src/main/java/org/elasticsearch/index/query/QueryParseContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public XContentParser parser() {
5555
}
5656

5757
public boolean isDeprecatedSetting(String setting) {
58-
return this.parseFieldMatcher.match(setting, CACHE) || this.parseFieldMatcher.match(setting, CACHE_KEY);
58+
return this.CACHE.match(setting) || this.CACHE_KEY.match(setting);
5959
}
6060

6161
/**

‎core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -524,24 +524,24 @@ public static BlobStoreIndexShardSnapshot fromXContent(XContentParser parser) th
524524
String currentFieldName = parser.currentName();
525525
token = parser.nextToken();
526526
if (token.isValue()) {
527-
if (parseFieldMatcher.match(currentFieldName, PARSE_NAME)) {
527+
if (PARSE_NAME.match(currentFieldName)) {
528528
snapshot = parser.text();
529-
} else if (parseFieldMatcher.match(currentFieldName, PARSE_INDEX_VERSION)) {
529+
} else if (PARSE_INDEX_VERSION.match(currentFieldName)) {
530530
// The index-version is needed for backward compatibility with v 1.0
531531
indexVersion = parser.longValue();
532-
} else if (parseFieldMatcher.match(currentFieldName, PARSE_START_TIME)) {
532+
} else if (PARSE_START_TIME.match(currentFieldName)) {
533533
startTime = parser.longValue();
534-
} else if (parseFieldMatcher.match(currentFieldName, PARSE_TIME)) {
534+
} else if (PARSE_TIME.match(currentFieldName)) {
535535
time = parser.longValue();
536-
} else if (parseFieldMatcher.match(currentFieldName, PARSE_NUMBER_OF_FILES)) {
536+
} else if (PARSE_NUMBER_OF_FILES.match(currentFieldName)) {
537537
numberOfFiles = parser.intValue();
538-
} else if (parseFieldMatcher.match(currentFieldName, PARSE_TOTAL_SIZE)) {
538+
} else if (PARSE_TOTAL_SIZE.match(currentFieldName)) {
539539
totalSize = parser.longValue();
540540
} else {
541541
throw new ElasticsearchParseException("unknown parameter [{}]", currentFieldName);
542542
}
543543
} else if (token == XContentParser.Token.START_ARRAY) {
544-
if (parseFieldMatcher.match(currentFieldName, PARSE_FILES)) {
544+
if (PARSE_FILES.match(currentFieldName)) {
545545
while ((parser.nextToken()) != XContentParser.Token.END_ARRAY) {
546546
indexFiles.add(FileInfo.fromXContent(parser));
547547
}

‎core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshots.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,15 +245,15 @@ public static BlobStoreIndexShardSnapshots fromXContent(XContentParser parser) t
245245
String currentFieldName = parser.currentName();
246246
token = parser.nextToken();
247247
if (token == XContentParser.Token.START_ARRAY) {
248-
if (parseFieldMatcher.match(currentFieldName, ParseFields.FILES) == false) {
248+
if (ParseFields.FILES.match(currentFieldName) == false) {
249249
throw new ElasticsearchParseException("unknown array [{}]", currentFieldName);
250250
}
251251
while (parser.nextToken() != XContentParser.Token.END_ARRAY) {
252252
FileInfo fileInfo = FileInfo.fromXContent(parser);
253253
files.put(fileInfo.name(), fileInfo);
254254
}
255255
} else if (token == XContentParser.Token.START_OBJECT) {
256-
if (parseFieldMatcher.match(currentFieldName, ParseFields.SNAPSHOTS) == false) {
256+
if (ParseFields.SNAPSHOTS.match(currentFieldName) == false) {
257257
throw new ElasticsearchParseException("unknown object [{}]", currentFieldName);
258258
}
259259
while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
@@ -268,7 +268,7 @@ public static BlobStoreIndexShardSnapshots fromXContent(XContentParser parser) t
268268
if (token == XContentParser.Token.FIELD_NAME) {
269269
currentFieldName = parser.currentName();
270270
if (parser.nextToken() == XContentParser.Token.START_ARRAY) {
271-
if (parseFieldMatcher.match(currentFieldName, ParseFields.FILES) == false) {
271+
if (ParseFields.FILES.match(currentFieldName) == false) {
272272
throw new ElasticsearchParseException("unknown array [{}]", currentFieldName);
273273
}
274274
List<String> fileNames = new ArrayList<>();

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ static void buildFromContent(XContentParser parser, AnalyzeRequest analyzeReques
8383
while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
8484
if (token == XContentParser.Token.FIELD_NAME) {
8585
currentFieldName = parser.currentName();
86-
} else if (parseFieldMatcher.match(currentFieldName, Fields.TEXT) && token == XContentParser.Token.VALUE_STRING) {
86+
} else if (Fields.TEXT.match(currentFieldName) && token == XContentParser.Token.VALUE_STRING) {
8787
analyzeRequest.text(parser.text());
88-
} else if (parseFieldMatcher.match(currentFieldName, Fields.TEXT) && token == XContentParser.Token.START_ARRAY) {
88+
} else if (Fields.TEXT.match(currentFieldName) && token == XContentParser.Token.START_ARRAY) {
8989
List<String> texts = new ArrayList<>();
9090
while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) {
9191
if (token.isValue() == false) {
@@ -94,19 +94,19 @@ static void buildFromContent(XContentParser parser, AnalyzeRequest analyzeReques
9494
texts.add(parser.text());
9595
}
9696
analyzeRequest.text(texts.toArray(new String[texts.size()]));
97-
} else if (parseFieldMatcher.match(currentFieldName, Fields.ANALYZER) && token == XContentParser.Token.VALUE_STRING) {
97+
} else if (Fields.ANALYZER.match(currentFieldName) && token == XContentParser.Token.VALUE_STRING) {
9898
analyzeRequest.analyzer(parser.text());
99-
} else if (parseFieldMatcher.match(currentFieldName, Fields.FIELD) && token == XContentParser.Token.VALUE_STRING) {
99+
} else if (Fields.FIELD.match(currentFieldName) && token == XContentParser.Token.VALUE_STRING) {
100100
analyzeRequest.field(parser.text());
101-
} else if (parseFieldMatcher.match(currentFieldName, Fields.TOKENIZER)) {
101+
} else if (Fields.TOKENIZER.match(currentFieldName)) {
102102
if (token == XContentParser.Token.VALUE_STRING) {
103103
analyzeRequest.tokenizer(parser.text());
104104
} else if (token == XContentParser.Token.START_OBJECT) {
105105
analyzeRequest.tokenizer(parser.map());
106106
} else {
107107
throw new IllegalArgumentException(currentFieldName + " should be tokenizer's name or setting");
108108
}
109-
} else if (parseFieldMatcher.match(currentFieldName, Fields.TOKEN_FILTERS)
109+
} else if (Fields.TOKEN_FILTERS.match(currentFieldName)
110110
&& token == XContentParser.Token.START_ARRAY) {
111111
while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) {
112112
if (token == XContentParser.Token.VALUE_STRING) {
@@ -118,7 +118,7 @@ static void buildFromContent(XContentParser parser, AnalyzeRequest analyzeReques
118118
+ " array element should contain filter's name or setting");
119119
}
120120
}
121-
} else if (parseFieldMatcher.match(currentFieldName, Fields.CHAR_FILTERS)
121+
} else if (Fields.CHAR_FILTERS.match(currentFieldName)
122122
&& token == XContentParser.Token.START_ARRAY) {
123123
while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) {
124124
if (token == XContentParser.Token.VALUE_STRING) {
@@ -130,13 +130,13 @@ static void buildFromContent(XContentParser parser, AnalyzeRequest analyzeReques
130130
+ " array element should contain char filter's name or setting");
131131
}
132132
}
133-
} else if (parseFieldMatcher.match(currentFieldName, Fields.EXPLAIN)) {
133+
} else if (Fields.EXPLAIN.match(currentFieldName)) {
134134
if (parser.isBooleanValue()) {
135135
analyzeRequest.explain(parser.booleanValue());
136136
} else {
137137
throw new IllegalArgumentException(currentFieldName + " must be either 'true' or 'false'");
138138
}
139-
} else if (parseFieldMatcher.match(currentFieldName, Fields.ATTRIBUTES) && token == XContentParser.Token.START_ARRAY) {
139+
} else if (Fields.ATTRIBUTES.match(currentFieldName) && token == XContentParser.Token.START_ARRAY) {
140140
List<String> attributes = new ArrayList<>();
141141
while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) {
142142
if (token.isValue() == false) {

‎core/src/main/java/org/elasticsearch/search/aggregations/Aggregator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public ParseField parseField() {
132132
public static SubAggCollectionMode parse(String value, ParseFieldMatcher parseFieldMatcher) {
133133
SubAggCollectionMode[] modes = SubAggCollectionMode.values();
134134
for (SubAggCollectionMode mode : modes) {
135-
if (parseFieldMatcher.match(value, mode.parseField)) {
135+
if (mode.parseField.match(value)) {
136136
return mode;
137137
}
138138
}

‎core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,17 +134,17 @@ public static Range fromXContent(XContentParser parser, ParseFieldMatcher parseF
134134
if (token == XContentParser.Token.FIELD_NAME) {
135135
currentFieldName = parser.currentName();
136136
} else if (token == XContentParser.Token.VALUE_NUMBER) {
137-
if (parseFieldMatcher.match(currentFieldName, FROM_FIELD)) {
137+
if (FROM_FIELD.match(currentFieldName)) {
138138
from = parser.doubleValue();
139-
} else if (parseFieldMatcher.match(currentFieldName, TO_FIELD)) {
139+
} else if (TO_FIELD.match(currentFieldName)) {
140140
to = parser.doubleValue();
141141
}
142142
} else if (token == XContentParser.Token.VALUE_STRING) {
143-
if (parseFieldMatcher.match(currentFieldName, FROM_FIELD)) {
143+
if (FROM_FIELD.match(currentFieldName)) {
144144
fromAsStr = parser.text();
145-
} else if (parseFieldMatcher.match(currentFieldName, TO_FIELD)) {
145+
} else if (TO_FIELD.match(currentFieldName)) {
146146
toAsStr = parser.text();
147-
} else if (parseFieldMatcher.match(currentFieldName, KEY_FIELD)) {
147+
} else if (KEY_FIELD.match(currentFieldName)) {
148148
key = parser.text();
149149
}
150150
}

‎core/src/main/java/org/elasticsearch/search/aggregations/bucket/range/geodistance/GeoDistanceAggregationBuilder.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,17 +180,17 @@ private static Range parseRange(XContentParser parser, QueryParseContext context
180180
if (token == XContentParser.Token.FIELD_NAME) {
181181
toOrFromOrKey = parser.currentName();
182182
} else if (token == XContentParser.Token.VALUE_NUMBER) {
183-
if (parseFieldMatcher.match(toOrFromOrKey, Range.FROM_FIELD)) {
183+
if (Range.FROM_FIELD.match(toOrFromOrKey)) {
184184
from = parser.doubleValue();
185-
} else if (parseFieldMatcher.match(toOrFromOrKey, Range.TO_FIELD)) {
185+
} else if (Range.TO_FIELD.match(toOrFromOrKey)) {
186186
to = parser.doubleValue();
187187
}
188188
} else if (token == XContentParser.Token.VALUE_STRING) {
189-
if (parseFieldMatcher.match(toOrFromOrKey, Range.KEY_FIELD)) {
189+
if (Range.KEY_FIELD.match(toOrFromOrKey)) {
190190
key = parser.text();
191-
} else if (parseFieldMatcher.match(toOrFromOrKey, Range.FROM_FIELD)) {
191+
} else if (Range.FROM_FIELD.match(toOrFromOrKey)) {
192192
fromAsStr = parser.text();
193-
} else if (parseFieldMatcher.match(toOrFromOrKey, Range.TO_FIELD)) {
193+
} else if (Range.TO_FIELD.match(toOrFromOrKey)) {
194194
toAsStr = parser.text();
195195
}
196196
}

‎core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/SamplerAggregator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ boolean needsGlobalOrdinals() {
113113

114114
public static ExecutionMode fromString(String value, ParseFieldMatcher parseFieldMatcher) {
115115
for (ExecutionMode mode : values()) {
116-
if (parseFieldMatcher.match(value, mode.parseField)) {
116+
if (mode.parseField.match(value)) {
117117
return mode;
118118
}
119119
}

‎core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/SignificantTermsAggregatorFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ Aggregator create(String name, AggregatorFactories factories, ValuesSource value
291291

292292
public static ExecutionMode fromString(String value, ParseFieldMatcher parseFieldMatcher) {
293293
for (ExecutionMode mode : values()) {
294-
if (parseFieldMatcher.match(value, mode.parseField)) {
294+
if (mode.parseField.match(value)) {
295295
return mode;
296296
}
297297
}

‎core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregatorFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ boolean needsGlobalOrdinals() {
308308

309309
public static ExecutionMode fromString(String value, ParseFieldMatcher parseFieldMatcher) {
310310
for (ExecutionMode mode : values()) {
311-
if (parseFieldMatcher.match(value, mode.parseField)) {
311+
if (mode.parseField.match(value)) {
312312
return mode;
313313
}
314314
}

‎core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/support/IncludeExclude.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,11 @@ public static IncludeExclude parseInclude(XContentParser parser, QueryParseConte
112112
} else
113113
// This "include":{"pattern":"foo.*"} syntax is undocumented since 2.0
114114
// Regexes should be "include":"foo.*"
115-
if (parseFieldMatcher.match(currentFieldName, PATTERN_FIELD)) {
115+
if (PATTERN_FIELD.match(currentFieldName)) {
116116
return new IncludeExclude(parser.text(), null);
117-
} else if (parseFieldMatcher.match(currentFieldName, NUM_PARTITIONS_FIELD)) {
117+
} else if (NUM_PARTITIONS_FIELD.match(currentFieldName)) {
118118
numPartitions = parser.intValue();
119-
} else if (parseFieldMatcher.match(currentFieldName, PARTITION_FIELD)) {
119+
} else if (PARTITION_FIELD.match(currentFieldName)) {
120120
partition = parser.intValue();
121121
} else {
122122
throw new ElasticsearchParseException(

‎core/src/main/java/org/elasticsearch/search/aggregations/pipeline/movavg/models/HoltWintersModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public static SeasonalityType parse(String text, ParseFieldMatcher parseFieldMat
6969
}
7070
SeasonalityType result = null;
7171
for (SeasonalityType policy : values()) {
72-
if (parseFieldMatcher.match(text, policy.parseField)) {
72+
if (policy.parseField.match(text)) {
7373
result = policy;
7474
break;
7575
}

0 commit comments

Comments
 (0)