Skip to content

REST high-level client: add support for Indices Update Settings API [take 2] #29327

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 6 commits into from
Apr 16, 2018
Merged

REST high-level client: add support for Indices Update Settings API [take 2] #29327

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
749642d
REST high-level client: add support for Indices Update Settings API
olcbean Mar 31, 2018
e635d82
reverting the equals for MasterNodeRequest ( preventing an x-pack tes…
olcbean Mar 31, 2018
b88d13c
revert equals/hashCode for AcknowledgedRequest
olcbean Apr 3, 2018
76fa596
equals / hashCode over all request fields
olcbean Apr 5, 2018
a5ab05d
Merge branch 'master' into hlrc_update_index_settings_take2
javanna Apr 5, 2018
60e34ab
Merge branch 'master' into hlrc_update_index_settings_take2
javanna Apr 16, 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
19 changes: 11 additions & 8 deletions .../main/java/org/elasticsearch/action/admin/indices/settings/put/UpdateSettingsRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,19 +239,22 @@ public String toString() {

@Override
public boolean equals(Object o) {
if (super.equals(o)) {
UpdateSettingsRequest that = (UpdateSettingsRequest) o;
return Objects.equals(settings, that.settings)
&& Objects.equals(indicesOptions, that.indicesOptions)
&& Objects.equals(preserveExisting, that.preserveExisting)
&& Arrays.equals(indices, that.indices);
if (this == o) {
return true;
}
return false;
if (o == null || getClass() != o.getClass()) {
return false;
}
UpdateSettingsRequest that = (UpdateSettingsRequest) o;
return Objects.equals(settings, that.settings)
&& Objects.equals(indicesOptions, that.indicesOptions)
&& Objects.equals(preserveExisting, that.preserveExisting)
&& Arrays.equals(indices, that.indices);
Copy link
Member

@javanna javanna Apr 4, 2018

Choose a reason for hiding this comment

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

don't you need to take also timeout and masterNodeTimeout into account?

Copy link
Member

@javanna javanna Apr 4, 2018

Choose a reason for hiding this comment

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

I would suspect proper equals/hashcode tests to fail currently, maybe also tests need to be updated to mutate such fields.

Copy link
Contributor Author

@olcbean olcbean Apr 5, 2018

Choose a reason for hiding this comment

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

Now the equals and the hashCode use all request fields except for the flatSettings ( as the flatSettings are not serialized ).

}

@Override
public int hashCode() {
return Objects.hash(super.hashCode(), settings, indicesOptions, preserveExisting, Arrays.hashCode(indices));
return Objects.hash(settings, indicesOptions, preserveExisting, Arrays.hashCode(indices));
}

}
17 changes: 0 additions & 17 deletions server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,21 +89,4 @@ public void writeTo(StreamOutput out) throws IOException {
timeout.writeTo(out);
}

@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
AcknowledgedRequest<?> that = (AcknowledgedRequest<?>) o;
return Objects.equals(timeout, that.timeout);
}

@Override
public int hashCode() {
return Objects.hash(timeout);
}

}