From b5df3336bed69a87bcb93963d875b7ab493d7b01 Mon Sep 17 00:00:00 2001 From: Conor Egan <68134729+c-eg@users.noreply.github.com> Date: Mon, 1 Jan 2024 16:46:51 +0000 Subject: [PATCH] fix super calls for equals and hashcode --- src/main/java/info/movito/themoviedbapi/model/Collection.java | 2 +- .../java/info/movito/themoviedbapi/model/CollectionInfo.java | 2 +- src/main/java/info/movito/themoviedbapi/model/Company.java | 2 +- src/main/java/info/movito/themoviedbapi/model/Credits.java | 2 +- src/main/java/info/movito/themoviedbapi/model/ExternalIds.java | 2 +- .../movito/themoviedbapi/model/MovieListCreationStatus.java | 2 +- .../java/info/movito/themoviedbapi/model/people/Person.java | 2 +- .../java/info/movito/themoviedbapi/model/people/PersonCast.java | 2 +- .../info/movito/themoviedbapi/model/people/PersonCredit.java | 2 +- .../info/movito/themoviedbapi/model/people/PersonPeople.java | 2 +- .../info/movito/themoviedbapi/model/tv/AbstractTvElement.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/info/movito/themoviedbapi/model/Collection.java b/src/main/java/info/movito/themoviedbapi/model/Collection.java index 7cad58e6..4cb64813 100644 --- a/src/main/java/info/movito/themoviedbapi/model/Collection.java +++ b/src/main/java/info/movito/themoviedbapi/model/Collection.java @@ -8,7 +8,7 @@ import org.apache.commons.lang3.StringUtils; @Data -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper = true) @JsonRootName("collection") public class Collection extends IdElement { @JsonProperty("title") diff --git a/src/main/java/info/movito/themoviedbapi/model/CollectionInfo.java b/src/main/java/info/movito/themoviedbapi/model/CollectionInfo.java index 199d25c5..54241fe7 100644 --- a/src/main/java/info/movito/themoviedbapi/model/CollectionInfo.java +++ b/src/main/java/info/movito/themoviedbapi/model/CollectionInfo.java @@ -8,7 +8,7 @@ import java.util.List; @Data -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper = true) public class CollectionInfo extends NamedIdElement { @JsonProperty("overview") private String overview; diff --git a/src/main/java/info/movito/themoviedbapi/model/Company.java b/src/main/java/info/movito/themoviedbapi/model/Company.java index d84098ec..bbfd9d5e 100644 --- a/src/main/java/info/movito/themoviedbapi/model/Company.java +++ b/src/main/java/info/movito/themoviedbapi/model/Company.java @@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode; @Data -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper = true) public class Company extends NamedIdElement { @JsonProperty("description") private String description; diff --git a/src/main/java/info/movito/themoviedbapi/model/Credits.java b/src/main/java/info/movito/themoviedbapi/model/Credits.java index c90fee61..ef3e4829 100644 --- a/src/main/java/info/movito/themoviedbapi/model/Credits.java +++ b/src/main/java/info/movito/themoviedbapi/model/Credits.java @@ -13,7 +13,7 @@ import java.util.Optional; @Data -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper = true) public class Credits extends IdElement { @JsonProperty("crew") List crew; diff --git a/src/main/java/info/movito/themoviedbapi/model/ExternalIds.java b/src/main/java/info/movito/themoviedbapi/model/ExternalIds.java index ea9f748b..26303c3b 100644 --- a/src/main/java/info/movito/themoviedbapi/model/ExternalIds.java +++ b/src/main/java/info/movito/themoviedbapi/model/ExternalIds.java @@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode; @Data -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper = true) public class ExternalIds extends IdElement { @JsonProperty("imdb_id") private String imdbId; diff --git a/src/main/java/info/movito/themoviedbapi/model/MovieListCreationStatus.java b/src/main/java/info/movito/themoviedbapi/model/MovieListCreationStatus.java index 6f63861c..d7afd733 100644 --- a/src/main/java/info/movito/themoviedbapi/model/MovieListCreationStatus.java +++ b/src/main/java/info/movito/themoviedbapi/model/MovieListCreationStatus.java @@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode; @Data -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper = true) public class MovieListCreationStatus extends ResponseStatus { @JsonProperty("list_id") private String listId; diff --git a/src/main/java/info/movito/themoviedbapi/model/people/Person.java b/src/main/java/info/movito/themoviedbapi/model/people/Person.java index a447b7e7..f74a5658 100644 --- a/src/main/java/info/movito/themoviedbapi/model/people/Person.java +++ b/src/main/java/info/movito/themoviedbapi/model/people/Person.java @@ -7,7 +7,7 @@ import org.apache.commons.lang3.StringUtils; @Data -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper = true) public class Person extends NamedIdElement { @JsonProperty("profile_path") protected String profilePath; diff --git a/src/main/java/info/movito/themoviedbapi/model/people/PersonCast.java b/src/main/java/info/movito/themoviedbapi/model/people/PersonCast.java index 11b27b03..72c3a4ad 100644 --- a/src/main/java/info/movito/themoviedbapi/model/people/PersonCast.java +++ b/src/main/java/info/movito/themoviedbapi/model/people/PersonCast.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils; @Data -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper = true) public class PersonCast extends Person { @JsonProperty("character") private String character; diff --git a/src/main/java/info/movito/themoviedbapi/model/people/PersonCredit.java b/src/main/java/info/movito/themoviedbapi/model/people/PersonCredit.java index 93e8353e..18996398 100644 --- a/src/main/java/info/movito/themoviedbapi/model/people/PersonCredit.java +++ b/src/main/java/info/movito/themoviedbapi/model/people/PersonCredit.java @@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode; @Data -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper = true) public class PersonCredit extends IdElement { // note: id here refers to a movie not a cast or crew @JsonProperty("original_language") diff --git a/src/main/java/info/movito/themoviedbapi/model/people/PersonPeople.java b/src/main/java/info/movito/themoviedbapi/model/people/PersonPeople.java index 8cc3c66b..889b2068 100644 --- a/src/main/java/info/movito/themoviedbapi/model/people/PersonPeople.java +++ b/src/main/java/info/movito/themoviedbapi/model/people/PersonPeople.java @@ -11,7 +11,7 @@ import java.util.List; @Data -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper = true) @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) public class PersonPeople extends Person implements Multi { // todo initializers should all go away diff --git a/src/main/java/info/movito/themoviedbapi/model/tv/AbstractTvElement.java b/src/main/java/info/movito/themoviedbapi/model/tv/AbstractTvElement.java index f06ad9f7..ca138e42 100644 --- a/src/main/java/info/movito/themoviedbapi/model/tv/AbstractTvElement.java +++ b/src/main/java/info/movito/themoviedbapi/model/tv/AbstractTvElement.java @@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode; @Data -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper = true) public class AbstractTvElement extends NamedIdElement { // Appendable responses for all tv elements