diff --git a/app/src/main/java/com/example/tampopo_client/models/Activity.java b/app/src/main/java/com/example/tampopo_client/models/Activity.java index fd54d94..f5432f2 100644 --- a/app/src/main/java/com/example/tampopo_client/models/Activity.java +++ b/app/src/main/java/com/example/tampopo_client/models/Activity.java @@ -1,13 +1,18 @@ package com.example.tampopo_client.models; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.Objects; + +@JsonIgnoreProperties(ignoreUnknown = true) public class Activity { private String userId; @JsonProperty("activity-id") private String activityId; + @JsonProperty("text") private String text; @JsonProperty("updated-time") @@ -54,4 +59,19 @@ public void setUpdateTime(String updateTime) { this.updateTime = updateTime; } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Activity activity = (Activity) o; + return Objects.equals(activityId, activity.activityId) && + Objects.equals(text, activity.text) && + Objects.equals(updateTime, activity.updateTime); + } + + @Override + public int hashCode() { + return Objects.hash(activityId, text, updateTime); + } }