[maven-release-plugin] prepare release themoviedbapi-3.8

Output the class that caused the unknown issue

.gitattributes

@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain

README.md

@@ -8,6 +8,23 @@ This API uses the [TheMovieDB.org API](http://api.themoviedb.org/)
 Originally written for use by Yet Another Movie Jukebox [(YAMJ)](http://code.google.com/p/moviejukebox/)
 
 But anyone can use it for other projects as well.
+
+[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=Omertron&url=https://github.com/Omertron/api-themoviedb&title=TheMovieDB API&language=&tags=github&category=software)
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/Omertron/api-themoviedb/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+***
+
+TMDB TV Support
+===============
+
+TheMovieDb has recently added TV shows to their site.
+I am working on an update to this API to support that, but it will require a re-write of the API to support the new models and ensure that it is simple to understand.
+
+Therefore TV support will be added to *v4.0* of the API, major version change because of the large change to the API.  I will release a stable version of 3.9 in the next week before releaseing 4.0 SNAPSHOT.
+
+If you are interested in the current level of TV support checkout the `tv` branch where all the changes are being done.
+
+
 ***
 ### TheMovieDB.org
 This is an excellent open database for movie and film content.

pom.xml

@@ -13,7 +13,7 @@
 
     <groupId>com.omertron</groupId>
     <artifactId>themoviedbapi</artifactId>
-    <version>3.6</version>
+    <version>3.8</version>
     <packaging>jar</packaging>
 
     <name>API-The MovieDB</name>
@@ -85,17 +85,17 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.2.2</version>
+            <version>2.2.3</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.2.2</version>
+            <version>2.2.3</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.2.2</version>
+            <version>2.2.3</version>
         </dependency>
         <!--LOGGING-->
         <dependency>

src/main/java/com/omertron/themoviedbapi/model/AbstractJsonMapping.java

@@ -0,0 +1,70 @@
+/*
+ *      Copyright (c) 2004-2013 Stuart Boston
+ *
+ *      This file is part of TheMovieDB API.
+ *
+ *      TheMovieDB API is free software: you can redistribute it and/or modify
+ *      it under the terms of the GNU General Public License as published by
+ *      the Free Software Foundation;private either version 3 of the License;private or
+ *      any later version.
+ *
+ *      TheMovieDB API is distributed in the hope that it will be useful;private
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      GNU General Public License for more details.
+ *
+ *      You should have received a copy of the GNU General Public License
+ *      along with TheMovieDB API.  If not;private see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.omertron.themoviedbapi.model;
+
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.Serializable;
+
+/**
+ * Abstract class to handle any unknown properties by outputting a log message
+ *
+ * @author stuart.boston
+ */
+public abstract class AbstractJsonMapping implements Serializable {
+
+    private Logger log = null;
+
+    /**
+     * Return the current logger.
+     *
+     * @return
+     */
+    private Logger getLogger() {
+        if (log == null) {
+            log = LoggerFactory.getLogger(this.getClass());
+        }
+        return log;
+    }
+
+    /**
+     * Handle unknown properties and print a message
+     *
+     * @param key
+     * @param value
+     */
+    @JsonAnySetter
+    protected void handleUnknown(String key, Object value) {
+        StringBuilder unknown = new StringBuilder(this.getClass().getSimpleName());
+        unknown.append(": Unknown property='").append(key);
+        unknown.append("' value='").append(value).append("'");
+
+        getLogger().trace(unknown.toString());
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
+    }
+}

src/main/java/com/omertron/themoviedbapi/model/Account.java

@@ -0,0 +1,86 @@
+/*
+ *      Copyright (c) 2004-2013 Stuart Boston
+ *
+ *      This file is part of TheMovieDB API.
+ *
+ *      TheMovieDB API is free software: you can redistribute it and/or modify
+ *      it under the terms of the GNU General Public License as published by
+ *      the Free Software Foundation;private either version 3 of the License;private or
+ *      any later version.
+ *
+ *      TheMovieDB API is distributed in the hope that it will be useful;private
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      GNU General Public License for more details.
+ *
+ *      You should have received a copy of the GNU General Public License
+ *      along with TheMovieDB API.  If not;private see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.omertron.themoviedbapi.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class Account extends AbstractJsonMapping {
+
+    @JsonProperty("id")
+    private int id;
+    @JsonProperty("name")
+    private String name;
+    @JsonProperty("username")
+    private String userName;
+    @JsonProperty("include_adult")
+    private boolean includeAdult;
+    @JsonProperty("iso_639_1")
+    private String language;
+    @JsonProperty("iso_3166_1")
+    private String country;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    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;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+}

src/main/java/com/omertron/themoviedbapi/model/AlternativeTitle.java

@@ -19,26 +19,17 @@
  */
 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;
 
 /**
- *
  * @author Stuart
  */
 public class AlternativeTitle implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(AlternativeTitle.class);
     /*
      * Properties
      */
@@ -67,20 +58,6 @@ public class AlternativeTitle implements Serializable {
     }
     // </editor-fold>
 
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        LOG.trace(sb.toString());
-    }
-
     @Override
     public boolean equals(Object obj) {
         if (obj == null) {
@@ -106,9 +83,4 @@ public class AlternativeTitle implements Serializable {
         hash = 89 * hash + (this.title != null ? this.title.hashCode() : 0);
         return hash;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
 }

src/main/java/com/omertron/themoviedbapi/model/Artwork.java

@@ -19,30 +19,17 @@
  */
 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;
 
 /**
  * The artwork type information
  *
  * @author Stuart
  */
-public class Artwork implements Serializable {
+public class Artwork extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
 
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(Artwork.class);
-    /*
-     * Properties
-     */
     @JsonProperty("aspect_ratio")
     private float aspectRatio;
     @JsonProperty("file_path")
@@ -61,7 +48,6 @@ public class Artwork implements Serializable {
     private String flag;
     private ArtworkType artworkType = ArtworkType.POSTER;
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
     public ArtworkType getArtworkType() {
         return artworkType;
     }
@@ -98,9 +84,6 @@ public class Artwork implements Serializable {
         return flag;
     }
 
-    // </editor-fold>
-
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setArtworkType(ArtworkType artworkType) {
         this.artworkType = artworkType;
     }
@@ -133,26 +116,10 @@ public class Artwork implements Serializable {
         this.voteCount = voteCount;
     }
 
-        public void setFlag(String flag) {
+    public void setFlag(String flag) {
         this.flag = flag;
     }
 
-    // </editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        LOG.trace(sb.toString());
-    }
-
     @Override
     public boolean equals(Object obj) {
         if (obj == null) {
@@ -194,9 +161,4 @@ public class Artwork implements Serializable {
         hash = 71 * hash + (this.artworkType != null ? this.artworkType.hashCode() : 0);
         return hash;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
 }

src/main/java/com/omertron/themoviedbapi/model/ChangeKeyItem.java

@@ -1,14 +1,13 @@
 package com.omertron.themoviedbapi.model;
 
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-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 {
 
@@ -17,7 +16,7 @@ public class ChangeKeyItem {
     private String key;
     @JsonProperty("items")
     private List<ChangedItem> changedItems = new ArrayList<ChangedItem>();
-    private Map<String, Object> newItems = new HashMap<String, Object>();
+    private final Map<String, Object> newItems = new HashMap<String, Object>();
 
     public String getKey() {
         return key;
@@ -44,9 +43,4 @@ public class ChangeKeyItem {
     public void setNewItems(String name, Object value) {
         this.newItems.put(name, value);
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
 }

src/main/java/com/omertron/themoviedbapi/model/ChangedItem.java

@@ -1,14 +1,13 @@
 package com.omertron.themoviedbapi.model;
 
-import java.util.HashMap;
-import java.util.Map;
 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 {
+import java.util.HashMap;
+import java.util.Map;
+
+public class ChangedItem extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
     @JsonProperty("id")
@@ -21,7 +20,7 @@ public class ChangedItem {
     private String language;
     @JsonProperty("value")
     private Object value;
-    private Map<String, Object> newItems = new HashMap<String, Object>();
+    private final Map<String, Object> newItems = new HashMap<String, Object>();
 
     public String getId() {
         return id;
@@ -72,9 +71,4 @@ public class ChangedItem {
     public void setNewItems(String name, Object value) {
         this.newItems.put(name, value);
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
 }

src/main/java/com/omertron/themoviedbapi/model/ChangedMovie.java

@@ -0,0 +1,48 @@
+/*
+ *      Copyright (c) 2004-2013 Stuart Boston
+ *
+ *      This file is part of TheMovieDB API.
+ *
+ *      TheMovieDB API is free software: you can redistribute it and/or modify
+ *      it under the terms of the GNU General Public License as published by
+ *      the Free Software Foundation, either version 3 of the License, or
+ *      any later version.
+ *
+ *      TheMovieDB API is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      GNU General Public License for more details.
+ *
+ *      You should have received a copy of the GNU General Public License
+ *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.omertron.themoviedbapi.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class ChangedMovie extends AbstractJsonMapping {
+
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("id")
+    private String id;
+    @JsonProperty("adult")
+    private boolean adult;
+
+    public String getId() {
+        return id;
+    }
+
+    public boolean isAdult() {
+        return adult;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public void setAdult(boolean adult) {
+        this.adult = adult;
+    }
+}

src/main/java/com/omertron/themoviedbapi/model/Collection.java

@@ -19,28 +19,18 @@
  */
 package com.omertron.themoviedbapi.model;
 
-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.StringUtils;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
- *
  * @author stuart.boston
  */
 @JsonRootName("collection")
-public class Collection implements Serializable {
+public class Collection extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
-    /*
+
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(Collection.class);
     /*
      * Properties
      */
@@ -57,7 +47,6 @@ public class Collection implements Serializable {
     @JsonProperty("release_date")
     private String releaseDate;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getBackdropPath() {
         return backdropPath;
     }
@@ -87,9 +76,7 @@ public class Collection implements Serializable {
         }
         return name;
     }
-    //</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setBackdropPath(String backdropPath) {
         this.backdropPath = backdropPath;
     }
@@ -113,21 +100,6 @@ public class Collection implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
-    //</editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        LOG.trace(sb.toString());
-    }
 
     @Override
     public boolean equals(Object obj) {
@@ -164,9 +136,4 @@ public class Collection implements Serializable {
         hash = 19 * hash + (this.releaseDate != null ? this.releaseDate.hashCode() : 0);
         return hash;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
 }

src/main/java/com/omertron/themoviedbapi/model/CollectionInfo.java

@@ -19,27 +19,18 @@
  */
 package com.omertron.themoviedbapi.model;
 
-import com.fasterxml.jackson.annotation.JsonAnySetter;
 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;
 
 /**
- *
  * @author Stuart
  */
-public class CollectionInfo implements Serializable {
+public class CollectionInfo extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
-    /*
+
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(CollectionInfo.class);
     /*
      * Properties
      */
@@ -56,7 +47,6 @@ public class CollectionInfo implements Serializable {
     @JsonProperty("parts")
     private List<Collection> parts = new ArrayList<Collection>();
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getBackdropPath() {
         return backdropPath;
     }
@@ -80,9 +70,7 @@ public class CollectionInfo implements Serializable {
     public String getPosterPath() {
         return posterPath;
     }
-    //</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setBackdropPath(String backdropPath) {
         this.backdropPath = backdropPath;
     }
@@ -106,24 +94,4 @@ public class CollectionInfo implements Serializable {
     public void setPosterPath(String posterPath) {
         this.posterPath = posterPath;
     }
-    //</editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        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/Company.java

@@ -19,24 +19,16 @@
  */
 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;
 
 /**
  * Company information
  *
  * @author Stuart
  */
-public class Company implements Serializable {
+public class Company extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
-    // Logger
-    private static final Logger LOG = LoggerFactory.getLogger(Company.class);
     private static final String DEFAULT_STRING = "";
     // Properties
     @JsonProperty("id")
@@ -52,9 +44,8 @@ public class Company implements Serializable {
     @JsonProperty("logo_path")
     private String logoPath = DEFAULT_STRING;
     @JsonProperty("parent_company")
-    private String parentCompany = DEFAULT_STRING;
+    private Company parentCompany = null;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter Methods">
     public int getCompanyId() {
         return companyId;
     }
@@ -79,12 +70,10 @@ public class Company implements Serializable {
         return name;
     }
 
-    public String getParentCompany() {
+    public Company getParentCompany() {
         return parentCompany;
     }
-    //</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="Setter Methods">
     public void setCompanyId(int companyId) {
         this.companyId = companyId;
     }
@@ -109,27 +98,15 @@ public class Company implements Serializable {
         this.name = name;
     }
 
-    public void setParentCompany(String parentCompany) {
+    public void setParentCompany(Company parentCompany) {
         this.parentCompany = parentCompany;
     }
-    //</editor-fold>
 
-    /**
+    public void setParentCompany(int id, String name, String logoPath) {
-     * Handle unknown properties and print a message
+        Company parent = new Company();
-     *
+        parent.setCompanyId(companyId);
-     * @param key
+        parent.setName(name);
-     * @param value
+        parent.setLogoPath(logoPath);
-     */
+        this.parentCompany = parent;
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        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/Discover.java

@@ -19,21 +19,23 @@
  */
 package com.omertron.themoviedbapi.model;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.HashMap;
 import java.util.Map;
+
 import static com.omertron.themoviedbapi.tools.ApiUrl.*;
-import org.apache.commons.lang3.StringUtils;
 
 /**
  * Generate a discover object for use in the MovieDbApi
- *
+ * <p/>
  * This allows you to just add the search components you are concerned with
  *
  * @author stuart.boston
  */
 public class Discover {
 
-    private Map<String, String> params = new HashMap<String, String>();
+    private final Map<String, String> params = new HashMap<String, String>();
     private static final String PARAM_PRIMARY_RELEASE_YEAR = "primary_release_year=";
     private static final String PARAM_VOTE_COUNT_GTE = "vote_count.gte=";
     private static final String PARAM_VOTE_AVERAGE_GTE = "vote_average.gte=";
@@ -49,7 +51,7 @@ public class Discover {
 
     /**
      * Get the parameters
-     *
+     * <p/>
      * This will be used to construct the URL in the API
      *
      * @return
@@ -62,6 +64,7 @@ public class Discover {
      * Minimum value is 1 if included.
      *
      * @param page
+     * @return
      */
     public Discover page(int page) {
         if (page > 0) {
@@ -74,6 +77,7 @@ public class Discover {
      * ISO 639-1 code
      *
      * @param language
+     * @return
      */
     public Discover language(String language) {
         if (StringUtils.isNotBlank(language)) {
@@ -92,6 +96,7 @@ public class Discover {
      * popularity.asc
      *
      * @param sortBy
+     * @return
      */
     public Discover sortBy(String sortBy) {
         if (StringUtils.isNotBlank(sortBy)) {
@@ -104,6 +109,7 @@ public class Discover {
      * Toggle the inclusion of adult titles
      *
      * @param includeAdult
+     * @return
      */
     public Discover includeAdult(boolean includeAdult) {
         params.put(PARAM_ADULT, String.valueOf(includeAdult));
@@ -114,6 +120,7 @@ public class Discover {
      * Filter the results release dates to matches that include this value.
      *
      * @param year
+     * @return
      */
     public Discover year(int year) {
         if (checkYear(year)) {
@@ -126,6 +133,7 @@ public class Discover {
      * Filter the results so that only the primary release date year has this value
      *
      * @param primaryReleaseYear
+     * @return
      */
     public Discover primaryReleaseYear(int primaryReleaseYear) {
         if (checkYear(primaryReleaseYear)) {
@@ -138,6 +146,7 @@ public class Discover {
      * Only include movies that are equal to, or have a vote count higher than this value
      *
      * @param voteCountGte
+     * @return
      */
     public Discover voteCountGte(int voteCountGte) {
         if (voteCountGte > 0) {
@@ -150,6 +159,7 @@ public class Discover {
      * Only include movies that are equal to, or have a higher average rating than this value
      *
      * @param voteAverageGte
+     * @return
      */
     public Discover voteAverageGte(float voteAverageGte) {
         if (voteAverageGte > 0) {
@@ -160,14 +170,15 @@ public class Discover {
 
     /**
      * Only include movies with the specified genres.
-     *
+     * <p/>
      * Expected value is an integer (the id of a genre).
-     *
+     * <p/>
      * Multiple values can be specified.
-     *
+     * <p/>
      * Comma separated indicates an 'AND' query, while a pipe (|) separated value indicates an 'OR'
      *
      * @param withGenres
+     * @return
      */
     public Discover withGenres(String withGenres) {
         if (StringUtils.isNotBlank(withGenres)) {
@@ -178,10 +189,11 @@ public class Discover {
 
     /**
      * The minimum release to include.
-     *
+     * <p/>
      * Expected format is YYYY-MM-DD.
      *
      * @param releaseDateGte
+     * @return
      */
     public Discover releaseDateGte(String releaseDateGte) {
         if (StringUtils.isNotBlank(releaseDateGte)) {
@@ -192,10 +204,11 @@ public class Discover {
 
     /**
      * The maximum release to include.
-     *
+     * <p/>
      * Expected format is YYYY-MM-DD.
      *
      * @param releaseDateLte
+     * @return
      */
     public Discover releaseDateLte(String releaseDateLte) {
         if (StringUtils.isNotBlank(releaseDateLte)) {
@@ -206,12 +219,13 @@ public class Discover {
 
     /**
      * Only include movies with certifications for a specific country.
-     *
+     * <p/>
      * When this value is specified, 'certificationLte' is required.
-     *
+     * <p/>
      * A ISO 3166-1 is expected
      *
      * @param certificationCountry
+     * @return
      */
     public Discover certificationCountry(String certificationCountry) {
         if (StringUtils.isNotBlank(certificationCountry)) {
@@ -222,10 +236,11 @@ public class Discover {
 
     /**
      * Only include movies with this certification and lower.
-     *
+     * <p/>
      * Expected value is a valid certification for the specified 'certificationCountry'.
      *
      * @param certificationLte
+     * @return
      */
     public Discover certificationLte(String certificationLte) {
         if (StringUtils.isNotBlank(certificationLte)) {
@@ -236,12 +251,13 @@ public class Discover {
 
     /**
      * Filter movies to include a specific company.
-     *
+     * <p/>
      * Expected value is an integer (the id of a company).
-     *
+     * <p/>
      * They can be comma separated to indicate an 'AND' query
      *
      * @param withCompanies
+     * @return
      */
     public Discover withCompanies(String withCompanies) {
         if (StringUtils.isNotBlank(withCompanies)) {

src/main/java/com/omertron/themoviedbapi/model/Genre.java

@@ -19,27 +19,16 @@
  */
 package com.omertron.themoviedbapi.model;
 
-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;
 
 /**
- *
  * @author stuart.boston
  */
 @JsonRootName("genre")
-public class Genre implements Serializable {
+public class Genre extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(Genre.class);
     /*
      * Properties
      */
@@ -48,7 +37,6 @@ public class Genre implements Serializable {
     @JsonProperty("name")
     private String name;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public int getId() {
         return id;
     }
@@ -56,9 +44,7 @@ public class Genre implements Serializable {
     public String getName() {
         return name;
     }
-    //</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setId(int id) {
         this.id = id;
     }
@@ -66,21 +52,6 @@ public class Genre implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
-    //</editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        LOG.trace(sb.toString());
-    }
 
     @Override
     public boolean equals(Object obj) {
@@ -107,9 +78,4 @@ public class Genre implements Serializable {
         hash = 53 * hash + (this.name != null ? this.name.hashCode() : 0);
         return hash;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
 }

src/main/java/com/omertron/themoviedbapi/model/JobDepartment.java

@@ -19,26 +19,19 @@
  */
 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;
 
-public class JobDepartment {
+import java.util.List;
+
+public class JobDepartment extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
-    // Logger
-    private static final Logger LOG = LoggerFactory.getLogger(JobDepartment.class);
     // Properties
     @JsonProperty("department")
     private String department;
     @JsonProperty("job_list")
     private List<String> jobs;
 
-    //<editor-fold defaultstate="collapsed" desc="Getters">
     public String getDepartment() {
         return department;
     }
@@ -46,9 +39,7 @@ public class JobDepartment {
     public List<String> getJobs() {
         return jobs;
     }
-    //</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="Setters">
     public void setDepartment(String department) {
         this.department = department;
     }
@@ -56,24 +47,4 @@ public class JobDepartment {
     public void setJobs(List<String> jobs) {
         this.jobs = jobs;
     }
-    //</editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        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

@@ -19,28 +19,17 @@
  */
 package com.omertron.themoviedbapi.model;
 
-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;
 
 /**
- *
  * @author stuart.boston
  */
 @JsonRootName("keyword")
-public class Keyword implements Serializable {
+public class Keyword extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
 
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(Keyword.class);
     /*
      * Properties
      */
@@ -49,7 +38,6 @@ public class Keyword implements Serializable {
     @JsonProperty("name")
     private String name;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public int getId() {
         return id;
     }
@@ -57,9 +45,7 @@ public class Keyword implements Serializable {
     public String getName() {
         return name;
     }
-    //</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setId(int id) {
         this.id = id;
     }
@@ -67,21 +53,6 @@ public class Keyword implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
-    //</editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        LOG.trace(sb.toString());
-    }
 
     @Override
     public boolean equals(Object obj) {
@@ -108,9 +79,4 @@ public class Keyword implements Serializable {
         hash = 83 * hash + (this.name != null ? this.name.hashCode() : 0);
         return hash;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
 }

src/main/java/com/omertron/themoviedbapi/model/KeywordMovie.java

@@ -19,26 +19,15 @@
  */
 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;
 
 /**
- *
  * @author Stuart
  */
-public class KeywordMovie implements Serializable {
+public class KeywordMovie extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
 
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(KeywordMovie.class);
     /*
      * Properties
      */
@@ -63,7 +52,6 @@ public class KeywordMovie implements Serializable {
     @JsonProperty("popularity")
     private float popularity;
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -107,9 +95,7 @@ public class KeywordMovie implements Serializable {
     public float getPopularity() {
         return popularity;
     }
-    // </editor-fold>
 
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setBackdropPath(String backdropPath) {
         this.backdropPath = backdropPath;
     }
@@ -149,24 +135,4 @@ public class KeywordMovie implements Serializable {
     public void setPopularity(float popularity) {
         this.popularity = popularity;
     }
-    // </editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        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

@@ -19,27 +19,16 @@
  */
 package com.omertron.themoviedbapi.model;
 
-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;
 
 /**
- *
  * @author stuart.boston
  */
 @JsonRootName("spoken_language")
-public class Language implements Serializable {
+public class Language extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(Language.class);
     /*
      * Properties
      */
@@ -48,7 +37,6 @@ public class Language implements Serializable {
     @JsonProperty("name")
     private String name;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getIsoCode() {
         return isoCode;
     }
@@ -56,9 +44,7 @@ public class Language implements Serializable {
     public String getName() {
         return name;
     }
-    //</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setIsoCode(String isoCode) {
         this.isoCode = isoCode;
     }
@@ -66,21 +52,6 @@ public class Language implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
-    //</editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        LOG.trace(sb.toString());
-    }
 
     @Override
     public boolean equals(Object obj) {
@@ -107,9 +78,4 @@ public class Language implements Serializable {
         hash = 71 * hash + (this.name != null ? this.name.hashCode() : 0);
         return hash;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
 }

src/main/java/com/omertron/themoviedbapi/model/ListItemStatus.java

@@ -0,0 +1,51 @@
+/*
+ *      Copyright (c) 2004-2013 Stuart Boston
+ *
+ *      This file is part of TheMovieDB API.
+ *
+ *      TheMovieDB API is free software: you can redistribute it and/or modify
+ *      it under the terms of the GNU General Public License as published by
+ *      the Free Software Foundation, either version 3 of the License, or
+ *      any later version.
+ *
+ *      TheMovieDB API is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      GNU General Public License for more details.
+ *
+ *      You should have received a copy of the GNU General Public License
+ *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.omertron.themoviedbapi.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @author Holger Brandl
+ */
+public class ListItemStatus extends AbstractJsonMapping {
+
+    private static final long serialVersionUID = 1L;
+
+    @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;
+    }
+}

src/main/java/com/omertron/themoviedbapi/model/MovieDb.java

@@ -19,40 +19,19 @@
  */
 package com.omertron.themoviedbapi.model;
 
-import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.wrapper.WrapperAlternativeTitles;
+import com.omertron.themoviedbapi.wrapper.*;
-import com.omertron.themoviedbapi.wrapper.WrapperImages;
+
-import com.omertron.themoviedbapi.wrapper.WrapperMovie;
-import com.omertron.themoviedbapi.wrapper.WrapperMovieCasts;
-import com.omertron.themoviedbapi.wrapper.WrapperMovieKeywords;
-import com.omertron.themoviedbapi.wrapper.WrapperMovieList;
-import com.omertron.themoviedbapi.wrapper.WrapperReleaseInfo;
-import com.omertron.themoviedbapi.wrapper.WrapperReviews;
-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;
 
 /**
  * Movie Bean
  *
  * @author stuart.boston
  */
-public class MovieDb implements Serializable {
+public class MovieDb extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(MovieDb.class);
-    /*
-     * Properties
-     */
     @JsonProperty("backdrop_path")
     private String backdropPath;
     @JsonProperty("id")
@@ -93,6 +72,8 @@ public class MovieDb implements Serializable {
     private List<Language> spokenLanguages;
     @JsonProperty("tagline")
     private String tagline;
+    @JsonProperty("rating")
+    private float userRating;
     @JsonProperty("vote_average")
     private float voteAverage;
     @JsonProperty("vote_count")
@@ -213,6 +194,10 @@ public class MovieDb implements Serializable {
     public String getStatus() {
         return status;
     }
+
+    public float getUserRating() {
+        return userRating;
+    }
     // </editor-fold>
 
     // <editor-fold defaultstate="collapsed" desc="Setter methods">
@@ -308,6 +293,9 @@ public class MovieDb implements Serializable {
         this.status = status;
     }
 
+    public void setUserRating(float userRating) {
+        this.userRating = userRating;
+    }
     // </editor-fold>
 
     //<editor-fold defaultstate="collapsed" desc="AppendToResponse Getters">
@@ -354,7 +342,7 @@ public class MovieDb implements Serializable {
     public List<Reviews> getReviews() {
         return reviews.getReviews();
     }
-    //</editor-fold>
+    // </editor-fold>
 
     //<editor-fold defaultstate="collapsed" desc="AppendToResponse Setters">
     public void setAlternativeTitles(WrapperAlternativeTitles alternativeTitles) {
@@ -396,22 +384,7 @@ public class MovieDb implements Serializable {
     public void setReviews(WrapperReviews reviews) {
         this.reviews = reviews;
     }
-
+    // </editor-fold>
-    //</editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        LOG.trace(sb.toString());
-    }
 
     //<editor-fold defaultstate="collapsed" desc="Equals and HashCode">
     @Override
@@ -443,10 +416,5 @@ public class MovieDb implements Serializable {
         hash = 89 * hash + this.runtime;
         return hash;
     }
-    //</editor-fold>
+    // </editor-fold>
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
 }

src/main/java/com/omertron/themoviedbapi/model/MovieDbList.java

@@ -19,29 +19,18 @@
  */
 package com.omertron.themoviedbapi.model;
 
-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 {
+public class MovieDbList extends AbstractJsonMapping {
-    /*
-     * Logger
-     */
 
-    private static final Logger LOG = LoggerFactory.getLogger(MovieDbList.class);
-    /*
-     * Properties
-     */
     @JsonProperty("id")
     private String id;
     @JsonProperty("created_by")
@@ -60,8 +49,11 @@ public class MovieDbList {
     private String name;
     @JsonProperty("poster_path")
     private String posterPath;
+    @JsonProperty("status_code")
+    private String statusCode;
+    @JsonProperty("status_message")
+    private String statusMessage;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter Methods">
     public String getId() {
         return id;
     }
@@ -97,9 +89,15 @@ public class MovieDbList {
     public String getPosterPath() {
         return posterPath;
     }
-    //</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="Setter Methods">
+    public String getStatusCode() {
+        return statusCode;
+    }
+
+    public String getStatusMessage() {
+        return statusMessage;
+    }
+
     public void setId(String id) {
         this.id = id;
     }
@@ -135,24 +133,12 @@ public class MovieDbList {
     public void setPosterPath(String posterPath) {
         this.posterPath = posterPath;
     }
-    //</editor-fold>
 
-    /**
+    public void setStatusCode(String statusCode) {
-     * Handle unknown properties and print a message
+        this.statusCode = statusCode;
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        LOG.trace(sb.toString());
     }
 
-    @Override
+    public void setStatusMessage(String statusMessage) {
-    public String toString() {
+        this.statusMessage = statusMessage;
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
     }
 }

src/main/java/com/omertron/themoviedbapi/model/MovieDbListStatus.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2004-2013 Stuart Boston
+ *
+ *      This file is part of TheMovieDB API.
+ *
+ *      TheMovieDB API is free software: you can redistribute it and/or modify
+ *      it under the terms of the GNU General Public License as published by
+ *      the Free Software Foundation;private either version 3 of the License;private or
+ *      any later version.
+ *
+ *      TheMovieDB API is distributed in the hope that it will be useful;private
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      GNU General Public License for more details.
+ *
+ *      You should have received a copy of the GNU General Public License
+ *      along with TheMovieDB API.  If not;private see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.omertron.themoviedbapi.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class MovieDbListStatus extends StatusCode {
+
+    @JsonProperty("list_id")
+    private String listId;
+
+    public String getListId() {
+        return listId;
+    }
+
+    public void setListId(String listId) {
+        this.listId = listId;
+    }
+}

src/main/java/com/omertron/themoviedbapi/model/MovieList.java

@@ -19,29 +19,15 @@
  */
 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;
 
 /**
- *
  * @author Stuart
  */
-public class MovieList implements Serializable {
+public class MovieList extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
 
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(MovieList.class);
-    /*
-     * Properties
-     */
     @JsonProperty("description")
     private String description;
     @JsonProperty("favorite_count")
@@ -59,7 +45,6 @@ public class MovieList implements Serializable {
     @JsonProperty("list_type")
     private String listType;
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getDescription() {
         return description;
     }
@@ -91,9 +76,7 @@ public class MovieList implements Serializable {
     public String getListType() {
         return listType;
     }
-    // </editor-fold>
 
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setDescription(String description) {
         this.description = description;
     }
@@ -125,24 +108,4 @@ public class MovieList implements Serializable {
     public void setListType(String listType) {
         this.listType = listType;
     }
-    // </editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        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/Person.java

@@ -19,29 +19,19 @@
  */
 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.StringUtils;
+
 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;
 
 /**
- *
  * @author stuart.boston
  */
-public class Person implements Serializable {
+public class Person extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
 
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(Person.class);
-
     /*
      * Static fields for default cast information
      */
@@ -91,14 +81,14 @@ public class Person implements Serializable {
      * @param job
      */
     public void addCrew(int id, String name, String profilePath, String department, String job) {
-        this.personType = PersonType.CREW;
+        setPersonType(PersonType.CREW);
-        this.id = id;
+        setId(id);
-        this.name = name;
+        setName(name);
-        this.profilePath = profilePath;
+        setProfilePath(profilePath);
-        this.department = department;
+        setDepartment(department);
-        this.job = job;
+        setJob(job);
-        this.character = "";
+        setCharacter("");
-        this.order = -1;
+        setOrder(-1);
     }
 
     /**
@@ -111,17 +101,16 @@ public class Person implements Serializable {
      * @param order
      */
     public void addCast(int id, String name, String profilePath, String character, int order) {
-        this.personType = PersonType.CAST;
+        setPersonType(PersonType.CAST);
-        this.id = id;
+        setId(id);
-        this.name = name;
+        setName(name);
-        this.profilePath = profilePath;
+        setProfilePath(profilePath);
-        this.character = character;
+        setCharacter(character);
-        this.order = order;
+        setOrder(order);
-        this.department = CAST_DEPARTMENT;
+        setDepartment(CAST_DEPARTMENT);
-        this.job = CAST_JOB;
+        setJob(CAST_JOB);
     }
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getCharacter() {
         return character;
     }
@@ -189,9 +178,7 @@ public class Person implements Serializable {
     public float getPopularity() {
         return popularity;
     }
-    // </editor-fold>
 
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setCharacter(String character) {
         this.character = character;
     }
@@ -205,11 +192,11 @@ public class Person implements Serializable {
     }
 
     public void setJob(String job) {
-        this.job = job;
+        this.job = StringUtils.trimToEmpty(job);
     }
 
     public void setName(String name) {
-        this.name = name;
+        this.name = StringUtils.trimToEmpty(name);
     }
 
     public void setOrder(int order) {
@@ -221,7 +208,7 @@ public class Person implements Serializable {
     }
 
     public void setProfilePath(String profilePath) {
-        this.profilePath = profilePath;
+        this.profilePath = StringUtils.trimToEmpty(profilePath);
     }
 
     public void setAdult(boolean adult) {
@@ -233,47 +220,32 @@ public class Person implements Serializable {
     }
 
     public void setBiography(String biography) {
-        this.biography = biography;
+        this.biography = StringUtils.trimToEmpty(biography);
     }
 
     public void setBirthday(String birthday) {
-        this.birthday = birthday;
+        this.birthday = StringUtils.trimToEmpty(birthday);
     }
 
     public void setBirthplace(String birthplace) {
-        this.birthplace = birthplace;
+        this.birthplace = StringUtils.trimToEmpty(birthplace);
     }
 
     public void setDeathday(String deathday) {
-        this.deathday = deathday;
+        this.deathday = StringUtils.trimToEmpty(deathday);
     }
 
     public void setHomepage(String homepage) {
-        this.homepage = homepage;
+        this.homepage = StringUtils.trimToEmpty(homepage);
     }
 
     public void setImdbId(String imdbId) {
-        this.imdbId = imdbId;
+        this.imdbId = StringUtils.trimToEmpty(imdbId);
     }
 
     public void setPopularity(float popularity) {
         this.popularity = popularity;
     }
-    // </editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        LOG.trace(sb.toString());
-    }
 
     @Override
     public boolean equals(Object obj) {
@@ -320,9 +292,4 @@ public class Person implements Serializable {
         hash = 37 * hash + (this.character != null ? this.character.hashCode() : 0);
         return hash;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
 }

src/main/java/com/omertron/themoviedbapi/model/PersonCast.java

@@ -19,26 +19,16 @@
  */
 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.StringUtils;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
- *
  * @author Stuart
  */
-public class PersonCast implements Serializable {
+public class PersonCast extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
 
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(PersonCast.class);
     /*
      * Properties
      */
@@ -55,7 +45,6 @@ public class PersonCast implements Serializable {
     @JsonProperty("cast_id")
     private int castId;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getCharacter() {
         return character;
     }
@@ -80,11 +69,8 @@ public class PersonCast implements Serializable {
         return castId;
     }
 
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setCharacter(String character) {
-        this.character = character;
+        this.character = StringUtils.trimToEmpty(character);
     }
 
     public void setId(int id) {
@@ -92,7 +78,7 @@ public class PersonCast implements Serializable {
     }
 
     public void setName(String name) {
-        this.name = name;
+        this.name = StringUtils.trimToEmpty(name);
     }
 
     public void setOrder(int order) {
@@ -100,29 +86,13 @@ public class PersonCast implements Serializable {
     }
 
     public void setProfilePath(String profilePath) {
-        this.profilePath = profilePath;
+        this.profilePath = StringUtils.trimToEmpty(profilePath);
     }
 
     public void setCastId(int castId) {
         this.castId = castId;
     }
 
-    //</editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        LOG.trace(sb.toString());
-    }
-
     @Override
     public boolean equals(Object obj) {
         if (obj == null) {
@@ -160,9 +130,4 @@ public class PersonCast implements Serializable {
         hash = 41 * hash + (this.profilePath != null ? this.profilePath.hashCode() : 0);
         return hash;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
 }

src/main/java/com/omertron/themoviedbapi/model/PersonCredit.java

@@ -19,26 +19,15 @@
  */
 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.StringUtils;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
- *
  * @author stuart.boston
  */
-public class PersonCredit implements Serializable {
+public class PersonCredit extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(PersonCredit.class);
     private static final String DEFAULT_STRING = "";
     /*
      * Properties
@@ -63,7 +52,6 @@ public class PersonCredit implements Serializable {
     private String adult = DEFAULT_STRING;
     private PersonType personType = PersonType.PERSON;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter Methods">
     public String getCharacter() {
         return character;
     }
@@ -103,19 +91,17 @@ public class PersonCredit implements Serializable {
     public String getAdult() {
         return adult;
     }
-    //</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="Setter Methods">
     public void setCharacter(String character) {
-        this.character = character;
+        this.character = StringUtils.trimToEmpty(character);
     }
 
     public void setDepartment(String department) {
-        this.department = department;
+        this.department = StringUtils.trimToEmpty(department);
     }
 
     public void setJob(String job) {
-        this.job = job;
+        this.job = StringUtils.trimToEmpty(job);
     }
 
     public void setMovieId(int movieId) {
@@ -123,11 +109,11 @@ public class PersonCredit implements Serializable {
     }
 
     public void setMovieOriginalTitle(String movieOriginalTitle) {
-        this.movieOriginalTitle = movieOriginalTitle;
+        this.movieOriginalTitle = StringUtils.trimToEmpty(movieOriginalTitle);
     }
 
     public void setMovieTitle(String movieTitle) {
-        this.movieTitle = movieTitle;
+        this.movieTitle = StringUtils.trimToEmpty(movieTitle);
     }
 
     public void setPersonType(PersonType personType) {
@@ -135,34 +121,14 @@ public class PersonCredit implements Serializable {
     }
 
     public void setPosterPath(String posterPath) {
-        this.posterPath = posterPath;
+        this.posterPath = StringUtils.trimToEmpty(posterPath);
     }
 
     public void setReleaseDate(String releaseDate) {
-        this.releaseDate = releaseDate;
+        this.releaseDate = StringUtils.trimToEmpty(releaseDate);
     }
 
     public void setAdult(String adult) {
-        this.adult = adult;
+        this.adult = StringUtils.trimToEmpty(adult);
-    }
-    //</editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        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/PersonCrew.java

@@ -19,26 +19,16 @@
  */
 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.StringUtils;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
- *
  * @author Stuart
  */
-public class PersonCrew implements Serializable {
+public class PersonCrew extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
 
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(PersonCrew.class);
     /*
      * Properties
      */
@@ -53,7 +43,6 @@ public class PersonCrew implements Serializable {
     @JsonProperty("profile_path")
     private String profilePath;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getDepartment() {
         return department;
     }
@@ -73,11 +62,9 @@ public class PersonCrew implements Serializable {
     public String getProfilePath() {
         return profilePath;
     }
-    //</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setDepartment(String department) {
-        this.department = department;
+        this.department = StringUtils.trimToEmpty(department);
     }
 
     public void setId(int id) {
@@ -85,30 +72,15 @@ public class PersonCrew implements Serializable {
     }
 
     public void setJob(String job) {
-        this.job = job;
+        this.job = StringUtils.trimToEmpty(job);
     }
 
     public void setName(String name) {
-        this.name = name;
+        this.name = StringUtils.trimToEmpty(name);
     }
 
     public void setProfilePath(String profilePath) {
-        this.profilePath = profilePath;
+        this.profilePath = StringUtils.trimToEmpty(profilePath);
-    }
-    //</editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        LOG.trace(sb.toString());
     }
 
     @Override
@@ -145,9 +117,4 @@ public class PersonCrew implements Serializable {
         hash = 59 * hash + (this.profilePath != null ? this.profilePath.hashCode() : 0);
         return hash;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
 }

src/main/java/com/omertron/themoviedbapi/model/PersonType.java

@@ -20,12 +20,11 @@
 package com.omertron.themoviedbapi.model;
 
 /**
- *
  * @author stuart.boston
  */
 public enum PersonType {
 
-    CAST,   // A member of the cast
+    CAST, // A member of the cast
-    CREW,   // A member of the crew
+    CREW, // A member of the crew
     PERSON  // No specific type
 }

src/main/java/com/omertron/themoviedbapi/model/ProductionCompany.java

@@ -19,28 +19,17 @@
  */
 package com.omertron.themoviedbapi.model;
 
-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;
 
 /**
- *
  * @author stuart.boston
  */
 @JsonRootName("production_company")
-public class ProductionCompany implements Serializable {
+public class ProductionCompany extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
 
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(ProductionCompany.class);
     /*
      * Properties
      */
@@ -49,7 +38,6 @@ public class ProductionCompany implements Serializable {
     @JsonProperty("name")
     private String name;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public int getId() {
         return id;
     }
@@ -57,9 +45,7 @@ public class ProductionCompany implements Serializable {
     public String getName() {
         return name;
     }
-    //</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setId(int id) {
         this.id = id;
     }
@@ -67,21 +53,6 @@ public class ProductionCompany implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
-    //</editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        LOG.trace(sb.toString());
-    }
 
     @Override
     public boolean equals(Object obj) {
@@ -108,9 +79,4 @@ public class ProductionCompany implements Serializable {
         hash = 37 * hash + (this.name != null ? this.name.hashCode() : 0);
         return hash;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
 }

src/main/java/com/omertron/themoviedbapi/model/ProductionCountry.java

@@ -19,28 +19,17 @@
  */
 package com.omertron.themoviedbapi.model;
 
-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;
 
 /**
- *
  * @author stuart.boston
  */
 @JsonRootName("production_country")
-public class ProductionCountry implements Serializable {
+public class ProductionCountry extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
 
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(ProductionCountry.class);
     /*
      * Properties
      */
@@ -49,7 +38,6 @@ public class ProductionCountry implements Serializable {
     @JsonProperty("name")
     private String name;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getIsoCode() {
         return isoCode;
     }
@@ -57,9 +45,7 @@ public class ProductionCountry implements Serializable {
     public String getName() {
         return name;
     }
-    //</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setIsoCode(String isoCode) {
         this.isoCode = isoCode;
     }
@@ -67,21 +53,6 @@ public class ProductionCountry implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
-    //</editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        LOG.trace(sb.toString());
-    }
 
     @Override
     public boolean equals(Object obj) {
@@ -108,9 +79,4 @@ public class ProductionCountry implements Serializable {
         hash = 47 * hash + (this.name != null ? this.name.hashCode() : 0);
         return hash;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
 }

src/main/java/com/omertron/themoviedbapi/model/ReleaseInfo.java

@@ -19,26 +19,15 @@
  */
 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;
 
 /**
- *
  * @author Stuart
  */
-public class ReleaseInfo implements Serializable {
+public class ReleaseInfo extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
 
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(ReleaseInfo.class);
     /*
      * Properties
      */
@@ -49,7 +38,6 @@ public class ReleaseInfo implements Serializable {
     @JsonProperty("release_date")
     private String releaseDate;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getCertification() {
         return certification;
     }
@@ -61,9 +49,7 @@ public class ReleaseInfo implements Serializable {
     public String getReleaseDate() {
         return releaseDate;
     }
-    //</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setCertification(String certification) {
         this.certification = certification;
     }
@@ -75,21 +61,6 @@ public class ReleaseInfo implements Serializable {
     public void setReleaseDate(String releaseDate) {
         this.releaseDate = releaseDate;
     }
-    //</editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        LOG.trace(sb.toString());
-    }
 
     @Override
     public boolean equals(Object obj) {
@@ -120,9 +91,4 @@ public class ReleaseInfo implements Serializable {
         hash = 89 * hash + (this.releaseDate != null ? this.releaseDate.hashCode() : 0);
         return hash;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
 }

src/main/java/com/omertron/themoviedbapi/model/Reviews.java

@@ -19,26 +19,15 @@
  */
 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;
 
 /**
- *
  * @author Stuart
  */
-public class Reviews implements Serializable {
+public class Reviews extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
 
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(Reviews.class);
     /*
      * Properties
      */
@@ -51,7 +40,6 @@ public class Reviews implements Serializable {
     @JsonProperty("url")
     private String url;
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getId() {
         return id;
     }
@@ -67,9 +55,7 @@ public class Reviews implements Serializable {
     public String getUrl() {
         return url;
     }
-    // </editor-fold>
 
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setId(String id) {
         this.id = id;
     }
@@ -85,24 +71,4 @@ public class Reviews implements Serializable {
     public void setUrl(String url) {
         this.url = url;
     }
-    // </editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        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

@@ -19,26 +19,15 @@
  */
 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;
 
 /**
- *
  * @author Stuart
  */
-public class StatusCode implements Serializable {
+public class StatusCode extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
 
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(StatusCode.class);
     /*
      * Properties
      */
@@ -47,7 +36,6 @@ public class StatusCode implements Serializable {
     @JsonProperty("status_message")
     private String statusMessage;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public int getStatusCode() {
         return statusCode;
     }
@@ -55,9 +43,7 @@ public class StatusCode implements Serializable {
     public void setStatusCode(int statusCode) {
         this.statusCode = statusCode;
     }
-    //</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
     public String getStatusMessage() {
         return statusMessage;
     }
@@ -65,24 +51,4 @@ public class StatusCode implements Serializable {
     public void setStatusMessage(String statusMessage) {
         this.statusMessage = statusMessage;
     }
-    //</editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        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/TmdbConfiguration.java

@@ -19,27 +19,17 @@
  */
 package com.omertron.themoviedbapi.model;
 
-import com.fasterxml.jackson.annotation.JsonAnySetter;
 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 java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
- *
  * @author stuart.boston
  */
-public class TmdbConfiguration implements Serializable {
+public class TmdbConfiguration extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(TmdbConfiguration.class);
     /*
      * Properties
      */
@@ -56,7 +46,6 @@ public class TmdbConfiguration implements Serializable {
     @JsonProperty("logo_sizes")
     private List<String> logoSizes;
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">//GEN-BEGIN:getterMethods
     public List<String> getBackdropSizes() {
         return backdropSizes;
     }
@@ -81,8 +70,6 @@ public class TmdbConfiguration implements Serializable {
         return secureBaseUrl;
     }
 
-    // </editor-fold>
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">//GEN-BEGIN:setterMethods
     public void setBackdropSizes(List<String> backdropSizes) {
         this.backdropSizes = backdropSizes;
     }
@@ -106,7 +93,6 @@ public class TmdbConfiguration implements Serializable {
     public void setSecureBaseUrl(String secureBaseUrl) {
         this.secureBaseUrl = secureBaseUrl;
     }
-    // </editor-fold>
 
     /**
      * Copy the data from the passed object to this one
@@ -125,6 +111,7 @@ public class TmdbConfiguration implements Serializable {
      * Check that the poster size is valid
      *
      * @param posterSize
+     * @return
      */
     public boolean isValidPosterSize(String posterSize) {
         if (StringUtils.isBlank(posterSize) || posterSizes.isEmpty()) {
@@ -137,6 +124,7 @@ public class TmdbConfiguration implements Serializable {
      * Check that the backdrop size is valid
      *
      * @param backdropSize
+     * @return
      */
     public boolean isValidBackdropSize(String backdropSize) {
         if (StringUtils.isBlank(backdropSize) || backdropSizes.isEmpty()) {
@@ -149,6 +137,7 @@ public class TmdbConfiguration implements Serializable {
      * Check that the profile size is valid
      *
      * @param profileSize
+     * @return
      */
     public boolean isValidProfileSize(String profileSize) {
         if (StringUtils.isBlank(profileSize) || profileSizes.isEmpty()) {
@@ -161,6 +150,7 @@ public class TmdbConfiguration implements Serializable {
      * Check that the logo size is valid
      *
      * @param logoSize
+     * @return
      */
     public boolean isValidLogoSize(String logoSize) {
         if (StringUtils.isBlank(logoSize) || logoSizes.isEmpty()) {
@@ -173,6 +163,7 @@ public class TmdbConfiguration implements Serializable {
      * Check to see if the size is valid for any of the images types
      *
      * @param sizeToCheck
+     * @return
      */
     public boolean isValidSize(String sizeToCheck) {
         return (isValidPosterSize(sizeToCheck)
@@ -180,23 +171,4 @@ public class TmdbConfiguration implements Serializable {
                 || isValidProfileSize(sizeToCheck)
                 || isValidLogoSize(sizeToCheck));
     }
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        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/TokenAuthorisation.java

@@ -19,18 +19,10 @@
  */
 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;
 
-public class TokenAuthorisation {
+public class TokenAuthorisation extends AbstractJsonMapping {
-    /*
+
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(TokenAuthorisation.class);
     /*
      * Properties
      */
@@ -41,7 +33,6 @@ public class TokenAuthorisation {
     @JsonProperty("success")
     private Boolean success;
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getExpires() {
         return expires;
     }
@@ -53,9 +44,7 @@ public class TokenAuthorisation {
     public Boolean getSuccess() {
         return success;
     }
-    // </editor-fold>
 
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setExpires(String expires) {
         this.expires = expires;
     }
@@ -67,25 +56,4 @@ public class TokenAuthorisation {
     public void setSuccess(Boolean success) {
         this.success = success;
     }
-    // </editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        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/TokenSession.java

@@ -19,19 +19,10 @@
  */
 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;
 
-public class TokenSession {
+public class TokenSession extends AbstractJsonMapping {
-    /*
-     * Logger
-     */
 
-    private static final Logger LOG = LoggerFactory.getLogger(TokenSession.class);
     /*
      * Properties
      */
@@ -48,7 +39,6 @@ public class TokenSession {
     @JsonProperty("expires_at")
     private String expiresAt;
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getSessionId() {
         return sessionId;
     }
@@ -72,9 +62,7 @@ public class TokenSession {
     public String getExpiresAt() {
         return expiresAt;
     }
-    // </editor-fold>
 
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setSessionId(String sessionId) {
         this.sessionId = sessionId;
     }
@@ -98,25 +86,4 @@ public class TokenSession {
     public void setExpiresAt(String expiresAt) {
         this.expiresAt = expiresAt;
     }
-
-    // </editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        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/Trailer.java

@@ -19,25 +19,13 @@
  */
 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;
-
 /**
- *
  * @author Stuart
  */
-public class Trailer implements Serializable {
+public class Trailer extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
 
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(Trailer.class);
     /*
      * Website sources
      */
@@ -50,8 +38,8 @@ public class Trailer implements Serializable {
     private String size;
     private String source;
     private String website;    // The website of the trailer
+    private String type;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getName() {
         return name;
     }
@@ -67,9 +55,11 @@ public class Trailer implements Serializable {
     public String getWebsite() {
         return website;
     }
-    //</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
+    public String getType() {
+        return type;
+    }
+
     public void setName(String name) {
         this.name = name;
     }
@@ -85,20 +75,9 @@ public class Trailer implements Serializable {
     public void setWebsite(String website) {
         this.website = website;
     }
-    //</editor-fold>
 
-    /**
+    public void setType(String type) {
-     * Handle unknown properties and print a message
+        this.type = type;
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        LOG.trace(sb.toString());
     }
 
     @Override
@@ -131,9 +110,4 @@ public class Trailer implements Serializable {
         hash = 61 * hash + (this.website != null ? this.website.hashCode() : 0);
         return hash;
     }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
 }

src/main/java/com/omertron/themoviedbapi/model/Translation.java

@@ -19,26 +19,17 @@
  */
 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;
 
 /**
- *
  * @author Stuart
  */
-public class Translation implements Serializable {
+public class Translation extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
 
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(Translation.class);
     /*
      * Properties
      */
@@ -49,7 +40,6 @@ public class Translation implements Serializable {
     @JsonProperty("name")
     private String name;
 
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getEnglishName() {
         return englishName;
     }
@@ -61,9 +51,7 @@ public class Translation implements Serializable {
     public String getName() {
         return name;
     }
-    //</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setEnglishName(String englishName) {
         this.englishName = englishName;
     }
@@ -75,21 +63,6 @@ public class Translation implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
-    //</editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        LOG.trace(sb.toString());
-    }
 
     @Override
     public boolean equals(Object obj) {
@@ -123,6 +96,6 @@ public class Translation implements Serializable {
 
     @Override
     public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SIMPLE_STYLE);
-     }
+    }
 }

src/main/java/com/omertron/themoviedbapi/tools/ApiUrl.java

@@ -53,10 +53,10 @@ public class ApiUrl {
     /*
      * Properties
      */
-    private String apiKey;
+    private final String apiKey;
-    private String method;
+    private final String method;
-    private String submethod;
+    private final String submethod;
-    private Map<String, String> arguments = new HashMap<String, String>();
+    private final Map<String, String> arguments = new HashMap<String, String>();
     /*
      * API Parameters
      */
@@ -74,14 +74,15 @@ public class ApiUrl {
     public static final String PARAM_TOKEN = "request_token=";
     public static final String PARAM_VALUE = "value=";
     public static final String PARAM_YEAR = "year=";
-    public static final String PARAM_START_DATE="start_date=";
+    public static final String PARAM_START_DATE = "start_date=";
-    public static final String PARAM_END_DATE="end_date=";
+    public static final String PARAM_END_DATE = "end_date=";
     private static final String APPEND_TO_RESPONSE = "append_to_response=";
 
     //<editor-fold defaultstate="collapsed" desc="Constructor Methods">
     /**
      * Constructor for the simple API URL method without a sub-method
      *
+     * @param apiKey
      * @param method
      */
     public ApiUrl(String apiKey, String method) {
@@ -93,6 +94,7 @@ public class ApiUrl {
     /**
      * Constructor for the API URL with a sub-method
      *
+     * @param apiKey
      * @param method
      * @param submethod
      */
@@ -105,6 +107,8 @@ public class ApiUrl {
 
     /**
      * Build the URL from the pre-created arguments.
+     *
+     * @return
      */
     public URL buildUrl() {
         StringBuilder urlString = new StringBuilder(TMDB_API_BASE);
@@ -115,8 +119,8 @@ public class ApiUrl {
         // We have either a queury, or a direct request
         if (arguments.containsKey(PARAM_QUERY)) {
             // Append the suffix of the API URL
-            if(StringUtils.endsWith(urlString, "/") && submethod.startsWith("/")) {
+            if (StringUtils.endsWith(urlString, "/") && submethod.startsWith("/")) {
-                urlString.deleteCharAt(urlString.length()-1);
+                urlString.deleteCharAt(urlString.length() - 1);
             }
             urlString.append(submethod);
 
@@ -148,8 +152,8 @@ public class ApiUrl {
             }
 
             // Append the suffix of the API URL
-            if(StringUtils.endsWith(urlString, "/") && submethod.startsWith("/")) {
+            if (StringUtils.endsWith(urlString, "/") && submethod.startsWith("/")) {
-                urlString.deleteCharAt(urlString.length()-1);
+                urlString.deleteCharAt(urlString.length() - 1);
             }
             urlString.append(submethod);
 

src/main/java/com/omertron/themoviedbapi/tools/WebBrowser.java

@@ -20,10 +20,11 @@
 package com.omertron.themoviedbapi.tools;
 
 import com.omertron.themoviedbapi.MovieDbException;
-import java.io.BufferedReader;
+import org.apache.commons.codec.binary.Base64;
-import java.io.IOException;
+import org.slf4j.Logger;
-import java.io.InputStreamReader;
+import org.slf4j.LoggerFactory;
-import java.io.StringWriter;
+
+import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -35,9 +36,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Web browser with simple cookies support
@@ -45,8 +44,8 @@ import org.slf4j.LoggerFactory;
 public final class WebBrowser {
 
     private static final Logger LOG = LoggerFactory.getLogger(WebBrowser.class);
-    private static Map<String, String> browserProperties = new HashMap<String, String>();
+    private static final Map<String, String> BROWSER_PROPERTIES = new HashMap<String, String>();
-    private static Map<String, Map<String, String>> cookies = new HashMap<String, Map<String, String>>();
+    private static final Map<String, Map<String, String>> COOKIES = new HashMap<String, Map<String, String>>();
     private static String proxyHost = null;
     private static String proxyPort = null;
     private static String proxyUsername = null;
@@ -65,9 +64,10 @@ public final class WebBrowser {
      * Populate the browser properties
      */
     private static void populateBrowserProperties() {
-        if (browserProperties.isEmpty()) {
+        if (BROWSER_PROPERTIES.isEmpty()) {
-            browserProperties.put("User-Agent", "Mozilla/5.25 Netscape/5.0 (Windows; I; Win95)");
+            BROWSER_PROPERTIES.put("User-Agent", "Mozilla/5.25 Netscape/5.0 (Windows; I; Win95)");
-            browserProperties.put("Accept", "application/json");
+            BROWSER_PROPERTIES.put("Accept", "application/json");
+            BROWSER_PROPERTIES.put("Content-type", "application/json");
         }
     }
 
@@ -100,25 +100,59 @@ public final class WebBrowser {
     }
 
     public static String request(URL url) throws MovieDbException {
+        return request(url, null, Boolean.FALSE);
+    }
+
+    public static String request(URL url, String jsonBody) throws MovieDbException {
+        return request(url, jsonBody, Boolean.FALSE);
+    }
+
+    public static String request(URL url, String jsonBody, boolean isDeleteRequest) throws MovieDbException {
+
         StringWriter content = null;
 
         try {
             content = new StringWriter();
 
             BufferedReader in = null;
-            URLConnection cnx = null;
+            HttpURLConnection cnx = null;
+            OutputStreamWriter wr = null;
             try {
-                cnx = openProxiedConnection(url);
+                cnx = (HttpURLConnection) openProxiedConnection(url);
+
+                if (isDeleteRequest) {
+                    cnx.setDoOutput(true);
+                    cnx.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+                    cnx.setRequestMethod("DELETE");
+                }
 
                 sendHeader(cnx);
+
+                if (StringUtils.isNotBlank(jsonBody)) {
+                    cnx.setDoOutput(true);
+                    wr = new OutputStreamWriter(cnx.getOutputStream());
+                    wr.write(jsonBody);
+                }
+
                 readHeader(cnx);
 
-                in = new BufferedReader(new InputStreamReader(cnx.getInputStream(), getCharset(cnx)));
+                // http://stackoverflow.com/questions/4633048/httpurlconnection-reading-response-content-on-403-error
+                if (cnx.getResponseCode() >= 400) {
+                    in = new BufferedReader(new InputStreamReader(cnx.getErrorStream(), getCharset(cnx)));
+                } else {
+                    in = new BufferedReader(new InputStreamReader(cnx.getInputStream(), getCharset(cnx)));
+                }
+
                 String line;
                 while ((line = in.readLine()) != null) {
                     content.write(line);
                 }
             } finally {
+                if (wr != null) {
+                    wr.flush();
+                    wr.close();
+                }
+
                 if (in != null) {
                     in.close();
                 }
@@ -145,7 +179,7 @@ public final class WebBrowser {
         populateBrowserProperties();
 
         // send browser properties
-        for (Map.Entry<String, String> browserProperty : browserProperties.entrySet()) {
+        for (Map.Entry<String, String> browserProperty : BROWSER_PROPERTIES.entrySet()) {
             cnx.setRequestProperty(browserProperty.getKey(), browserProperty.getValue());
         }
         // send cookies
@@ -158,7 +192,7 @@ public final class WebBrowser {
     private static String createCookieHeader(URLConnection cnx) {
         String host = cnx.getURL().getHost();
         StringBuilder cookiesHeader = new StringBuilder();
-        for (Map.Entry<String, Map<String, String>> domainCookies : cookies.entrySet()) {
+        for (Map.Entry<String, Map<String, String>> domainCookies : COOKIES.entrySet()) {
             if (host.endsWith(domainCookies.getKey())) {
                 for (Map.Entry<String, String> cookie : domainCookies.getValue().entrySet()) {
                     cookiesHeader.append(cookie.getKey());
@@ -198,10 +232,10 @@ public final class WebBrowser {
                             // if domain isn't set take current host
                             cookieDomain = cnx.getURL().getHost();
                         }
-                        Map<String, String> domainCookies = cookies.get(cookieDomain);
+                        Map<String, String> domainCookies = COOKIES.get(cookieDomain);
                         if (domainCookies == null) {
                             domainCookies = new HashMap<String, String>();
-                            cookies.put(cookieDomain, domainCookies);
+                            COOKIES.put(cookieDomain, domainCookies);
                         }
                         // add or replace cookie
                         domainCookies.put(cookieName, cookieValue);

src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapper.java

@@ -19,23 +19,16 @@
  */
 package com.omertron.themoviedbapi.wrapper;
 
-import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.omertron.themoviedbapi.model.AbstractJsonMapping;
+import java.io.Serializable;
 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;
 
-public abstract class AbstractWrapper {
+public abstract class AbstractWrapper extends AbstractJsonMapping implements Serializable {
 
-    private Logger log;
+    private static final long serialVersionUID = 1L;
-
-    public AbstractWrapper(Class classToLog) {
-        this.log = LoggerFactory.getLogger(classToLog);
-    }
 
     /**
      * Get a list of the enums passed
@@ -52,23 +45,4 @@ public abstract class AbstractWrapper {
             return new ArrayList<E>(EnumSet.allOf(clz));
         }
     }
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        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/AbstractWrapperAll.java

@@ -26,10 +26,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  *
  * @author Stuart
  */
-public class AbstractWrapperAll extends AbstractWrapperId implements IWrapperId, IWrapperPages {
+public class AbstractWrapperAll extends AbstractWrapperId implements IWrapperId, IWrapperPages, IWrapperDates {
-    /*
-     * Properties
-     */
 
     @JsonProperty("page")
     private int page;
@@ -37,10 +34,8 @@ public class AbstractWrapperAll extends AbstractWrapperId implements IWrapperId,
     private int totalPages;
     @JsonProperty("total_results")
     private int totalResults;
-
+    @JsonProperty("dates")
-    public AbstractWrapperAll(Class classToLog) {
+    private ResultDates dates = new ResultDates();
-        super(classToLog);
-    }
 
     @Override
     public int getPage() {
@@ -57,6 +52,11 @@ public class AbstractWrapperAll extends AbstractWrapperId implements IWrapperId,
         return totalResults;
     }
 
+    @Override
+    public ResultDates getDates() {
+        return dates;
+    }
+
     @Override
     public void setPage(int page) {
         this.page = page;
@@ -71,4 +71,9 @@ public class AbstractWrapperAll extends AbstractWrapperId implements IWrapperId,
     public void setTotalResults(int totalResults) {
         this.totalResults = totalResults;
     }
+
+    @Override
+    public void setDates(ResultDates dates) {
+        this.dates = dates;
+    }
 }

src/main/java/com/omertron/themoviedbapi/wrapper/AbstractWrapperId.java

@@ -27,17 +27,11 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @author Stuart
  */
 public class AbstractWrapperId extends AbstractWrapper implements IWrapperId {
-    /*
-     * Properties
-     */
 
+    private static final long serialVersionUID = 1L;
     @JsonProperty("id")
     private int id;
 
-    public AbstractWrapperId(Class classToLog) {
-        super(classToLog);
-    }
-
     @Override
     public int getId() {
         return id;

src/main/java/com/omertron/themoviedbapi/wrapper/IWrapperDates.java

@@ -0,0 +1,27 @@
+/*
+ *      Copyright (c) 2004-2013 Stuart Boston
+ *
+ *      This file is part of TheMovieDB API.
+ *
+ *      TheMovieDB API is free software: you can redistribute it and/or modify
+ *      it under the terms of the GNU General Public License as published by
+ *      the Free Software Foundation, either version 3 of the License, or
+ *      any later version.
+ *
+ *      TheMovieDB API is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      GNU General Public License for more details.
+ *
+ *      You should have received a copy of the GNU General Public License
+ *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.omertron.themoviedbapi.wrapper;
+
+public interface IWrapperDates {
+
+    ResultDates getDates();
+
+    void setDates(ResultDates dates);
+}

src/main/java/com/omertron/themoviedbapi/wrapper/ResultDates.java

@@ -0,0 +1,88 @@
+/*
+ *      Copyright (c) 2004-2013 Stuart Boston
+ *
+ *      This file is part of TheMovieDB API.
+ *
+ *      TheMovieDB API is free software: you can redistribute it and/or modify
+ *      it under the terms of the GNU General Public License as published by
+ *      the Free Software Foundation, either version 3 of the License, or
+ *      any later version.
+ *
+ *      TheMovieDB API is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      GNU General Public License for more details.
+ *
+ *      You should have received a copy of the GNU General Public License
+ *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.omertron.themoviedbapi.wrapper;
+
+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;
+
+/**
+ *
+ * @author Stuart
+ */
+public class ResultDates implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * Logger
+     */
+    private static final Logger LOG = LoggerFactory.getLogger(ResultDates.class);
+    /*
+     * Properties
+     */
+    @JsonProperty("minimum")
+    private String minimum = "";
+    @JsonProperty("maximum")
+    private String maximum = "";
+
+    // <editor-fold defaultstate="collapsed" desc="Getter methods">
+    public String getMinimum() {
+        return minimum;
+    }
+
+    public String getMaximum() {
+        return maximum;
+    }
+    // </editor-fold>
+
+    // <editor-fold defaultstate="collapsed" desc="Setter methods">
+    public void setMinimum(String minimum) {
+        this.minimum = minimum;
+    }
+
+    public void setMaximum(String maximum) {
+        this.maximum = maximum;
+    }
+    // </editor-fold>
+
+    /**
+     * Handle unknown properties and print a message
+     *
+     * @param key
+     * @param value
+     */
+    @JsonAnySetter
+    public void handleUnknown(String key, Object value) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Unknown property: '").append(key);
+        sb.append("' value: '").append(value).append("'");
+        LOG.trace(sb.toString());
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SIMPLE_STYLE);
+    }
+}

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperAlternativeTitles.java

@@ -21,21 +21,19 @@ package com.omertron.themoviedbapi.wrapper;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.AlternativeTitle;
+import java.io.Serializable;
 import java.util.List;
 
 /**
  *
  * @author Stuart
  */
-public class WrapperAlternativeTitles extends AbstractWrapperId {
+public class WrapperAlternativeTitles extends AbstractWrapperId implements Serializable {
 
+    private static final long serialVersionUID = 1L;
     @JsonProperty("titles")
     private List<AlternativeTitle> titles;
 
-    public WrapperAlternativeTitles() {
-        super(WrapperAlternativeTitles.class);
-    }
-
     public List<AlternativeTitle> getTitles() {
         return titles;
     }

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperChanges.java

@@ -15,7 +15,7 @@ public class WrapperChanges {
 
     @JsonProperty("changes")
     private List<ChangeKeyItem> changedItems = new ArrayList<ChangeKeyItem>();
-    private Map<String, Object> newItems = new HashMap<String, Object>();
+    private final Map<String, Object> newItems = new HashMap<String, Object>();
 
     public List<ChangeKeyItem> getChangedItems() {
         return changedItems;

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCollection.java

@@ -32,10 +32,6 @@ public class WrapperCollection extends AbstractWrapperAll {
     @JsonProperty("results")
     private List<Collection> results;
 
-    public WrapperCollection() {
-        super(WrapperCollection.class);
-    }
-
     public List<Collection> getResults() {
         return results;
     }

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompany.java

@@ -32,10 +32,6 @@ public class WrapperCompany extends AbstractWrapperAll {
     @JsonProperty("results")
     private List<Company> results;
 
-    public WrapperCompany() {
-        super(WrapperCompany.class);
-    }
-
     public List<Company> getResults() {
         return results;
     }

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperCompanyMovies.java

@@ -32,10 +32,6 @@ public class WrapperCompanyMovies extends AbstractWrapperAll {
     @JsonProperty("results")
     private List<MovieDb> results;
 
-    public WrapperCompanyMovies() {
-        super(WrapperCompanyMovies.class);
-    }
-
     public List<MovieDb> getResults() {
         return results;
     }

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperConfig.java

@@ -35,10 +35,6 @@ public class WrapperConfig extends AbstractWrapper {
     @JsonProperty("change_keys")
     private List<String> changeKeys = Collections.EMPTY_LIST;
 
-    public WrapperConfig() {
-        super(WrapperConfig.class);
-    }
-
     public TmdbConfiguration getTmdbConfiguration() {
         return tmdbConfiguration;
     }

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperGenres.java

@@ -33,10 +33,6 @@ public class WrapperGenres extends AbstractWrapper {
     @JsonProperty("genres")
     private List<Genre> genres;
 
-    public WrapperGenres() {
-        super(WrapperGenres.class);
-    }
-
     public List<Genre> getGenres() {
         return genres;
     }

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperImages.java

@@ -22,6 +22,7 @@ package com.omertron.themoviedbapi.wrapper;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.Artwork;
 import com.omertron.themoviedbapi.model.ArtworkType;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -31,8 +32,9 @@ import java.util.List;
  *
  * @author Stuart
  */
-public class WrapperImages extends AbstractWrapperAll {
+public class WrapperImages extends AbstractWrapperAll implements Serializable {
 
+    private static final long serialVersionUID = 1L;
     @JsonProperty("backdrops")
     private List<Artwork> backdrops = Collections.EMPTY_LIST;
     @JsonProperty("posters")
@@ -40,10 +42,6 @@ public class WrapperImages extends AbstractWrapperAll {
     @JsonProperty("profiles")
     private List<Artwork> profiles = Collections.EMPTY_LIST;
 
-    public WrapperImages() {
-        super(WrapperImages.class);
-    }
-
     public List<Artwork> getBackdrops() {
         return backdrops;
     }
@@ -73,6 +71,7 @@ public class WrapperImages extends AbstractWrapperAll {
      *
      * Leaving the parameters blank will return all types
      *
+     * @param artworkList
      * @return
      */
     public List<Artwork> getAll(ArtworkType... artworkList) {

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperJobList.java

@@ -32,10 +32,6 @@ public class WrapperJobList extends AbstractWrapper {
     @JsonProperty("jobs")
     private List<JobDepartment> jobs;
 
-    public WrapperJobList() {
-        super(WrapperJobList.class);
-    }
-
     public List<JobDepartment> getJobs() {
         return jobs;
     }

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperKeywordMovies.java

@@ -32,10 +32,6 @@ public class WrapperKeywordMovies extends AbstractWrapperAll {
     @JsonProperty("results")
     private List<KeywordMovie> results;
 
-    public WrapperKeywordMovies() {
-        super(WrapperKeywordMovies.class);
-    }
-
     public List<KeywordMovie> getResults() {
         return results;
     }

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperKeywords.java

@@ -32,10 +32,6 @@ public class WrapperKeywords extends AbstractWrapperAll {
     @JsonProperty("results")
     private List<Keyword> results;
 
-    public WrapperKeywords() {
-        super(WrapperKeywords.class);
-    }
-
     public List<Keyword> getResults() {
         return results;
     }

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovie.java

@@ -21,21 +21,19 @@ package com.omertron.themoviedbapi.wrapper;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.MovieDb;
+import java.io.Serializable;
 import java.util.List;
 
 /**
  *
  * @author stuart.boston
  */
-public class WrapperMovie extends AbstractWrapperAll {
+public class WrapperMovie extends AbstractWrapperAll implements Serializable {
 
+    private static final long serialVersionUID = 1L;
     @JsonProperty("results")
     private List<MovieDb> movies;
 
-    public WrapperMovie() {
-        super(WrapperMovie.class);
-    }
-
     public List<MovieDb> getMovies() {
         return movies;
     }

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieCasts.java

@@ -23,6 +23,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.Person;
 import com.omertron.themoviedbapi.model.PersonCast;
 import com.omertron.themoviedbapi.model.PersonCrew;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -30,17 +31,14 @@ import java.util.List;
  *
  * @author Stuart
  */
-public class WrapperMovieCasts extends AbstractWrapperId {
+public class WrapperMovieCasts extends AbstractWrapperId implements Serializable {
 
+    private static final long serialVersionUID = 1L;
     @JsonProperty("cast")
     private List<PersonCast> cast;
     @JsonProperty("crew")
     private List<PersonCrew> crew;
 
-    public WrapperMovieCasts() {
-        super(WrapperMovieCasts.class);
-    }
-
     public List<PersonCast> getCast() {
         return cast;
     }

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieChanges.java

@@ -0,0 +1,39 @@
+/*
+ *      Copyright (c) 2004-2013 Stuart Boston
+ *
+ *      This file is part of TheMovieDB API.
+ *
+ *      TheMovieDB API is free software: you can redistribute it and/or modify
+ *      it under the terms of the GNU General Public License as published by
+ *      the Free Software Foundation, either version 3 of the License, or
+ *      any later version.
+ *
+ *      TheMovieDB API is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      GNU General Public License for more details.
+ *
+ *      You should have received a copy of the GNU General Public License
+ *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.omertron.themoviedbapi.wrapper;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.omertron.themoviedbapi.model.ChangedMovie;
+
+public class WrapperMovieChanges extends AbstractWrapperAll {
+
+    @JsonProperty("results")
+    private List<ChangedMovie> results;
+
+    public List<ChangedMovie> getResults() {
+        return results;
+    }
+
+    public void setResults(List<ChangedMovie> results) {
+        this.results = results;
+    }
+}

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieDbList.java

@@ -0,0 +1,21 @@
+package com.omertron.themoviedbapi.wrapper;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.omertron.themoviedbapi.model.MovieDbList;
+
+import java.util.List;
+
+public class WrapperMovieDbList extends AbstractWrapperAll {
+
+
+    @JsonProperty("results")
+    private List<MovieDbList> lists;
+
+    public List<MovieDbList> getLists() {
+        return lists;
+    }
+
+    public void setLists(List<MovieDbList> lists) {
+        this.lists = lists;
+    }
+}

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieKeywords.java

@@ -21,21 +21,19 @@ package com.omertron.themoviedbapi.wrapper;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.Keyword;
+import java.io.Serializable;
 import java.util.List;
 
 /**
  *
  * @author Stuart
  */
-public class WrapperMovieKeywords extends AbstractWrapperId {
+public class WrapperMovieKeywords extends AbstractWrapperId implements Serializable {
 
+    private static final long serialVersionUID = 1L;
     @JsonProperty("keywords")
     private List<Keyword> keywords;
 
-    public WrapperMovieKeywords() {
-        super(WrapperMovieKeywords.class);
-    }
-
     public List<Keyword> getKeywords() {
         return keywords;
     }

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperMovieList.java

@@ -21,21 +21,19 @@ package com.omertron.themoviedbapi.wrapper;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.MovieList;
+import java.io.Serializable;
 import java.util.List;
 
 /**
  *
  * @author Stuart
  */
-public class WrapperMovieList extends AbstractWrapperAll {
+public class WrapperMovieList extends AbstractWrapperAll implements Serializable {
 
+    private static final long serialVersionUID = 1L;
     @JsonProperty("results")
     private List<MovieList> movieList;
 
-    public WrapperMovieList() {
-        super(WrapperMovieList.class);
-    }
-
     public List<MovieList> getMovieList() {
         return movieList;
     }

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPerson.java

@@ -32,10 +32,6 @@ public class WrapperPerson extends AbstractWrapperAll {
     @JsonProperty("results")
     private List<Person> results;
 
-    public WrapperPerson() {
-        super(WrapperPerson.class);
-    }
-
     public List<Person> getResults() {
         return results;
     }

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPersonCredits.java

@@ -36,10 +36,6 @@ public class WrapperPersonCredits extends AbstractWrapperAll {
     @JsonProperty("crew")
     private List<PersonCredit> crew;
 
-    public WrapperPersonCredits() {
-        super(WrapperMovieCasts.class);
-    }
-
     public List<PersonCredit> getCast() {
         return cast;
     }

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperPersonList.java

@@ -32,10 +32,6 @@ public class WrapperPersonList extends AbstractWrapperAll {
     @JsonProperty("results")
     private List<Person> personList;
 
-    public WrapperPersonList() {
-        super(WrapperPersonList.class);
-    }
-
     public List<Person> getPersonList() {
         return personList;
     }

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperReleaseInfo.java

@@ -21,21 +21,19 @@ package com.omertron.themoviedbapi.wrapper;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.ReleaseInfo;
+import java.io.Serializable;
 import java.util.List;
 
 /**
  *
  * @author Stuart
  */
-public class WrapperReleaseInfo extends AbstractWrapperId {
+public class WrapperReleaseInfo extends AbstractWrapperId implements Serializable {
 
+    private static final long serialVersionUID = 1L;
     @JsonProperty("countries")
     private List<ReleaseInfo> countries;
 
-    public WrapperReleaseInfo() {
-        super(WrapperReleaseInfo.class);
-    }
-
     public List<ReleaseInfo> getCountries() {
         return countries;
     }

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperReviews.java

@@ -21,21 +21,19 @@ package com.omertron.themoviedbapi.wrapper;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.Reviews;
+import java.io.Serializable;
 import java.util.List;
 
 /**
  *
  * @author stuart.boston
  */
-public class WrapperReviews extends AbstractWrapperAll {
+public class WrapperReviews extends AbstractWrapperAll implements Serializable {
 
+    private static final long serialVersionUID = 1L;
     @JsonProperty("results")
     private List<Reviews> reviews;
 
-    public WrapperReviews() {
-        super(WrapperReviews.class);
-    }
-
     public List<Reviews> getReviews() {
         return reviews;
     }

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTrailers.java

@@ -21,6 +21,7 @@ package com.omertron.themoviedbapi.wrapper;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.Trailer;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -28,17 +29,14 @@ import java.util.List;
  *
  * @author Stuart
  */
-public class WrapperTrailers extends AbstractWrapperId {
+public class WrapperTrailers extends AbstractWrapperId implements Serializable {
 
+    private static final long serialVersionUID = 1L;
     @JsonProperty("quicktime")
     private List<Trailer> quicktime;
     @JsonProperty("youtube")
     private List<Trailer> youtube;
 
-    public WrapperTrailers() {
-        super(WrapperTrailers.class);
-    }
-
     public List<Trailer> getQuicktime() {
         return quicktime;
     }

src/main/java/com/omertron/themoviedbapi/wrapper/WrapperTranslations.java

@@ -21,21 +21,19 @@ package com.omertron.themoviedbapi.wrapper;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.omertron.themoviedbapi.model.Translation;
+import java.io.Serializable;
 import java.util.List;
 
 /**
  *
  * @author Stuart
  */
-public class WrapperTranslations extends AbstractWrapperId {
+public class WrapperTranslations extends AbstractWrapperId implements Serializable {
 
+    private static final long serialVersionUID = 1L;
     @JsonProperty("translations")
     private List<Translation> translations;
 
-    public WrapperTranslations() {
-        super(WrapperTranslations.class);
-    }
-
     public void setTranslations(List<Translation> translations) {
         this.translations = translations;
     }

src/test/java/com/omertron/themoviedbapi/TestLogger.java

@@ -46,7 +46,7 @@ public class TestLogger {
         config.append(".level = ").append(level).append(CRLF);
         config.append("java.util.logging.ConsoleHandler.level = ").append(level).append(CRLF);
         // Only works with Java 7 or later
-        config.append("java.util.logging.SimpleFormatter.format = [%1$tc %4$s] %2$s - %5$s %6$s%n").append(CRLF);
+        config.append("java.util.logging.SimpleFormatter.format = [%1$tH:%1$tM:%1$tS %4$6s] %2$s - %5$s %6$s%n").append(CRLF);
         // Exclude http logging
         config.append("sun.net.www.protocol.http.HttpURLConnection.level = OFF").append(CRLF);
 

src/test/java/com/omertron/themoviedbapi/TheMovieDbApiTest.java

@@ -19,9 +19,31 @@
  */
 package com.omertron.themoviedbapi;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.List;
+import java.util.Random;
+
+import org.apache.commons.lang3.StringUtils;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.omertron.themoviedbapi.model.Account;
 import com.omertron.themoviedbapi.model.AlternativeTitle;
 import com.omertron.themoviedbapi.model.Artwork;
 import com.omertron.themoviedbapi.model.ChangedItem;
+import com.omertron.themoviedbapi.model.ChangedMovie;
 import com.omertron.themoviedbapi.model.Collection;
 import com.omertron.themoviedbapi.model.CollectionInfo;
 import com.omertron.themoviedbapi.model.Company;
@@ -37,6 +59,7 @@ import com.omertron.themoviedbapi.model.Person;
 import com.omertron.themoviedbapi.model.PersonCredit;
 import com.omertron.themoviedbapi.model.ReleaseInfo;
 import com.omertron.themoviedbapi.model.Reviews;
+import com.omertron.themoviedbapi.model.StatusCode;
 import com.omertron.themoviedbapi.model.TmdbConfiguration;
 import com.omertron.themoviedbapi.model.TokenAuthorisation;
 import com.omertron.themoviedbapi.model.TokenSession;
@@ -44,13 +67,6 @@ import com.omertron.themoviedbapi.model.Trailer;
 import com.omertron.themoviedbapi.model.Translation;
 import com.omertron.themoviedbapi.results.TmdbResultsList;
 import com.omertron.themoviedbapi.results.TmdbResultsMap;
-import java.io.IOException;
-import java.util.List;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.*;
-import static org.junit.Assert.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Test cases for TheMovieDbApi API
@@ -69,7 +85,7 @@ public class TheMovieDbApiTest {
     private static final int ID_MOVIE_THE_AVENGERS = 24428;
     private static final int ID_COLLECTION_STAR_WARS = 10;
     private static final int ID_PERSON_BRUCE_WILLIS = 62;
-    private static final int ID_COMPANY_LUCASFILM = 1;
+    private static final int ID_COMPANY = 2;
     private static final String COMPANY_NAME = "Marvel Studios";
     private static final int ID_GENRE_ACTION = 28;
     private static final String ID_KEYWORD = "1721";
@@ -77,6 +93,9 @@ public class TheMovieDbApiTest {
     private static final String LANGUAGE_DEFAULT = "";
     private static final String LANGUAGE_ENGLISH = "en";
     private static final String LANGUAGE_RUSSIAN = "ru";
+    // session and account id of test users named 'apitests'
+    private static final String SESSION_ID_APITESTS = "63c85deb39337e29b69d78265eb28d639cbd6f72";
+    private static final int ACCOUNT_ID_APITESTS = 6065849;
 
     public TheMovieDbApiTest() throws MovieDbException {
     }
@@ -103,7 +122,7 @@ public class TheMovieDbApiTest {
      * Test of getConfiguration method, of class TheMovieDbApi.
      */
     @Test
-    public void testConfiguration() throws IOException {
+    public void testConfiguration() {
         LOG.info("Test Configuration");
 
         TmdbConfiguration tmdbConfig = tmdb.getConfiguration();
@@ -115,8 +134,55 @@ public class TheMovieDbApiTest {
         LOG.info(tmdbConfig.toString());
     }
 
+    @Test
+    public void testAccount() throws MovieDbException {
+        Account account = tmdb.getAccount(SESSION_ID_APITESTS);
+
+        // Make sure properties are extracted correctly
+        assertEquals(account.getUserName(), "apitests");
+        assertEquals(account.getId(), ACCOUNT_ID_APITESTS);
+    }
+
+    @Ignore("Session required")
+    public void testWatchList() throws MovieDbException {
+        // make sure it's empty (because it's just a test account
+        Assert.assertTrue(tmdb.getWatchList(SESSION_ID_APITESTS, ACCOUNT_ID_APITESTS).isEmpty());
+
+        // add a movie
+        tmdb.addToWatchList(SESSION_ID_APITESTS, ACCOUNT_ID_APITESTS, 550);
+
+        List<MovieDb> watchList = tmdb.getWatchList(SESSION_ID_APITESTS, ACCOUNT_ID_APITESTS);
+        assertNotNull("Empty watch list returned", watchList);
+        assertEquals("Watchlist wrong size", 1, watchList.size());
+
+        // clean up again
+        tmdb.removeFromWatchList(SESSION_ID_APITESTS, ACCOUNT_ID_APITESTS, 550);
+
+        Assert.assertTrue(tmdb.getWatchList(SESSION_ID_APITESTS, ACCOUNT_ID_APITESTS).isEmpty());
+    }
+
+    @Ignore("Session required")
+    public void testFavorites() throws MovieDbException {
+        // make sure it's empty (because it's just a test account
+        Assert.assertTrue(tmdb.getFavoriteMovies(SESSION_ID_APITESTS, ACCOUNT_ID_APITESTS).isEmpty());
+
+        // add a movie
+        tmdb.changeFavoriteStatus(SESSION_ID_APITESTS, ACCOUNT_ID_APITESTS, 550, true);
+
+        List<MovieDb> watchList = tmdb.getFavoriteMovies(SESSION_ID_APITESTS, ACCOUNT_ID_APITESTS);
+        assertNotNull("Empty watch list returned", watchList);
+        assertEquals("Watchlist wrong size", 1, watchList.size());
+
+        // clean up again
+        tmdb.changeFavoriteStatus(SESSION_ID_APITESTS, ACCOUNT_ID_APITESTS, 550, false);
+
+        Assert.assertTrue(tmdb.getFavoriteMovies(SESSION_ID_APITESTS, ACCOUNT_ID_APITESTS).isEmpty());
+    }
+
     /**
      * Test of searchMovie method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testSearchMovie() throws MovieDbException {
@@ -138,6 +204,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getMovieInfo method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetMovieInfo() throws MovieDbException {
@@ -148,6 +216,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getMovieAlternativeTitles method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetMovieAlternativeTitles() throws MovieDbException {
@@ -164,6 +234,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getMovieCasts method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetMovieCasts() throws MovieDbException {
@@ -191,6 +263,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getMovieImages method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetMovieImages() throws MovieDbException {
@@ -202,6 +276,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getMovieKeywords method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetMovieKeywords() throws MovieDbException {
@@ -212,6 +288,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getMovieReleaseInfo method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetMovieReleaseInfo() throws MovieDbException {
@@ -222,6 +300,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getMovieTrailers method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetMovieTrailers() throws MovieDbException {
@@ -232,6 +312,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getMovieTranslations method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetMovieTranslations() throws MovieDbException {
@@ -242,6 +324,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getCollectionInfo method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetCollectionInfo() throws MovieDbException {
@@ -266,6 +350,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getMovieInfoImdb method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetMovieInfoImdb() throws MovieDbException {
@@ -276,6 +362,7 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getApiKey method, of class TheMovieDbApi.
+     *
      */
     @Test
     public void testGetApiKey() {
@@ -284,6 +371,7 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getApiBase method, of class TheMovieDbApi.
+     *
      */
     @Test
     public void testGetApiBase() {
@@ -292,6 +380,7 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getConfiguration method, of class TheMovieDbApi.
+     *
      */
     @Test
     public void testGetConfiguration() {
@@ -300,6 +389,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of searchPeople method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testSearchPeople() throws MovieDbException {
@@ -312,6 +403,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getPersonInfo method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetPersonInfo() throws MovieDbException {
@@ -322,6 +415,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getPersonCredits method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetPersonCredits() throws MovieDbException {
@@ -333,6 +428,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getPersonImages method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetPersonImages() throws MovieDbException {
@@ -344,6 +441,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getLatestMovie method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetLatestMovie() throws MovieDbException {
@@ -355,6 +454,7 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of compareMovies method, of class TheMovieDbApi.
+     *
      */
     @Test
     public void testCompareMovies() {
@@ -363,6 +463,7 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of setProxy method, of class TheMovieDbApi.
+     *
      */
     @Test
     public void testSetProxy() {
@@ -371,6 +472,7 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of setTimeout method, of class TheMovieDbApi.
+     *
      */
     @Test
     public void testSetTimeout() {
@@ -379,6 +481,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getNowPlayingMovies method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetNowPlayingMovies() throws MovieDbException {
@@ -389,6 +493,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getPopularMovieList method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetPopularMovieList() throws MovieDbException {
@@ -399,6 +505,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getTopRatedMovies method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetTopRatedMovies() throws MovieDbException {
@@ -409,26 +517,33 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getCompanyInfo method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetCompanyInfo() throws MovieDbException {
         LOG.info("getCompanyInfo");
-        Company company = tmdb.getCompanyInfo(ID_COMPANY_LUCASFILM);
+        Company company = tmdb.getCompanyInfo(ID_COMPANY);
         assertTrue("No company information found", company.getCompanyId() > 0);
+        assertNotNull("No parent company found", company.getParentCompany());
     }
 
     /**
      * Test of getCompanyMovies method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetCompanyMovies() throws MovieDbException {
         LOG.info("getCompanyMovies");
-        TmdbResultsList<MovieDb> result = tmdb.getCompanyMovies(ID_COMPANY_LUCASFILM, LANGUAGE_DEFAULT, 0);
+        TmdbResultsList<MovieDb> result = tmdb.getCompanyMovies(ID_COMPANY, LANGUAGE_DEFAULT, 0);
         assertTrue("No company movies found", !result.getResults().isEmpty());
     }
 
     /**
      * Test of searchCompanies method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testSearchCompanies() throws MovieDbException {
@@ -439,6 +554,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getSimilarMovies method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetSimilarMovies() throws MovieDbException {
@@ -449,6 +566,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getGenreList method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetGenreList() throws MovieDbException {
@@ -459,6 +578,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getGenreMovies method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetGenreMovies() throws MovieDbException {
@@ -469,6 +590,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getUpcoming method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetUpcoming() throws Exception {
@@ -479,6 +602,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getCollectionImages method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetCollectionImages() throws Exception {
@@ -489,6 +614,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getAuthorisationToken method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetAuthorisationToken() throws Exception {
@@ -503,13 +630,16 @@ public class TheMovieDbApiTest {
      * Test of getSessionToken method, of class TheMovieDbApi.
      *
      * TODO: Cannot be tested without a HTTP authorisation: http://help.themoviedb.org/kb/api/user-authentication
+     *
+     * @throws MovieDbException
      */
+    @Ignore("Session required")
     public void testGetSessionToken() throws Exception {
         LOG.info("getSessionToken");
         TokenAuthorisation token = tmdb.getAuthorisationToken();
         assertFalse("Token is null", token == null);
         assertTrue("Token is not valid", token.getSuccess());
-        LOG.info(token.toString());
+        LOG.info("Token: {}", token.toString());
 
         TokenSession result = tmdb.getSessionToken(token);
         assertFalse("Session token is null", result == null);
@@ -519,6 +649,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getGuestSessionToken method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Ignore("Not ready yet")
     public void testGetGuestSessionToken() throws Exception {
@@ -540,6 +672,8 @@ public class TheMovieDbApiTest {
      * Test of getMovieChanges method,of class TheMovieDbApi
      *
      * TODO: Do not test this until it is fixed
+     *
+     * @throws MovieDbException
      */
     @Ignore("Do not test this until it is fixed")
     public void testGetMovieChanges() throws Exception {
@@ -570,6 +704,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of searchCollection method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testSearchCollection() throws Exception {
@@ -583,6 +719,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of searchList method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testSearchList() throws Exception {
@@ -596,6 +734,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of searchKeyword method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testSearchKeyword() throws Exception {
@@ -611,22 +751,65 @@ public class TheMovieDbApiTest {
      * Test of postMovieRating method, of class TheMovieDbApi.
      *
      * TODO: Cannot be tested without a HTTP authorisation: http://help.themoviedb.org/kb/api/user-authentication
+     *
+     * @throws MovieDbException
      */
-    @Ignore("Not ready yet")
+    @Ignore("Session required")
-    public void testPostMovieRating() throws Exception {
+    public void testMovieRating() throws Exception {
         LOG.info("postMovieRating");
-        String sessionId = "";
+        Integer movieID = 68724;
-        String rating = "";
+        Integer rating = new Random().nextInt(10) + 1;
-        boolean expResult = false;
+
-        boolean result = tmdb.postMovieRating(sessionId, rating);
+        boolean wasPosted = tmdb.postMovieRating(SESSION_ID_APITESTS, movieID, rating);
-        assertEquals(expResult, result);
+
-        // TODO review the generated test code and remove the default call to fail.
+        assertNotNull(wasPosted);
-        fail("The test case is a prototype.");
+        assertTrue(wasPosted);
+
+        // get all rated movies
+        List<MovieDb> ratedMovies = tmdb.getRatedMovies(SESSION_ID_APITESTS, ACCOUNT_ID_APITESTS);
+        assertTrue(ratedMovies.size() > 0);
+
+        // make sure that we find the movie and it is rated correctly
+        boolean foundMovie = false;
+        for (MovieDb movie : ratedMovies) {
+            if (movie.getId() == movieID) {
+                assertEquals(movie.getUserRating(), (float) rating, 0);
+                foundMovie = true;
+            }
+        }
+        assertTrue(foundMovie);
+    }
+
+    @Ignore("Session required")
+    public void testMovieLists() throws Exception {
+        Integer movieID = 68724;
+
+        // use a random name to avoid that we clash we leftovers of incomplete test runs
+        String name = "test list " + new Random().nextInt(100);
+
+        // create the list
+        String listId = tmdb.createList(SESSION_ID_APITESTS, name, "api testing only");
+
+        // add a movie, and test that it is on the list now
+        tmdb.addMovieToList(SESSION_ID_APITESTS, listId, movieID);
+        MovieDbList list = tmdb.getList(listId);
+        assertNotNull("Movie list returned was null", list);
+        assertEquals("Unexpected number of items returned", 1, list.getItemCount());
+        assertEquals((int) movieID, list.getItems().get(0).getId());
+
+        // now remove the movie
+        tmdb.removeMovieFromList(SESSION_ID_APITESTS, listId, movieID);
+        assertEquals(tmdb.getList(listId).getItemCount(), 0);
+
+        // delete the test list
+        StatusCode statusCode = tmdb.deleteMovieList(SESSION_ID_APITESTS, listId);
+        assertEquals(statusCode.getStatusCode(), 13);
     }
 
     /**
      * Test of getPersonChanges method, of class TheMovieDbApi.
      *
+     * @throws MovieDbException
      */
     @Ignore("Not ready yet")
     public void testGetPersonChanges() throws Exception {
@@ -638,6 +821,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getList method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetList() throws Exception {
@@ -649,6 +834,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getKeyword method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetKeyword() throws Exception {
@@ -659,6 +846,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getKeywordMovies method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetKeywordMovies() throws Exception {
@@ -670,6 +859,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getReviews method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetReviews() throws Exception {
@@ -682,6 +873,7 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of compareMovies method, of class TheMovieDbApi.
+     *
      */
     @Ignore("Not required")
     public void testCompareMovies_3args() {
@@ -689,6 +881,7 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of compareMovies method, of class TheMovieDbApi.
+     *
      */
     @Ignore("Not required")
     public void testCompareMovies_4args() {
@@ -696,13 +889,17 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getPersonPopular method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Ignore("Not required")
-    public void testGetPersonPopular_0args() throws Exception {
+    public void testGetPersonPopular_0args() {
     }
 
     /**
      * Test of getPersonPopular method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetPersonPopular_int() throws Exception {
@@ -714,6 +911,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getGenreMovies method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Ignore("Not required")
     public void testGetGenreMovies_3args() throws Exception {
@@ -721,6 +920,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getGenreMovies method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Ignore("Not required")
     public void testGetGenreMovies_4args() throws Exception {
@@ -728,20 +929,23 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getMovieChangesList method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
-    @Ignore("Not ready yet")
+    @Test
     public void testGetMovieChangesList() throws Exception {
         LOG.info("getMovieChangesList");
         int page = 0;
         String startDate = "";
         String endDate = "";
-        tmdb.getMovieChangesList(page, startDate, endDate);
+        TmdbResultsList<ChangedMovie> result = tmdb.getMovieChangesList(page, startDate, endDate);
-        // TODO review the generated test code and remove the default call to fail.
+        assertFalse("No movie changes.", result.getResults().isEmpty());
-        fail("The test case is a prototype.");
     }
 
     /**
      * Test of getPersonChangesList method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Ignore("Not ready yet")
     public void testGetPersonChangesList() throws Exception {
@@ -756,6 +960,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getJobs method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetJobs() throws Exception {
@@ -766,6 +972,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getDiscover method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Ignore("Not required")
     public void testGetDiscover_14args() throws Exception {
@@ -773,6 +981,8 @@ public class TheMovieDbApiTest {
 
     /**
      * Test of getDiscover method, of class TheMovieDbApi.
+     *
+     * @throws MovieDbException
      */
     @Test
     public void testGetDiscover_Discover() throws Exception {