Skip to content

[HLRC] Update Stop & Start ILM APIs to use Validatable #34242

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
gwbrown merged 3 commits into from
Oct 3, 2018
Merged

[HLRC] Update Stop & Start ILM APIs to use Validatable #34242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ee3190
HLRC: Update Start ILM API to use Validatable
gwbrown Oct 2, 2018
ba8d0a7
HLRC: Update Stop ILM API to use Validatable
gwbrown Oct 2, 2018
d364914
Merge branch 'index-lifecycle' into ilm/update-stop-start-api
gwbrown Oct 2, 2018
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
10 changes: 2 additions & 8 deletions ...est-high-level/src/main/java/org/elasticsearch/client/indexlifecycle/StartILMRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,13 @@

package org.elasticsearch.client.indexlifecycle;

import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.support.master.AcknowledgedRequest;
import org.elasticsearch.client.TimedRequest;

public class StartILMRequest extends AcknowledgedRequest<StartILMRequest> {
public class StartILMRequest extends TimedRequest {

public StartILMRequest() {
}

@Override
public ActionRequestValidationException validate() {
return null;
}

@Override
public int hashCode() {
return 64;
Expand Down
10 changes: 2 additions & 8 deletions ...rest-high-level/src/main/java/org/elasticsearch/client/indexlifecycle/StopILMRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,13 @@

package org.elasticsearch.client.indexlifecycle;

import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.support.master.AcknowledgedRequest;
import org.elasticsearch.client.TimedRequest;

public class StopILMRequest extends AcknowledgedRequest<StopILMRequest> {
public class StopILMRequest extends TimedRequest {

public StopILMRequest() {
}

@Override
public ActionRequestValidationException validate() {
return null;
}

@Override
public int hashCode() {
return 75;
Expand Down
8 changes: 4 additions & 4 deletions client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1520,8 +1520,8 @@ public void testSetIndexLifecyclePolicy() throws Exception {
public void testStartILM() throws Exception {
StartILMRequest req = new StartILMRequest();
Map<String, String> expectedParams = new HashMap<>();
setRandomMasterTimeout(req, expectedParams);
setRandomTimeout(req::timeout, AcknowledgedRequest.DEFAULT_ACK_TIMEOUT, expectedParams);
setRandomMasterTimeout(req::setMasterTimeout, StartILMRequest.DEFAULT_MASTER_TIMEOUT, expectedParams);
setRandomTimeoutTimeValue(req::setTimeout, StartILMRequest.DEFAULT_TIMEOUT, expectedParams);

Request request = RequestConverters.startILM(req);
assertThat(request.getMethod(), equalTo(HttpPost.METHOD_NAME));
Expand All @@ -1532,8 +1532,8 @@ public void testStartILM() throws Exception {
public void testStopILM() throws Exception {
StopILMRequest req = new StopILMRequest();
Map<String, String> expectedParams = new HashMap<>();
setRandomMasterTimeout(req, expectedParams);
setRandomTimeout(req::timeout, AcknowledgedRequest.DEFAULT_ACK_TIMEOUT, expectedParams);
setRandomMasterTimeout(req::setMasterTimeout, StopILMRequest.DEFAULT_MASTER_TIMEOUT, expectedParams);
setRandomTimeoutTimeValue(req::setTimeout, StopILMRequest.DEFAULT_TIMEOUT, expectedParams);

Request request = RequestConverters.stopILM(req);
assertThat(request.getMethod(), equalTo(HttpPost.METHOD_NAME));
Expand Down
17 changes: 8 additions & 9 deletions ...igh-level/src/test/java/org/elasticsearch/client/indexlifecycle/StartILMRequestTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,22 @@

package org.elasticsearch.client.indexlifecycle;

import org.elasticsearch.test.AbstractStreamableTestCase;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.test.EqualsHashCodeTestUtils;

public class StartILMRequestTests extends AbstractStreamableTestCase<StartILMRequest> {
public class StartILMRequestTests extends ESTestCase {

@Override
protected StartILMRequest createBlankInstance() {
return new StartILMRequest();
}

@Override
protected StartILMRequest createTestInstance() {
return new StartILMRequest();
}

public void testValidate() {
StartILMRequest request = createTestInstance();
assertNull(request.validate());
assertFalse(request.validate().isPresent());
}

public void testEqualsAndHashcode() {
EqualsHashCodeTestUtils.checkEqualsAndHashCode(createTestInstance(), (original) -> createTestInstance());
}

}
17 changes: 8 additions & 9 deletions ...high-level/src/test/java/org/elasticsearch/client/indexlifecycle/StopILMRequestTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,22 @@

package org.elasticsearch.client.indexlifecycle;

import org.elasticsearch.test.AbstractStreamableTestCase;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.test.EqualsHashCodeTestUtils;

public class StopILMRequestTests extends AbstractStreamableTestCase<StopILMRequest> {
public class StopILMRequestTests extends ESTestCase {

@Override
protected StopILMRequest createBlankInstance() {
return new StopILMRequest();
}

@Override
protected StopILMRequest createTestInstance() {
return new StopILMRequest();
}

public void testValidate() {
StopILMRequest request = createTestInstance();
assertNull(request.validate());
assertFalse(request.validate().isPresent());
}

public void testEqualsAndHashcode() {
EqualsHashCodeTestUtils.checkEqualsAndHashCode(createTestInstance(), (original) -> createTestInstance());
}

}