Skip to content

properly add equals() and compare fields #3218

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
pongad merged 2 commits into from
May 1, 2018
Merged

properly add equals() and compare fields #3218

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
d5f1cde
properly add equals() and compare fields
pongad May 1, 2018
0d9a2b3
pr comment
pongad May 1, 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: 17 additions & 2 deletions google-cloud-core/src/main/java/com/google/cloud/BaseServiceException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,27 @@ public boolean isRetryable(boolean idempotent, Set<Error> retryableErrors) {

@Override
public String toString() {
return MoreObjects.toStringHelper(this).add("code", code).add("reason", reason).toString();
return MoreObjects.toStringHelper(this)
.add("code", code)
.add("reason", reason)
.add("rejected", rejected)
.toString();
}

@Override
public int hashCode() {
return Objects.hash(code, reason);
return Objects.hash(code, reason, rejected);
}

@Override
public boolean equals(Object obj) {
if (!(obj instanceof Error)) {
return false;
}
Error o = (Error) obj;
return Objects.equals(code, o.code)
&& Objects.equals(reason, o.reason)
&& Objects.equals(rejected, o.rejected);
}
}

Expand Down
16 changes: 16 additions & 0 deletions google-cloud-core/src/test/java/com/google/cloud/BaseServiceExceptionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.google.cloud;

import static com.google.cloud.BaseServiceException.UNKNOWN_CODE;
import static com.google.common.truth.Truth.assertThat;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
Expand Down Expand Up @@ -132,4 +133,19 @@ public void testTranslateAndThrow() throws Exception {
verify(exceptionMock);
}
}

@Test
public void testError_Equal() {
BaseServiceException.Error error = new BaseServiceException.Error(0, "reason", true);
assertThat(error).isEqualTo(error);
assertThat(error.hashCode()).isEqualTo(error.hashCode());

BaseServiceException.Error sameError = new BaseServiceException.Error(0, "reason", true);
assertThat(error).isEqualTo(sameError);
assertThat(error.hashCode()).isEqualTo(sameError.hashCode());

BaseServiceException.Error error2 = new BaseServiceException.Error(1, "other reason", false);
assertThat(error).isNotEqualTo(error2);
assertThat(error.hashCode()).isNotEqualTo(error2.hashCode());
}
}