Standardised toString methods

src/main/java/com/omertron/themoviedbapi/TheMovieDbApi.java

@@ -267,9 +267,8 @@ public class TheMovieDbApi {
             throw new MovieDbException(MovieDbExceptionType.INVALID_URL, sb.toString(), ex);
         }
     }
-
     //</editor-fold>
-    //
+
     //<editor-fold defaultstate="collapsed" desc="Authentication Functions">
     /**
      * 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);
         }
     }
-
     //</editor-fold>
-    //
+
     //<editor-fold defaultstate="collapsed" desc="Account Functions">
+    // No account functions
     //</editor-fold>
     //
     //<editor-fold defaultstate="collapsed" desc="Movie Functions">
@@ -951,9 +950,8 @@ public class TheMovieDbApi {
 
         throw new MovieDbException(MovieDbExceptionType.UNKNOWN_CAUSE, "Not implemented yet");
     }
-
     //</editor-fold>
-    //
+
     //<editor-fold defaultstate="collapsed" desc="Collection Functions">
     /**
      * 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);
         }
     }
-
     //</editor-fold>
-    //
+
     //<editor-fold defaultstate="collapsed" desc="People Functions">
     /**
      * 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);
         }
     }
-
     //</editor-fold>
-    //
+
     //<editor-fold defaultstate="collapsed" desc="Company Functions">
     /**
      * 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);
         }
     }
-
     //</editor-fold>
-    //
+
     //<editor-fold defaultstate="collapsed" desc="Genre Functions">
     /**
      * You can use this method to retrieve the list of genres used on TMDb.
@@ -1304,9 +1299,8 @@ public class TheMovieDbApi {
         }
     }
     //</editor-fold>
-    //
-    //<editor-fold defaultstate="collapsed" desc="Search Functions">
 
+    //<editor-fold defaultstate="collapsed" desc="Search Functions">
     /**
      * Search Movies This is a good starting point to start finding movies on TMDb.
      *
@@ -1524,9 +1518,8 @@ public class TheMovieDbApi {
         }
     }
     //</editor-fold>
-    //
-    //<editor-fold defaultstate="collapsed" desc="List Functions">
 
+    //<editor-fold defaultstate="collapsed" desc="List Functions">
     /**
      * Get a list by its ID
      *
@@ -1549,9 +1542,8 @@ public class TheMovieDbApi {
         }
     }
     //</editor-fold>
-    //
-    //<editor-fold defaultstate="collapsed" desc="Keyword Functions">
 
+    //<editor-fold defaultstate="collapsed" desc="Keyword Functions">
     /**
      * Get the basic information for a specific keyword id.
      *
@@ -1611,9 +1603,8 @@ public class TheMovieDbApi {
 
     }
     //</editor-fold>
-    //
-    //<editor-fold defaultstate="collapsed" desc="Changes Functions">
 
+    //<editor-fold defaultstate="collapsed" desc="Changes Functions">
     public void getMovieChangesList(int page, String startDate, String endDate) throws MovieDbException {
         throw new MovieDbException(MovieDbExceptionType.UNKNOWN_CAUSE, "Not implemented yet");
     }

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);
     }
 }

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);
     }
 }

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);
     }
 }

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);
     }
 }

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);
     }
 }

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);
     }
 }

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);
     }
 }

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);
     }
 }

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);
+    }
 }

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);
     }
 }

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);
+    }
 }

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);
     }
 }

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;
     }
-    
+
     //</editor-fold>
 
     /**
@@ -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);
     }
 }

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);
+    }
 }

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);
     }
 }

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);
     }
 }

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);
     }
 }

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);
     }
 }

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);
     }
 }

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);
     }
 }

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);
     }
 }

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);
     }
 }

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);
+    }
 }

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);
     }
 }

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);
     }
 }

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);
     }
 
 }

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);
     }
 }

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);
     }
 }

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);
+     }
 }

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 {
     //</editor-fold>
 
     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);
+    }
 }

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);
+    }
 }

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);
     }
 }

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<MovieDb> 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();
-    }
 }

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<MovieDb> 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();
-    }
 }