Skip to content

Commit 8ce31f6

Browse files
authored
[ILM] Convert Explain request to new HLRC classes (#34922)
1 parent d8322ca commit 8ce31f6

File tree

2 files changed

+41
-20
lines changed

2 files changed

+41
-20
lines changed

client/rest-high-level/src/main/java/org/elasticsearch/client/indexlifecycle/ExplainLifecycleRequest.java

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,51 @@
1919

2020
package org.elasticsearch.client.indexlifecycle;
2121

22-
import org.elasticsearch.action.ActionRequestValidationException;
23-
import org.elasticsearch.action.support.master.info.ClusterInfoRequest;
24-
import org.elasticsearch.common.io.stream.StreamInput;
22+
import org.elasticsearch.action.support.IndicesOptions;
23+
import org.elasticsearch.client.TimedRequest;
24+
import org.elasticsearch.client.ValidationException;
25+
import org.elasticsearch.common.Strings;
2526

26-
import java.io.IOException;
2727
import java.util.Arrays;
2828
import java.util.Objects;
29+
import java.util.Optional;
2930

3031
/**
3132
* The request object used by the Explain Lifecycle API.
3233
*
3334
* Multiple indices may be queried in the same request using the
3435
* {@link #indices(String...)} method
3536
*/
36-
public class ExplainLifecycleRequest extends ClusterInfoRequest<ExplainLifecycleRequest> {
37+
public class ExplainLifecycleRequest extends TimedRequest {
38+
39+
private String[] indices = Strings.EMPTY_ARRAY;
40+
private IndicesOptions indicesOptions = IndicesOptions.strictExpandOpen();
3741

3842
public ExplainLifecycleRequest() {
3943
super();
4044
}
4145

42-
public ExplainLifecycleRequest(StreamInput in) throws IOException {
43-
super(in);
46+
public ExplainLifecycleRequest indices(String... indices) {
47+
this.indices = indices;
48+
return this;
49+
}
50+
51+
public String[] indices() {
52+
return indices;
4453
}
4554

55+
public ExplainLifecycleRequest indicesOptions(IndicesOptions indicesOptions) {
56+
this.indicesOptions = indicesOptions;
57+
return this;
58+
}
59+
60+
public IndicesOptions indicesOptions() {
61+
return indicesOptions;
62+
}
63+
4664
@Override
47-
public ActionRequestValidationException validate() {
48-
return null;
65+
public Optional<ValidationException> validate() {
66+
return Optional.empty();
4967
}
5068

5169
@Override

client/rest-high-level/src/test/java/org/elasticsearch/client/indexlifecycle/ExplainLifecycleRequestTests.java

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,18 @@
2020
package org.elasticsearch.client.indexlifecycle;
2121

2222
import org.elasticsearch.action.support.IndicesOptions;
23-
import org.elasticsearch.common.io.stream.Writeable.Reader;
24-
import org.elasticsearch.test.AbstractWireSerializingTestCase;
23+
import org.elasticsearch.test.ESTestCase;
24+
import org.elasticsearch.test.EqualsHashCodeTestUtils;
2525

26-
import java.io.IOException;
2726
import java.util.Arrays;
2827

29-
public class ExplainLifecycleRequestTests extends AbstractWireSerializingTestCase<ExplainLifecycleRequest> {
28+
public class ExplainLifecycleRequestTests extends ESTestCase {
3029

31-
@Override
32-
protected ExplainLifecycleRequest createTestInstance() {
30+
public void testEqualsAndHashcode() {
31+
EqualsHashCodeTestUtils.checkEqualsAndHashCode(createTestInstance(), this::copy, this::mutateInstance);
32+
}
33+
34+
private ExplainLifecycleRequest createTestInstance() {
3335
ExplainLifecycleRequest request = new ExplainLifecycleRequest();
3436
if (randomBoolean()) {
3537
request.indices(generateRandomStringArray(20, 20, false, true));
@@ -42,8 +44,7 @@ protected ExplainLifecycleRequest createTestInstance() {
4244
return request;
4345
}
4446

45-
@Override
46-
protected ExplainLifecycleRequest mutateInstance(ExplainLifecycleRequest instance) throws IOException {
47+
private ExplainLifecycleRequest mutateInstance(ExplainLifecycleRequest instance) {
4748
String[] indices = instance.indices();
4849
IndicesOptions indicesOptions = instance.indicesOptions();
4950
switch (between(0, 1)) {
@@ -64,9 +65,11 @@ protected ExplainLifecycleRequest mutateInstance(ExplainLifecycleRequest instanc
6465
return newRequest;
6566
}
6667

67-
@Override
68-
protected Reader<ExplainLifecycleRequest> instanceReader() {
69-
return ExplainLifecycleRequest::new;
68+
private ExplainLifecycleRequest copy(ExplainLifecycleRequest original) {
69+
ExplainLifecycleRequest copy = new ExplainLifecycleRequest();
70+
copy.indices(original.indices());
71+
copy.indicesOptions(original.indicesOptions());
72+
return copy;
7073
}
7174

7275
}

0 commit comments

Comments
 (0)