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

Tidy up other code

pom.xml

@@ -13,7 +13,7 @@
 
     <groupId>com.omertron</groupId>
     <artifactId>themoviedbapi</artifactId>
-    <version>3.6</version>
+    <version>3.7</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/TheMovieDbApi.java

@@ -19,7 +19,6 @@
  */
 package com.omertron.themoviedbapi;
 
-import static com.omertron.themoviedbapi.tools.ApiUrl.*;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.omertron.themoviedbapi.MovieDbException.MovieDbExceptionType;
 import com.omertron.themoviedbapi.model.*;
@@ -28,19 +27,23 @@ import com.omertron.themoviedbapi.results.TmdbResultsMap;
 import com.omertron.themoviedbapi.tools.ApiUrl;
 import com.omertron.themoviedbapi.tools.WebBrowser;
 import com.omertron.themoviedbapi.wrapper.*;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.methods.HttpGet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.yamj.api.common.http.CommonHttpClient;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.omertron.themoviedbapi.tools.ApiUrl.*;
+
 /**
  * The MovieDb API <p> This is for version 3 of the API as specified here: http://help.themoviedb.org/kb/api/about-3
  *
@@ -49,6 +52,7 @@ import org.yamj.api.common.http.CommonHttpClient;
 public class TheMovieDbApi {
 
     private static final Logger LOG = LoggerFactory.getLogger(TheMovieDbApi.class);
+    private static final String FAILED_KEYWORD = "Failed to get keyword: {}";
     private String apiKey;
     private CommonHttpClient httpClient;
     private TmdbConfiguration tmdbConfig;
@@ -59,7 +63,7 @@ public class TheMovieDbApi {
     private static final String BASE_GENRE = "genre/";
     private static final String BASE_AUTH = "authentication/";
     private static final String BASE_COLLECTION = "collection/";
-//    private static final String BASE_ACCOUNT = "account/";
+    private static final String BASE_ACCOUNT = "account/";
     private static final String BASE_SEARCH = "search/";
     private static final String BASE_LIST = "list/";
     private static final String BASE_KEYWORD = "keyword/";
@@ -350,13 +354,106 @@ public class TheMovieDbApi {
             throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
         }
     }
-    //</editor-fold>
 
+    /**
+     * Get the basic information for an account. You will need to have a valid session id.
+     *
+     *
+     * @throws MovieDbException
+     */
+    public Account getAccount(String sessionId) throws MovieDbException {
+        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_ACCOUNT.replace("/", ""));
+
+        apiUrl.addArgument(PARAM_SESSION, sessionId);
+
+
+        URL url = apiUrl.buildUrl();
+        String webpage = requestWebPage(url);
+
+        try {
+            return mapper.readValue(webpage, Account.class);
+        } catch (IOException ex) {
+            LOG.warn("Failed to get Session Token: {}", ex.getMessage());
+            throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
+        }
+    }
+
+    public List<MovieDb> getFavoriteMovies(String sessionId, int accountId) throws MovieDbException {
+        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_ACCOUNT, accountId + "/favorite_movies");
+        apiUrl.addArgument(PARAM_SESSION, sessionId);
+
+        URL url = apiUrl.buildUrl();
+        String webpage = WebBrowser.request(url);
+
+        try {
+            return mapper.readValue(webpage, WrapperMovie.class).getMovies();
+        } catch (IOException ex) {
+            LOG.warn(FAILED_KEYWORD, ex.getMessage());
+            throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
+        }
+    }
+
+    public StatusCode changeFavoriteStatus(String sessionId, int accountId, Integer movieId, boolean isFavorite) throws MovieDbException {
+        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_ACCOUNT, accountId + "/favorite");
+
+        apiUrl.addArgument(PARAM_SESSION, sessionId);
+
+        HashMap<String, Object> body = new HashMap<String, Object>();
+        body.put("movie_id", movieId);
+        body.put("favorite", isFavorite);
+        String jsonBody = WebBrowser.convertToJson(body);
+
+        URL url = apiUrl.buildUrl();
+        String webpage = WebBrowser.request(url, jsonBody);
+
+        try {
+            return mapper.readValue(webpage, StatusCode.class);
+        } catch (IOException ex) {
+            LOG.warn(FAILED_KEYWORD, ex.getMessage());
+            throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
+        }
+    }
+
+    /**
+     * Add a movie to an account's watch list.
+     */
+    public StatusCode addToWatchList(String sessionId, int accountId, Integer movieId) throws MovieDbException {
+        return modifyWatchList(sessionId, accountId, movieId, true);
+    }
+
+    /**
+     * Remove a movie from an account's watch list.
+     */
+    public StatusCode removeFromWatchList(String sessionId, int accountId, Integer movieId) throws MovieDbException {
+        return modifyWatchList(sessionId, accountId, movieId, false);
+    }
+
+    private StatusCode modifyWatchList(String sessionId, int accountId, Integer movieId, boolean add) throws MovieDbException {
+        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_ACCOUNT, accountId + "/movie_watchlist");
+
+        apiUrl.addArgument(PARAM_SESSION, sessionId);
+
+        HashMap<String, Object> body = new HashMap<String, Object>();
+        body.put("movie_id", movieId);
+        body.put("movie_watchlist", add);
+        String jsonBody = WebBrowser.convertToJson(body);
+
+        URL url = apiUrl.buildUrl();
+        String webpage = WebBrowser.request(url, jsonBody);
+
+        try {
+            return mapper.readValue(webpage, StatusCode.class);
+        } catch (IOException ex) {
+            LOG.warn(FAILED_KEYWORD, ex.getMessage());
+            throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
+        }
+    }
     //<editor-fold defaultstate="collapsed" desc="Account Functions">
     // No account functions
     //</editor-fold>
     //
     //<editor-fold defaultstate="collapsed" desc="Movie Functions">
