From c4b42ea2dd5cf43085967eee70e5488d2ad128e3 Mon Sep 17 00:00:00 2001
From: Conor Egan <68134729+c-eg@users.noreply.github.com>
Date: Sun, 31 Dec 2023 15:40:29 +0000
Subject: [PATCH 1/4] update dependencies

---
 build.gradle | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 48ec296c..62800b6e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,16 +17,16 @@ dependencies {
     testImplementation 'org.slf4j:slf4j-simple:2.0.9'
 
     // testing
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:5.6.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.1'
 
     // util
-    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.15.3'
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.15.3'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.3'
+    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.16.0'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.16.0'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.16.0'
 
     implementation 'com.google.guava:guava:32.1.3-jre'
-    implementation 'org.apache.commons:commons-lang3:3.13.0'
+    implementation 'org.apache.commons:commons-lang3:3.14.0'
     implementation 'commons-codec:commons-codec:1.16.0'
 }
 
@@ -39,6 +39,10 @@ java {
     withSourcesJar()
 }
 
+test {
+    useJUnitPlatform()
+}
+
 checkstyle {
     toolVersion '10.12.5'
     configFile file("config/checkstyle/checkstyle.xml")

From 78bb73ca4cd1b4ce1b16c184a010d7f2cda5eec5 Mon Sep 17 00:00:00 2001
From: Conor Egan <68134729+c-eg@users.noreply.github.com>
Date: Sun, 31 Dec 2023 15:40:53 +0000
Subject: [PATCH 2/4] add lombok

---
 build.gradle | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build.gradle b/build.gradle
index 62800b6e..a6ae0184 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,6 +21,11 @@ dependencies {
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.1'
 
     // util
+    compileOnly 'org.projectlombok:lombok:1.18.30'
+    annotationProcessor 'org.projectlombok:lombok:1.18.30'
+    testCompileOnly 'org.projectlombok:lombok:1.18.30'
+    testAnnotationProcessor 'org.projectlombok:lombok:1.18.30'
+
     implementation 'com.fasterxml.jackson.core:jackson-annotations:2.16.0'
     implementation 'com.fasterxml.jackson.core:jackson-core:2.16.0'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.16.0'

From 5f33510d59139002e2627719d44d5982ad30f438 Mon Sep 17 00:00:00 2001
From: Conor Egan <68134729+c-eg@users.noreply.github.com>
Date: Mon, 1 Jan 2024 16:42:13 +0000
Subject: [PATCH 3/4] replace boilerplate code with lombok annotations

---
 .../themoviedbapi/model/AlternativeTitle.java |  20 +-
 .../movito/themoviedbapi/model/Artwork.java   |  76 +----
 .../themoviedbapi/model/Collection.java       |  36 +--
 .../themoviedbapi/model/CollectionInfo.java   |  36 +--
 .../movito/themoviedbapi/model/Company.java   |  44 +--
 .../themoviedbapi/model/ContentRating.java    |  21 +-
 .../movito/themoviedbapi/model/Credits.java   |  28 +-
 .../info/movito/themoviedbapi/model/Data.java |  34 +--
 .../movito/themoviedbapi/model/Discover.java  |  12 +-
 .../themoviedbapi/model/ExternalIds.java      |  68 +----
 .../themoviedbapi/model/FindResults.java      |  28 +-
 .../themoviedbapi/model/JobDepartment.java    |  20 +-
 .../movito/themoviedbapi/model/Language.java  |  45 +--
 .../themoviedbapi/model/ListItemStatus.java   |  20 +-
 .../movito/themoviedbapi/model/MovieDb.java   | 261 +-----------------
 .../themoviedbapi/model/MovieImages.java      |  36 +--
 .../movito/themoviedbapi/model/MovieList.java |  60 +---
 .../model/MovieListCreationStatus.java        |  12 +-
 .../model/MovieTranslations.java              |  12 +-
 .../model/MoviesAlternativeTitles.java        |  12 +-
 .../model/ProductionCompany.java              |  27 +-
 .../model/ProductionCountry.java              |  20 +-
 .../themoviedbapi/model/ReleaseDate.java      |  44 +--
 .../themoviedbapi/model/ReleaseInfo.java      |  20 +-
 .../movito/themoviedbapi/model/Reviews.java   |  28 +-
 .../themoviedbapi/model/Translation.java      |  42 +--
 .../movito/themoviedbapi/model/Video.java     |  43 +--
 .../model/changes/ChangeKeyItem.java          |  24 +-
 .../model/changes/ChangedItem.java            |  36 +--
 .../model/changes/ChangedMovie.java           |  12 +-
 .../model/changes/ChangesItems.java           |  19 +-
 .../themoviedbapi/model/config/Account.java   |  20 +-
 .../model/config/ConfigResults.java           |  20 +-
 .../themoviedbapi/model/config/Timezone.java  |  27 +-
 .../model/config/TmdbConfiguration.java       |  52 +---
 .../model/config/TokenAuthorisation.java      |  28 +-
 .../model/config/TokenSession.java            |  52 +---
 .../themoviedbapi/model/core/AccountID.java   |   7 +-
 .../themoviedbapi/model/core/IdElement.java   |  35 +--
 .../model/core/MovieKeywords.java             |  12 +-
 .../model/core/NamedElement.java              |  36 +--
 .../model/core/NamedIdElement.java            |  17 +-
 .../model/core/NamedStringIdElement.java      |  20 +-
 .../model/core/ResponseStatus.java            |  39 +--
 .../model/core/ResponseStatusException.java   |   6 +-
 .../themoviedbapi/model/core/ResultDates.java |  20 +-
 .../themoviedbapi/model/core/ResultsPage.java |  36 +--
 .../model/core/SessionToken.java              |  30 +-
 .../model/core/StringIdElement.java           |  35 +--
 .../themoviedbapi/model/core/TvKeywords.java  |  15 +-
 .../model/keywords/KeywordMovie.java          |  76 +----
 .../themoviedbapi/model/people/Person.java    |  24 +-
 .../model/people/PersonCast.java              |  25 +-
 .../model/people/PersonCredit.java            | 152 +---------
 .../model/people/PersonCredits.java           |  20 +-
 .../model/people/PersonCrew.java              |  12 +-
 .../model/people/PersonPeople.java            | 106 +------
 .../model/providers/Provider.java             |  40 +--
 .../model/providers/ProviderResults.java      |  13 +-
 .../model/providers/WatchProviders.java       |  40 +--
 .../model/tv/AbstractTvElement.java           |  47 +---
 .../themoviedbapi/model/tv/TvEpisode.java     |  79 +-----
 .../themoviedbapi/model/tv/TvSeason.java      |  45 +--
 .../themoviedbapi/model/tv/TvSeries.java      | 180 +-----------
 .../tools/RequestCountLimitException.java     |   7 +-
 src/main/java/module-info.java                |   1 +
 66 files changed, 274 insertions(+), 2296 deletions(-)

diff --git a/src/main/java/info/movito/themoviedbapi/model/AlternativeTitle.java b/src/main/java/info/movito/themoviedbapi/model/AlternativeTitle.java
index 253b8d0b..b094b4e0 100644
--- a/src/main/java/info/movito/themoviedbapi/model/AlternativeTitle.java
+++ b/src/main/java/info/movito/themoviedbapi/model/AlternativeTitle.java
@@ -2,27 +2,15 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.AbstractJsonMapping;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class AlternativeTitle extends AbstractJsonMapping {
     @JsonProperty("iso_3166_1")
     private String country;
 
     @JsonProperty("title")
     private String title;
-
-    public String getCountry() {
-        return country;
-    }
-
-    public void setCountry(String country) {
-        this.country = country;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/Artwork.java b/src/main/java/info/movito/themoviedbapi/model/Artwork.java
index 4ecc0236..5931ced2 100644
--- a/src/main/java/info/movito/themoviedbapi/model/Artwork.java
+++ b/src/main/java/info/movito/themoviedbapi/model/Artwork.java
@@ -2,7 +2,11 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.AbstractJsonMapping;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class Artwork extends AbstractJsonMapping {
     @JsonProperty("iso_639_1")
     private String language;
@@ -29,76 +33,4 @@ public class Artwork extends AbstractJsonMapping {
     private String flag;
 
     private ArtworkType artworkType = ArtworkType.POSTER;
-
-    public ArtworkType getArtworkType() {
-        return artworkType;
-    }
-
-    public void setArtworkType(ArtworkType artworkType) {
-        this.artworkType = artworkType;
-    }
-
-    public float getAspectRatio() {
-        return aspectRatio;
-    }
-
-    public void setAspectRatio(float aspectRatio) {
-        this.aspectRatio = aspectRatio;
-    }
-
-    public String getFilePath() {
-        return filePath;
-    }
-
-    public void setFilePath(String filePath) {
-        this.filePath = filePath;
-    }
-
-    public int getHeight() {
-        return height;
-    }
-
-    public void setHeight(int height) {
-        this.height = height;
-    }
-
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public int getWidth() {
-        return width;
-    }
-
-    public void setWidth(int width) {
-        this.width = width;
-    }
-
-    public float getVoteAverage() {
-        return voteAverage;
-    }
-
-    public void setVoteAverage(float voteAverage) {
-        this.voteAverage = voteAverage;
-    }
-
-    public int getVoteCount() {
-        return voteCount;
-    }
-
-    public void setVoteCount(int voteCount) {
-        this.voteCount = voteCount;
-    }
-
-    public String getFlag() {
-        return flag;
-    }
-
-    public void setFlag(String flag) {
-        this.flag = flag;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/Collection.java b/src/main/java/info/movito/themoviedbapi/model/Collection.java
index 6a93e1a2..7cad58e6 100644
--- a/src/main/java/info/movito/themoviedbapi/model/Collection.java
+++ b/src/main/java/info/movito/themoviedbapi/model/Collection.java
@@ -3,8 +3,12 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 import info.movito.themoviedbapi.model.core.IdElement;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.StringUtils;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 @JsonRootName("collection")
 public class Collection extends IdElement {
     @JsonProperty("title")
@@ -22,30 +26,6 @@ public class Collection extends IdElement {
     @JsonProperty("release_date")
     private String releaseDate;
 
-    public String getBackdropPath() {
-        return backdropPath;
-    }
-
-    public void setBackdropPath(String backdropPath) {
-        this.backdropPath = backdropPath;
-    }
-
-    public String getPosterPath() {
-        return posterPath;
-    }
-
-    public void setPosterPath(String posterPath) {
-        this.posterPath = posterPath;
-    }
-
-    public String getReleaseDate() {
-        return releaseDate;
-    }
-
-    public void setReleaseDate(String releaseDate) {
-        this.releaseDate = releaseDate;
-    }
-
     /**
      * Gets the title, or name, if the title is blank.
      *
@@ -58,10 +38,6 @@ public String getTitle() {
         return title;
     }
 
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
     /**
      * Gets the name, or title, if the name is blank.
      *
@@ -73,8 +49,4 @@ public String getName() {
         }
         return name;
     }
-
-    public void setName(String name) {
-        this.name = name;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/CollectionInfo.java b/src/main/java/info/movito/themoviedbapi/model/CollectionInfo.java
index 233a2061..199d25c5 100644
--- a/src/main/java/info/movito/themoviedbapi/model/CollectionInfo.java
+++ b/src/main/java/info/movito/themoviedbapi/model/CollectionInfo.java
@@ -2,9 +2,13 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.NamedIdElement;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class CollectionInfo extends NamedIdElement {
     @JsonProperty("overview")
     private String overview;
@@ -17,36 +21,4 @@ public class CollectionInfo extends NamedIdElement {
 
     @JsonProperty("parts")
     private List<Collection> parts;
-
-    public String getBackdropPath() {
-        return backdropPath;
-    }
-
-    public void setBackdropPath(String backdropPath) {
-        this.backdropPath = backdropPath;
-    }
-
-    public String getOverview() {
-        return overview;
-    }
-
-    public void setOverview(String overview) {
-        this.overview = overview;
-    }
-
-    public List<Collection> getParts() {
-        return parts;
-    }
-
-    public void setParts(List<Collection> parts) {
-        this.parts = parts;
-    }
-
-    public String getPosterPath() {
-        return posterPath;
-    }
-
-    public void setPosterPath(String posterPath) {
-        this.posterPath = posterPath;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/Company.java b/src/main/java/info/movito/themoviedbapi/model/Company.java
index ca8e8109..d84098ec 100644
--- a/src/main/java/info/movito/themoviedbapi/model/Company.java
+++ b/src/main/java/info/movito/themoviedbapi/model/Company.java
@@ -2,7 +2,11 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.NamedIdElement;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class Company extends NamedIdElement {
     @JsonProperty("description")
     private String description;
@@ -20,46 +24,6 @@ public class Company extends NamedIdElement {
     @JsonProperty("parent_company")
     private Company parentCompany;
 
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getHeadquarters() {
-        return headquarters;
-    }
-
-    public void setHeadquarters(String headquarters) {
-        this.headquarters = headquarters;
-    }
-
-    public String getHomepage() {
-        return homepage;
-    }
-
-    public void setHomepage(String homepage) {
-        this.homepage = homepage;
-    }
-
-    public String getLogoPath() {
-        return logoPath;
-    }
-
-    public void setLogoPath(String logoPath) {
-        this.logoPath = logoPath;
-    }
-
-    public Company getParentCompany() {
-        return parentCompany;
-    }
-
-    public void setParentCompany(Company parentCompany) {
-        this.parentCompany = parentCompany;
-    }
-
     /**
      * Sets the parent company.
      */
diff --git a/src/main/java/info/movito/themoviedbapi/model/ContentRating.java b/src/main/java/info/movito/themoviedbapi/model/ContentRating.java
index f803eea9..723f4514 100644
--- a/src/main/java/info/movito/themoviedbapi/model/ContentRating.java
+++ b/src/main/java/info/movito/themoviedbapi/model/ContentRating.java
@@ -3,10 +3,14 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 import info.movito.themoviedbapi.model.core.IdElement;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 @JsonRootName("content_ratings")
 public class ContentRating implements Serializable {
     @JsonProperty("iso_3166_1")
@@ -15,24 +19,7 @@ public class ContentRating implements Serializable {
     @JsonProperty("rating")
     private String rating;
 
-    public String getLocale() {
-        return locale;
-    }
-
-    public void setLocale(String locale) {
-        this.locale = locale;
-    }
-
-    public String getRating() {
-        return rating;
-    }
-
-    public void setRating(String rating) {
-        this.rating = rating;
-    }
-
     public static class Results extends IdElement {
-
         @JsonProperty("results")
         private List<ContentRating> results;
 
diff --git a/src/main/java/info/movito/themoviedbapi/model/Credits.java b/src/main/java/info/movito/themoviedbapi/model/Credits.java
index 04e987c4..c90fee61 100644
--- a/src/main/java/info/movito/themoviedbapi/model/Credits.java
+++ b/src/main/java/info/movito/themoviedbapi/model/Credits.java
@@ -5,11 +5,15 @@
 import info.movito.themoviedbapi.model.people.Person;
 import info.movito.themoviedbapi.model.people.PersonCast;
 import info.movito.themoviedbapi.model.people.PersonCrew;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class Credits extends IdElement {
     @JsonProperty("crew")
     List<PersonCrew> crew;
@@ -20,30 +24,6 @@ public class Credits extends IdElement {
     @JsonProperty("guest_stars")
     List<PersonCast> guestStars;
 
-    public List<PersonCrew> getCrew() {
-        return crew;
-    }
-
-    public void setCrew(List<PersonCrew> crew) {
-        this.crew = crew;
-    }
-
-    public List<PersonCast> getCast() {
-        return cast;
-    }
-
-    public void setCast(List<PersonCast> cast) {
-        this.cast = cast;
-    }
-
-    public List<PersonCast> getGuestStars() {
-        return guestStars;
-    }
-
-    public void setGuestStars(List<PersonCast> guestStars) {
-        this.guestStars = guestStars;
-    }
-
     /**
      * Convenience wrapper to get all people involved in the movie.
      */
diff --git a/src/main/java/info/movito/themoviedbapi/model/Data.java b/src/main/java/info/movito/themoviedbapi/model/Data.java
index d12f5407..adf488f1 100644
--- a/src/main/java/info/movito/themoviedbapi/model/Data.java
+++ b/src/main/java/info/movito/themoviedbapi/model/Data.java
@@ -1,41 +1,13 @@
 package info.movito.themoviedbapi.model;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
 
+@lombok.Data
+@EqualsAndHashCode(callSuper = false)
 public class Data {
     private String title;
 
     private String overview;
 
     private String homepage;
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public String getOverview() {
-        return overview;
-    }
-
-    public void setOverview(String overview) {
-        this.overview = overview;
-    }
-
-    public String getHomepage() {
-        return homepage;
-    }
-
-    public void setHomepage(String homepage) {
-        this.homepage = homepage;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SIMPLE_STYLE);
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/Discover.java b/src/main/java/info/movito/themoviedbapi/model/Discover.java
index f7fcc339..c1fab8e1 100644
--- a/src/main/java/info/movito/themoviedbapi/model/Discover.java
+++ b/src/main/java/info/movito/themoviedbapi/model/Discover.java
@@ -6,6 +6,7 @@
 import info.movito.themoviedbapi.AbstractTmdbApi;
 import info.movito.themoviedbapi.model.core.IdElement;
 import info.movito.themoviedbapi.model.keywords.Keyword;
+import lombok.Getter;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.HashMap;
@@ -45,16 +46,13 @@ public class Discover {
 
     private static final int YEAR_MAX = 2100;
 
-    private final Map<String, String> params = new HashMap<>();
-
-    Function<IdElement, Integer> toID = IdElement::getId;
-
     /**
      * Get the parameters. This will be used to construct the URL in the API.
      */
-    public Map<String, String> getParams() {
-        return params;
-    }
+    @Getter
+    private final Map<String, String> params = new HashMap<>();
+
+    Function<IdElement, Integer> toID = IdElement::getId;
 
     /**
      * Minimum value is 1 if included.
diff --git a/src/main/java/info/movito/themoviedbapi/model/ExternalIds.java b/src/main/java/info/movito/themoviedbapi/model/ExternalIds.java
index 343b2720..ea9f748b 100644
--- a/src/main/java/info/movito/themoviedbapi/model/ExternalIds.java
+++ b/src/main/java/info/movito/themoviedbapi/model/ExternalIds.java
@@ -2,7 +2,11 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.IdElement;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class ExternalIds extends IdElement {
     @JsonProperty("imdb_id")
     private String imdbId;
@@ -27,68 +31,4 @@ public class ExternalIds extends IdElement {
 
     @JsonProperty("twitter_id")
     private String twitterId;
-
-    public String getImdbId() {
-        return imdbId;
-    }
-
-    public void setImdbId(String imdbId) {
-        this.imdbId = imdbId;
-    }
-
-    public String getFreeBaseId() {
-        return freeBaseId;
-    }
-
-    public void setFreeBaseId(String freeBaseId) {
-        this.freeBaseId = freeBaseId;
-    }
-
-    public String getFreebaseMid() {
-        return freebaseMid;
-    }
-
-    public void setFreebaseMid(String freebaseMid) {
-        this.freebaseMid = freebaseMid;
-    }
-
-    public String getTvdbId() {
-        return tvdbId;
-    }
-
-    public void setTvdbId(String tvdbId) {
-        this.tvdbId = tvdbId;
-    }
-
-    public String getTvrageId() {
-        return tvrageId;
-    }
-
-    public void setTvrageId(String tvrageId) {
-        this.tvrageId = tvrageId;
-    }
-
-    public String getFacebookId() {
-        return facebookId;
-    }
-
-    public void setFacebookId(String facebookId) {
-        this.facebookId = facebookId;
-    }
-
-    public String getInstagramId() {
-        return instagramId;
-    }
-
-    public void setInstagramId(String instagramId) {
-        this.instagramId = instagramId;
-    }
-
-    public String getTwitterId() {
-        return twitterId;
-    }
-
-    public void setTwitterId(String twitterId) {
-        this.twitterId = twitterId;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/FindResults.java b/src/main/java/info/movito/themoviedbapi/model/FindResults.java
index 6b7429d0..8051529b 100644
--- a/src/main/java/info/movito/themoviedbapi/model/FindResults.java
+++ b/src/main/java/info/movito/themoviedbapi/model/FindResults.java
@@ -4,9 +4,13 @@
 import info.movito.themoviedbapi.model.core.AbstractJsonMapping;
 import info.movito.themoviedbapi.model.people.Person;
 import info.movito.themoviedbapi.model.tv.TvSeries;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class FindResults extends AbstractJsonMapping {
     @JsonProperty("movie_results")
     private List<MovieDb> movieResults;
@@ -16,28 +20,4 @@ public class FindResults extends AbstractJsonMapping {
 
     @JsonProperty("tv_results")
     private List<TvSeries> tvResults;
-
-    public List<MovieDb> getMovieResults() {
-        return movieResults;
-    }
-
-    public void setMovieResults(List<MovieDb> movieResults) {
-        this.movieResults = movieResults;
-    }
-
-    public List<Person> getPersonResults() {
-        return personResults;
-    }
-
-    public void setPersonResults(List<Person> personResults) {
-        this.personResults = personResults;
-    }
-
-    public List<TvSeries> getTvResults() {
-        return tvResults;
-    }
-
-    public void setTvResults(List<TvSeries> tvResults) {
-        this.tvResults = tvResults;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/JobDepartment.java b/src/main/java/info/movito/themoviedbapi/model/JobDepartment.java
index 4f623a41..b660ee2d 100644
--- a/src/main/java/info/movito/themoviedbapi/model/JobDepartment.java
+++ b/src/main/java/info/movito/themoviedbapi/model/JobDepartment.java
@@ -2,29 +2,17 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.AbstractJsonMapping;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class JobDepartment extends AbstractJsonMapping {
     @JsonProperty("department")
     private String department;
 
     @JsonProperty("jobs")
     private List<String> jobs;
-
-    public String getDepartment() {
-        return department;
-    }
-
-    public void setDepartment(String department) {
-        this.department = department;
-    }
-
-    public List<String> getJobs() {
-        return jobs;
-    }
-
-    public void setJobs(List<String> jobs) {
-        this.jobs = jobs;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/Language.java b/src/main/java/info/movito/themoviedbapi/model/Language.java
index 0a05f168..d66fcdb1 100644
--- a/src/main/java/info/movito/themoviedbapi/model/Language.java
+++ b/src/main/java/info/movito/themoviedbapi/model/Language.java
@@ -3,9 +3,11 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 import info.movito.themoviedbapi.model.core.AbstractJsonMapping;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
-import java.util.Objects;
-
+@Data
+@EqualsAndHashCode(callSuper = false)
 @JsonRootName("spoken_language")
 public class Language extends AbstractJsonMapping {
     @JsonProperty("iso_639_1")
@@ -13,43 +15,4 @@ public class Language extends AbstractJsonMapping {
 
     @JsonProperty("name")
     private String name;
-
-    public String getIsoCode() {
-        return isoCode;
-    }
-
-    public void setIsoCode(String isoCode) {
-        this.isoCode = isoCode;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final Language other = (Language) obj;
-        if (!Objects.equals(this.isoCode, other.isoCode)) {
-            return false;
-        }
-        return Objects.equals(this.name, other.name);
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 7;
-        hash = 71 * hash + (this.isoCode != null ? this.isoCode.hashCode() : 0);
-        hash = 71 * hash + (this.name != null ? this.name.hashCode() : 0);
-        return hash;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/ListItemStatus.java b/src/main/java/info/movito/themoviedbapi/model/ListItemStatus.java
index 665e3f37..041fce28 100644
--- a/src/main/java/info/movito/themoviedbapi/model/ListItemStatus.java
+++ b/src/main/java/info/movito/themoviedbapi/model/ListItemStatus.java
@@ -2,30 +2,18 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.AbstractJsonMapping;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author Holger Brandl
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class ListItemStatus extends AbstractJsonMapping {
     @JsonProperty("status_code")
     private int statusCode;
 
     @JsonProperty("item_present")
     private boolean itemPresent;
-
-    public int getStatusCode() {
-        return statusCode;
-    }
-
-    public void setStatusCode(int statusCode) {
-        this.statusCode = statusCode;
-    }
-
-    public boolean isItemPresent() {
-        return itemPresent;
-    }
-
-    public void setItemPresent(boolean itemPresent) {
-        this.itemPresent = itemPresent;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/MovieDb.java b/src/main/java/info/movito/themoviedbapi/model/MovieDb.java
index f206d578..3821d938 100644
--- a/src/main/java/info/movito/themoviedbapi/model/MovieDb.java
+++ b/src/main/java/info/movito/themoviedbapi/model/MovieDb.java
@@ -10,9 +10,13 @@
 import info.movito.themoviedbapi.model.people.PersonCast;
 import info.movito.themoviedbapi.model.people.PersonCrew;
 import info.movito.themoviedbapi.model.providers.ProviderResults;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 @JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
 public class MovieDb extends IdElement implements Multi {
     @JsonProperty("title")
@@ -129,198 +133,10 @@ public class MovieDb extends IdElement implements Multi {
     @JsonProperty("external_ids")
     private ExternalIds externalIds;
 
-    public String getBackdropPath() {
-        return backdropPath;
-    }
-
-    public void setBackdropPath(String backdropPath) {
-        this.backdropPath = backdropPath;
-    }
-
-    public String getOriginalTitle() {
-        return originalTitle;
-    }
-
-    public void setOriginalTitle(String originalTitle) {
-        this.originalTitle = originalTitle;
-    }
-
-    public float getPopularity() {
-        return popularity;
-    }
-
-    public void setPopularity(float popularity) {
-        this.popularity = popularity;
-    }
-
-    public String getPosterPath() {
-        return posterPath;
-    }
-
-    public void setPosterPath(String posterPath) {
-        this.posterPath = posterPath;
-    }
-
-    public String getReleaseDate() {
-        return releaseDate;
-    }
-
-    public void setReleaseDate(String releaseDate) {
-        this.releaseDate = releaseDate;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public boolean isAdult() {
-        return adult;
-    }
-
-    public void setAdult(boolean adult) {
-        this.adult = adult;
-    }
-
-    public Collection getBelongsToCollection() {
-        return belongsToCollection;
-    }
-
-    public void setBelongsToCollection(Collection belongsToCollection) {
-        this.belongsToCollection = belongsToCollection;
-    }
-
-    public long getBudget() {
-        return budget;
-    }
-
-    public void setBudget(long budget) {
-        this.budget = budget;
-    }
-
-    public List<Genre> getGenres() {
-        return genres;
-    }
-
-    public void setGenres(List<Genre> genres) {
-        this.genres = genres;
-    }
-
-    public String getHomepage() {
-        return homepage;
-    }
-
-    public void setHomepage(String homepage) {
-        this.homepage = homepage;
-    }
-
-    public String getImdbID() {
-        return imdbID;
-    }
-
-    public void setImdbID(String imdbID) {
-        this.imdbID = imdbID;
-    }
-
-    public String getOriginalLanguage() {
-        return originalLanguage;
-    }
-
-    public void setOriginalLanguage(String originalLanguage) {
-        this.originalLanguage = originalLanguage;
-    }
-
-    public String getOverview() {
-        return overview;
-    }
-
-    public void setOverview(String overview) {
-        this.overview = overview;
-    }
-
-    public List<ProductionCompany> getProductionCompanies() {
-        return productionCompanies;
-    }
-
-    public void setProductionCompanies(List<ProductionCompany> productionCompanies) {
-        this.productionCompanies = productionCompanies;
-    }
-
-    public List<ProductionCountry> getProductionCountries() {
-        return productionCountries;
-    }
-
-    public void setProductionCountries(List<ProductionCountry> productionCountries) {
-        this.productionCountries = productionCountries;
-    }
-
-    public long getRevenue() {
-        return revenue;
-    }
-
-    public void setRevenue(long revenue) {
-        this.revenue = revenue;
-    }
-
-    public int getRuntime() {
-        return runtime;
-    }
-
-    public void setRuntime(int runtime) {
-        this.runtime = runtime;
-    }
-
-    public List<Language> getSpokenLanguages() {
-        return spokenLanguages;
-    }
-
-    public void setSpokenLanguages(List<Language> spokenLanguages) {
-        this.spokenLanguages = spokenLanguages;
-    }
-
-    public String getTagline() {
-        return tagline;
-    }
-
-    public void setTagline(String tagline) {
-        this.tagline = tagline;
-    }
-
-    public float getVoteAverage() {
-        return voteAverage;
-    }
-
-    public void setVoteAverage(float voteAverage) {
-        this.voteAverage = voteAverage;
-    }
-
-    public int getVoteCount() {
-        return voteCount;
-    }
-
-    public void setVoteCount(int voteCount) {
-        this.voteCount = voteCount;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
     public List<AlternativeTitle> getAlternativeTitles() {
         return alternativeTitles != null ? alternativeTitles.getTitles() : null;
     }
 
-    public void setAlternativeTitles(MoviesAlternativeTitles alternativeTitles) {
-        this.alternativeTitles = alternativeTitles;
-    }
-
     public List<PersonCast> getCast() {
         return credits != null ? credits.getCast() : null;
     }
@@ -337,42 +153,22 @@ public List<Keyword> getKeywords() {
         return keywords != null ? keywords.getKeywords() : null;
     }
 
-    public void setKeywords(MovieKeywords keywords) {
-        this.keywords = keywords;
-    }
-
     public List<ReleaseInfo> getReleases() {
         return releases != null ? releases.getResults() : null;
     }
 
-    public void setReleases(TmdbMovies.ReleaseInfoResults releases) {
-        this.releases = releases;
-    }
-
     public List<Video> getVideos() {
         return videos != null ? videos.getVideos() : null;
     }
 
-    public void setVideos(Video.Results videos) {
-        this.videos = videos;
-    }
-
     public List<Translation> getTranslations() {
         return translations != null ? translations.getTranslations() : null;
     }
 
-    public void setTranslations(MovieTranslations translations) {
-        this.translations = translations;
-    }
-
     public List<MovieDb> getSimilarMovies() {
         return similarMovies != null ? similarMovies.getResults() : null;
     }
 
-    public void setSimilarMovies(ResultsPage<MovieDb> similarMovies) {
-        this.similarMovies = similarMovies;
-    }
-
     public List<MovieDb> getRecommendations() {
         return recommendedMovies != null ? recommendedMovies.getResults() : null;
     }
@@ -381,61 +177,12 @@ public List<MovieList> getLists() {
         return lists != null ? lists.getResults() : null;
     }
 
-    public void setLists(ResultsPage<MovieList> lists) {
-        this.lists = lists;
-    }
-
     public List<Reviews> getReviews() {
         return reviews != null ? reviews.getResults() : null;
     }
 
-    public void setReviews(ResultsPage<Reviews> reviews) {
-        this.reviews = reviews;
-    }
-
-    public Credits getCredits() {
-        return credits;
-    }
-
-    public void setCredits(Credits credits) {
-        this.credits = credits;
-    }
-
-    public float getUserRating() {
-        return userRating;
-    }
-
-    public void setUserRating(float userRating) {
-        this.userRating = userRating;
-    }
-
-    public ProviderResults getWatchProviders() {
-        return watchProviders;
-    }
-
-    public void setWatchProviders(ProviderResults watchProviders) {
-        this.watchProviders = watchProviders;
-    }
-
-    public ExternalIds getExternalIds() {
-        return externalIds;
-    }
-
-    public void setExternalIds(ExternalIds externalIds) {
-        this.externalIds = externalIds;
-    }
-
-    @Override
-    public String toString() {
-        return title + " - " + releaseDate;
-    }
-
     @Override
     public MediaType getMediaType() {
         return MediaType.MOVIE;
     }
-
-    public void setImages(MovieImages images) {
-        this.images = images;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/MovieImages.java b/src/main/java/info/movito/themoviedbapi/model/MovieImages.java
index 08ddb4ef..4d546d2c 100644
--- a/src/main/java/info/movito/themoviedbapi/model/MovieImages.java
+++ b/src/main/java/info/movito/themoviedbapi/model/MovieImages.java
@@ -2,11 +2,15 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.IdElement;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class MovieImages extends IdElement {
     @JsonProperty("backdrops")
     private List<Artwork> backdrops;
@@ -21,38 +25,6 @@ public class MovieImages extends IdElement {
     @JsonProperty("stills")
     private List<Artwork> stills;
 
-    public List<Artwork> getBackdrops() {
-        return backdrops;
-    }
-
-    public void setBackdrops(List<Artwork> backdrops) {
-        this.backdrops = backdrops;
-    }
-
-    public List<Artwork> getPosters() {
-        return posters;
-    }
-
-    public void setPosters(List<Artwork> posters) {
-        this.posters = posters;
-    }
-
-    public List<Artwork> getProfiles() {
-        return profiles;
-    }
-
-    public void setProfiles(List<Artwork> profiles) {
-        this.profiles = profiles;
-    }
-
-    public List<Artwork> getStills() {
-        return stills;
-    }
-
-    public void setStills(List<Artwork> stills) {
-        this.stills = stills;
-    }
-
     /**
      * Convenience wrapper to return a list of all the artwork with their types.
      */
diff --git a/src/main/java/info/movito/themoviedbapi/model/MovieList.java b/src/main/java/info/movito/themoviedbapi/model/MovieList.java
index 1130933d..b11ab59b 100644
--- a/src/main/java/info/movito/themoviedbapi/model/MovieList.java
+++ b/src/main/java/info/movito/themoviedbapi/model/MovieList.java
@@ -2,9 +2,13 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.NamedStringIdElement;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class MovieList extends NamedStringIdElement {
     @JsonProperty("created_by")
     private String createdBy;
@@ -27,60 +31,4 @@ public class MovieList extends NamedStringIdElement {
     //used for /list
     @JsonProperty("items")
     private List<MovieDb> items;
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public int getFavoriteCount() {
-        return favoriteCount;
-    }
-
-    public void setFavoriteCount(int favoriteCount) {
-        this.favoriteCount = favoriteCount;
-    }
-
-    public int getItemCount() {
-        return itemCount;
-    }
-
-    public void setItemCount(int itemCount) {
-        this.itemCount = itemCount;
-    }
-
-    public String getPosterPath() {
-        return posterPath;
-    }
-
-    public void setPosterPath(String posterPath) {
-        this.posterPath = posterPath;
-    }
-
-    public String getListType() {
-        return listType;
-    }
-
-    public void setListType(String listType) {
-        this.listType = listType;
-    }
-
-    public List<MovieDb> getItems() {
-        return items;
-    }
-
-    public void setItems(List<MovieDb> items) {
-        this.items = items;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/MovieListCreationStatus.java b/src/main/java/info/movito/themoviedbapi/model/MovieListCreationStatus.java
index df7cc0b0..6f63861c 100644
--- a/src/main/java/info/movito/themoviedbapi/model/MovieListCreationStatus.java
+++ b/src/main/java/info/movito/themoviedbapi/model/MovieListCreationStatus.java
@@ -2,16 +2,12 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.ResponseStatus;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class MovieListCreationStatus extends ResponseStatus {
     @JsonProperty("list_id")
     private String listId;
-
-    public String getListId() {
-        return listId;
-    }
-
-    public void setListId(String listId) {
-        this.listId = listId;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/MovieTranslations.java b/src/main/java/info/movito/themoviedbapi/model/MovieTranslations.java
index c8118c33..da6e9abd 100644
--- a/src/main/java/info/movito/themoviedbapi/model/MovieTranslations.java
+++ b/src/main/java/info/movito/themoviedbapi/model/MovieTranslations.java
@@ -2,18 +2,14 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.IdElement;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class MovieTranslations extends IdElement {
     @JsonProperty("translations")
     private List<Translation> translations;
-
-    public List<Translation> getTranslations() {
-        return translations;
-    }
-
-    public void setTranslations(List<Translation> translations) {
-        this.translations = translations;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/MoviesAlternativeTitles.java b/src/main/java/info/movito/themoviedbapi/model/MoviesAlternativeTitles.java
index 92c1f2c9..4f672ef3 100644
--- a/src/main/java/info/movito/themoviedbapi/model/MoviesAlternativeTitles.java
+++ b/src/main/java/info/movito/themoviedbapi/model/MoviesAlternativeTitles.java
@@ -2,18 +2,14 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.AbstractJsonMapping;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class MoviesAlternativeTitles extends AbstractJsonMapping {
     @JsonProperty("titles")
     private List<AlternativeTitle> titles;
-
-    public List<AlternativeTitle> getTitles() {
-        return titles;
-    }
-
-    public void setTitles(List<AlternativeTitle> titles) {
-        this.titles = titles;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/ProductionCompany.java b/src/main/java/info/movito/themoviedbapi/model/ProductionCompany.java
index 9011028a..0f736666 100644
--- a/src/main/java/info/movito/themoviedbapi/model/ProductionCompany.java
+++ b/src/main/java/info/movito/themoviedbapi/model/ProductionCompany.java
@@ -3,9 +3,11 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 import info.movito.themoviedbapi.model.core.NamedIdElement;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 @JsonRootName("production_company")
 public class ProductionCompany extends NamedIdElement {
     @JsonProperty("logo_path")
@@ -13,25 +15,4 @@ public class ProductionCompany extends NamedIdElement {
 
     @JsonProperty("origin_country")
     private String originCountry;
-
-    public String getLogoPath() {
-        return logoPath;
-    }
-
-    public void setLogoPath(String logoPath) {
-        this.logoPath = logoPath;
-    }
-
-    public String getOriginCountry() {
-        return originCountry;
-    }
-
-    public void setOriginCountry(String originCountry) {
-        this.originCountry = originCountry;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SIMPLE_STYLE);
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/ProductionCountry.java b/src/main/java/info/movito/themoviedbapi/model/ProductionCountry.java
index bb7dec8c..d0b8ee87 100644
--- a/src/main/java/info/movito/themoviedbapi/model/ProductionCountry.java
+++ b/src/main/java/info/movito/themoviedbapi/model/ProductionCountry.java
@@ -3,7 +3,11 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 import info.movito.themoviedbapi.model.core.AbstractJsonMapping;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 @JsonRootName("production_country")
 public class ProductionCountry extends AbstractJsonMapping {
     @JsonProperty("iso_3166_1")
@@ -11,20 +15,4 @@ public class ProductionCountry extends AbstractJsonMapping {
 
     @JsonProperty("name")
     private String name;
-
-    public String getIsoCode() {
-        return isoCode;
-    }
-
-    public void setIsoCode(String isoCode) {
-        this.isoCode = isoCode;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/ReleaseDate.java b/src/main/java/info/movito/themoviedbapi/model/ReleaseDate.java
index 7f741612..23d8e5ef 100644
--- a/src/main/java/info/movito/themoviedbapi/model/ReleaseDate.java
+++ b/src/main/java/info/movito/themoviedbapi/model/ReleaseDate.java
@@ -2,7 +2,11 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.AbstractJsonMapping;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class ReleaseDate extends AbstractJsonMapping {
     @JsonProperty("iso_639_1")
     private String language;
@@ -18,44 +22,4 @@ public class ReleaseDate extends AbstractJsonMapping {
 
     @JsonProperty("type")
     private String type;
-
-    public String getNote() {
-        return note;
-    }
-
-    public void setNote(String note) {
-        this.note = note;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getCertification() {
-        return certification;
-    }
-
-    public void setCertification(String certification) {
-        this.certification = certification;
-    }
-
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public String getReleaseDate() {
-        return releaseDate;
-    }
-
-    public void setReleaseDate(String releaseDate) {
-        this.releaseDate = releaseDate;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/ReleaseInfo.java b/src/main/java/info/movito/themoviedbapi/model/ReleaseInfo.java
index a5daef0d..4b63a74d 100644
--- a/src/main/java/info/movito/themoviedbapi/model/ReleaseInfo.java
+++ b/src/main/java/info/movito/themoviedbapi/model/ReleaseInfo.java
@@ -2,29 +2,17 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.AbstractJsonMapping;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class ReleaseInfo extends AbstractJsonMapping {
     @JsonProperty("iso_3166_1")
     private String country;
 
     @JsonProperty("release_dates")
     private List<ReleaseDate> releaseDates;
-
-    public String getCountry() {
-        return country;
-    }
-
-    public void setCountry(String country) {
-        this.country = country;
-    }
-
-    public List<ReleaseDate> getReleaseDates() {
-        return releaseDates;
-    }
-
-    public void setReleaseDates(List<ReleaseDate> releaseDates) {
-        this.releaseDates = releaseDates;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/Reviews.java b/src/main/java/info/movito/themoviedbapi/model/Reviews.java
index 8da8f4f3..7b33af5b 100644
--- a/src/main/java/info/movito/themoviedbapi/model/Reviews.java
+++ b/src/main/java/info/movito/themoviedbapi/model/Reviews.java
@@ -2,7 +2,11 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.StringIdElement;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class Reviews extends StringIdElement {
     @JsonProperty("author")
     private String author;
@@ -12,28 +16,4 @@ public class Reviews extends StringIdElement {
 
     @JsonProperty("url")
     private String url;
-
-    public String getAuthor() {
-        return author;
-    }
-
-    public void setAuthor(String author) {
-        this.author = author;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/Translation.java b/src/main/java/info/movito/themoviedbapi/model/Translation.java
index b1024999..a6d793e4 100644
--- a/src/main/java/info/movito/themoviedbapi/model/Translation.java
+++ b/src/main/java/info/movito/themoviedbapi/model/Translation.java
@@ -2,9 +2,10 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.NamedElement;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.EqualsAndHashCode;
 
+@lombok.Data
+@EqualsAndHashCode(callSuper = true)
 public class Translation extends NamedElement {
     @JsonProperty("iso_3166_1")
     private String countryCode;
@@ -17,22 +18,6 @@ public class Translation extends NamedElement {
 
     private Data data;
 
-    public String getCountryCode() {
-        return countryCode;
-    }
-
-    public void setCountryCode(String countryCode) {
-        this.countryCode = countryCode;
-    }
-
-    public String getEnglishName() {
-        return englishName;
-    }
-
-    public void setEnglishName(String englishName) {
-        this.englishName = englishName;
-    }
-
     /**
      * @deprecated use {@code getLanguageCode} as iso_3166_1 (country iso code) was added.
      */
@@ -48,25 +33,4 @@ public String getIsoCode() {
     public void setIsoCode(String isoCode) {
         setLanguageCode(isoCode);
     }
-
-    public String getLanguageCode() {
-        return languageCode;
-    }
-
-    public void setLanguageCode(String languageCode) {
-        this.languageCode = languageCode;
-    }
-
-    public Data getData() {
-        return data;
-    }
-
-    public void setData(Data data) {
-        this.data = data;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.SIMPLE_STYLE);
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/Video.java b/src/main/java/info/movito/themoviedbapi/model/Video.java
index f903f050..f6d78bc2 100644
--- a/src/main/java/info/movito/themoviedbapi/model/Video.java
+++ b/src/main/java/info/movito/themoviedbapi/model/Video.java
@@ -4,9 +4,13 @@
 import com.fasterxml.jackson.annotation.JsonRootName;
 import info.movito.themoviedbapi.model.core.IdElement;
 import info.movito.themoviedbapi.model.core.NamedStringIdElement;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 @JsonRootName("video")
 public class Video extends NamedStringIdElement {
     @JsonProperty("site")
@@ -21,45 +25,10 @@ public class Video extends NamedStringIdElement {
     @JsonProperty("type")
     private String type;
 
-    public String getSite() {
-        return site;
-    }
-
-    public void setSite(String site) {
-        this.site = site;
-    }
-
-    public Integer getSize() {
-        return size;
-    }
-
-    public void setSize(Integer size) {
-        this.size = size;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
+    @Data
+    @EqualsAndHashCode(callSuper = true)
     public static class Results extends IdElement {
-
         @JsonProperty("results")
         private List<Video> videos;
-
-        public List<Video> getVideos() {
-            return videos;
-        }
     }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/changes/ChangeKeyItem.java b/src/main/java/info/movito/themoviedbapi/model/changes/ChangeKeyItem.java
index 6450c59d..f02863be 100644
--- a/src/main/java/info/movito/themoviedbapi/model/changes/ChangeKeyItem.java
+++ b/src/main/java/info/movito/themoviedbapi/model/changes/ChangeKeyItem.java
@@ -3,36 +3,24 @@
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class ChangeKeyItem {
-    private final Map<String, Object> newItems = new HashMap<String, Object>();
+    private final Map<String, Object> newItems = new HashMap<>();
 
     @JsonProperty("key")
     private String key;
 
     @JsonProperty("items")
-    private List<ChangedItem> changedItems = new ArrayList<ChangedItem>();
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public List<ChangedItem> getChangedItems() {
-        return changedItems;
-    }
-
-    public void setChangedItems(List<ChangedItem> changes) {
-        this.changedItems = changes;
-    }
+    private List<ChangedItem> changedItems = new ArrayList<>();
 
     @JsonAnyGetter
     public Map<String, Object> getNewItems() {
diff --git a/src/main/java/info/movito/themoviedbapi/model/changes/ChangedItem.java b/src/main/java/info/movito/themoviedbapi/model/changes/ChangedItem.java
index bee83791..5fcd6c59 100644
--- a/src/main/java/info/movito/themoviedbapi/model/changes/ChangedItem.java
+++ b/src/main/java/info/movito/themoviedbapi/model/changes/ChangedItem.java
@@ -4,10 +4,14 @@
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.IdElement;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.HashMap;
 import java.util.Map;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class ChangedItem extends IdElement {
     private final Map<String, Object> newItems = new HashMap<>();
 
@@ -23,38 +27,6 @@ public class ChangedItem extends IdElement {
     @JsonProperty("value")
     private Object value;
 
-    public String getAction() {
-        return action;
-    }
-
-    public void setAction(String action) {
-        this.action = action;
-    }
-
-    public String getTime() {
-        return time;
-    }
-
-    public void setTime(String time) {
-        this.time = time;
-    }
-
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public Object getValue() {
-        return value;
-    }
-
-    public void setValue(Object value) {
-        this.value = value;
-    }
-
     @JsonAnyGetter
     public Map<String, Object> getNewItems() {
         return this.newItems;
diff --git a/src/main/java/info/movito/themoviedbapi/model/changes/ChangedMovie.java b/src/main/java/info/movito/themoviedbapi/model/changes/ChangedMovie.java
index 20070cc9..5ccfe64b 100644
--- a/src/main/java/info/movito/themoviedbapi/model/changes/ChangedMovie.java
+++ b/src/main/java/info/movito/themoviedbapi/model/changes/ChangedMovie.java
@@ -2,16 +2,12 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.IdElement;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class ChangedMovie extends IdElement {
     @JsonProperty("adult")
     private boolean adult;
-
-    public boolean isAdult() {
-        return adult;
-    }
-
-    public void setAdult(boolean adult) {
-        this.adult = adult;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/changes/ChangesItems.java b/src/main/java/info/movito/themoviedbapi/model/changes/ChangesItems.java
index 7723e393..20380520 100644
--- a/src/main/java/info/movito/themoviedbapi/model/changes/ChangesItems.java
+++ b/src/main/java/info/movito/themoviedbapi/model/changes/ChangesItems.java
@@ -3,8 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -14,20 +14,14 @@
 /**
  * TODO: fix or change this.
  */
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class ChangesItems {
     private final Map<String, Object> newItems = new HashMap<>();
 
     @JsonProperty("changes")
     private List<ChangeKeyItem> changedItems = new ArrayList<>();
 
-    public List<ChangeKeyItem> getChangedItems() {
-        return changedItems;
-    }
-
-    public void setChangedItems(List<ChangeKeyItem> changes) {
-        this.changedItems = changes;
-    }
-
     @JsonAnyGetter
     public Map<String, Object> getNewItems() {
         return this.newItems;
@@ -37,9 +31,4 @@ public Map<String, Object> getNewItems() {
     public void setNewItems(String name, Object value) {
         this.newItems.put(name, value);
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/config/Account.java b/src/main/java/info/movito/themoviedbapi/model/config/Account.java
index 8423363d..d6a739c8 100644
--- a/src/main/java/info/movito/themoviedbapi/model/config/Account.java
+++ b/src/main/java/info/movito/themoviedbapi/model/config/Account.java
@@ -2,9 +2,13 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.NamedIdElement;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.HashMap;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class Account extends NamedIdElement {
     @JsonProperty("username")
     private String userName;
@@ -15,22 +19,6 @@ public class Account extends NamedIdElement {
     @JsonProperty("avatar")
     private HashMap<String, HashMap<String, String>> avatar;
 
-    public boolean isIncludeAdult() {
-        return includeAdult;
-    }
-
-    public void setIncludeAdult(boolean includeAdult) {
-        this.includeAdult = includeAdult;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
     /**
      * Gets the gravatar hash.
      *
diff --git a/src/main/java/info/movito/themoviedbapi/model/config/ConfigResults.java b/src/main/java/info/movito/themoviedbapi/model/config/ConfigResults.java
index c7b43a45..344e8008 100644
--- a/src/main/java/info/movito/themoviedbapi/model/config/ConfigResults.java
+++ b/src/main/java/info/movito/themoviedbapi/model/config/ConfigResults.java
@@ -2,30 +2,18 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.AbstractJsonMapping;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class ConfigResults extends AbstractJsonMapping implements Serializable {
     @JsonProperty("images")
     private TmdbConfiguration tmdbConfiguration;
 
     @JsonProperty("change_keys")
     private List<String> changeKeys;
-
-    public TmdbConfiguration getTmdbConfiguration() {
-        return tmdbConfiguration;
-    }
-
-    public void setTmdbConfiguration(TmdbConfiguration tmdbConfiguration) {
-        this.tmdbConfiguration = tmdbConfiguration;
-    }
-
-    public List<String> getChangeKeys() {
-        return changeKeys;
-    }
-
-    public void setChangeKeys(List<String> changeKeys) {
-        this.changeKeys = changeKeys;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/config/Timezone.java b/src/main/java/info/movito/themoviedbapi/model/config/Timezone.java
index db69781e..53b21d87 100644
--- a/src/main/java/info/movito/themoviedbapi/model/config/Timezone.java
+++ b/src/main/java/info/movito/themoviedbapi/model/config/Timezone.java
@@ -1,33 +1,18 @@
 package info.movito.themoviedbapi.model.config;
 
 import info.movito.themoviedbapi.model.core.AbstractJsonMapping;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@AllArgsConstructor
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class Timezone extends AbstractJsonMapping {
     private String name;
 
     private String country;
 
-    public Timezone(String name, String country) {
-        this.name = name;
-        this.country = country;
-    }
-
-    public String getCountry() {
-        return country;
-    }
-
-    public void setCountry(String country) {
-        this.country = country;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
     @Override
     public String toString() {
         return name;
diff --git a/src/main/java/info/movito/themoviedbapi/model/config/TmdbConfiguration.java b/src/main/java/info/movito/themoviedbapi/model/config/TmdbConfiguration.java
index 444b599d..460b064a 100644
--- a/src/main/java/info/movito/themoviedbapi/model/config/TmdbConfiguration.java
+++ b/src/main/java/info/movito/themoviedbapi/model/config/TmdbConfiguration.java
@@ -2,10 +2,14 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.AbstractJsonMapping;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class TmdbConfiguration extends AbstractJsonMapping {
     @JsonProperty("base_url")
     private String baseUrl;
@@ -25,54 +29,6 @@ public class TmdbConfiguration extends AbstractJsonMapping {
     @JsonProperty("logo_sizes")
     private List<String> logoSizes;
 
-    public List<String> getBackdropSizes() {
-        return backdropSizes;
-    }
-
-    public void setBackdropSizes(List<String> backdropSizes) {
-        this.backdropSizes = backdropSizes;
-    }
-
-    public String getBaseUrl() {
-        return baseUrl;
-    }
-
-    public void setBaseUrl(String baseUrl) {
-        this.baseUrl = baseUrl;
-    }
-
-    public List<String> getPosterSizes() {
-        return posterSizes;
-    }
-
-    public void setPosterSizes(List<String> posterSizes) {
-        this.posterSizes = posterSizes;
-    }
-
-    public List<String> getProfileSizes() {
-        return profileSizes;
-    }
-
-    public void setProfileSizes(List<String> profileSizes) {
-        this.profileSizes = profileSizes;
-    }
-
-    public List<String> getLogoSizes() {
-        return logoSizes;
-    }
-
-    public void setLogoSizes(List<String> logoSizes) {
-        this.logoSizes = logoSizes;
-    }
-
-    public String getSecureBaseUrl() {
-        return secureBaseUrl;
-    }
-
-    public void setSecureBaseUrl(String secureBaseUrl) {
-        this.secureBaseUrl = secureBaseUrl;
-    }
-
     /**
      * Copy the data from the passed object to this one.
      */
diff --git a/src/main/java/info/movito/themoviedbapi/model/config/TokenAuthorisation.java b/src/main/java/info/movito/themoviedbapi/model/config/TokenAuthorisation.java
index c3798a8f..436764ce 100644
--- a/src/main/java/info/movito/themoviedbapi/model/config/TokenAuthorisation.java
+++ b/src/main/java/info/movito/themoviedbapi/model/config/TokenAuthorisation.java
@@ -1,7 +1,11 @@
 package info.movito.themoviedbapi.model.config;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class TokenAuthorisation {
     @JsonProperty("expires_at")
     private String expires;
@@ -11,28 +15,4 @@ public class TokenAuthorisation {
 
     @JsonProperty("success")
     private Boolean success;
-
-    public String getExpires() {
-        return expires;
-    }
-
-    public void setExpires(String expires) {
-        this.expires = expires;
-    }
-
-    public String getRequestToken() {
-        return requestToken;
-    }
-
-    public void setRequestToken(String requestToken) {
-        this.requestToken = requestToken;
-    }
-
-    public Boolean getSuccess() {
-        return success != null && success;
-    }
-
-    public void setSuccess(Boolean success) {
-        this.success = success;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/config/TokenSession.java b/src/main/java/info/movito/themoviedbapi/model/config/TokenSession.java
index 36aae7a5..a208eae5 100644
--- a/src/main/java/info/movito/themoviedbapi/model/config/TokenSession.java
+++ b/src/main/java/info/movito/themoviedbapi/model/config/TokenSession.java
@@ -1,7 +1,11 @@
 package info.movito.themoviedbapi.model.config;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class TokenSession {
     @JsonProperty("session_id")
     private String sessionId;
@@ -20,52 +24,4 @@ public class TokenSession {
 
     @JsonProperty("expires_at")
     private String expiresAt;
-
-    public String getSessionId() {
-        return sessionId;
-    }
-
-    public void setSessionId(String sessionId) {
-        this.sessionId = sessionId;
-    }
-
-    public Boolean getSuccess() {
-        return success;
-    }
-
-    public void setSuccess(Boolean success) {
-        this.success = success;
-    }
-
-    public String getStatusCode() {
-        return statusCode;
-    }
-
-    public void setStatusCode(String statusCode) {
-        this.statusCode = statusCode;
-    }
-
-    public String getStatusMessage() {
-        return statusMessage;
-    }
-
-    public void setStatusMessage(String statusMessage) {
-        this.statusMessage = statusMessage;
-    }
-
-    public String getGuestSessionId() {
-        return guestSessionId;
-    }
-
-    public void setGuestSessionId(String guestSessionId) {
-        this.guestSessionId = guestSessionId;
-    }
-
-    public String getExpiresAt() {
-        return expiresAt;
-    }
-
-    public void setExpiresAt(String expiresAt) {
-        this.expiresAt = expiresAt;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/core/AccountID.java b/src/main/java/info/movito/themoviedbapi/model/core/AccountID.java
index ab314eef..5eecc783 100644
--- a/src/main/java/info/movito/themoviedbapi/model/core/AccountID.java
+++ b/src/main/java/info/movito/themoviedbapi/model/core/AccountID.java
@@ -1,10 +1,12 @@
 package info.movito.themoviedbapi.model.core;
 
 import com.google.common.base.Preconditions;
+import lombok.ToString;
 
 /**
  * Simple wrapper to make method signatures less ambiguous as movie ids and page numbers are also just integers.
  */
+@ToString
 public class AccountID {
     private final int accountId;
 
@@ -12,9 +14,4 @@ public AccountID(int accountId) {
         Preconditions.checkArgument(accountId > 0);
         this.accountId = accountId;
     }
-
-    @Override
-    public String toString() {
-        return accountId + "";
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/core/IdElement.java b/src/main/java/info/movito/themoviedbapi/model/core/IdElement.java
index 04d04bb2..0e0c65dd 100644
--- a/src/main/java/info/movito/themoviedbapi/model/core/IdElement.java
+++ b/src/main/java/info/movito/themoviedbapi/model/core/IdElement.java
@@ -1,42 +1,17 @@
 package info.movito.themoviedbapi.model.core;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * Base class for json wrappers with id element.
  *
  * @author Holger Brandl
  */
-public class IdElement extends AbstractJsonMapping implements Serializable {
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class IdElement extends AbstractJsonMapping {
     @JsonProperty("id")
     private int id;
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        IdElement idElement = (IdElement) o;
-
-        return id == idElement.id;
-    }
-
-    @Override
-    public int hashCode() {
-        return id;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/core/MovieKeywords.java b/src/main/java/info/movito/themoviedbapi/model/core/MovieKeywords.java
index 4efcc9a4..497729c1 100644
--- a/src/main/java/info/movito/themoviedbapi/model/core/MovieKeywords.java
+++ b/src/main/java/info/movito/themoviedbapi/model/core/MovieKeywords.java
@@ -2,19 +2,15 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.keywords.Keyword;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.ArrayList;
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class MovieKeywords extends AbstractJsonMapping {
     @JsonProperty("keywords")
     private List<Keyword> keywords = new ArrayList<Keyword>();
-
-    public List<Keyword> getKeywords() {
-        return keywords;
-    }
-
-    public void setKeywords(List<Keyword> keywords) {
-        this.keywords = keywords;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/core/NamedElement.java b/src/main/java/info/movito/themoviedbapi/model/core/NamedElement.java
index 398db9c9..6c531544 100644
--- a/src/main/java/info/movito/themoviedbapi/model/core/NamedElement.java
+++ b/src/main/java/info/movito/themoviedbapi/model/core/NamedElement.java
@@ -1,40 +1,12 @@
 package info.movito.themoviedbapi.model.core;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class NamedElement extends AbstractJsonMapping {
     @JsonProperty("name")
     private String name;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        NamedElement that = (NamedElement) o;
-
-        return name.equals(that.name);
-    }
-
-    @Override
-    public int hashCode() {
-        return name.hashCode();
-    }
-
-    @Override
-    public String toString() {
-        return name;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/core/NamedIdElement.java b/src/main/java/info/movito/themoviedbapi/model/core/NamedIdElement.java
index 0856dca0..ac3d6348 100644
--- a/src/main/java/info/movito/themoviedbapi/model/core/NamedIdElement.java
+++ b/src/main/java/info/movito/themoviedbapi/model/core/NamedIdElement.java
@@ -1,21 +1,12 @@
 package info.movito.themoviedbapi.model.core;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class NamedIdElement extends IdElement {
     @JsonProperty("name")
     private String name;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String toString() {
-        return getName() + " [" + getId() + "]";
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/core/NamedStringIdElement.java b/src/main/java/info/movito/themoviedbapi/model/core/NamedStringIdElement.java
index 1298d925..132bc2ed 100644
--- a/src/main/java/info/movito/themoviedbapi/model/core/NamedStringIdElement.java
+++ b/src/main/java/info/movito/themoviedbapi/model/core/NamedStringIdElement.java
@@ -1,27 +1,15 @@
 package info.movito.themoviedbapi.model.core;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class NamedStringIdElement extends StringIdElement {
     @JsonProperty("name")
     private String name;
 
     @JsonProperty("iso_639_1")
     private String iso639;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getIso639() {
-        return iso639;
-    }
-
-    public void setIso639(String iso639) {
-        this.iso639 = iso639;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/core/ResponseStatus.java b/src/main/java/info/movito/themoviedbapi/model/core/ResponseStatus.java
index 3866d59a..688112fa 100644
--- a/src/main/java/info/movito/themoviedbapi/model/core/ResponseStatus.java
+++ b/src/main/java/info/movito/themoviedbapi/model/core/ResponseStatus.java
@@ -1,45 +1,22 @@
 package info.movito.themoviedbapi.model.core;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.MoreObjects;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
 /**
  * See https://www.themoviedb.org/documentation/api/status-codes.
  */
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class ResponseStatus extends AbstractJsonMapping {
     @JsonProperty("status_code")
     private Integer statusCode;
 
     @JsonProperty("status_message")
     private String statusMessage;
-
-    public ResponseStatus() {
-    }
-
-    public ResponseStatus(Integer statusCode, String statusMessage) {
-        this.statusCode = statusCode;
-        this.statusMessage = statusMessage;
-    }
-
-    public Integer getStatusCode() {
-        return statusCode;
-    }
-
-    public void setStatusCode(int statusCode) {
-        this.statusCode = statusCode;
-    }
-
-    public String getStatusMessage() {
-        return statusMessage;
-    }
-
-    public void setStatusMessage(String statusMessage) {
-        this.statusMessage = statusMessage;
-    }
-
-    @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this).add("code", getStatusCode()).add("message", getStatusMessage())
-            .toString();
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/core/ResponseStatusException.java b/src/main/java/info/movito/themoviedbapi/model/core/ResponseStatusException.java
index db5a01f8..72efb370 100644
--- a/src/main/java/info/movito/themoviedbapi/model/core/ResponseStatusException.java
+++ b/src/main/java/info/movito/themoviedbapi/model/core/ResponseStatusException.java
@@ -1,7 +1,9 @@
 package info.movito.themoviedbapi.model.core;
 
 import info.movito.themoviedbapi.tools.MovieDbException;
+import lombok.Getter;
 
+@Getter
 public class ResponseStatusException extends MovieDbException {
     private final ResponseStatus responseStatus;
 
@@ -14,10 +16,6 @@ public ResponseStatusException(ResponseStatus responseStatus) {
         this.responseStatus = responseStatus;
     }
 
-    public ResponseStatus getResponseStatus() {
-        return responseStatus;
-    }
-
     @Override
     public String toString() {
         return responseStatus.toString();
diff --git a/src/main/java/info/movito/themoviedbapi/model/core/ResultDates.java b/src/main/java/info/movito/themoviedbapi/model/core/ResultDates.java
index 0f4f94be..8bda4393 100644
--- a/src/main/java/info/movito/themoviedbapi/model/core/ResultDates.java
+++ b/src/main/java/info/movito/themoviedbapi/model/core/ResultDates.java
@@ -2,11 +2,15 @@
 
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Setter
+@Getter
 public class ResultDates extends AbstractJsonMapping {
     private static final Logger logger = LoggerFactory.getLogger(ResultDates.class);
 
@@ -16,22 +20,6 @@ public class ResultDates extends AbstractJsonMapping {
     @JsonProperty("maximum")
     private String maximum = "";
 
-    public String getMinimum() {
-        return minimum;
-    }
-
-    public void setMinimum(String minimum) {
-        this.minimum = minimum;
-    }
-
-    public String getMaximum() {
-        return maximum;
-    }
-
-    public void setMaximum(String maximum) {
-        this.maximum = maximum;
-    }
-
     /**
      * Handle unknown properties and print a message.
      */
diff --git a/src/main/java/info/movito/themoviedbapi/model/core/ResultsPage.java b/src/main/java/info/movito/themoviedbapi/model/core/ResultsPage.java
index d29d373f..90e3cfd4 100644
--- a/src/main/java/info/movito/themoviedbapi/model/core/ResultsPage.java
+++ b/src/main/java/info/movito/themoviedbapi/model/core/ResultsPage.java
@@ -1,10 +1,14 @@
 package info.movito.themoviedbapi.model.core;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Iterator;
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class ResultsPage<T> extends AbstractJsonMapping implements Iterable<T> {
     @JsonProperty("results")
     private List<T> results;
@@ -22,36 +26,4 @@ public class ResultsPage<T> extends AbstractJsonMapping implements Iterable<T> {
     public Iterator<T> iterator() {
         return results.iterator();
     }
-
-    public List<T> getResults() {
-        return results;
-    }
-
-    public void setResults(List<T> results) {
-        this.results = results;
-    }
-
-    public int getPage() {
-        return page;
-    }
-
-    public void setPage(int page) {
-        this.page = page;
-    }
-
-    public int getTotalPages() {
-        return totalPages;
-    }
-
-    public void setTotalPages(int totalPages) {
-        this.totalPages = totalPages;
-    }
-
-    public int getTotalResults() {
-        return totalResults;
-    }
-
-    public void setTotalResults(int totalResults) {
-        this.totalResults = totalResults;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/core/SessionToken.java b/src/main/java/info/movito/themoviedbapi/model/core/SessionToken.java
index b0bbb277..0a88cef3 100644
--- a/src/main/java/info/movito/themoviedbapi/model/core/SessionToken.java
+++ b/src/main/java/info/movito/themoviedbapi/model/core/SessionToken.java
@@ -1,30 +1,18 @@
 package info.movito.themoviedbapi.model.core;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 /**
  * A simple wrapper around the session token used for user authentication. Introduced to have a more strongly typed
  * api.
+ *
+ * @param sessionToken the session token.
  */
-public class SessionToken {
-    private final String sessionToken;
-
-    public SessionToken(String sessionToken) {
+@Data
+@EqualsAndHashCode(callSuper = false)
+public record SessionToken(String sessionToken) {
+    public SessionToken {
         assert sessionToken != null;
-        this.sessionToken = sessionToken;
-    }
-
-    @Override
-    public String toString() {
-        return sessionToken;
-    }
-
-    @Override
-    public int hashCode() {
-        return sessionToken.hashCode();
-    }
-
-    @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
-    @Override
-    public boolean equals(Object obj) {
-        return sessionToken.equals(obj.toString());
     }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/core/StringIdElement.java b/src/main/java/info/movito/themoviedbapi/model/core/StringIdElement.java
index c2e0a903..686a4983 100644
--- a/src/main/java/info/movito/themoviedbapi/model/core/StringIdElement.java
+++ b/src/main/java/info/movito/themoviedbapi/model/core/StringIdElement.java
@@ -1,42 +1,17 @@
 package info.movito.themoviedbapi.model.core;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * Base class for json wrappers with id element.
  *
  * @author Holger Brandl
  */
-public class StringIdElement extends AbstractJsonMapping implements Serializable {
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class StringIdElement extends AbstractJsonMapping {
     @JsonProperty("id")
     private String id;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        StringIdElement that = (StringIdElement) o;
-
-        return id.equals(that.id);
-    }
-
-    @Override
-    public int hashCode() {
-        return id.hashCode();
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/core/TvKeywords.java b/src/main/java/info/movito/themoviedbapi/model/core/TvKeywords.java
index a8b38166..02bc43d3 100644
--- a/src/main/java/info/movito/themoviedbapi/model/core/TvKeywords.java
+++ b/src/main/java/info/movito/themoviedbapi/model/core/TvKeywords.java
@@ -2,19 +2,14 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.keywords.Keyword;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
-import java.util.ArrayList;
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class TvKeywords extends AbstractJsonMapping {
     @JsonProperty("results")
-    private List<Keyword> results = new ArrayList<Keyword>();
-
-    public List<Keyword> getKeywords() {
-        return results;
-    }
-
-    public void setKeywords(List<Keyword> keywords) {
-        this.results = keywords;
-    }
+    private List<Keyword> results;
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/keywords/KeywordMovie.java b/src/main/java/info/movito/themoviedbapi/model/keywords/KeywordMovie.java
index b24a2b42..38c1d49c 100644
--- a/src/main/java/info/movito/themoviedbapi/model/keywords/KeywordMovie.java
+++ b/src/main/java/info/movito/themoviedbapi/model/keywords/KeywordMovie.java
@@ -2,7 +2,11 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.IdElement;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class KeywordMovie extends IdElement {
     @JsonProperty("backdrop_path")
     private String backdropPath;
@@ -30,76 +34,4 @@ public class KeywordMovie extends IdElement {
 
     @JsonProperty("popularity")
     private float popularity;
-
-    public String getBackdropPath() {
-        return backdropPath;
-    }
-
-    public void setBackdropPath(String backdropPath) {
-        this.backdropPath = backdropPath;
-    }
-
-    public String getOriginalTitle() {
-        return originalTitle;
-    }
-
-    public void setOriginalTitle(String originalTitle) {
-        this.originalTitle = originalTitle;
-    }
-
-    public String getReleaseDate() {
-        return releaseDate;
-    }
-
-    public void setReleaseDate(String releaseDate) {
-        this.releaseDate = releaseDate;
-    }
-
-    public String getPosterPath() {
-        return posterPath;
-    }
-
-    public void setPosterPath(String posterPath) {
-        this.posterPath = posterPath;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public float getVoteAverage() {
-        return voteAverage;
-    }
-
-    public void setVoteAverage(float voteAverage) {
-        this.voteAverage = voteAverage;
-    }
-
-    public double getVoteCount() {
-        return voteCount;
-    }
-
-    public void setVoteCount(double voteCount) {
-        this.voteCount = voteCount;
-    }
-
-    public boolean isAdult() {
-        return adult;
-    }
-
-    public void setAdult(boolean adult) {
-        this.adult = adult;
-    }
-
-    public float getPopularity() {
-        return popularity;
-    }
-
-    public void setPopularity(float popularity) {
-        this.popularity = popularity;
-    }
 }
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 37bcfebe..a447b7e7 100644
--- a/src/main/java/info/movito/themoviedbapi/model/people/Person.java
+++ b/src/main/java/info/movito/themoviedbapi/model/people/Person.java
@@ -2,8 +2,12 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.NamedIdElement;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.StringUtils;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class Person extends NamedIdElement {
     @JsonProperty("profile_path")
     protected String profilePath;
@@ -14,27 +18,7 @@ public class Person extends NamedIdElement {
     @JsonProperty("credit_id")
     private String creditId;
 
-    public String getProfilePath() {
-        return profilePath;
-    }
-
     public void setProfilePath(String profilePath) {
         this.profilePath = StringUtils.trimToEmpty(profilePath);
     }
-
-    public int getCastId() {
-        return castId;
-    }
-
-    public void setCastId(int castId) {
-        this.castId = castId;
-    }
-
-    public String getCreditId() {
-        return creditId;
-    }
-
-    public void setCreditId(String creditId) {
-        this.creditId = creditId;
-    }
 }
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 6077d47a..11b27b03 100644
--- a/src/main/java/info/movito/themoviedbapi/model/people/PersonCast.java
+++ b/src/main/java/info/movito/themoviedbapi/model/people/PersonCast.java
@@ -1,37 +1,20 @@
 package info.movito.themoviedbapi.model.people;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.StringUtils;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class PersonCast extends Person {
-
     @JsonProperty("character")
     private String character;
 
     @JsonProperty("order")
     private int order;
 
-    public String getCharacter() {
-        return character;
-    }
-
     public void setCharacter(String character) {
         this.character = StringUtils.trimToEmpty(character);
     }
-
-    public int getOrder() {
-        return order;
-    }
-
-    public void setOrder(int order) {
-        this.order = order;
-    }
-
-    public String getProfilePath() {
-        return profilePath;
-    }
-
-    public void setProfilePath(String profilePath) {
-        this.profilePath = StringUtils.trimToEmpty(profilePath);
-    }
 }
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 119b70e7..93e8353e 100644
--- a/src/main/java/info/movito/themoviedbapi/model/people/PersonCredit.java
+++ b/src/main/java/info/movito/themoviedbapi/model/people/PersonCredit.java
@@ -2,7 +2,11 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.IdElement;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class PersonCredit extends IdElement {
     // note:  id here refers to a movie not a cast or crew
     @JsonProperty("original_language")
@@ -61,160 +65,12 @@ public class PersonCredit extends IdElement {
 
     private PersonType personType = PersonType.PERSON;
 
-    public String getBackdropPath() {
-        return backdropPath;
-    }
-
-    public void setBackdropPath(String backdropPath) {
-        this.backdropPath = backdropPath;
-    }
-
-    public Float getVoteAvg() {
-        return voteAvg;
-    }
-
-    public void setVoteAvg(Float voteAvg) {
-        this.voteAvg = voteAvg;
-    }
-
-    public String getFirstAirDate() {
-        return firstAirDate;
-    }
-
-    public void setFirstAirDate(String firstAirDate) {
-        this.firstAirDate = firstAirDate;
-    }
-
     public String getSeriesName() {
         return name;
     }
 
-    public int getEpisodeCount() {
-        return episodeCount;
-    }
-
-    public void setEpisodeCount(int episodeCount) {
-        this.episodeCount = episodeCount;
-    }
-
-    public String getOverview() {
-        return overview;
-    }
-
-    public void setOverview(String overview) {
-        this.overview = overview;
-    }
-
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public String getMediaType() {
-        return mediaType;
-    }
-
-    public void setMediaType(String mediaType) {
-        this.mediaType = mediaType;
-    }
-
-    public String getSeriesOriginalTitle() {
-        return seriesOriginalTitle;
-    }
-
-    public void setSeriesOriginalTitle(String seriesOriginalTitle) {
-        this.seriesOriginalTitle = seriesOriginalTitle;
-    }
-
-    public String getCharacter() {
-        return character;
-    }
-
-    public void setCharacter(String character) {
-        this.character = character;
-    }
-
-    public String getDepartment() {
-        return department;
-    }
-
-    public void setDepartment(String department) {
-        this.department = department;
-    }
-
     // convenience wrapper to make api more clear
     public int getMediaId() {
         return getId();
     }
-
-    public String getMovieOriginalTitle() {
-        return movieOriginalTitle;
-    }
-
-    public void setMovieOriginalTitle(String movieOriginalTitle) {
-        this.movieOriginalTitle = movieOriginalTitle;
-    }
-
-    public String getMovieTitle() {
-        return movieTitle;
-    }
-
-    public void setMovieTitle(String movieTitle) {
-        this.movieTitle = movieTitle;
-    }
-
-    public PersonType getPersonType() {
-        return personType;
-    }
-
-    public void setPersonType(PersonType personType) {
-        this.personType = personType;
-    }
-
-    public String getPosterPath() {
-        return posterPath;
-    }
-
-    public void setPosterPath(String posterPath) {
-        this.posterPath = posterPath;
-    }
-
-    public String getReleaseDate() {
-        return releaseDate;
-    }
-
-    public void setReleaseDate(String releaseDate) {
-        this.releaseDate = releaseDate;
-    }
-
-    public float getPopularity() {
-        return popularity;
-    }
-
-    public void setPopularity(float popularity) {
-        this.popularity = popularity;
-    }
-
-    public int getVoteCount() {
-        return voteCount;
-    }
-
-    public void setVoteCount(int voteCount) {
-        this.voteCount = voteCount;
-    }
-
-    public String getAdult() {
-        return adult;
-    }
-
-    public void setAdult(String adult) {
-        this.adult = adult;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/people/PersonCredits.java b/src/main/java/info/movito/themoviedbapi/model/people/PersonCredits.java
index 3ab30b2a..44c1d340 100644
--- a/src/main/java/info/movito/themoviedbapi/model/people/PersonCredits.java
+++ b/src/main/java/info/movito/themoviedbapi/model/people/PersonCredits.java
@@ -2,29 +2,17 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import info.movito.themoviedbapi.model.core.AbstractJsonMapping;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class PersonCredits extends AbstractJsonMapping {
     @JsonProperty("cast")
     private List<PersonCredit> cast;
 
     @JsonProperty("crew")
     private List<PersonCredit> crew;
-
-    public List<PersonCredit> getCast() {
-        return cast;
-    }
-
-    public void setCast(List<PersonCredit> cast) {
-        this.cast = cast;
-    }
-
-    public List<PersonCredit> getCrew() {
-        return crew;
-    }
-
-    public void setCrew(List<PersonCredit> crew) {
-        this.crew = crew;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/people/PersonCrew.java b/src/main/java/info/movito/themoviedbapi/model/people/PersonCrew.java
index 8bc0ab75..324cc438 100644
--- a/src/main/java/info/movito/themoviedbapi/model/people/PersonCrew.java
+++ b/src/main/java/info/movito/themoviedbapi/model/people/PersonCrew.java
@@ -1,8 +1,12 @@
 package info.movito.themoviedbapi.model.people;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.StringUtils;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class PersonCrew extends Person {
     @JsonProperty("department")
     private String department;
@@ -10,18 +14,10 @@ public class PersonCrew extends Person {
     @JsonProperty("job")
     private String job;
 
-    public String getDepartment() {
-        return department;
-    }
-
     public void setDepartment(String department) {
         this.department = StringUtils.trimToEmpty(department);
     }
 
-    public String getJob() {
-        return job;
-    }
-
     public void setJob(String job) {
         this.job = StringUtils.trimToEmpty(job);
     }
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 de89caf2..8cc3c66b 100644
--- a/src/main/java/info/movito/themoviedbapi/model/people/PersonPeople.java
+++ b/src/main/java/info/movito/themoviedbapi/model/people/PersonPeople.java
@@ -3,11 +3,15 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import info.movito.themoviedbapi.model.Multi;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 @JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
 public class PersonPeople extends Person implements Multi {
     // todo initializers should all go away
@@ -35,7 +39,7 @@ public class PersonPeople extends Person implements Multi {
     private boolean adult = false;  // PersonPeople info
 
     @JsonProperty("also_known_as")
-    private List<String> aka = new ArrayList<String>();
+    private List<String> aka = new ArrayList<>();
 
     @JsonProperty("biography")
     private String biography;
@@ -92,134 +96,34 @@ public void addCast(int id, String name, String profilePath, String character, i
         setJob(CAST_JOB);
     }
 
-    public String getCharacter() {
-        return character;
-    }
-
-    public void setCharacter(String character) {
-        this.character = character;
-    }
-
-    public String getDepartment() {
-        return department;
-    }
-
-    public void setDepartment(String department) {
-        this.department = department;
-    }
-
-    public String getJob() {
-        return job;
-    }
-
     public void setJob(String job) {
         this.job = StringUtils.trimToEmpty(job);
     }
 
-    public int getOrder() {
-        return order;
-    }
-
-    public void setOrder(int order) {
-        this.order = order;
-    }
-
-    public PersonType getPersonType() {
-        return personType;
-    }
-
-    public void setPersonType(PersonType personType) {
-        this.personType = personType;
-    }
-
-    public boolean isAdult() {
-        return adult;
-    }
-
-    public void setAdult(boolean adult) {
-        this.adult = adult;
-    }
-
-    public List<String> getAka() {
-        return aka;
-    }
-
-    public void setAka(List<String> aka) {
-        this.aka = aka;
-    }
-
-    public String getBiography() {
-        return biography;
-    }
-
     public void setBiography(String biography) {
         this.biography = StringUtils.trimToEmpty(biography);
     }
 
-    public String getBirthday() {
-        return birthday;
-    }
-
     public void setBirthday(String birthday) {
         this.birthday = StringUtils.trimToEmpty(birthday);
     }
 
-    public String getBirthplace() {
-        return birthplace;
-    }
-
     public void setBirthplace(String birthplace) {
         this.birthplace = StringUtils.trimToEmpty(birthplace);
     }
 
-    public String getDeathday() {
-        return deathday;
-    }
-
     public void setDeathday(String deathday) {
         this.deathday = StringUtils.trimToEmpty(deathday);
     }
 
-    public String getHomepage() {
-        return homepage;
-    }
-
     public void setHomepage(String homepage) {
         this.homepage = StringUtils.trimToEmpty(homepage);
     }
 
-    public String getImdbId() {
-        return imdbId;
-    }
-
     public void setImdbId(String imdbId) {
         this.imdbId = StringUtils.trimToEmpty(imdbId);
     }
 
-    public float getPopularity() {
-        return popularity;
-    }
-
-    public void setPopularity(float popularity) {
-        this.popularity = popularity;
-    }
-
-    public int getGender() {
-        return gender;
-    }
-
-    public void setGender(int gender) {
-        this.gender = gender;
-    }
-
-    public String getKnownForDepartment() {
-        return knownForDepartment;
-    }
-
-    public void setKnownForDepartment(String knownForDepartment) {
-        this.knownForDepartment = knownForDepartment;
-    }
-
     @Override
     public MediaType getMediaType() {
         return MediaType.PERSON;
diff --git a/src/main/java/info/movito/themoviedbapi/model/providers/Provider.java b/src/main/java/info/movito/themoviedbapi/model/providers/Provider.java
index e164a1e3..bf1a6a1b 100644
--- a/src/main/java/info/movito/themoviedbapi/model/providers/Provider.java
+++ b/src/main/java/info/movito/themoviedbapi/model/providers/Provider.java
@@ -1,7 +1,11 @@
 package info.movito.themoviedbapi.model.providers;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class Provider {
     @JsonProperty("display_priority")
     private Integer displayPriority;
@@ -14,40 +18,4 @@ public class Provider {
 
     @JsonProperty("provider_name")
     private String providerName;
-
-    public Integer getDisplayPriority() {
-        return displayPriority;
-    }
-
-    public Provider setDisplayPriority(Integer displayPriority) {
-        this.displayPriority = displayPriority;
-        return this;
-    }
-
-    public String getLogoPath() {
-        return logoPath;
-    }
-
-    public Provider setLogoPath(String logoPath) {
-        this.logoPath = logoPath;
-        return this;
-    }
-
-    public Integer getProviderId() {
-        return providerId;
-    }
-
-    public Provider setProviderId(Integer providerId) {
-        this.providerId = providerId;
-        return this;
-    }
-
-    public String getProviderName() {
-        return providerName;
-    }
-
-    public Provider setProviderName(String providerName) {
-        this.providerName = providerName;
-        return this;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/providers/ProviderResults.java b/src/main/java/info/movito/themoviedbapi/model/providers/ProviderResults.java
index f2155dac..44872d55 100644
--- a/src/main/java/info/movito/themoviedbapi/model/providers/ProviderResults.java
+++ b/src/main/java/info/movito/themoviedbapi/model/providers/ProviderResults.java
@@ -1,9 +1,13 @@
 package info.movito.themoviedbapi.model.providers;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.Map;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class ProviderResults {
     @JsonProperty("id")
     private int id;
@@ -11,15 +15,6 @@ public class ProviderResults {
     @JsonProperty("results")
     private Map<String, WatchProviders> results;
 
-    public Map<String, WatchProviders> getResults() {
-        return results;
-    }
-
-    public ProviderResults setResults(Map<String, WatchProviders> results) {
-        this.results = results;
-        return this;
-    }
-
     public WatchProviders getProvidersForCountry(String country) {
         return results.getOrDefault(country, null);
     }
diff --git a/src/main/java/info/movito/themoviedbapi/model/providers/WatchProviders.java b/src/main/java/info/movito/themoviedbapi/model/providers/WatchProviders.java
index cbf7edaf..326554ae 100644
--- a/src/main/java/info/movito/themoviedbapi/model/providers/WatchProviders.java
+++ b/src/main/java/info/movito/themoviedbapi/model/providers/WatchProviders.java
@@ -1,9 +1,13 @@
 package info.movito.themoviedbapi.model.providers;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class WatchProviders {
     @JsonProperty("link")
     private String link;
@@ -16,40 +20,4 @@ public class WatchProviders {
 
     @JsonProperty("flatrate")
     private List<Provider> flatrateProviders;
-
-    public String getLink() {
-        return link;
-    }
-
-    public WatchProviders setLink(String link) {
-        this.link = link;
-        return this;
-    }
-
-    public List<Provider> getRentProviders() {
-        return rentProviders;
-    }
-
-    public WatchProviders setRentProviders(List<Provider> rentProviders) {
-        this.rentProviders = rentProviders;
-        return this;
-    }
-
-    public List<Provider> getBuyProviders() {
-        return buyProviders;
-    }
-
-    public WatchProviders setBuyProviders(List<Provider> buyProviders) {
-        this.buyProviders = buyProviders;
-        return this;
-    }
-
-    public List<Provider> getFlatrateProviders() {
-        return flatrateProviders;
-    }
-
-    public WatchProviders setFlatrateProviders(List<Provider> flatrateProviders) {
-        this.flatrateProviders = flatrateProviders;
-        return this;
-    }
 }
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 650f39b7..f06ad9f7 100644
--- a/src/main/java/info/movito/themoviedbapi/model/tv/AbstractTvElement.java
+++ b/src/main/java/info/movito/themoviedbapi/model/tv/AbstractTvElement.java
@@ -7,10 +7,11 @@
 import info.movito.themoviedbapi.model.Video;
 import info.movito.themoviedbapi.model.core.NamedIdElement;
 import info.movito.themoviedbapi.model.core.TvKeywords;
-import info.movito.themoviedbapi.model.keywords.Keyword;
-
-import java.util.List;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = false)
 public class AbstractTvElement extends NamedIdElement {
     // Appendable responses for all tv elements
 
@@ -28,44 +29,4 @@ public class AbstractTvElement extends NamedIdElement {
 
     @JsonProperty("keywords")
     private TvKeywords keywords;
-
-    public Credits getCredits() {
-        return credits;
-    }
-
-    public void setCredits(Credits c) {
-        credits = c;
-    }
-
-    public ExternalIds getExternalIds() {
-        return externalIds;
-    }
-
-    public void setExternalIds(ExternalIds e) {
-        externalIds = e;
-    }
-
-    public MovieImages getImages() {
-        return images;
-    }
-
-    public void setImages(MovieImages images) {
-        this.images = images;
-    }
-
-    public List<Video> getVideos() {
-        return videos != null ? videos.getVideos() : null;
-    }
-
-    public void setVideos(Video.Results videos) {
-        this.videos = videos;
-    }
-
-    public List<Keyword> getKeywords() {
-        return keywords != null ? keywords.getKeywords() : null;
-    }
-
-    public void setKeywords(TvKeywords keywords) {
-        this.keywords = keywords;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/tv/TvEpisode.java b/src/main/java/info/movito/themoviedbapi/model/tv/TvEpisode.java
index d93cfdd9..db8bef06 100644
--- a/src/main/java/info/movito/themoviedbapi/model/tv/TvEpisode.java
+++ b/src/main/java/info/movito/themoviedbapi/model/tv/TvEpisode.java
@@ -1,7 +1,11 @@
 package info.movito.themoviedbapi.model.tv;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class TvEpisode extends AbstractTvElement {
     @JsonProperty("overview")
     private String overview;
@@ -29,79 +33,4 @@ public class TvEpisode extends AbstractTvElement {
 
     @JsonProperty("vote_count")
     private int voteCount;
-
-    public String getOverview() {
-        return overview;
-    }
-
-    public void setOverview(String overview) {
-        this.overview = overview;
-    }
-
-    public String getAirDate() {
-        return airDate;
-    }
-
-    public void setAirDate(String airDate) {
-        this.airDate = airDate;
-    }
-
-    /**
-     * Just set when fetching rated tv-episodes.
-     */
-    public Integer getSeriesId() {
-        return seriesId;
-    }
-
-    public void setSeriesId(int seriesId) {
-        this.seriesId = seriesId;
-    }
-
-    public int getSeasonNumber() {
-        return seasonNumber;
-    }
-
-    public void setSeasonNumber(Integer seasonNumber) {
-        this.seasonNumber = seasonNumber;
-    }
-
-    public int getEpisodeNumber() {
-        return episodeNumber;
-    }
-
-    public void setEpisodeNumber(int episodeNumber) {
-        this.episodeNumber = episodeNumber;
-    }
-
-    public String getStillPath() {
-        return stillPath;
-    }
-
-    public void setStillPath(String stillPath) {
-        this.stillPath = stillPath;
-    }
-
-    public float getUserRating() {
-        return userRating;
-    }
-
-    public void setUserRating(float userRating) {
-        this.userRating = userRating;
-    }
-
-    public float getVoteAverage() {
-        return voteAverage;
-    }
-
-    public void setVoteAverage(float voteAverage) {
-        this.voteAverage = voteAverage;
-    }
-
-    public int getVoteCount() {
-        return voteCount;
-    }
-
-    public void setVoteCount(int voteCount) {
-        this.voteCount = voteCount;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/tv/TvSeason.java b/src/main/java/info/movito/themoviedbapi/model/tv/TvSeason.java
index 4da61499..fb44c510 100644
--- a/src/main/java/info/movito/themoviedbapi/model/tv/TvSeason.java
+++ b/src/main/java/info/movito/themoviedbapi/model/tv/TvSeason.java
@@ -1,9 +1,13 @@
 package info.movito.themoviedbapi.model.tv;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
+@Data
+@EqualsAndHashCode(callSuper = true)
 public class TvSeason extends AbstractTvElement {
     @JsonProperty("air_date")
     private String airDate;
@@ -19,45 +23,4 @@ public class TvSeason extends AbstractTvElement {
 
     @JsonProperty("episodes")
     private List<TvEpisode> episodes;
-
-    public String getAirDate() {
-        return airDate;
-    }
-
-    public void setAirDate(String airDate) {
-        this.airDate = airDate;
-    }
-
-    public String getPosterPath() {
-        return posterPath;
-    }
-
-    public void setPosterPath(String posterPath) {
-        this.posterPath = posterPath;
-    }
-
-    public int getSeasonNumber() {
-        return seasonNumber;
-    }
-
-    public void setSeasonNumber(int seasonNumber) {
-        this.seasonNumber = seasonNumber;
-    }
-
-    public List<TvEpisode> getEpisodes() {
-
-        return episodes;
-    }
-
-    public void setEpisodes(List<TvEpisode> episodes) {
-        this.episodes = episodes;
-    }
-
-    public String getOverview() {
-        return overview;
-    }
-
-    public void setOverview(String overview) {
-        this.overview = overview;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/model/tv/TvSeries.java b/src/main/java/info/movito/themoviedbapi/model/tv/TvSeries.java
index c0ccb679..6b491485 100644
--- a/src/main/java/info/movito/themoviedbapi/model/tv/TvSeries.java
+++ b/src/main/java/info/movito/themoviedbapi/model/tv/TvSeries.java
@@ -7,12 +7,16 @@
 import info.movito.themoviedbapi.model.Multi;
 import info.movito.themoviedbapi.model.core.ResultsPage;
 import info.movito.themoviedbapi.model.people.Person;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
 /**
  * @author Holger Brandl
  */
+@Data
+@EqualsAndHashCode(callSuper = true)
 @JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
 public class TvSeries extends AbstractTvElement implements Multi {
     @JsonProperty("created_by")
@@ -81,184 +85,8 @@ public class TvSeries extends AbstractTvElement implements Multi {
     @JsonProperty("content_ratings")
     private ContentRating.Results contentRatings;
 
-    public List<Person> getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(List<Person> createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public List<Integer> getEpisodeRuntime() {
-        return episodeRuntime;
-    }
-
-    public void setEpisodeRuntime(List<Integer> episodeRuntime) {
-        this.episodeRuntime = episodeRuntime;
-    }
-
-    public String getFirstAirDate() {
-        return firstAirDate;
-    }
-
-    public void setFirstAirDate(String firstAirDate) {
-        this.firstAirDate = firstAirDate;
-    }
-
-    public String getLastAirDate() {
-        return lastAirDate;
-    }
-
-    public void setLastAirDate(String lastAirDate) {
-        this.lastAirDate = lastAirDate;
-    }
-
-    public List<Genre> getGenres() {
-        return genres;
-    }
-
-    public void setGenres(List<Genre> genres) {
-        this.genres = genres;
-    }
-
-    public String getHomepage() {
-        return homepage;
-    }
-
-    public void setHomepage(String homepage) {
-        this.homepage = homepage;
-    }
-
-    public String getOriginalName() {
-        return originalName;
-    }
-
-    public void setOriginalName(String originalName) {
-        this.originalName = originalName;
-    }
-
-    public List<String> getOriginCountry() {
-        return originCountry;
-    }
-
-    public void setOriginCountry(List<String> originCountry) {
-        this.originCountry = originCountry;
-    }
-
-    public List<Network> getNetworks() {
-        return networks;
-    }
-
-    public void setNetworks(List<Network> networks) {
-        this.networks = networks;
-    }
-
-    public String getOverview() {
-        return overview;
-    }
-
-    public void setOverview(String overview) {
-        this.overview = overview;
-    }
-
-    public float getPopularity() {
-        return popularity;
-    }
-
-    public void setPopularity(float popularity) {
-        this.popularity = popularity;
-    }
-
-    public String getBackdropPath() {
-        return backdropPath;
-    }
-
-    public void setBackdropPath(String backdropPath) {
-        this.backdropPath = backdropPath;
-    }
-
-    public String getPosterPath() {
-        return posterPath;
-    }
-
-    public void setPosterPath(String posterPath) {
-        this.posterPath = posterPath;
-    }
-
-    public int getNumberOfEpisodes() {
-        return numberOfEpisodes;
-    }
-
-    public void setNumberOfEpisodes(int numberOfEpisodes) {
-        this.numberOfEpisodes = numberOfEpisodes;
-    }
-
-    public int getNumberOfSeasons() {
-        return numberOfSeasons;
-    }
-
-    public void setNumberOfSeasons(int numberOfSeasons) {
-        this.numberOfSeasons = numberOfSeasons;
-    }
-
-    public List<TvSeason> getSeasons() {
-        return seasons;
-    }
-
-    public void setSeasons(List<TvSeason> seasons) {
-        this.seasons = seasons;
-    }
-
-    public ResultsPage<TvSeries> getRecommendations() {
-        return recommendations;
-    }
-
-    public void setRecommendations(ResultsPage<TvSeries> recommendations) {
-        this.recommendations = recommendations;
-    }
-
-    public float getUserRating() {
-        return userRating;
-    }
-
-    public void setUserRating(float userRating) {
-        this.userRating = userRating;
-    }
-
-    public float getVoteAverage() {
-        return voteAverage;
-    }
-
-    public void setVoteAverage(float voteAverage) {
-        this.voteAverage = voteAverage;
-    }
-
-    public int getVoteCount() {
-        return voteCount;
-    }
-
-    public void setVoteCount(int voteCount) {
-        this.voteCount = voteCount;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
     @Override
     public MediaType getMediaType() {
         return MediaType.TV_SERIES;
     }
-
-    public List<ContentRating> getContentRatings() {
-        return contentRatings != null ? contentRatings.getContentRatings() : null;
-    }
-
-    public void setContentRatings(ContentRating.Results contentRatings) {
-        this.contentRatings = contentRatings;
-    }
 }
diff --git a/src/main/java/info/movito/themoviedbapi/tools/RequestCountLimitException.java b/src/main/java/info/movito/themoviedbapi/tools/RequestCountLimitException.java
index 8bae1e88..b14d1eff 100644
--- a/src/main/java/info/movito/themoviedbapi/tools/RequestCountLimitException.java
+++ b/src/main/java/info/movito/themoviedbapi/tools/RequestCountLimitException.java
@@ -1,8 +1,11 @@
 package info.movito.themoviedbapi.tools;
 
+import lombok.Getter;
+
 /**
  * Exception that is thrown if the request limit is reached.
  */
+@Getter
 public class RequestCountLimitException extends RuntimeException {
     /**
      * Retry internal in seconds.
@@ -17,8 +20,4 @@ public RequestCountLimitException(String jsonResposne, int retryAfter) {
         super(jsonResposne);
         this.retryAfter = retryAfter;
     }
-
-    public int getRetryAfter() {
-        return retryAfter;
-    }
 }
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 28795bc5..3d9ac327 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,4 +1,5 @@
 module info.movito.themoviedbapi {
+    requires lombok;
     requires org.slf4j;
     requires org.apache.commons.codec;
     requires org.apache.commons.lang3;

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 4/4] 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<PersonCrew> 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