From 66a83c18b4553ad6225de9a2303572b54d0a6abe Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 29 May 2018 12:58:37 -0700 Subject: [PATCH] Replace equals(:Object) and hashCode() method overrides with Lomboks @EqualsAndHashCode annotation. --- .../query/cq/event/TemperatureReading.java | 32 ++----------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/geode-spring-boot-starter/src/test/java/example/geode/query/cq/event/TemperatureReading.java b/geode-spring-boot-starter/src/test/java/example/geode/query/cq/event/TemperatureReading.java index 7ca20321..19649d9b 100644 --- a/geode-spring-boot-starter/src/test/java/example/geode/query/cq/event/TemperatureReading.java +++ b/geode-spring-boot-starter/src/test/java/example/geode/query/cq/event/TemperatureReading.java @@ -18,9 +18,8 @@ package example.geode.query.cq.event; import java.time.LocalDateTime; -import org.springframework.util.ObjectUtils; - import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NonNull; import lombok.RequiredArgsConstructor; @@ -33,6 +32,7 @@ import lombok.RequiredArgsConstructor; * @since 1.0.0 */ @Data +@EqualsAndHashCode(of = { "temperature", "temperatureUnit" }) @RequiredArgsConstructor(staticName = "of") public class TemperatureReading { @@ -53,34 +53,6 @@ public class TemperatureReading { return this; } - @Override - public boolean equals(Object obj) { - - if (this == obj) { - return true; - } - - if (!(obj instanceof TemperatureReading)) { - return false; - } - - TemperatureReading that = (TemperatureReading) obj; - - return ObjectUtils.nullSafeEquals(this.getTemperature(), that.getTemperature()) - && ObjectUtils.nullSafeEquals(this.getTemperatureUnit(), that.getTemperatureUnit()); - } - - @Override - public int hashCode() { - - int hashValue = 17; - - hashValue = 37 * hashValue + ObjectUtils.nullSafeHashCode(getTemperature()); - hashValue = 37 * hashValue + ObjectUtils.nullSafeHashCode(getTemperatureUnit()); - - return hashValue; - } - @Override public String toString() { return String.format("%d %s", getTemperature(), getTemperatureUnit());