Skip to content

Commit 3d21117

Browse files
Merge pull request #1038 from ie3-institute/sp/#1037-fixing-equals
Fixing equals in `ResultEntity` and `TimeSeriesEntry`
2 parents 4dafa70 + 591b6ed commit 3d21117

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased/Snapshot]
88

9+
### Fixed
10+
- Fixed `equals` of `ResultEntity` and `TimeSeriesEntry` [#1037](https://github.com/ie3-institute/PowerSystemDataModel/issues/1037)
11+
912
## [5.0.0] - 2024-03-06
1013

1114
### Added

src/main/java/edu/ie3/datamodel/models/result/ResultEntity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public void setTime(ZonedDateTime time) {
4949
public boolean equals(Object o) {
5050
if (this == o) return true;
5151
if (o == null || getClass() != o.getClass()) return false;
52-
if (!super.equals(o)) return false;
5352
ResultEntity that = (ResultEntity) o;
5453
return time.equals(that.time) && inputModel.equals(that.inputModel);
5554
}

src/main/java/edu/ie3/datamodel/models/timeseries/TimeSeriesEntry.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ public V getValue() {
2929
public boolean equals(Object o) {
3030
if (this == o) return true;
3131
if (o == null || getClass() != o.getClass()) return false;
32-
if (!super.equals(o)) return false;
33-
3432
TimeSeriesEntry<?> entry = (TimeSeriesEntry<?>) o;
3533
return value.equals(entry.value);
3634
}

0 commit comments

Comments
 (0)