+
     /**
      * This method is used to retrieve all of the basic movie information.
      *
@@ -933,22 +1030,54 @@ public class TheMovieDbApi {
         }
     }
 
+    public List<MovieDb> getRatedMovies(String sessionId, int accountId) throws MovieDbException {
+        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_ACCOUNT, accountId + "/rated_movies");
+        apiUrl.addArgument(PARAM_SESSION, sessionId);
+
+        URL url = apiUrl.buildUrl();
+        String webpage = WebBrowser.request(url);
+
+        try {
+            return mapper.readValue(webpage, WrapperMovie.class).getMovies();
+        } catch (IOException ex) {
+            LOG.warn(FAILED_KEYWORD, ex.getMessage());
+            throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
+        }
+    }
+
     /**
      * This method lets users rate a movie.
      *
      * A valid session id is required.
      *
      * @param sessionId
+     * @param movieId
      * @param rating
      * @throws MovieDbException
      */
-    public boolean postMovieRating(String sessionId, String rating) throws MovieDbException {
+    public boolean postMovieRating(String sessionId, Integer movieId, Integer rating) throws MovieDbException {
-        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_MOVIE, "/rating");
+        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_MOVIE, movieId + "/rating");
 
         apiUrl.addArgument(PARAM_SESSION, sessionId);
-        apiUrl.addArgument(PARAM_VALUE, rating);
 
-        throw new MovieDbException(MovieDbExceptionType.UNKNOWN_CAUSE, "Not implemented yet");
+        if (rating < 0 || rating > 10) {
+            throw new MovieDbException(MovieDbExceptionType.UNKNOWN_CAUSE, "Rating out of range");
+        }
+
+        String jsonBody = WebBrowser.convertToJson(Collections.singletonMap("value", rating));
+        LOG.info("Body: {}", jsonBody);
+        URL url = apiUrl.buildUrl();
+        String webpage = WebBrowser.request(url, jsonBody);
+
+        try {
+            StatusCode status = mapper.readValue(webpage, StatusCode.class);
+            LOG.info("Status: {}", status);
+            int code = status.getStatusCode();
+            return code == 12;
+        } catch (IOException ex) {
+            LOG.warn(FAILED_KEYWORD, ex.getMessage());
+            throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
+        }
     }
     //</editor-fold>
 
