-
Notifications
You must be signed in to change notification settings - Fork 24.4k
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
REST Client: NodeSelector for node attributes #31296
Merged
Merged
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
e384a0a
REST Client: NodeSelector for node attributes
nik9000 2bcdeeb
Docs
nik9000 85c7a9b
Statics
nik9000 c317348
Cleanup
nik9000 52d649b
More strict
nik9000 c4e3e3d
Merge branch 'master' into node_selector_attributes
nik9000 9ee1ad7
Merge branch 'master' into node_selector_attributes
nik9000 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
56 changes: 56 additions & 0 deletions
56
client/rest/src/main/java/org/elasticsearch/client/HasAttributeNodeSelector.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,56 @@ | ||
/* | ||
* 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; | ||
|
||
import java.util.Iterator; | ||
import java.util.List; | ||
import java.util.Map; | ||
|
||
/** | ||
* A {@link NodeSelector} that selects nodes that have a particular value | ||
* for an attribute. | ||
*/ | ||
public final class HasAttributeNodeSelector implements NodeSelector { | ||
private final String key; | ||
private final String value; | ||
|
||
public HasAttributeNodeSelector(String key, String value) { | ||
this.key = key; | ||
this.value = value; | ||
} | ||
|
||
@Override | ||
public void select(Iterable<Node> nodes) { | ||
Iterator<Node> itr = nodes.iterator(); | ||
while (itr.hasNext()) { | ||
Map<String, List<String>> allAttributes = itr.next().getAttributes(); | ||
if (allAttributes == null) continue; | ||
List<String> values = allAttributes.get(key); | ||
if (values == null || false == values.contains(value)) { | ||
itr.remove(); | ||
} | ||
} | ||
} | ||
|
||
@Override | ||
public String toString() { | ||
return key + "=" + value; | ||
} | ||
} |
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
client/rest/src/test/java/org/elasticsearch/client/HasAttributeNodeSelectorTests.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; | ||
|
||
import org.apache.http.HttpHost; | ||
import org.elasticsearch.client.Node.Roles; | ||
|
||
import java.util.ArrayList; | ||
import java.util.Arrays; | ||
import java.util.Collections; | ||
import java.util.List; | ||
import java.util.Map; | ||
|
||
import static java.util.Collections.singletonList; | ||
import static java.util.Collections.singletonMap; | ||
import static org.junit.Assert.assertEquals; | ||
|
||
public class HasAttributeNodeSelectorTests extends RestClientTestCase { | ||
public void testHasAttribute() { | ||
Node hasAttributeValue = dummyNode(singletonMap("attr", singletonList("val"))); | ||
Node hasAttributeButNotValue = dummyNode(singletonMap("attr", singletonList("notval"))); | ||
Node hasAttributeValueInList = dummyNode(singletonMap("attr", Arrays.asList("val", "notval"))); | ||
Node notHasAttribute = dummyNode(singletonMap("notattr", singletonList("val"))); | ||
List<Node> nodes = new ArrayList<>(); | ||
nodes.add(hasAttributeValue); | ||
nodes.add(hasAttributeButNotValue); | ||
nodes.add(hasAttributeValueInList); | ||
nodes.add(notHasAttribute); | ||
List<Node> expected = new ArrayList<>(); | ||
expected.add(hasAttributeValue); | ||
expected.add(hasAttributeValueInList); | ||
new HasAttributeNodeSelector("attr", "val").select(nodes); | ||
assertEquals(expected, nodes); | ||
} | ||
|
||
private Node dummyNode(Map<String, List<String>> attributes) { | ||
return new Node(new HttpHost("dummy"), Collections.<HttpHost>emptySet(), | ||
randomAsciiAlphanumOfLength(5), randomAsciiAlphanumOfLength(5), | ||
new Roles(randomBoolean(), randomBoolean(), randomBoolean()), | ||
attributes); | ||
} | ||
} |
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
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
Oops, something went wrong.
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.
static?
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.
Sure!