Skip to content

Commit 0f7d52d

Browse files
javannajavanna
authored
Remove some more ParseFieldMatcher usages (#22571)
1 parent 17342c4 commit 0f7d52d

File tree

29 files changed

+144
-205
lines changed

29 files changed

+144
-205
lines changed

‎core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainRequest.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import org.elasticsearch.action.support.master.MasterNodeRequest;
2626
import org.elasticsearch.common.Nullable;
2727
import org.elasticsearch.common.ParseField;
28-
import org.elasticsearch.common.ParseFieldMatcher;
29-
import org.elasticsearch.common.ParseFieldMatcherSupplier;
3028
import org.elasticsearch.common.io.stream.StreamInput;
3129
import org.elasticsearch.common.io.stream.StreamOutput;
3230
import org.elasticsearch.common.xcontent.ObjectParser;
@@ -41,8 +39,7 @@
4139
*/
4240
public class ClusterAllocationExplainRequest extends MasterNodeRequest<ClusterAllocationExplainRequest> {
4341

44-
private static ObjectParser<ClusterAllocationExplainRequest, ParseFieldMatcherSupplier> PARSER = new ObjectParser(
45-
"cluster/allocation/explain");
42+
private static ObjectParser<ClusterAllocationExplainRequest, Void> PARSER = new ObjectParser<>("cluster/allocation/explain");
4643
static {
4744
PARSER.declareString(ClusterAllocationExplainRequest::setIndex, new ParseField("index"));
4845
PARSER.declareInt(ClusterAllocationExplainRequest::setShard, new ParseField("shard"));
@@ -225,7 +222,7 @@ public String toString() {
225222
}
226223

227224
public static ClusterAllocationExplainRequest parse(XContentParser parser) throws IOException {
228-
ClusterAllocationExplainRequest req = PARSER.parse(parser, new ClusterAllocationExplainRequest(), () -> ParseFieldMatcher.STRICT);
225+
ClusterAllocationExplainRequest req = PARSER.parse(parser, new ClusterAllocationExplainRequest(), null);
229226
Exception e = req.validate();
230227
if (e != null) {
231228
throw new ElasticsearchParseException("'index', 'shard', and 'primary' must be specified in allocation explain request", e);

‎core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,17 @@
3131
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
3232
import org.elasticsearch.cluster.node.DiscoveryNode;
3333
import org.elasticsearch.cluster.service.ClusterService;
34-
import org.elasticsearch.common.ParseFieldMatcher;
3534
import org.elasticsearch.common.inject.Inject;
3635
import org.elasticsearch.common.settings.Settings;
3736
import org.elasticsearch.common.util.concurrent.AbstractRunnable;
3837
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
3938
import org.elasticsearch.common.xcontent.XContentHelper;
4039
import org.elasticsearch.common.xcontent.XContentParser;
4140
import org.elasticsearch.index.IndexNotFoundException;
42-
import org.elasticsearch.tasks.TaskResult;
4341
import org.elasticsearch.tasks.Task;
4442
import org.elasticsearch.tasks.TaskId;
4543
import org.elasticsearch.tasks.TaskInfo;
44+
import org.elasticsearch.tasks.TaskResult;
4645
import org.elasticsearch.tasks.TaskResultsService;
4746
import org.elasticsearch.threadpool.ThreadPool;
4847
import org.elasticsearch.transport.TransportException;
@@ -251,7 +250,7 @@ void onGetFinishedTaskFromIndex(GetResponse response, ActionListener<GetTaskResp
251250
return;
252251
}
253252
try (XContentParser parser = XContentHelper.createParser(xContentRegistry, response.getSourceAsBytesRef())) {
254-
TaskResult result = TaskResult.PARSER.apply(parser, () -> ParseFieldMatcher.STRICT);
253+
TaskResult result = TaskResult.PARSER.apply(parser, null);
255254
listener.onResponse(new GetTaskResponse(result));
256255
}
257256
}

‎core/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.elasticsearch.cluster.metadata.AliasMetaData;
3030
import org.elasticsearch.cluster.metadata.MetaData;
3131
import org.elasticsearch.common.ParseField;
32-
import org.elasticsearch.common.ParseFieldMatcherSupplier;
3332
import org.elasticsearch.common.ParsingException;
3433
import org.elasticsearch.common.Strings;
3534
import org.elasticsearch.common.collect.ImmutableOpenMap;
@@ -42,6 +41,7 @@
4241
import org.elasticsearch.common.xcontent.ToXContent;
4342
import org.elasticsearch.common.xcontent.XContentBuilder;
4443
import org.elasticsearch.common.xcontent.XContentFactory;
44+
import org.elasticsearch.common.xcontent.XContentParser;
4545
import org.elasticsearch.common.xcontent.XContentType;
4646
import org.elasticsearch.index.query.QueryBuilder;
4747

@@ -118,8 +118,8 @@ public static AliasActions remove() {
118118
public static AliasActions removeIndex() {
119119
return new AliasActions(AliasActions.Type.REMOVE_INDEX);
120120
}
121-
private static ObjectParser<AliasActions, ParseFieldMatcherSupplier> parser(String name, Supplier<AliasActions> supplier) {
122-
ObjectParser<AliasActions, ParseFieldMatcherSupplier> parser = new ObjectParser<>(name, supplier);
121+
private static ObjectParser<AliasActions, Void> parser(String name, Supplier<AliasActions> supplier) {
122+
ObjectParser<AliasActions, Void> parser = new ObjectParser<>(name, supplier);
123123
parser.declareString((action, index) -> {
124124
if (action.indices() != null) {
125125
throw new IllegalArgumentException("Only one of [index] and [indices] is supported");
@@ -147,7 +147,7 @@ private static ObjectParser<AliasActions, ParseFieldMatcherSupplier> parser(Stri
147147
return parser;
148148
}
149149

150-
private static final ObjectParser<AliasActions, ParseFieldMatcherSupplier> ADD_PARSER = parser("add", AliasActions::add);
150+
private static final ObjectParser<AliasActions, Void> ADD_PARSER = parser("add", AliasActions::add);
151151
static {
152152
ADD_PARSER.declareObject(AliasActions::filter, (parser, m) -> {
153153
try {
@@ -157,18 +157,17 @@ private static ObjectParser<AliasActions, ParseFieldMatcherSupplier> parser(Stri
157157
}
158158
}, new ParseField("filter"));
159159
// Since we need to support numbers AND strings here we have to use ValueType.INT.
160-
ADD_PARSER.declareField(AliasActions::routing, p -> p.text(), new ParseField("routing"), ValueType.INT);
161-
ADD_PARSER.declareField(AliasActions::indexRouting, p -> p.text(), new ParseField("index_routing"), ValueType.INT);
162-
ADD_PARSER.declareField(AliasActions::searchRouting, p -> p.text(), new ParseField("search_routing"), ValueType.INT);
160+
ADD_PARSER.declareField(AliasActions::routing, XContentParser::text, new ParseField("routing"), ValueType.INT);
161+
ADD_PARSER.declareField(AliasActions::indexRouting, XContentParser::text, new ParseField("index_routing"), ValueType.INT);
162+
ADD_PARSER.declareField(AliasActions::searchRouting, XContentParser::text, new ParseField("search_routing"), ValueType.INT);
163163
}
164-
private static final ObjectParser<AliasActions, ParseFieldMatcherSupplier> REMOVE_PARSER = parser("remove", AliasActions::remove);
165-
private static final ObjectParser<AliasActions, ParseFieldMatcherSupplier> REMOVE_INDEX_PARSER = parser("remove_index",
166-
AliasActions::removeIndex);
164+
private static final ObjectParser<AliasActions, Void> REMOVE_PARSER = parser("remove", AliasActions::remove);
165+
private static final ObjectParser<AliasActions, Void> REMOVE_INDEX_PARSER = parser("remove_index", AliasActions::removeIndex);
167166

168167
/**
169168
* Parser for any one {@link AliasAction}.
170169
*/
171-
public static final ConstructingObjectParser<AliasActions, ParseFieldMatcherSupplier> PARSER = new ConstructingObjectParser<>(
170+
public static final ConstructingObjectParser<AliasActions, Void> PARSER = new ConstructingObjectParser<>(
172171
"alias_action", a -> {
173172
// Take the first action and complain if there are more than one actions
174173
AliasActions action = null;

‎core/src/main/java/org/elasticsearch/action/admin/indices/rollover/Condition.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package org.elasticsearch.action.admin.indices.rollover;
2121

2222
import org.elasticsearch.common.ParseField;
23-
import org.elasticsearch.common.ParseFieldMatcherSupplier;
2423
import org.elasticsearch.common.io.stream.NamedWriteable;
2524
import org.elasticsearch.common.unit.TimeValue;
2625
import org.elasticsearch.common.xcontent.ObjectParser;
@@ -32,8 +31,7 @@
3231
*/
3332
public abstract class Condition<T> implements NamedWriteable {
3433

35-
public static ObjectParser<Set<Condition>, ParseFieldMatcherSupplier> PARSER =
36-
new ObjectParser<>("conditions", null);
34+
public static ObjectParser<Set<Condition>, Void> PARSER = new ObjectParser<>("conditions", null);
3735
static {
3836
PARSER.declareString((conditions, s) ->
3937
conditions.add(new MaxAgeCondition(TimeValue.parseTimeValue(s, MaxAgeCondition.NAME))),

‎core/src/main/java/org/elasticsearch/action/admin/indices/rollover/RolloverRequest.java‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.elasticsearch.action.support.IndicesOptions;
2626
import org.elasticsearch.action.support.master.AcknowledgedRequest;
2727
import org.elasticsearch.common.ParseField;
28-
import org.elasticsearch.common.ParseFieldMatcherSupplier;
2928
import org.elasticsearch.common.io.stream.StreamInput;
3029
import org.elasticsearch.common.io.stream.StreamOutput;
3130
import org.elasticsearch.common.unit.TimeValue;
@@ -44,23 +43,19 @@
4443
*/
4544
public class RolloverRequest extends AcknowledgedRequest<RolloverRequest> implements IndicesRequest {
4645

47-
public static final ObjectParser<RolloverRequest, ParseFieldMatcherSupplier> PARSER =
48-
new ObjectParser<>("conditions", null);
46+
public static final ObjectParser<RolloverRequest, Void> PARSER = new ObjectParser<>("conditions", null);
4947
static {
50-
PARSER.declareField((parser, request, parseFieldMatcherSupplier) ->
51-
Condition.PARSER.parse(parser, request.conditions, parseFieldMatcherSupplier),
48+
PARSER.declareField((parser, request, context) -> Condition.PARSER.parse(parser, request.conditions, null),
5249
new ParseField("conditions"), ObjectParser.ValueType.OBJECT);
53-
PARSER.declareField((parser, request, parseFieldMatcherSupplier) ->
54-
request.createIndexRequest.settings(parser.map()),
50+
PARSER.declareField((parser, request, context) -> request.createIndexRequest.settings(parser.map()),
5551
new ParseField("settings"), ObjectParser.ValueType.OBJECT);
56-
PARSER.declareField((parser, request, parseFieldMatcherSupplier) -> {
52+
PARSER.declareField((parser, request, context) -> {
5753
for (Map.Entry<String, Object> mappingsEntry : parser.map().entrySet()) {
5854
request.createIndexRequest.mapping(mappingsEntry.getKey(),
5955
(Map<String, Object>) mappingsEntry.getValue());
6056
}
6157
}, new ParseField("mappings"), ObjectParser.ValueType.OBJECT);
62-
PARSER.declareField((parser, request, parseFieldMatcherSupplier) ->
63-
request.createIndexRequest.aliases(parser.map()),
58+
PARSER.declareField((parser, request, context) -> request.createIndexRequest.aliases(parser.map()),
6459
new ParseField("aliases"), ObjectParser.ValueType.OBJECT);
6560
}
6661

‎core/src/main/java/org/elasticsearch/action/admin/indices/shrink/ShrinkRequest.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.elasticsearch.action.support.IndicesOptions;
2626
import org.elasticsearch.action.support.master.AcknowledgedRequest;
2727
import org.elasticsearch.common.ParseField;
28-
import org.elasticsearch.common.ParseFieldMatcherSupplier;
2928
import org.elasticsearch.common.io.stream.StreamInput;
3029
import org.elasticsearch.common.io.stream.StreamOutput;
3130
import org.elasticsearch.common.xcontent.ObjectParser;
@@ -40,14 +39,11 @@
4039
*/
4140
public class ShrinkRequest extends AcknowledgedRequest<ShrinkRequest> implements IndicesRequest {
4241

43-
public static final ObjectParser<ShrinkRequest, ParseFieldMatcherSupplier> PARSER =
44-
new ObjectParser<>("shrink_request", null);
42+
public static final ObjectParser<ShrinkRequest, Void> PARSER = new ObjectParser<>("shrink_request", null);
4543
static {
46-
PARSER.declareField((parser, request, parseFieldMatcherSupplier) ->
47-
request.getShrinkIndexRequest().settings(parser.map()),
44+
PARSER.declareField((parser, request, context) -> request.getShrinkIndexRequest().settings(parser.map()),
4845
new ParseField("settings"), ObjectParser.ValueType.OBJECT);
49-
PARSER.declareField((parser, request, parseFieldMatcherSupplier) ->
50-
request.getShrinkIndexRequest().aliases(parser.map()),
46+
PARSER.declareField((parser, request, context) -> request.getShrinkIndexRequest().aliases(parser.map()),
5147
new ParseField("aliases"), ObjectParser.ValueType.OBJECT);
5248
}
5349

‎core/src/main/java/org/elasticsearch/cluster/routing/AllocationId.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121

2222
import org.elasticsearch.common.Nullable;
2323
import org.elasticsearch.common.ParseField;
24-
import org.elasticsearch.common.ParseFieldMatcher;
25-
import org.elasticsearch.common.ParseFieldMatcherSupplier;
2624
import org.elasticsearch.common.UUIDs;
2725
import org.elasticsearch.common.io.stream.StreamInput;
2826
import org.elasticsearch.common.io.stream.StreamOutput;
@@ -48,7 +46,7 @@ public class AllocationId implements ToXContent, Writeable {
4846
private static final String ID_KEY = "id";
4947
private static final String RELOCATION_ID_KEY = "relocation_id";
5048

51-
private static final ObjectParser<AllocationId.Builder, ParseFieldMatcherSupplier> ALLOCATION_ID_PARSER = new ObjectParser<>(
49+
private static final ObjectParser<AllocationId.Builder, Void> ALLOCATION_ID_PARSER = new ObjectParser<>(
5250
"allocationId");
5351

5452
static {
@@ -203,6 +201,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
203201
}
204202

205203
public static AllocationId fromXContent(XContentParser parser) throws IOException {
206-
return ALLOCATION_ID_PARSER.parse(parser, new AllocationId.Builder(), () -> ParseFieldMatcher.STRICT).build();
204+
return ALLOCATION_ID_PARSER.parse(parser, new AllocationId.Builder(), null).build();
207205
}
208206
}

‎core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AbstractAllocateAllocationCommand.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.elasticsearch.cluster.routing.allocation.decider.Decision;
3131
import org.elasticsearch.common.Nullable;
3232
import org.elasticsearch.common.ParseField;
33-
import org.elasticsearch.common.ParseFieldMatcherSupplier;
3433
import org.elasticsearch.common.io.stream.StreamInput;
3534
import org.elasticsearch.common.io.stream.StreamOutput;
3635
import org.elasticsearch.common.xcontent.ObjectParser;
@@ -50,8 +49,8 @@ public abstract class AbstractAllocateAllocationCommand implements AllocationCom
5049
private static final String SHARD_FIELD = "shard";
5150
private static final String NODE_FIELD = "node";
5251

53-
protected static <T extends Builder<?>> ObjectParser<T, ParseFieldMatcherSupplier> createAllocateParser(String command) {
54-
ObjectParser<T, ParseFieldMatcherSupplier> parser = new ObjectParser<>(command);
52+
protected static <T extends Builder<?>> ObjectParser<T, Void> createAllocateParser(String command) {
53+
ObjectParser<T, Void> parser = new ObjectParser<>(command);
5554
parser.declareString(Builder::setIndex, new ParseField(INDEX_FIELD));
5655
parser.declareInt(Builder::setShard, new ParseField(SHARD_FIELD));
5756
parser.declareString(Builder::setNode, new ParseField(NODE_FIELD));

‎core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateEmptyPrimaryAllocationCommand.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
import org.elasticsearch.cluster.routing.allocation.RoutingAllocation;
3131
import org.elasticsearch.cluster.routing.allocation.decider.Decision;
3232
import org.elasticsearch.common.ParseField;
33-
import org.elasticsearch.common.ParseFieldMatcher;
34-
import org.elasticsearch.common.ParseFieldMatcherSupplier;
3533
import org.elasticsearch.common.io.stream.StreamInput;
3634
import org.elasticsearch.common.xcontent.ObjectParser;
3735
import org.elasticsearch.common.xcontent.XContentParser;
@@ -49,8 +47,7 @@ public class AllocateEmptyPrimaryAllocationCommand extends BasePrimaryAllocation
4947
public static final String NAME = "allocate_empty_primary";
5048
public static final ParseField COMMAND_NAME_FIELD = new ParseField(NAME);
5149

52-
private static final ObjectParser<Builder, ParseFieldMatcherSupplier> EMPTY_PRIMARY_PARSER = BasePrimaryAllocationCommand
53-
.createAllocatePrimaryParser(NAME);
50+
private static final ObjectParser<Builder, Void> EMPTY_PRIMARY_PARSER = BasePrimaryAllocationCommand.createAllocatePrimaryParser(NAME);
5451

5552
/**
5653
* Creates a new {@link AllocateEmptyPrimaryAllocationCommand}
@@ -83,7 +80,7 @@ public static class Builder extends BasePrimaryAllocationCommand.Builder<Allocat
8380

8481
@Override
8582
public Builder parse(XContentParser parser) throws IOException {
86-
return EMPTY_PRIMARY_PARSER.parse(parser, this, () -> ParseFieldMatcher.STRICT);
83+
return EMPTY_PRIMARY_PARSER.parse(parser, this, null);
8784
}
8885

8986
@Override

‎core/src/main/java/org/elasticsearch/cluster/routing/allocation/command/AllocateReplicaAllocationCommand.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
import org.elasticsearch.cluster.routing.allocation.RoutingAllocation;
2929
import org.elasticsearch.cluster.routing.allocation.decider.Decision;
3030
import org.elasticsearch.common.ParseField;
31-
import org.elasticsearch.common.ParseFieldMatcher;
32-
import org.elasticsearch.common.ParseFieldMatcherSupplier;
3331
import org.elasticsearch.common.io.stream.StreamInput;
3432
import org.elasticsearch.common.xcontent.ObjectParser;
3533
import org.elasticsearch.common.xcontent.XContentParser;
@@ -46,8 +44,7 @@ public class AllocateReplicaAllocationCommand extends AbstractAllocateAllocation
4644
public static final String NAME = "allocate_replica";
4745
public static final ParseField COMMAND_NAME_FIELD = new ParseField(NAME);
4846

49-
private static final ObjectParser<AllocateReplicaAllocationCommand.Builder, ParseFieldMatcherSupplier> REPLICA_PARSER =
50-
createAllocateParser(NAME);
47+
private static final ObjectParser<AllocateReplicaAllocationCommand.Builder, Void> REPLICA_PARSER = createAllocateParser(NAME);
5148

5249
/**
5350
* Creates a new {@link AllocateReplicaAllocationCommand}
@@ -80,7 +77,7 @@ protected static class Builder extends AbstractAllocateAllocationCommand.Builder
8077

8178
@Override
8279
public Builder parse(XContentParser parser) throws IOException {
83-
return REPLICA_PARSER.parse(parser, this, () -> ParseFieldMatcher.STRICT);
80+
return REPLICA_PARSER.parse(parser, this, null);
8481
}
8582

8683
@Override

0 commit comments

Comments
 (0)