@@ -1541,6 +1670,157 @@ public class TheMovieDbApi {
             throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
         }
     }
+
+    /**
+     * Get all lists of a given user
+     *
+     * @return The lists
+     * @throws MovieDbException
+     */
+    public List<MovieDbList> getUserLists(String sessionId, int accountID) throws MovieDbException {
+        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_ACCOUNT, accountID + "/lists");
+        apiUrl.addArgument(PARAM_SESSION, sessionId);
+
+        URL url = apiUrl.buildUrl();
+        String webpage = requestWebPage(url);
+
+        try {
+            return mapper.readValue(webpage, WrapperMovieDbList.class).getLists();
+        } catch (IOException ex) {
+            LOG.warn("Failed to get lists: {}", ex.getMessage());
+            throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
+        }
+    }
+
+    /**
+     * This method lets users create a new list. A valid session id is required.
+     *
+     * @return The list id
+     * @throws MovieDbException
+     */
+    public String createList(String sessionId, String name, String description) throws MovieDbException {
+        ApiUrl apiUrl = new ApiUrl(apiKey, "list");
+        apiUrl.addArgument(PARAM_SESSION, sessionId);
+
+        HashMap<String, String> body = new HashMap<String, String>();
+        body.put("name", StringUtils.trimToEmpty(name));
+        body.put("description", StringUtils.trimToEmpty(description));
+
+        String jsonBody = WebBrowser.convertToJson(body);
+
+        URL url = apiUrl.buildUrl();
+        String webpage = WebBrowser.request(url, jsonBody);
+
+
+        try {
+            return mapper.readValue(webpage, MovieDbListStatus.class).getListId();
+        } catch (IOException ex) {
+            LOG.warn(FAILED_KEYWORD, ex.getMessage());
+            throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
+        }
+    }
+
+    /**
+     * Check to see if a movie ID is already added to a list.
+     *
+     * @return true if the movie is on the list
+     * @throws MovieDbException
+     */
+    public boolean isMovieOnList(String listId, Integer movieId) throws MovieDbException {
+        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_LIST, listId + "/item_status");
+        apiUrl.addArgument("movie_id", movieId);
+
+        URL url = apiUrl.buildUrl();
+        String webpage = WebBrowser.request(url);
+
+        try {
+            return mapper.readValue(webpage, ListItemStatus.class).isItemPresent();
+        } catch (IOException ex) {
+            LOG.warn(FAILED_KEYWORD, ex.getMessage());
+            throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
+        }
+    }
+
+    /**
+     * This method lets users add new movies to a list that they created. A valid session id is required.
+     *
+     * @return true if the movie is on the list
+     * @throws MovieDbException
+     */
+    public StatusCode addMovieToList(String sessionId, String listId, Integer movieId) throws MovieDbException {
+        return modifyMovieList(sessionId, listId, movieId, "/add_item");
+    }
+
+    /**
+     * This method lets users remove movies from a list that they created. A valid session id is required.
+     *
+     * @return true if the movie is on the list
+     * @throws MovieDbException
+     */
+    public StatusCode removeMovieFromList(String sessionId, String listId, Integer movieId) throws MovieDbException {
+        return modifyMovieList(sessionId, listId, movieId, "/remove_item");
+    }
+
+    private StatusCode modifyMovieList(String sessionId, String listId, Integer movieId, String operation) throws MovieDbException {
+        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_LIST, listId + operation);
+
+        apiUrl.addArgument(PARAM_SESSION, sessionId);
+
+        String jsonBody = WebBrowser.convertToJson(Collections.singletonMap("media_id", movieId + ""));
+
+        URL url = apiUrl.buildUrl();
+        String webpage = WebBrowser.request(url, jsonBody);
+
+        try {
+            return mapper.readValue(webpage, StatusCode.class);
+        } catch (IOException ex) {
+            LOG.warn(FAILED_KEYWORD, ex.getMessage());
+            throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
+        }
+    }
+
+    /**
+     * Get the list of movies on an accounts watchlist.
+     *
+     * @return The watchlist of the user
+     * @throws MovieDbException
+     */
+    public List<MovieDb> getWatchList(String sessionId, int accountId) throws MovieDbException {
+        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_ACCOUNT, accountId + "/movie_watchlist");
+        apiUrl.addArgument(PARAM_SESSION, sessionId);
+
+        URL url = apiUrl.buildUrl();
+        String webpage = WebBrowser.request(url);
+
+        try {
+            return mapper.readValue(webpage, WrapperMovie.class).getMovies();
+        } catch (IOException ex) {
+            LOG.warn(FAILED_KEYWORD, ex.getMessage());
+            throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
+        }
+    }
+
+    /**
+     * This method lets users delete a list that they created. A valid session id is required.
+     *
+     * @throws MovieDbException
+     */
+    public StatusCode deleteMovieList(String sessionId, String listId) throws MovieDbException {
+        ApiUrl apiUrl = new ApiUrl(apiKey, BASE_LIST, listId);
+
+        apiUrl.addArgument(PARAM_SESSION, sessionId);
+
+        URL url = apiUrl.buildUrl();
+        String webpage = WebBrowser.request(url, null, true);
+
+
+        try {
+            return mapper.readValue(webpage, StatusCode.class);
+        } catch (IOException ex) {
+            LOG.warn(FAILED_KEYWORD, ex.getMessage());
+            throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
+        }
+    }
     //</editor-fold>
 
     //<editor-fold defaultstate="collapsed" desc="Keyword Functions">
