Skip to content

[ILM] Convert Explain request to new HLRC classes #34922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 26, 2018
Merged

[ILM] Convert Explain request to new HLRC classes #34922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 27 additions & 9 deletions ...-level/src/main/java/org/elasticsearch/client/indexlifecycle/ExplainLifecycleRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,33 +19,51 @@

package org.elasticsearch.client.indexlifecycle;

import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.support.master.info.ClusterInfoRequest;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.client.TimedRequest;
import org.elasticsearch.client.ValidationException;
import org.elasticsearch.common.Strings;

import java.io.IOException;
import java.util.Arrays;
import java.util.Objects;
import java.util.Optional;

/**
* The request object used by the Explain Lifecycle API.
*
* Multiple indices may be queried in the same request using the
* {@link #indices(String...)} method
*/
public class ExplainLifecycleRequest extends ClusterInfoRequest<ExplainLifecycleRequest> {
public class ExplainLifecycleRequest extends TimedRequest {

private String[] indices = Strings.EMPTY_ARRAY;
private IndicesOptions indicesOptions = IndicesOptions.strictExpandOpen();

public ExplainLifecycleRequest() {
super();
}

public ExplainLifecycleRequest(StreamInput in) throws IOException {
super(in);
public ExplainLifecycleRequest indices(String... indices) {
this.indices = indices;
return this;
}

public String[] indices() {
return indices;
}

public ExplainLifecycleRequest indicesOptions(IndicesOptions indicesOptions) {
this.indicesOptions = indicesOptions;
return this;
}

public IndicesOptions indicesOptions() {
return indicesOptions;
}

@Override
public ActionRequestValidationException validate() {
return null;
public Optional<ValidationException> validate() {
return Optional.empty();
}

@Override
Expand Down
25 changes: 14 additions & 11 deletions ...l/src/test/java/org/elasticsearch/client/indexlifecycle/ExplainLifecycleRequestTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,18 @@
package org.elasticsearch.client.indexlifecycle;

import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.common.io.stream.Writeable.Reader;
import org.elasticsearch.test.AbstractWireSerializingTestCase;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.test.EqualsHashCodeTestUtils;

import java.io.IOException;
import java.util.Arrays;

public class ExplainLifecycleRequestTests extends AbstractWireSerializingTestCase<ExplainLifecycleRequest> {
public class ExplainLifecycleRequestTests extends ESTestCase {

@Override
protected ExplainLifecycleRequest createTestInstance() {
public void testEqualsAndHashcode() {
EqualsHashCodeTestUtils.checkEqualsAndHashCode(createTestInstance(), this::copy, this::mutateInstance);
}

private ExplainLifecycleRequest createTestInstance() {
ExplainLifecycleRequest request = new ExplainLifecycleRequest();
if (randomBoolean()) {
request.indices(generateRandomStringArray(20, 20, false, true));
Expand All @@ -42,8 +44,7 @@ protected ExplainLifecycleRequest createTestInstance() {
return request;
}

@Override
protected ExplainLifecycleRequest mutateInstance(ExplainLifecycleRequest instance) throws IOException {
private ExplainLifecycleRequest mutateInstance(ExplainLifecycleRequest instance) {
String[] indices = instance.indices();
IndicesOptions indicesOptions = instance.indicesOptions();
switch (between(0, 1)) {
Expand All @@ -64,9 +65,11 @@ protected ExplainLifecycleRequest mutateInstance(ExplainLifecycleRequest instanc
return newRequest;
}

@Override
protected Reader<ExplainLifecycleRequest> instanceReader() {
return ExplainLifecycleRequest::new;
private ExplainLifecycleRequest copy(ExplainLifecycleRequest original) {
ExplainLifecycleRequest copy = new ExplainLifecycleRequest();
copy.indices(original.indices());
copy.indicesOptions(original.indicesOptions());
return copy;
}

}