Skip to content

Add UnknownRole#equals, hashCode, toString #43227

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

Closed
wants to merge 2 commits into from
Closed

Add UnknownRole#equals, hashCode, toString #43227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d66524a
Add UnknownRole#equals, hashCode, toString
DaveCTurner Jun 14, 2019
0b45894
Decruftify
DaveCTurner Jun 14, 2019
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
21 changes: 21 additions & 0 deletions server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNodeRole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,27 @@ protected Setting<Boolean> roleSetting() {
return Setting.boolSetting("node. " + roleName(), false, Setting.Property.NodeScope);
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
UnknownRole that = (UnknownRole) o;
return Objects.equals(roleName(), that.roleName()) &&
Objects.equals(roleNameAbbreviation(), that.roleNameAbbreviation());
}

@Override
public int hashCode() {
return Objects.hash(roleName(), roleNameAbbreviation());
}

@Override
public String toString() {
return "UnknownRole{" +
"roleName='" + roleName() + '\'' +
", roleAbbreviation='" + roleNameAbbreviation() + '\'' +
'}';
}
Copy link
Member

@jasontedor jasontedor Jun 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these can all go in the base class, as final, with adding getClass() to the toString implementation?

}

}
12 changes: 12 additions & 0 deletions server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeRoleTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.test.EqualsHashCodeTestUtils;

import java.util.Set;

Expand Down Expand Up @@ -75,4 +76,15 @@ protected Setting<Boolean> roleSetting() {
assertThat(e, hasToString(containsString("Duplicate key")));
}

public void testUnknownDiscoveryNodeRoleEqualsHashCode() {
EqualsHashCodeTestUtils.checkEqualsAndHashCode(new DiscoveryNodeRole.UnknownRole(randomAlphaOfLength(10), randomAlphaOfLength(1)),
r -> new DiscoveryNodeRole.UnknownRole(r.roleName(), r.roleNameAbbreviation()),
r -> {
if (randomBoolean()) {
return new DiscoveryNodeRole.UnknownRole(randomAlphaOfLength(21 - r.roleName().length()), r.roleNameAbbreviation());
} else {
return new DiscoveryNodeRole.UnknownRole(r.roleName(), randomAlphaOfLength(3 - r.roleNameAbbreviation().length()));
}
});
}
}