-
Notifications
You must be signed in to change notification settings - Fork 24.3k
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.
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
HLRC: Add Lifecycle delete to the HLRC #33142
Merged
Merged
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
2085d31
HLRC: Add Lifecycle delete to the HLRC
gwbrown b3cd4c3
Add default to master timeout class
gwbrown 60eb043
Split up test case (#33142)
gwbrown 3f02774
Stronger validation for Delete request
gwbrown 7b14f1b
Rename delete request class
gwbrown 4c6a5c6
Merge branch 'index-lifecycle' into hlrc-delete
gwbrown 24c2f6a
Rename ILM client methods to match class name
gwbrown 5f8e8d0
Make test utility more flexible
gwbrown 6681ccc
Merge branch 'index-lifecycle' into hlrc-delete
gwbrown b65b83b
Change `lifecycle` to `lifecyclePolicy`
gwbrown 95dce78
Simplify validation test
gwbrown File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
...l/src/main/java/org/elasticsearch/client/indexlifecycle/DeleteLifecyclePolicyRequest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
package org.elasticsearch.client.indexlifecycle; | ||
|
||
import org.elasticsearch.client.TimedRequest; | ||
import org.elasticsearch.common.Strings; | ||
|
||
import java.util.Objects; | ||
|
||
public class DeleteLifecyclePolicyRequest extends TimedRequest { | ||
|
||
private final String lifecycle; | ||
|
||
public DeleteLifecyclePolicyRequest(String lifecycle) { | ||
if (Strings.isNullOrEmpty(lifecycle)) { | ||
throw new IllegalArgumentException("lifecycle name must be present"); | ||
} | ||
this.lifecycle = lifecycle; | ||
} | ||
|
||
public String getLifecycle() { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you also rename these |
||
return lifecycle; | ||
} | ||
|
||
|
||
@Override | ||
public boolean equals(Object o) { | ||
if (this == o) { | ||
return true; | ||
} | ||
if (o == null || getClass() != o.getClass()) { | ||
return false; | ||
} | ||
DeleteLifecyclePolicyRequest that = (DeleteLifecyclePolicyRequest) o; | ||
return Objects.equals(getLifecycle(), that.getLifecycle()); | ||
} | ||
|
||
@Override | ||
public int hashCode() { | ||
return Objects.hash(getLifecycle()); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
.../test/java/org/elasticsearch/client/indexlifecycle/DeleteLifecyclePolicyRequestTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
/* | ||
* Licensed to Elasticsearch under one or more contributor | ||
* license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright | ||
* ownership. Elasticsearch licenses this file to you under | ||
* the Apache License, Version 2.0 (the "License"); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
|
||
package org.elasticsearch.client.indexlifecycle; | ||
|
||
import org.elasticsearch.test.ESTestCase; | ||
|
||
public class DeleteLifecyclePolicyRequestTests extends ESTestCase { | ||
|
||
private DeleteLifecyclePolicyRequest createTestInstance() { | ||
return new DeleteLifecyclePolicyRequest(randomAlphaOfLengthBetween(2, 20)); | ||
} | ||
|
||
public void testValidate() { | ||
DeleteLifecyclePolicyRequest req = createTestInstance(); | ||
assertFalse(req.validate().isPresent()); | ||
|
||
} | ||
|
||
public void testValidationFailure() { | ||
try { | ||
DeleteLifecyclePolicyRequest req = new DeleteLifecyclePolicyRequest(randomFrom("", null)); | ||
fail("should not be able to create a DeleteLifecyclePolicyRequest with null lifecycle name"); | ||
} catch (IllegalArgumentException exception) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For the future, you can use expectThrows(IllegalArgumentException.class, () -> new DeleteLifecyclePolicyRequest(randomFrom("", null))); Instead of having to do the try/fail/catch check |
||
// ok | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rename to
deleteLifecyclePolicy
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep, +1 to rename this
deleteLifecyclePolicy