Skip to content

Fix equality operation for Geometry subclasses #2093

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
absurdfarce merged 1 commit into from
Jul 8, 2026
Merged

Fix equality operation for Geometry subclasses #2093

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion core/src/main/java/com/datastax/dse/driver/internal/core/data/geometry/DefaultGeometry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public boolean equals(Object o) {
return false;
}
DefaultGeometry that = (DefaultGeometry) o;
return this.getOgcGeometry().equals((Object) that.getOgcGeometry());
return this.getOgcGeometry().Equals(that.getOgcGeometry());

@absurdfarce absurdfarce Jul 8, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I'm becoming increasingly convinced that the earlier change was indeed incorrect. Prior to that update we were doing the following for DefaultGeometry.equals():

return this.getOgcGeometry().equals(that.getOgcGeometry());

That leverages the equals(OGCGeometry) method in ESRI 1.2.1. ESRI 2.2.4 introduced an equals(Object) impl in the PR referenced elsewhere but the meaning is different from the old equals() impl. The old implementation has been moved to Equals(OGCGeometry) in 2.2.4... that's what we should have moved to originally (and what this PR does move us to).

}

@Override
Expand Down