@@ -1561,7 +1841,7 @@ public class TheMovieDbApi {
         try {
             return mapper.readValue(webpage, Keyword.class);
         } catch (IOException ex) {
-            LOG.warn("Failed to get keyword: {}", ex.getMessage());
+            LOG.warn(FAILED_KEYWORD, ex.getMessage());
             throw new MovieDbException(MovieDbExceptionType.MAPPING_FAILED, webpage, ex);
         }
 

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

@@ -0,0 +1,58 @@
+/*
+ *      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;
+
+/**
+ * @author Holger Brandl
+ */
+public abstract class AbstractJsonMapping implements Serializable {
+
+    private static Logger getLogger(Class<?> aClass) {
+        return LoggerFactory.getLogger(aClass);
+    }
+
+    /**
+     * 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("'");
+
+        getLogger(this.getClass()).warn(sb.toString());
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SIMPLE_STYLE);
+    }
+}

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

@@ -0,0 +1,66 @@
+/*
+ *      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;
+
+    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;
+    }
+}

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,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 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
      */
@@ -97,7 +87,6 @@ public class Artwork implements Serializable {
     public String getFlag() {
         return flag;
     }
-
     // </editor-fold>
 
     // <editor-fold defaultstate="collapsed" desc="Setter methods">
@@ -133,26 +122,11 @@ 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 +168,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 {
 
@@ -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")
@@ -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/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
      */
@@ -87,9 +77,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 +101,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 +137,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
      */
@@ -80,9 +71,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 +95,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,7 +44,7 @@ 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() {
@@ -79,12 +71,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 +99,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,14 +19,16 @@
  */
 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
@@ -49,7 +51,7 @@ public class Discover {
 
     /**
      * Get the parameters
-     *
+     * <p/>
      * This will be used to construct the URL in the API
      *
      * @return
@@ -160,11 +162,11 @@ 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
@@ -178,7 +180,7 @@ public class Discover {
 
     /**
      * The minimum release to include.
-     *
+     * <p/>
      * Expected format is YYYY-MM-DD.
      *
      * @param releaseDateGte
@@ -192,7 +194,7 @@ public class Discover {
 
     /**
      * The maximum release to include.
-     *
+     * <p/>
      * Expected format is YYYY-MM-DD.
      *
      * @param releaseDateLte
@@ -206,9 +208,9 @@ 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
@@ -222,7 +224,7 @@ public class Discover {
 
     /**
      * Only include movies with this certification and lower.
-     *
+     * <p/>
      * Expected value is a valid certification for the specified 'certificationCountry'.
      *
      * @param certificationLte
@@ -236,9 +238,9 @@ 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

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
      */
@@ -56,9 +45,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 +53,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 +79,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,19 +19,13 @@
  */
 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 {
 
     private static final long serialVersionUID = 1L;
-    // Logger
-    private static final Logger LOG = LoggerFactory.getLogger(JobDepartment.class);
     // Properties
     @JsonProperty("department")
     private String department;
@@ -46,7 +40,6 @@ public class JobDepartment {
     public List<String> getJobs() {
         return jobs;
     }
-    //</editor-fold>
 
     //<editor-fold defaultstate="collapsed" desc="Setters">
     public void setDepartment(String department) {
@@ -56,24 +49,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
      */
@@ -57,9 +46,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 +54,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 +80,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
      */
@@ -150,23 +139,4 @@ public class KeywordMovie implements Serializable {
         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
      */
@@ -56,9 +45,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 +53,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 +79,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,37 +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
      */
@@ -93,6 +75,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 +197,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 +296,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 +345,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 +387,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 +419,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,26 +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
      */
@@ -60,6 +52,10 @@ 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() {
@@ -97,6 +93,14 @@ public class MovieDbList {
     public String getPosterPath() {
         return posterPath;
     }
+
+    public String getStatusCode() {
+        return statusCode;
+    }
+
+    public String getStatusMessage() {
+        return statusMessage;
+    }
     //</editor-fold>
 
     //<editor-fold defaultstate="collapsed" desc="Setter Methods">
@@ -135,24 +139,13 @@ public class MovieDbList {
     public void setPosterPath(String posterPath) {
         this.posterPath = posterPath;
     }
+
+    public void setStatusCode(String statusCode) {
+        this.statusCode = statusCode;
+    }
+
+    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/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,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 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
      */
@@ -126,23 +115,4 @@ public class MovieList implements Serializable {
         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,14 +101,14 @@ 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">
@@ -205,11 +195,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 +211,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,27 +223,27 @@ 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) {
@@ -261,20 +251,6 @@ public class Person 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) {
@@ -320,9 +296,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
      */
@@ -80,11 +70,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 +79,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 +87,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 +131,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
@@ -103,19 +92,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 +110,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 +122,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
      */
@@ -73,11 +63,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 +73,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 +118,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
      */
@@ -57,9 +46,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 +54,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 +80,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
      */
@@ -57,9 +46,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 +54,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 +80,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
      */
@@ -61,9 +50,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 +62,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 +92,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
      */
@@ -86,23 +75,4 @@ public class Reviews implements Serializable {
         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
      */
@@ -55,9 +44,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 +52,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
      */
@@ -180,23 +170,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,12 @@
  */
 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 {
-    /*
+
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(TokenAuthorisation.class);
     /*
      * Properties
      */
@@ -69,23 +63,8 @@ public class TokenAuthorisation {
     }
     // </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);
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE);
     }
-
 }

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

@@ -19,19 +19,12 @@
  */
 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 {
-    /*
-     * Logger
-     */
 
-    private static final Logger LOG = LoggerFactory.getLogger(TokenSession.class);
     /*
      * Properties
      */
@@ -98,25 +91,10 @@ 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);
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_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
      */
@@ -67,9 +55,7 @@ public class Trailer implements Serializable {
     public String getWebsite() {
         return website;
     }
-    //</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setName(String name) {
         this.name = name;
     }
@@ -85,21 +71,6 @@ public class Trailer implements Serializable {
     public void setWebsite(String website) {
         this.website = website;
     }
-    //</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) {
@@ -131,9 +102,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
      */
@@ -61,9 +52,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 +64,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 +97,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/WebBrowser.java

@@ -19,11 +19,14 @@
  */
 package com.omertron.themoviedbapi.tools;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 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 +38,6 @@ 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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Web browser with simple cookies support
@@ -68,6 +68,7 @@ public final class WebBrowser {
         if (browserProperties.isEmpty()) {
             browserProperties.put("User-Agent", "Mozilla/5.25 Netscape/5.0 (Windows; I; Win95)");
             browserProperties.put("Accept", "application/json");
+            browserProperties.put("Content-type", "application/json");
         }
     }
 
@@ -100,25 +101,59 @@ public final class WebBrowser {
     }
 
     public static String request(URL url) throws MovieDbException {
+        return request(url, null);
+    }
+
+    public static String request(URL url, String jsonBody) throws MovieDbException {
+        return request(url, jsonBody, 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 (jsonBody != null) {
+                    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();
                 }
@@ -286,4 +321,15 @@ public final class WebBrowser {
     public static void setWebTimeoutRead(int webTimeoutRead) {
         WebBrowser.webTimeoutRead = webTimeoutRead;
     }
+
+    /**
+     * Use Jackson to convert Map to JSON string.
+     */
+    public static String convertToJson(Map<String, ?> map) throws MovieDbException {
+        try {
+            return new ObjectMapper().writeValueAsString(map);
+        } catch (JsonProcessingException jpe) {
+            throw new MovieDbException(MovieDbException.MovieDbExceptionType.MAPPING_FAILED, "JSON conversion failed", jpe);
+        }
+    }
 }

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

@@ -26,7 +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
      */
@@ -37,6 +37,8 @@ public class AbstractWrapperAll extends AbstractWrapperId implements IWrapperId,
     private int totalPages;
     @JsonProperty("total_results")
     private int totalResults;
+    @JsonProperty("dates")
+    private ResultDates dates = new ResultDates();
 
     public AbstractWrapperAll(Class classToLog) {
         super(classToLog);
@@ -57,6 +59,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 +78,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/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,89 @@
+/*
+ *      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.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 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/WrapperMovieDbList.java

@@ -0,0 +1,25 @@
+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 WrapperMovieDbList() {
+        super(WrapperMovieDbList.class);
+    }
+
+    public List<MovieDbList> getLists() {
+        return lists;
+    }
+
+    public void setLists(List<MovieDbList> lists) {
+        this.lists = lists;
+    }
+}

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

@@ -19,39 +19,20 @@
  */
 package com.omertron.themoviedbapi;
 
-import com.omertron.themoviedbapi.model.AlternativeTitle;
+import com.omertron.themoviedbapi.model.*;
-import com.omertron.themoviedbapi.model.Artwork;
-import com.omertron.themoviedbapi.model.ChangedItem;
-import com.omertron.themoviedbapi.model.Collection;
-import com.omertron.themoviedbapi.model.CollectionInfo;
-import com.omertron.themoviedbapi.model.Company;
-import com.omertron.themoviedbapi.model.Discover;
-import com.omertron.themoviedbapi.model.Genre;
-import com.omertron.themoviedbapi.model.JobDepartment;
-import com.omertron.themoviedbapi.model.Keyword;
-import com.omertron.themoviedbapi.model.KeywordMovie;
-import com.omertron.themoviedbapi.model.MovieDb;
-import com.omertron.themoviedbapi.model.MovieDbList;
-import com.omertron.themoviedbapi.model.MovieList;
-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.TmdbConfiguration;
-import com.omertron.themoviedbapi.model.TokenAuthorisation;
-import com.omertron.themoviedbapi.model.TokenSession;
-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;
 
+import java.io.IOException;
+import java.util.List;
+import java.util.Random;
+
+import static org.junit.Assert.*;
+
 /**
  * Test cases for TheMovieDbApi API
  *
@@ -69,7 +50,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 +58,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 {
     }
@@ -115,6 +99,51 @@ 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.
      */
@@ -413,8 +442,9 @@ public class TheMovieDbApiTest {
     @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());
     }
 
     /**
@@ -423,7 +453,7 @@ public class TheMovieDbApiTest {
     @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());
     }
 
@@ -504,12 +534,13 @@ public class TheMovieDbApiTest {
      *
      * TODO: Cannot be tested without a HTTP authorisation: http://help.themoviedb.org/kb/api/user-authentication
      */
+    @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);
@@ -612,16 +643,57 @@ public class TheMovieDbApiTest {
      *
      * TODO: Cannot be tested without a HTTP authorisation: http://help.themoviedb.org/kb/api/user-authentication
      */
-    @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);
     }
 
     /**