Skip to content

Commit 8fa2ccd

Browse files
committed
PR Fixes - Make the REST handler validation happy with the new params
1 parent c65a5fe commit 8fa2ccd

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

modules/streams/src/main/java/org/elasticsearch/rest/streams/logs/RestSetLogStreamsEnabledAction.java

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424

2525
@ServerlessScope(Scope.PUBLIC)
2626
public class RestSetLogStreamsEnabledAction extends BaseRestHandler {
27+
28+
public static final Set<String> SUPPORTED_PARAMS = Set.of(RestUtils.REST_MASTER_TIMEOUT_PARAM, RestUtils.REST_TIMEOUT_PARAM);
29+
2730
@Override
2831
public String getName() {
2932
return "streams_logs_set_enabled_action";
@@ -38,20 +41,23 @@ public List<Route> routes() {
3841
protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) {
3942
final boolean enabled = request.path().endsWith("_enable");
4043
assert enabled || request.path().endsWith("_disable");
44+
45+
LogsStreamsActivationToggleAction.Request activationRequest = new LogsStreamsActivationToggleAction.Request(
46+
RestUtils.getMasterNodeTimeout(request),
47+
RestUtils.getAckTimeout(request),
48+
enabled
49+
);
50+
4151
return restChannel -> client.execute(
4252
LogsStreamsActivationToggleAction.INSTANCE,
43-
new LogsStreamsActivationToggleAction.Request(
44-
RestUtils.getMasterNodeTimeout(request),
45-
RestUtils.getAckTimeout(request),
46-
enabled
47-
),
53+
activationRequest,
4854
new RestToXContentListener<>(restChannel)
4955
);
5056
}
5157

5258
@Override
5359
public Set<String> supportedQueryParameters() {
54-
return Set.of(RestUtils.REST_MASTER_TIMEOUT_PARAM, RestUtils.REST_TIMEOUT_PARAM);
60+
return SUPPORTED_PARAMS;
5561
}
5662

5763
}

modules/streams/src/main/java/org/elasticsearch/rest/streams/logs/RestStreamsStatusAction.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
@ServerlessScope(Scope.PUBLIC)
2828
public class RestStreamsStatusAction extends BaseRestHandler {
2929

30+
public static final Set<String> SUPPORTED_PARAMS = Collections.singleton(RestUtils.REST_MASTER_TIMEOUT_PARAM);
31+
3032
@Override
3133
public String getName() {
3234
return "streams_status_action";
@@ -39,15 +41,12 @@ public List<RestHandler.Route> routes() {
3941

4042
@Override
4143
protected BaseRestHandler.RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) {
42-
return restChannel -> client.execute(
43-
StreamsStatusAction.INSTANCE,
44-
new StreamsStatusAction.Request(RestUtils.getMasterNodeTimeout(request)),
45-
new RestToXContentListener<>(restChannel)
46-
);
44+
StreamsStatusAction.Request statusRequest = new StreamsStatusAction.Request(RestUtils.getMasterNodeTimeout(request));
45+
return restChannel -> client.execute(StreamsStatusAction.INSTANCE, statusRequest, new RestToXContentListener<>(restChannel));
4746
}
4847

4948
@Override
5049
public Set<String> supportedQueryParameters() {
51-
return Collections.singleton(RestUtils.REST_MASTER_TIMEOUT_PARAM);
50+
return SUPPORTED_PARAMS;
5251
}
5352
}

0 commit comments

Comments
 (0)