Skip to content

Implement equals and Hashcode on GenericData #589

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 7 commits into from
Feb 13, 2019
Merged

Implement equals and Hashcode on GenericData #589

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a9ae85a
936: Added hashCode(), toString() and equals() methods relaing on cla…
Feb 12, 2019
1fe20d8
936: Changes after review.
Feb 12, 2019
75a9714
936: Modified unit test.
Feb 12, 2019
4413b65
936: Added more unit tests.
Feb 12, 2019
20daa8f
936: GenericJsonTest fixed because toString was updated in GenericData.
Feb 12, 2019
fbc0256
936: Changes after review.
Feb 13, 2019
3c3468d
Update GenericData.java
sduskis Feb 13, 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
Prev Previous commit
Next Next commit
936: Changes after review.
  • Loading branch information
andrey-qlogic committed Feb 12, 2019
commit 1fe20d8816a0e826d575a85bfa4dddd21208b404
13 changes: 3 additions & 10 deletions google-http-client/src/main/java/com/google/api/client/util/GenericData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,26 +204,19 @@ public boolean equals(Object o) {
}
if (o instanceof GenericData) {
GenericData that = (GenericData) o;
return Objects.equals(this.classInfo, that.classInfo)
&& Objects.equals(this.unknownFields, that.unknownFields);
return super.equals(that) && Objects.equals(this.classInfo, that.classInfo);
}
return false;
}

@Override
public int hashCode() {
return Objects.hash(classInfo, unknownFields);
return Objects.hash(super.hashCode(), classInfo);
}

@Override
public String toString() {
return "GenericData{"
+ "classInfo="
+ classInfo.names
+ ", "
+ "unknownFields="
+ unknownFields
+ "}";
return "GenericData{" + "classInfo=" + classInfo.names + ", " + super.toString() + "}";
}

/**
Expand Down
4 changes: 2 additions & 2 deletions google-http-client/src/test/java/com/google/api/client/util/GenericDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ public void testEquals_Symmetric() {

public void testClone_changingEntrySet() {
GenericData data = new GenericData();
assertEquals("GenericData{classInfo=[], unknownFields={}}", data.toString());
assertEquals("GenericData{classInfo=[], {}}", data.toString());
GenericData clone = data.clone();
clone.set("foo", "bar");
assertEquals("GenericData{classInfo=[], unknownFields={foo=bar}}", clone.toString());
assertEquals("GenericData{classInfo=[], {foo=bar}}", clone.toString());
}

public void testSetIgnoreCase_unknownKey() {
Expand Down