diff --git a/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java b/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java index ada0096ba..cd8f2276b 100644 --- a/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java +++ b/src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java @@ -267,9 +267,8 @@ public class TheMovieDbApi { throw new MovieDbException(MovieDbExceptionType.INVALID_URL, sb.toString(), ex); } } - // - // + // /** * This method is used to generate a valid request token for user based authentication. @@ -351,10 +350,10 @@ public class TheMovieDbApi { throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex); } } - // - // + // + // No account functions // // // @@ -951,9 +950,8 @@ public class TheMovieDbApi { throw new MovieDbException(MovieDbExceptionType.UNKNOWN_CAUSE, "Not implemented yet"); } - // - // + // /** * This method is used to retrieve all of the basic information about a movie collection. @@ -1011,9 +1009,8 @@ public class TheMovieDbApi { throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex); } } - // - // + // /** * This method is used to retrieve all of the basic person information. @@ -1172,9 +1169,8 @@ public class TheMovieDbApi { throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex); } } - // - // + // /** * This method is used to retrieve the basic information about a production company on TMDb. @@ -1236,9 +1232,8 @@ public class TheMovieDbApi { throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex); } } - // - // + // /** * You can use this method to retrieve the list of genres used on TMDb. @@ -1304,9 +1299,8 @@ public class TheMovieDbApi { } } // - // - // + // /** * Search Movies This is a good starting point to start finding movies on TMDb. * @@ -1524,9 +1518,8 @@ public class TheMovieDbApi { } } // - // - // + // /** * Get a list by its ID * @@ -1549,9 +1542,8 @@ public class TheMovieDbApi { } } // - // - // + // /** * Get the basic information for a specific keyword id. * @@ -1611,9 +1603,8 @@ public class TheMovieDbApi { } // - // - // + // public void getMovieChangesList(int page, String startDate, String endDate) throws MovieDbException { throw new MovieDbException(MovieDbExceptionType.UNKNOWN_CAUSE, "Not implemented yet"); } diff --git a/src/main/java/com/omertron/themoviedbapi/model/AlternativeTitle.java b/src/main/java/com/omertron/themoviedbapi/model/AlternativeTitle.java index fc390e926..ccc7f0972 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/AlternativeTitle.java +++ b/src/main/java/com/omertron/themoviedbapi/model/AlternativeTitle.java @@ -22,6 +22,8 @@ package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -107,10 +109,6 @@ public class AlternativeTitle implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("[AlternativeTitle="); - sb.append("[country=").append(country); - sb.append("],[title=").append(title); - sb.append("]]"); - return sb.toString(); + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/Artwork.java b/src/main/java/com/omertron/themoviedbapi/model/Artwork.java index 0c689a577..4af944c28 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/Artwork.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Artwork.java @@ -22,6 +22,8 @@ package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -195,14 +197,6 @@ public class Artwork implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("[Artwork="); - sb.append("[aspectRatio=").append(aspectRatio); - sb.append("],[filePath=").append(filePath); - sb.append("],[height=").append(height); - sb.append("],[language=").append(language); - sb.append("],[width=").append(width); - sb.append("],[artworkType=").append(artworkType); - sb.append("]]"); - return sb.toString(); + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/ChangeKeyItem.java b/src/main/java/com/omertron/themoviedbapi/model/ChangeKeyItem.java index f6be48132..b884d22e9 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/ChangeKeyItem.java +++ b/src/main/java/com/omertron/themoviedbapi/model/ChangeKeyItem.java @@ -8,6 +8,7 @@ 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; public class ChangeKeyItem { @@ -46,6 +47,6 @@ public class ChangeKeyItem { @Override public String toString() { - return ToStringBuilder.reflectionToString(this); + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/ChangedItem.java b/src/main/java/com/omertron/themoviedbapi/model/ChangedItem.java index 536ef3e9a..73be6dba6 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/ChangedItem.java +++ b/src/main/java/com/omertron/themoviedbapi/model/ChangedItem.java @@ -6,6 +6,7 @@ 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; public class ChangedItem { @@ -74,6 +75,6 @@ public class ChangedItem { @Override public String toString() { - return ToStringBuilder.reflectionToString(this); + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/Collection.java b/src/main/java/com/omertron/themoviedbapi/model/Collection.java index 7df3b9647..03926eb3f 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/Collection.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Collection.java @@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; import java.io.Serializable; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -165,14 +167,6 @@ public class Collection implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("[Collection="); - sb.append("[id=").append(id); - sb.append("],[title=").append(title); - sb.append("],[name=").append(name); - sb.append("],[posterPath=").append(posterPath); - sb.append("],[backdropPath=").append(backdropPath); - sb.append("],[releaseDate=").append(releaseDate); - sb.append("]]"); - return sb.toString(); + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/CollectionInfo.java b/src/main/java/com/omertron/themoviedbapi/model/CollectionInfo.java index 5e6fd1808..815a24107 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/CollectionInfo.java +++ b/src/main/java/com/omertron/themoviedbapi/model/CollectionInfo.java @@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -122,14 +124,6 @@ public class CollectionInfo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("[CollectionInfo="); - sb.append("[id=").append(id); - sb.append("],[name=").append(name); - sb.append("],[overview=").append(overview); - sb.append("],[posterPath=").append(posterPath); - sb.append("],[backdropPath=").append(backdropPath); - sb.append("],[# of parts=").append(parts.size()); - sb.append("]]"); - return sb.toString(); + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/Company.java b/src/main/java/com/omertron/themoviedbapi/model/Company.java index 47d9ccce2..9098c30b5 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/Company.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Company.java @@ -22,6 +22,8 @@ package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -128,6 +130,6 @@ public class Company implements Serializable { @Override public String toString() { - return "Company{" + "companyId=" + companyId + ", name=" + name + ", description=" + description + ", headquarters=" + headquarters + ", homepage=" + homepage + ", logoPath=" + logoPath + ", parentCompany=" + parentCompany + '}'; + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/Genre.java b/src/main/java/com/omertron/themoviedbapi/model/Genre.java index 2679c65c5..b62260e59 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/Genre.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Genre.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; import java.io.Serializable; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -108,10 +110,6 @@ public class Genre implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("[Genre="); - sb.append("[id=").append(id); - sb.append("],[name=").append(name); - sb.append("]]"); - return sb.toString(); + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/JobDepartment.java b/src/main/java/com/omertron/themoviedbapi/model/JobDepartment.java index 03986e728..c7335e746 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/JobDepartment.java +++ b/src/main/java/com/omertron/themoviedbapi/model/JobDepartment.java @@ -22,6 +22,8 @@ package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -69,4 +71,9 @@ public class JobDepartment { sb.append("' value: '").append(value).append("'"); LOG.trace(sb.toString()); } + + @Override + public String toString() { + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); + } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/Keyword.java b/src/main/java/com/omertron/themoviedbapi/model/Keyword.java index f5169c85c..80cef7cf9 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/Keyword.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Keyword.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; import java.io.Serializable; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -109,10 +111,6 @@ public class Keyword implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("[Keyword="); - sb.append("[id=").append(id); - sb.append("],[name=").append(name); - sb.append("]]"); - return sb.toString(); + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/KeywordMovie.java b/src/main/java/com/omertron/themoviedbapi/model/KeywordMovie.java index 04607c304..b1efec2cf 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/KeywordMovie.java +++ b/src/main/java/com/omertron/themoviedbapi/model/KeywordMovie.java @@ -22,6 +22,8 @@ package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -162,4 +164,9 @@ public class KeywordMovie implements Serializable { sb.append("' value: '").append(value).append("'"); LOG.trace(sb.toString()); } + + @Override + public String toString() { + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); + } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/Language.java b/src/main/java/com/omertron/themoviedbapi/model/Language.java index 71bd87720..17b7c1568 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/Language.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Language.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; import java.io.Serializable; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -108,10 +110,6 @@ public class Language implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("[Language="); - sb.append("isoCode=").append(isoCode); - sb.append(", name=").append(name); - sb.append("]]"); - return sb.toString(); + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/MovieDb.java b/src/main/java/com/omertron/themoviedbapi/model/MovieDb.java index f42768193..644eb164e 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/MovieDb.java +++ b/src/main/java/com/omertron/themoviedbapi/model/MovieDb.java @@ -33,6 +33,8 @@ import com.omertron.themoviedbapi.wrapper.WrapperTrailers; import com.omertron.themoviedbapi.wrapper.WrapperTranslations; import java.io.Serializable; import java.util.List; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -394,7 +396,7 @@ public class MovieDb implements Serializable { public void setReviews(WrapperReviews reviews) { this.reviews = reviews; } - + // /** @@ -445,31 +447,6 @@ public class MovieDb implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("[MovieDB="); - sb.append("[backdropPath=").append(backdropPath); - sb.append("],[id=").append(id); - sb.append("],[originalTitle=").append(originalTitle); - sb.append("],[popularity=").append(popularity); - sb.append("],[posterPath=").append(posterPath); - sb.append("],[releaseDate=").append(releaseDate); - sb.append("],[title=").append(title); - sb.append("],[adult=").append(adult); - sb.append("],[belongsToCollection=").append(belongsToCollection); - sb.append("],[budget=").append(budget); - sb.append("],[genres=").append(genres); - sb.append("],[homepage=").append(homepage); - sb.append("],[imdbID=").append(imdbID); - sb.append("],[overview=").append(overview); - sb.append("],[productionCompanies=").append(productionCompanies); - sb.append("],[productionCountries=").append(productionCountries); - sb.append("],[revenue=").append(revenue); - sb.append("],[runtime=").append(runtime); - sb.append("],[spokenLanguages=").append(spokenLanguages); - sb.append("],[tagline=").append(tagline); - sb.append("],[voteAverage=").append(voteAverage); - sb.append("],[voteCount=").append(voteCount); - sb.append("],[status=").append(status); - sb.append("]]"); - return sb.toString(); + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/MovieDbList.java b/src/main/java/com/omertron/themoviedbapi/model/MovieDbList.java index d3c51c1b4..2c466dd53 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/MovieDbList.java +++ b/src/main/java/com/omertron/themoviedbapi/model/MovieDbList.java @@ -23,11 +23,14 @@ import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Collections; import java.util.List; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * Wrapper for the MovieDbList function + * * @author stuart.boston */ public class MovieDbList { @@ -148,4 +151,8 @@ public class MovieDbList { LOG.trace(sb.toString()); } + @Override + public String toString() { + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); + } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/MovieList.java b/src/main/java/com/omertron/themoviedbapi/model/MovieList.java index 747cbe020..63a1586a6 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/MovieList.java +++ b/src/main/java/com/omertron/themoviedbapi/model/MovieList.java @@ -22,6 +22,8 @@ package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -141,6 +143,6 @@ public class MovieList implements Serializable { @Override public String toString() { - return "MovieList{" + "description=" + description + ", favoriteCount=" + favoriteCount + ", id=" + id + ", itemCount=" + itemCount + ", language=" + language + ", name=" + name + ", posterPath=" + posterPath + '}'; + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/Person.java b/src/main/java/com/omertron/themoviedbapi/model/Person.java index a80bd4b8b..ab4480ee1 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/Person.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Person.java @@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -321,23 +323,6 @@ public class Person implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("[Person="); - sb.append("[id=").append(id); - sb.append("],[name=").append(name); - sb.append("],[profilePath=").append(profilePath); - sb.append("],[personType=").append(personType); - sb.append("],[department=").append(department); - sb.append("],[job=").append(job); - sb.append("],[character=").append(character); - sb.append("],[order=").append(order); - sb.append("],[adult=").append(adult); - sb.append("],[=aka").append(aka.toString()); - sb.append("],[biography=").append(biography); - sb.append("],[birthday=").append(birthday); - sb.append("],[deathday=").append(deathday); - sb.append("],[homepage=").append(homepage); - sb.append("],[birthplace=").append(birthplace); - sb.append("]]"); - return sb.toString(); + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/PersonCast.java b/src/main/java/com/omertron/themoviedbapi/model/PersonCast.java index 0f26edaa2..0337e47c4 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/PersonCast.java +++ b/src/main/java/com/omertron/themoviedbapi/model/PersonCast.java @@ -22,6 +22,8 @@ package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -161,13 +163,6 @@ public class PersonCast implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("[PersonCast="); - sb.append("id=").append(id); - sb.append("],[character=").append(character); - sb.append("],[name=").append(name); - sb.append("],[order=").append(order); - sb.append("],[profilePath=").append(profilePath); - sb.append("]]"); - return sb.toString(); + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/PersonCredit.java b/src/main/java/com/omertron/themoviedbapi/model/PersonCredit.java index a17c6551c..1ba7fed6a 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/PersonCredit.java +++ b/src/main/java/com/omertron/themoviedbapi/model/PersonCredit.java @@ -22,6 +22,8 @@ package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -161,18 +163,6 @@ public class PersonCredit implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("[PersonCredit="); - sb.append("[movieId=").append(movieId); - sb.append("],[personType=").append(personType); - sb.append("],[originalTitle=").append(movieOriginalTitle); - sb.append("],[movieTitle=").append(movieTitle); - sb.append("],[posterPath=").append(posterPath); - sb.append("],[releaseDate=").append(releaseDate); - sb.append("],[character=").append(character); - sb.append("],[department=").append(department); - sb.append("],[job=").append(job); - sb.append("],[adult=").append(adult); - sb.append("]]"); - return sb.toString(); + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/PersonCrew.java b/src/main/java/com/omertron/themoviedbapi/model/PersonCrew.java index f69c27166..7d91969a8 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/PersonCrew.java +++ b/src/main/java/com/omertron/themoviedbapi/model/PersonCrew.java @@ -22,6 +22,8 @@ package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -146,13 +148,6 @@ public class PersonCrew implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("[PersonCrew="); - sb.append("id=").append(id); - sb.append("],[department=").append(department); - sb.append("],[job=").append(job); - sb.append("],[name=").append(name); - sb.append("],[profilePath=").append(profilePath); - sb.append("]]"); - return sb.toString(); + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/ProductionCompany.java b/src/main/java/com/omertron/themoviedbapi/model/ProductionCompany.java index 15f62ee55..dd5e00ef7 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/ProductionCompany.java +++ b/src/main/java/com/omertron/themoviedbapi/model/ProductionCompany.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; import java.io.Serializable; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -109,10 +111,6 @@ public class ProductionCompany implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("[ProductionCompany="); - sb.append("[id=").append(id); - sb.append("],[name=").append(name); - sb.append("]]"); - return sb.toString(); + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/ProductionCountry.java b/src/main/java/com/omertron/themoviedbapi/model/ProductionCountry.java index cc1063f16..6c0a73030 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/ProductionCountry.java +++ b/src/main/java/com/omertron/themoviedbapi/model/ProductionCountry.java @@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; import java.io.Serializable; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -109,10 +111,6 @@ public class ProductionCountry implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("[ProductionCountry="); - sb.append("[isoCode=").append(isoCode); - sb.append("],[name=").append(name); - sb.append("]]"); - return sb.toString(); + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/ReleaseInfo.java b/src/main/java/com/omertron/themoviedbapi/model/ReleaseInfo.java index 22a91c4bc..d667d305e 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/ReleaseInfo.java +++ b/src/main/java/com/omertron/themoviedbapi/model/ReleaseInfo.java @@ -22,6 +22,8 @@ package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -121,11 +123,6 @@ public class ReleaseInfo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("[ReleaseInfo="); - sb.append("[country=").append(country); - sb.append("],[certification=").append(certification); - sb.append("],[releaseDate=").append(releaseDate); - sb.append("]]"); - return sb.toString(); + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/Reviews.java b/src/main/java/com/omertron/themoviedbapi/model/Reviews.java index 92db445f8..04bafd590 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/Reviews.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Reviews.java @@ -22,6 +22,8 @@ package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -98,4 +100,9 @@ public class Reviews implements Serializable { sb.append("' value: '").append(value).append("'"); LOG.trace(sb.toString()); } + + @Override + public String toString() { + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); + } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/StatusCode.java b/src/main/java/com/omertron/themoviedbapi/model/StatusCode.java index 9a0f3423b..7161ef4e3 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/StatusCode.java +++ b/src/main/java/com/omertron/themoviedbapi/model/StatusCode.java @@ -22,6 +22,8 @@ package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -81,9 +83,6 @@ public class StatusCode implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("Status Code: ").append(statusCode); - sb.append(", Message: ").append(statusMessage); - return sb.toString(); + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/TmdbConfiguration.java b/src/main/java/com/omertron/themoviedbapi/model/TmdbConfiguration.java index 469f9f1a0..a5dc721c3 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/TmdbConfiguration.java +++ b/src/main/java/com/omertron/themoviedbapi/model/TmdbConfiguration.java @@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; import java.util.List; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -195,13 +197,6 @@ public class TmdbConfiguration implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("[ImageConfiguration="); - sb.append("[baseUrl=").append(baseUrl); - sb.append("],[posterSizes=").append(posterSizes.toString()); - sb.append("],[backdropSizes=").append(backdropSizes.toString()); - sb.append("],[profileSizes=").append(profileSizes.toString()); - sb.append("],[logoSizes=").append(logoSizes.toString()); - sb.append(("]]")); - return sb.toString(); + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/TokenAuthorisation.java b/src/main/java/com/omertron/themoviedbapi/model/TokenAuthorisation.java index cebbd2d4d..e7f365bf2 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/TokenAuthorisation.java +++ b/src/main/java/com/omertron/themoviedbapi/model/TokenAuthorisation.java @@ -21,6 +21,8 @@ package com.omertron.themoviedbapi.model; 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 org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -83,7 +85,7 @@ public class TokenAuthorisation { @Override public String toString() { - return "TokenAuthorisation{" + "expires=" + expires + ", requestToken=" + requestToken + ", success=" + success + '}'; + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/TokenSession.java b/src/main/java/com/omertron/themoviedbapi/model/TokenSession.java index 5ba745392..7d1828635 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/TokenSession.java +++ b/src/main/java/com/omertron/themoviedbapi/model/TokenSession.java @@ -21,6 +21,8 @@ package com.omertron.themoviedbapi.model; 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 org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -115,6 +117,6 @@ public class TokenSession { @Override public String toString() { - return "TokenSession{" + "sessionId=" + sessionId + ", success=" + success + ", statusCode=" + statusCode + ", statusMessage=" + statusMessage + ", guestSessionId=" + guestSessionId + ", expiresAt=" + expiresAt + '}'; + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/Trailer.java b/src/main/java/com/omertron/themoviedbapi/model/Trailer.java index e38112d7a..e08692ccf 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/Trailer.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Trailer.java @@ -21,6 +21,8 @@ package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import java.io.Serializable; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -132,12 +134,6 @@ public class Trailer implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("[Trailer="); - sb.append("name=").append(name); - sb.append("],[size=").append(size); - sb.append("],[source=").append(source); - sb.append("],[website=").append(website); - sb.append("]]"); - return sb.toString(); + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/model/Translation.java b/src/main/java/com/omertron/themoviedbapi/model/Translation.java index 315c069cd..5640a4e51 100644 --- a/src/main/java/com/omertron/themoviedbapi/model/Translation.java +++ b/src/main/java/com/omertron/themoviedbapi/model/Translation.java @@ -22,6 +22,8 @@ package com.omertron.themoviedbapi.model; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -121,11 +123,6 @@ public class Translation implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("[Translation="); - sb.append("[englishName=").append(englishName); - sb.append("],[isoCode=").append(isoCode); - sb.append("],[name=").append(name); - sb.append("]]"); - return sb.toString(); - } + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); + } } diff --git a/src/main/java/com/omertron/themoviedbapi/results/TmdbResults.java b/src/main/java/com/omertron/themoviedbapi/results/TmdbResults.java index 54a1076c3..ac24988f6 100644 --- a/src/main/java/com/omertron/themoviedbapi/results/TmdbResults.java +++ b/src/main/java/com/omertron/themoviedbapi/results/TmdbResults.java @@ -22,6 +22,8 @@ package com.omertron.themoviedbapi.results; import com.omertron.themoviedbapi.wrapper.AbstractWrapper; import com.omertron.themoviedbapi.wrapper.AbstractWrapperAll; import com.omertron.themoviedbapi.wrapper.AbstractWrapperId; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * Abstract class to return the results and the id/page info @@ -72,7 +74,7 @@ public abstract class TmdbResults { // public void copyWrapper(AbstractWrapper wrapper) { - // Nothing to copy, just a placeholder + // These results have nothing to copy, so this is just a placeholder } /** @@ -95,4 +97,9 @@ public abstract class TmdbResults { this.totalPages = wrapper.getTotalPages(); this.totalResults = wrapper.getTotalResults(); } + + @Override + public String toString() { + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); + } } diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapper.java b/src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapper.java index 840d8c41f..d9363de39 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapper.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapper.java @@ -24,6 +24,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.EnumSet; import java.util.List; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -64,4 +66,9 @@ public abstract class AbstractWrapper { sb.append("' value: '").append(value).append("'"); log.trace(sb.toString()); } + + @Override + public String toString() { + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); + } } diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperChanges.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperChanges.java index c7cb990b4..0ef1e54e1 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperChanges.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperChanges.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; import com.omertron.themoviedbapi.model.ChangeKeyItem; import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; public class WrapperChanges { @@ -36,6 +37,6 @@ public class WrapperChanges { @Override public String toString() { - return ToStringBuilder.reflectionToString(this); + return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE); } } diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompanyMovies.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompanyMovies.java index 5e34bcd81..399cb3a19 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompanyMovies.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompanyMovies.java @@ -22,6 +22,8 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; import com.omertron.themoviedbapi.model.MovieDb; import java.util.List; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * @@ -43,16 +45,4 @@ public class WrapperCompanyMovies extends AbstractWrapperAll { public void setResults(List results) { this.results = results; } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder("[ResultList=["); - sb.append("[companyId=").append(getId()); - sb.append("],[page=").append(getPage()); - sb.append("],[pageResults=").append(getResults().size()); - sb.append("],[totalPages=").append(getTotalPages()); - sb.append("],[totalResults=").append(getTotalResults()); - sb.append("]]"); - return sb.toString(); - } } diff --git a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovie.java b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovie.java index 8d902f69f..a8e96ce36 100644 --- a/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovie.java +++ b/src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovie.java @@ -22,6 +22,8 @@ package com.omertron.themoviedbapi.wrapper; import com.fasterxml.jackson.annotation.JsonProperty; import com.omertron.themoviedbapi.model.MovieDb; import java.util.List; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * @@ -43,16 +45,4 @@ public class WrapperMovie extends AbstractWrapperAll { public void setMovies(List movies) { this.movies = movies; } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder("[ResultList=["); - sb.append("[page=").append(getPage()); - sb.append("],[pageResults=").append(getMovies().size()); - sb.append("],[totalPages=").append(getTotalPages()); - sb.append("],[totalResults=").append(getTotalResults()); - sb.append("],[id=").append(getId()); - sb.append("]]"); - return sb.toString(); - } }