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

Correct URL for collections

.gitattributes

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

.gitignore

@@ -1,9 +1,9 @@
-*.class
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-/target/
-/nbactions.xml
+*.class
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+/target/
+/nbactions.xml

JacksonReplacement/JsonAnySetter.java

@@ -1,12 +1,12 @@
-package com.darylbeattie.movies.util;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(value=ElementType.METHOD)
-@Retention(value=RetentionPolicy.RUNTIME)
-public @interface JsonAnySetter {
-
-}
+package com.darylbeattie.movies.util;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(value=ElementType.METHOD)
+@Retention(value=RetentionPolicy.RUNTIME)
+public @interface JsonAnySetter {
+
+}

JacksonReplacement/JsonProperty.java

@@ -1,12 +1,12 @@
-package com.darylbeattie.movies.util;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface JsonProperty {
-	String value() default "";
-}
+package com.darylbeattie.movies.util;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface JsonProperty {
+	String value() default "";
+}

JacksonReplacement/JsonRootName.java

@@ -1,12 +1,12 @@
-package com.darylbeattie.movies.util;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface JsonRootName {
-	String value() default "";
-}
+package com.darylbeattie.movies.util;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface JsonRootName {
+	String value() default "";
+}

JacksonReplacement/ObjectMapper.java

@@ -1,69 +1,69 @@
-package com.darylbeattie.movies.util;
-
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.ParameterizedType;
-import java.util.List;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-public class ObjectMapper {
-
-	/**
-	 * This takes a JSON string and creates (and populates) an object of the given class
-	 * with the data from that JSON string. It mimics the method signature of the jackson
-	 * JSON API, so that we don't have to import the jackson library into this application.
-	 * 
-	 * @param jsonString The JSON string to parse.
-	 * @param objClass The class of object we want to create.
-	 * @return The instantiation of that class, populated with data from the JSON object.
-	 * @throws IOException If there was any kind of issue.
-	 */
-	public <T> T readValue(String jsonString, Class<T> objClass) throws IOException {
-		try {
-			return readValue(new JSONObject(jsonString), objClass);
-		}
-		catch (IOException ioe) {
-			throw ioe;
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-			throw new IOException(e);
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	public <T, R> T readValue(JSONObject json, Class<T> objClass) throws IOException {
-		try {
-			//TODO Iterate through json object values and call the JsonAnySetter method on the unknown ones.
-			T obj = objClass.newInstance();
-			for (Field f : objClass.getFields()) {
-				Annotation a = f.getAnnotation(JsonProperty.class);
-				if (List.class.equals(f.getType()) && (json.optJSONArray(((JsonProperty) a).value()) != null)) { // It's a list.
-					JSONArray jsonArray = json.optJSONArray(((JsonProperty) a).value());
-					ParameterizedType listType = (ParameterizedType) f.getGenericType();
-					Class<?> subObj = (Class<?>) listType.getActualTypeArguments()[0];
-					List<R> subObjList = ((Class<List<R>>) f.getType()).newInstance();
-					for (int i = 0; i < jsonArray.length(); i++) {
-						subObjList.add((R) readValue(jsonArray.getJSONObject(i), subObj));
-					}
-					f.set(obj, subObjList);
-				}
-				else if (a != null) {
-					f.set(obj, json.opt(((JsonProperty) a).value()));
-				}
-			}
-			return obj;
-		}
-		catch (IOException ioe) {
-			throw ioe;
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-			throw new IOException(e);
-		}
-	}
-
+package com.darylbeattie.movies.util;
+
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.ParameterizedType;
+import java.util.List;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+public class ObjectMapper {
+
+	/**
+	 * This takes a JSON string and creates (and populates) an object of the given class
+	 * with the data from that JSON string. It mimics the method signature of the jackson
+	 * JSON API, so that we don't have to import the jackson library into this application.
+	 * 
+	 * @param jsonString The JSON string to parse.
+	 * @param objClass The class of object we want to create.
+	 * @return The instantiation of that class, populated with data from the JSON object.
+	 * @throws IOException If there was any kind of issue.
+	 */
+	public <T> T readValue(String jsonString, Class<T> objClass) throws IOException {
+		try {
+			return readValue(new JSONObject(jsonString), objClass);
+		}
+		catch (IOException ioe) {
+			throw ioe;
+		}
+		catch (Exception e) {
+			e.printStackTrace();
+			throw new IOException(e);
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	public <T, R> T readValue(JSONObject json, Class<T> objClass) throws IOException {
+		try {
+			//TODO Iterate through json object values and call the JsonAnySetter method on the unknown ones.
+			T obj = objClass.newInstance();
+			for (Field f : objClass.getFields()) {
+				Annotation a = f.getAnnotation(JsonProperty.class);
+				if (List.class.equals(f.getType()) && (json.optJSONArray(((JsonProperty) a).value()) != null)) { // It's a list.
+					JSONArray jsonArray = json.optJSONArray(((JsonProperty) a).value());
+					ParameterizedType listType = (ParameterizedType) f.getGenericType();
+					Class<?> subObj = (Class<?>) listType.getActualTypeArguments()[0];
+					List<R> subObjList = ((Class<List<R>>) f.getType()).newInstance();
+					for (int i = 0; i < jsonArray.length(); i++) {
+						subObjList.add((R) readValue(jsonArray.getJSONObject(i), subObj));
+					}
+					f.set(obj, subObjList);
+				}
+				else if (a != null) {
+					f.set(obj, json.opt(((JsonProperty) a).value()));
+				}
+			}
+			return obj;
+		}
+		catch (IOException ioe) {
+			throw ioe;
+		}
+		catch (Exception e) {
+			e.printStackTrace();
+			throw new IOException(e);
+		}
+	}
+
 }

JacksonReplacement/README.md

@@ -1,6 +1,6 @@
-Jackson Library Replacement
-===========================
-
-These files are provided by Darren Beattie as an example of how to replace the Jackson libraries with native libraries inside Android.
-
-They are provided without warrantee and if you modify them or find them useful, please let me know.
+Jackson Library Replacement
+===========================
+
+These files are provided by Darren Beattie as an example of how to replace the Jackson libraries with native libraries inside Android.
+
+They are provided without warrantee and if you modify them or find them useful, please let me know.

README.md

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

pom.xml

@@ -13,7 +13,7 @@
 
     <groupId>com.omertron</groupId>
     <artifactId>themoviedbapi</artifactId>
-    <version>3.6</version>
+    <version>3.9</version>
     <packaging>jar</packaging>
 
     <name>API-The MovieDB</name>
@@ -71,6 +71,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <distribution.format>zip</distribution.format>
+        <version.jackson>2.3.0</version.jackson>
+        <version.slf4j>1.7.5</version.slf4j>
     </properties>
 
     <dependencies>
@@ -85,35 +87,35 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.2.2</version>
+            <version>${version.jackson}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.2.2</version>
+            <version>${version.jackson}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.2.2</version>
+            <version>${version.jackson}</version>
         </dependency>
         <!--LOGGING-->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.5</version>
+            <version>${version.slf4j}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
-            <version>1.7.5</version>
+            <version>${version.slf4j}</version>
             <scope>test</scope>
         </dependency>
         <!--COMMON HTTP TOOLS-->
         <dependency>
             <groupId>org.yamj</groupId>
             <artifactId>api-common</artifactId>
-            <version>1.0</version>
+            <version>1.1</version>
         </dependency>
     </dependencies>
 
@@ -174,7 +176,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.14.1</version>
+                <version>2.16</version>
                 <configuration>
                     <!-- To skip tests by default -->
                     <skipTests>${skipTests}</skipTests>
@@ -233,7 +235,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>versions-maven-plugin</artifactId>
-                <version>2.0</version>
+                <version>2.1</version>
             </plugin>
 
             <plugin>
@@ -277,7 +279,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.7</version>
+                <version>2.8.1</version>
             </plugin>
 
             <plugin>
@@ -289,7 +291,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-install-plugin</artifactId>
-                <version>2.4</version>
+                <version>2.5.1</version>
             </plugin>
 
             <plugin>

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

@@ -1,87 +1,87 @@
-/*
- *      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;
-
-public class MovieDbException extends Exception {
-
-    private static final long serialVersionUID = 1L;
-
-    public enum MovieDbExceptionType {
-        /*
-         * Unknown error occured
-         */
-        UNKNOWN_CAUSE,
-        /*
-         * URL is invalid
-         */
-        INVALID_URL,
-        /*
-         * Page not found
-         */
-        HTTP_404_ERROR,
-        /*
-         * The movie id was not found
-         */
-        MOVIE_ID_NOT_FOUND,
-        /*
-         * Mapping failed from target to internal onbjects
-         */
-        MAPPING_FAILED,
-        /*
-         * Error connecting to the service
-         */
-        CONNECTION_ERROR,
-        /*
-         * Image was invalid
-         */
-        INVALID_IMAGE,
-        /*
-         * Autorisation rejected
-         */
-        AUTHORISATION_FAILURE,
-        /*
-         * Service Unavailable, usually temporary
-         */
-        HTTP_503_ERROR;
-    }
-
-    private final MovieDbExceptionType exceptionType;
-    private final String response;
-
-    public MovieDbException(final MovieDbExceptionType exceptionType, final String response) {
-        super();
-        this.exceptionType = exceptionType;
-        this.response = response;
-    }
-
-    public MovieDbException(final MovieDbExceptionType exceptionType, final String response, final Throwable cause) {
-        super(cause);
-        this.exceptionType = exceptionType;
-        this.response = response;
-    }
-
-    public MovieDbExceptionType getExceptionType() {
-        return exceptionType;
-    }
-
-    public String getResponse() {
-        return response;
-    }
-}
+/*
+ *      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;
+
+public class MovieDbException extends Exception {
+
+    private static final long serialVersionUID = 1L;
+
+    public enum MovieDbExceptionType {
+        /*
+         * Unknown error occured
+         */
+        UNKNOWN_CAUSE,
+        /*
+         * URL is invalid
+         */
+        INVALID_URL,
+        /*
+         * Page not found
+         */
+        HTTP_404_ERROR,
+        /*
+         * The movie id was not found
+         */
+        MOVIE_ID_NOT_FOUND,
+        /*
+         * Mapping failed from target to internal onbjects
+         */
+        MAPPING_FAILED,
+        /*
+         * Error connecting to the service
+         */
+        CONNECTION_ERROR,
+        /*
+         * Image was invalid
+         */
+        INVALID_IMAGE,
+        /*
+         * Autorisation rejected
+         */
+        AUTHORISATION_FAILURE,
+        /*
+         * Service Unavailable, usually temporary
+         */
+        HTTP_503_ERROR;
+    }
+
+    private final MovieDbExceptionType exceptionType;
+    private final String response;
+
+    public MovieDbException(final MovieDbExceptionType exceptionType, final String response) {
+        super();
+        this.exceptionType = exceptionType;
+        this.response = response;
+    }
+
+    public MovieDbException(final MovieDbExceptionType exceptionType, final String response, final Throwable cause) {
+        super(cause);
+        this.exceptionType = exceptionType;
+        this.response = response;
+    }
+
+    public MovieDbExceptionType getExceptionType() {
+        return exceptionType;
+    }
+
+    public String getResponse() {
+        return response;
+    }
+}

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

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

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

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

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

@@ -1,114 +1,86 @@
-/*
- *      Copyright (c) 2004-2013 Stuart Boston
- *
- *      This file is part of TheMovieDB API.
- *
- *      TheMovieDB API is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, 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.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
-     */
-    @JsonProperty("iso_3166_1")
-    private String country;
-    @JsonProperty("title")
-    private String title;
-
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
-    public String getCountry() {
-        return country;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-    // </editor-fold>
-
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setCountry(String country) {
-        this.country = country;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-    // </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) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final AlternativeTitle other = (AlternativeTitle) obj;
-        if ((this.country == null) ? (other.country != null) : !this.country.equals(other.country)) {
-            return false;
-        }
-        if ((this.title == null) ? (other.title != null) : !this.title.equals(other.title)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 7;
-        hash = 89 * hash + (this.country != null ? this.country.hashCode() : 0);
-        hash = 89 * hash + (this.title != null ? this.title.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
-}
+/*
+ *      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;
+
+import java.io.Serializable;
+
+/**
+ * @author Stuart
+ */
+public class AlternativeTitle implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * Properties
+     */
+    @JsonProperty("iso_3166_1")
+    private String country;
+    @JsonProperty("title")
+    private String title;
+
+    // <editor-fold defaultstate="collapsed" desc="Getter methods">
+    public String getCountry() {
+        return country;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+    // </editor-fold>
+
+    // <editor-fold defaultstate="collapsed" desc="Setter methods">
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+    // </editor-fold>
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final AlternativeTitle other = (AlternativeTitle) obj;
+        if ((this.country == null) ? (other.country != null) : !this.country.equals(other.country)) {
+            return false;
+        }
+        if ((this.title == null) ? (other.title != null) : !this.title.equals(other.title)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 89 * hash + (this.country != null ? this.country.hashCode() : 0);
+        hash = 89 * hash + (this.title != null ? this.title.hashCode() : 0);
+        return hash;
+    }
+}

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

@@ -1,202 +1,164 @@
-/*
- *      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.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 {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(Artwork.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("aspect_ratio")
-    private float aspectRatio;
-    @JsonProperty("file_path")
-    private String filePath;
-    @JsonProperty("height")
-    private int height;
-    @JsonProperty("iso_639_1")
-    private String language;
-    @JsonProperty("width")
-    private int width;
-    @JsonProperty("vote_average")
-    private float voteAverage;
-    @JsonProperty("vote_count")
-    private int voteCount;
-    @JsonProperty("flag")
-    private String flag;
-    private ArtworkType artworkType = ArtworkType.POSTER;
-
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
-    public ArtworkType getArtworkType() {
-        return artworkType;
-    }
-
-    public float getAspectRatio() {
-        return aspectRatio;
-    }
-
-    public String getFilePath() {
-        return filePath;
-    }
-
-    public int getHeight() {
-        return height;
-    }
-
-    public String getLanguage() {
-        return language;
-    }
-
-    public int getWidth() {
-        return width;
-    }
-
-    public float getVoteAverage() {
-        return voteAverage;
-    }
-
-    public int getVoteCount() {
-        return voteCount;
-    }
-
-    public String getFlag() {
-        return flag;
-    }
-
-    // </editor-fold>
-
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setArtworkType(ArtworkType artworkType) {
-        this.artworkType = artworkType;
-    }
-
-    public void setAspectRatio(float aspectRatio) {
-        this.aspectRatio = aspectRatio;
-    }
-
-    public void setFilePath(String filePath) {
-        this.filePath = filePath;
-    }
-
-    public void setHeight(int height) {
-        this.height = height;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public void setWidth(int width) {
-        this.width = width;
-    }
-
-    public void setVoteAverage(float voteAverage) {
-        this.voteAverage = voteAverage;
-    }
-
-    public void setVoteCount(int voteCount) {
-        this.voteCount = voteCount;
-    }
-
-        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) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final Artwork other = (Artwork) obj;
-        if (Float.floatToIntBits(this.aspectRatio) != Float.floatToIntBits(other.aspectRatio)) {
-            return false;
-        }
-        if ((this.filePath == null) ? (other.filePath != null) : !this.filePath.equals(other.filePath)) {
-            return false;
-        }
-        if (this.height != other.height) {
-            return false;
-        }
-        if ((this.language == null) ? (other.language != null) : !this.language.equals(other.language)) {
-            return false;
-        }
-        if (this.width != other.width) {
-            return false;
-        }
-        if (this.artworkType != other.artworkType) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 3;
-        hash = 71 * hash + Float.floatToIntBits(this.aspectRatio);
-        hash = 71 * hash + (this.filePath != null ? this.filePath.hashCode() : 0);
-        hash = 71 * hash + this.height;
-        hash = 71 * hash + (this.language != null ? this.language.hashCode() : 0);
-        hash = 71 * hash + this.width;
-        hash = 71 * hash + (this.artworkType != null ? this.artworkType.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
-}
+/*
+ *      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;
+
+/**
+ * The artwork type information
+ *
+ * @author Stuart
+ */
+public class Artwork extends AbstractJsonMapping {
+
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("aspect_ratio")
+    private float aspectRatio;
+    @JsonProperty("file_path")
+    private String filePath;
+    @JsonProperty("height")
+    private int height;
+    @JsonProperty("iso_639_1")
+    private String language;
+    @JsonProperty("width")
+    private int width;
+    @JsonProperty("vote_average")
+    private float voteAverage;
+    @JsonProperty("vote_count")
+    private int voteCount;
+    @JsonProperty("flag")
+    private String flag;
+    private ArtworkType artworkType = ArtworkType.POSTER;
+
+    public ArtworkType getArtworkType() {
+        return artworkType;
+    }
+
+    public float getAspectRatio() {
+        return aspectRatio;
+    }
+
+    public String getFilePath() {
+        return filePath;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public int getWidth() {
+        return width;
+    }
+
+    public float getVoteAverage() {
+        return voteAverage;
+    }
+
+    public int getVoteCount() {
+        return voteCount;
+    }
+
+    public String getFlag() {
+        return flag;
+    }
+
+    public void setArtworkType(ArtworkType artworkType) {
+        this.artworkType = artworkType;
+    }
+
+    public void setAspectRatio(float aspectRatio) {
+        this.aspectRatio = aspectRatio;
+    }
+
+    public void setFilePath(String filePath) {
+        this.filePath = filePath;
+    }
+
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
+    public void setVoteAverage(float voteAverage) {
+        this.voteAverage = voteAverage;
+    }
+
+    public void setVoteCount(int voteCount) {
+        this.voteCount = voteCount;
+    }
+
+    public void setFlag(String flag) {
+        this.flag = flag;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final Artwork other = (Artwork) obj;
+        if (Float.floatToIntBits(this.aspectRatio) != Float.floatToIntBits(other.aspectRatio)) {
+            return false;
+        }
+        if ((this.filePath == null) ? (other.filePath != null) : !this.filePath.equals(other.filePath)) {
+            return false;
+        }
+        if (this.height != other.height) {
+            return false;
+        }
+        if ((this.language == null) ? (other.language != null) : !this.language.equals(other.language)) {
+            return false;
+        }
+        if (this.width != other.width) {
+            return false;
+        }
+        if (this.artworkType != other.artworkType) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 3;
+        hash = 71 * hash + Float.floatToIntBits(this.aspectRatio);
+        hash = 71 * hash + (this.filePath != null ? this.filePath.hashCode() : 0);
+        hash = 71 * hash + this.height;
+        hash = 71 * hash + (this.language != null ? this.language.hashCode() : 0);
+        hash = 71 * hash + this.width;
+        hash = 71 * hash + (this.artworkType != null ? this.artworkType.hashCode() : 0);
+        return hash;
+    }
+}

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

@@ -1,30 +1,33 @@
-/*
- *      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;
-
-/**
- * ArtworkType enum List of the artwork types that are available
- */
-public enum ArtworkType {
-
-    POSTER,     // Poster artwork
-    BACKDROP,   // Fanart/backdrop
-    PROFILE     // Person image
-}
+/*
+ *      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;
+
+/**
+ * ArtworkType enum List of the artwork types that are available
+ */
+public enum ArtworkType {
+
+    // Poster artwork
+    POSTER,
+    // Fanart/backdrop
+    BACKDROP,
+    // Person image
+    PROFILE
+}

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

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

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

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

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

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

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

@@ -1,172 +1,139 @@
-/*
- *      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.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 {
-
-    private static final long serialVersionUID = 1L;
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(Collection.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("id")
-    private int id;
-    @JsonProperty("title")
-    private String title;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("poster_path")
-    private String posterPath;
-    @JsonProperty("backdrop_path")
-    private String backdropPath;
-    @JsonProperty("release_date")
-    private String releaseDate;
-
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public String getBackdropPath() {
-        return backdropPath;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public String getPosterPath() {
-        return posterPath;
-    }
-
-    public String getReleaseDate() {
-        return releaseDate;
-    }
-
-    public String getTitle() {
-        if (StringUtils.isBlank(title)) {
-            return name;
-        }
-        return title;
-    }
-
-    public String getName() {
-        if (StringUtils.isBlank(name)) {
-            return title;
-        }
-        return name;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setBackdropPath(String backdropPath) {
-        this.backdropPath = backdropPath;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public void setPosterPath(String posterPath) {
-        this.posterPath = posterPath;
-    }
-
-    public void setReleaseDate(String releaseDate) {
-        this.releaseDate = releaseDate;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    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) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final Collection other = (Collection) obj;
-        if ((this.backdropPath == null) ? (other.backdropPath != null) : !this.backdropPath.equals(other.backdropPath)) {
-            return false;
-        }
-        if (this.id != other.id) {
-            return false;
-        }
-        if ((this.title == null) ? (other.title != null) : !this.title.equals(other.title)) {
-            return false;
-        }
-        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 7;
-        hash = 19 * hash + (this.backdropPath != null ? this.backdropPath.hashCode() : 0);
-        hash = 19 * hash + this.id;
-        hash = 19 * hash + (this.title != null ? this.title.hashCode() : 0);
-        hash = 19 * hash + (this.name != null ? this.name.hashCode() : 0);
-        hash = 19 * hash + (this.posterPath != null ? this.posterPath.hashCode() : 0);
-        hash = 19 * hash + (this.releaseDate != null ? this.releaseDate.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
-}
+/*
+ *      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;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * @author stuart.boston
+ */
+@JsonRootName("collection")
+public class Collection extends AbstractJsonMapping {
+
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * Properties
+     */
+    @JsonProperty("id")
+    private int id;
+    @JsonProperty("title")
+    private String title;
+    @JsonProperty("name")
+    private String name;
+    @JsonProperty("poster_path")
+    private String posterPath;
+    @JsonProperty("backdrop_path")
+    private String backdropPath;
+    @JsonProperty("release_date")
+    private String releaseDate;
+
+    public String getBackdropPath() {
+        return backdropPath;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public String getPosterPath() {
+        return posterPath;
+    }
+
+    public String getReleaseDate() {
+        return releaseDate;
+    }
+
+    public String getTitle() {
+        if (StringUtils.isBlank(title)) {
+            return name;
+        }
+        return title;
+    }
+
+    public String getName() {
+        if (StringUtils.isBlank(name)) {
+            return title;
+        }
+        return name;
+    }
+
+    public void setBackdropPath(String backdropPath) {
+        this.backdropPath = backdropPath;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public void setPosterPath(String posterPath) {
+        this.posterPath = posterPath;
+    }
+
+    public void setReleaseDate(String releaseDate) {
+        this.releaseDate = releaseDate;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final Collection other = (Collection) obj;
+        if ((this.backdropPath == null) ? (other.backdropPath != null) : !this.backdropPath.equals(other.backdropPath)) {
+            return false;
+        }
+        if (this.id != other.id) {
+            return false;
+        }
+        if ((this.title == null) ? (other.title != null) : !this.title.equals(other.title)) {
+            return false;
+        }
+        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 19 * hash + (this.backdropPath != null ? this.backdropPath.hashCode() : 0);
+        hash = 19 * hash + this.id;
+        hash = 19 * hash + (this.title != null ? this.title.hashCode() : 0);
+        hash = 19 * hash + (this.name != null ? this.name.hashCode() : 0);
+        hash = 19 * hash + (this.posterPath != null ? this.posterPath.hashCode() : 0);
+        hash = 19 * hash + (this.releaseDate != null ? this.releaseDate.hashCode() : 0);
+        return hash;
+    }
+}

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

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

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

@@ -1,135 +1,112 @@
-/*
- *      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.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 {
-
-    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")
-    private int companyId = 0;
-    @JsonProperty("name")
-    private String name = DEFAULT_STRING;
-    @JsonProperty("description")
-    private String description = DEFAULT_STRING;
-    @JsonProperty("headquarters")
-    private String headquarters = DEFAULT_STRING;
-    @JsonProperty("homepage")
-    private String homepage = DEFAULT_STRING;
-    @JsonProperty("logo_path")
-    private String logoPath = DEFAULT_STRING;
-    @JsonProperty("parent_company")
-    private String parentCompany = DEFAULT_STRING;
-
-    //<editor-fold defaultstate="collapsed" desc="Getter Methods">
-    public int getCompanyId() {
-        return companyId;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public String getHeadquarters() {
-        return headquarters;
-    }
-
-    public String getHomepage() {
-        return homepage;
-    }
-
-    public String getLogoPath() {
-        return logoPath;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getParentCompany() {
-        return parentCompany;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter Methods">
-    public void setCompanyId(int companyId) {
-        this.companyId = companyId;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public void setHeadquarters(String headquarters) {
-        this.headquarters = headquarters;
-    }
-
-    public void setHomepage(String homepage) {
-        this.homepage = homepage;
-    }
-
-    public void setLogoPath(String logoPath) {
-        this.logoPath = logoPath;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setParentCompany(String parentCompany) {
-        this.parentCompany = parentCompany;
-    }
-    //</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);
-    }
-}
+/*
+ *      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;
+
+/**
+ * Company information
+ *
+ * @author Stuart
+ */
+public class Company extends AbstractJsonMapping {
+
+    private static final long serialVersionUID = 1L;
+    private static final String DEFAULT_STRING = "";
+    // Properties
+    @JsonProperty("id")
+    private int companyId = 0;
+    @JsonProperty("name")
+    private String name = DEFAULT_STRING;
+    @JsonProperty("description")
+    private String description = DEFAULT_STRING;
+    @JsonProperty("headquarters")
+    private String headquarters = DEFAULT_STRING;
+    @JsonProperty("homepage")
+    private String homepage = DEFAULT_STRING;
+    @JsonProperty("logo_path")
+    private String logoPath = DEFAULT_STRING;
+    @JsonProperty("parent_company")
+    private Company parentCompany = null;
+
+    public int getCompanyId() {
+        return companyId;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getHeadquarters() {
+        return headquarters;
+    }
+
+    public String getHomepage() {
+        return homepage;
+    }
+
+    public String getLogoPath() {
+        return logoPath;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Company getParentCompany() {
+        return parentCompany;
+    }
+
+    public void setCompanyId(int companyId) {
+        this.companyId = companyId;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public void setHeadquarters(String headquarters) {
+        this.headquarters = headquarters;
+    }
+
+    public void setHomepage(String homepage) {
+        this.homepage = homepage;
+    }
+
+    public void setLogoPath(String logoPath) {
+        this.logoPath = logoPath;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setParentCompany(Company parentCompany) {
+        this.parentCompany = parentCompany;
+    }
+
+    public void setParentCompany(int id, String name, String logoPath) {
+        Company parent = new Company();
+        parent.setCompanyId(companyId);
+        parent.setName(name);
+        parent.setLogoPath(logoPath);
+        this.parentCompany = parent;
+    }
+}

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

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

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

@@ -1,115 +1,81 @@
-/*
- *      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.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 {
-
-    private static final long serialVersionUID = 1L;
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(Genre.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("id")
-    private int id;
-    @JsonProperty("name")
-    private String name;
-
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public int getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    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) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final Genre other = (Genre) obj;
-        if (this.id != other.id) {
-            return false;
-        }
-        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 5;
-        hash = 53 * hash + this.id;
-        hash = 53 * hash + (this.name != null ? this.name.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
-}
+/*
+ *      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;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+/**
+ * @author stuart.boston
+ */
+@JsonRootName("genre")
+public class Genre extends AbstractJsonMapping {
+
+    private static final long serialVersionUID = 1L;
+    /*
+     * Properties
+     */
+    @JsonProperty("id")
+    private int id;
+    @JsonProperty("name")
+    private String name;
+
+    public int getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final Genre other = (Genre) obj;
+        if (this.id != other.id) {
+            return false;
+        }
+        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 5;
+        hash = 53 * hash + this.id;
+        hash = 53 * hash + (this.name != null ? this.name.hashCode() : 0);
+        return hash;
+    }
+}

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

@@ -19,26 +19,19 @@
  */
 package com.omertron.themoviedbapi.model;
 
-import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.List;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-public class JobDepartment {
+import java.util.List;
+
+public class JobDepartment extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
-    // Logger
-    private static final Logger LOG = LoggerFactory.getLogger(JobDepartment.class);
     // Properties
     @JsonProperty("department")
     private String department;
     @JsonProperty("job_list")
     private List<String> jobs;
 
-    //<editor-fold defaultstate="collapsed" desc="Getters">
     public String getDepartment() {
         return department;
     }
@@ -46,9 +39,7 @@ public class JobDepartment {
     public List<String> getJobs() {
         return jobs;
     }
-    //</editor-fold>
 
-    //<editor-fold defaultstate="collapsed" desc="Setters">
     public void setDepartment(String department) {
         this.department = department;
     }
@@ -56,24 +47,4 @@ public class JobDepartment {
     public void setJobs(List<String> jobs) {
         this.jobs = jobs;
     }
-    //</editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        LOG.trace(sb.toString());
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
 }

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

@@ -1,116 +1,82 @@
-/*
- *      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.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 {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(Keyword.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("id")
-    private int id;
-    @JsonProperty("name")
-    private String name;
-
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public int getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    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) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final Keyword other = (Keyword) obj;
-        if (this.id != other.id) {
-            return false;
-        }
-        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 3;
-        hash = 83 * hash + this.id;
-        hash = 83 * hash + (this.name != null ? this.name.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
-}
+/*
+ *      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;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+/**
+ * @author stuart.boston
+ */
+@JsonRootName("keyword")
+public class Keyword extends AbstractJsonMapping {
+
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * Properties
+     */
+    @JsonProperty("id")
+    private int id;
+    @JsonProperty("name")
+    private String name;
+
+    public int getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final Keyword other = (Keyword) obj;
+        if (this.id != other.id) {
+            return false;
+        }
+        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 3;
+        hash = 83 * hash + this.id;
+        hash = 83 * hash + (this.name != null ? this.name.hashCode() : 0);
+        return hash;
+    }
+}

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

@@ -1,172 +1,138 @@
-/*
- *      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.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 {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(KeywordMovie.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("id")
-    private String id;
-    @JsonProperty("backdrop_path")
-    private String backdropPath;
-    @JsonProperty("original_title")
-    private String originalTitle;
-    @JsonProperty("release_date")
-    private String releaseDate;
-    @JsonProperty("poster_path")
-    private String posterPath;
-    @JsonProperty("title")
-    private String title;
-    @JsonProperty("vote_average")
-    private float voteAverage;
-    @JsonProperty("vote_count")
-    private double voteCount;
-    @JsonProperty("adult")
-    private boolean adult;
-    @JsonProperty("popularity")
-    private float popularity;
-
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public String getBackdropPath() {
-        return backdropPath;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public String getOriginalTitle() {
-        return originalTitle;
-    }
-
-    public String getReleaseDate() {
-        return releaseDate;
-    }
-
-    public String getPosterPath() {
-        return posterPath;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public float getVoteAverage() {
-        return voteAverage;
-    }
-
-    public double getVoteCount() {
-        return voteCount;
-    }
-
-    public boolean isAdult() {
-        return adult;
-    }
-
-    public float getPopularity() {
-        return popularity;
-    }
-    // </editor-fold>
-
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setBackdropPath(String backdropPath) {
-        this.backdropPath = backdropPath;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public void setOriginalTitle(String originalTitle) {
-        this.originalTitle = originalTitle;
-    }
-
-    public void setReleaseDate(String releaseDate) {
-        this.releaseDate = releaseDate;
-    }
-
-    public void setPosterPath(String posterPath) {
-        this.posterPath = posterPath;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public void setVoteAverage(float voteAverage) {
-        this.voteAverage = voteAverage;
-    }
-
-    public void setVoteCount(double voteCount) {
-        this.voteCount = voteCount;
-    }
-
-    public void setAdult(boolean adult) {
-        this.adult = adult;
-    }
-
-    public void setPopularity(float popularity) {
-        this.popularity = popularity;
-    }
-    // </editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        LOG.trace(sb.toString());
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
-}
+/*
+ *      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 Stuart
+ */
+public class KeywordMovie extends AbstractJsonMapping {
+
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * Properties
+     */
+    @JsonProperty("id")
+    private String id;
+    @JsonProperty("backdrop_path")
+    private String backdropPath;
+    @JsonProperty("original_title")
+    private String originalTitle;
+    @JsonProperty("release_date")
+    private String releaseDate;
+    @JsonProperty("poster_path")
+    private String posterPath;
+    @JsonProperty("title")
+    private String title;
+    @JsonProperty("vote_average")
+    private float voteAverage;
+    @JsonProperty("vote_count")
+    private double voteCount;
+    @JsonProperty("adult")
+    private boolean adult;
+    @JsonProperty("popularity")
+    private float popularity;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getBackdropPath() {
+        return backdropPath;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getOriginalTitle() {
+        return originalTitle;
+    }
+
+    public String getReleaseDate() {
+        return releaseDate;
+    }
+
+    public String getPosterPath() {
+        return posterPath;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public float getVoteAverage() {
+        return voteAverage;
+    }
+
+    public double getVoteCount() {
+        return voteCount;
+    }
+
+    public boolean isAdult() {
+        return adult;
+    }
+
+    public float getPopularity() {
+        return popularity;
+    }
+
+    public void setBackdropPath(String backdropPath) {
+        this.backdropPath = backdropPath;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public void setOriginalTitle(String originalTitle) {
+        this.originalTitle = originalTitle;
+    }
+
+    public void setReleaseDate(String releaseDate) {
+        this.releaseDate = releaseDate;
+    }
+
+    public void setPosterPath(String posterPath) {
+        this.posterPath = posterPath;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public void setVoteAverage(float voteAverage) {
+        this.voteAverage = voteAverage;
+    }
+
+    public void setVoteCount(double voteCount) {
+        this.voteCount = voteCount;
+    }
+
+    public void setAdult(boolean adult) {
+        this.adult = adult;
+    }
+
+    public void setPopularity(float popularity) {
+        this.popularity = popularity;
+    }
+}

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

@@ -1,115 +1,81 @@
-/*
- *      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.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 {
-
-    private static final long serialVersionUID = 1L;
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(Language.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("iso_639_1")
-    private String isoCode;
-    @JsonProperty("name")
-    private String name;
-
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public String getIsoCode() {
-        return isoCode;
-    }
-
-    public String getName() {
-        return name;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setIsoCode(String isoCode) {
-        this.isoCode = isoCode;
-    }
-
-    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) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final Language other = (Language) obj;
-        if ((this.isoCode == null) ? (other.isoCode != null) : !this.isoCode.equals(other.isoCode)) {
-            return false;
-        }
-        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 7;
-        hash = 71 * hash + (this.isoCode != null ? this.isoCode.hashCode() : 0);
-        hash = 71 * hash + (this.name != null ? this.name.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
-}
+/*
+ *      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;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+/**
+ * @author stuart.boston
+ */
+@JsonRootName("spoken_language")
+public class Language extends AbstractJsonMapping {
+
+    private static final long serialVersionUID = 1L;
+    /*
+     * Properties
+     */
+    @JsonProperty("iso_639_1")
+    private String isoCode;
+    @JsonProperty("name")
+    private String name;
+
+    public String getIsoCode() {
+        return isoCode;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setIsoCode(String isoCode) {
+        this.isoCode = isoCode;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final Language other = (Language) obj;
+        if ((this.isoCode == null) ? (other.isoCode != null) : !this.isoCode.equals(other.isoCode)) {
+            return false;
+        }
+        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 71 * hash + (this.isoCode != null ? this.isoCode.hashCode() : 0);
+        hash = 71 * hash + (this.name != null ? this.name.hashCode() : 0);
+        return hash;
+    }
+}

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

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

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

@@ -19,40 +19,19 @@
  */
 package com.omertron.themoviedbapi.model;
 
-import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.omertron.themoviedbapi.wrapper.WrapperAlternativeTitles;
-import com.omertron.themoviedbapi.wrapper.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 com.omertron.themoviedbapi.wrapper.*;
+
 import java.util.List;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Movie Bean
  *
  * @author stuart.boston
  */
-public class MovieDb implements Serializable {
+public class MovieDb extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(MovieDb.class);
-    /*
-     * Properties
-     */
     @JsonProperty("backdrop_path")
     private String backdropPath;
     @JsonProperty("id")
@@ -93,6 +72,8 @@ public class MovieDb implements Serializable {
     private List<Language> spokenLanguages;
     @JsonProperty("tagline")
     private String tagline;
+    @JsonProperty("rating")
+    private float userRating;
     @JsonProperty("vote_average")
     private float voteAverage;
     @JsonProperty("vote_count")
@@ -213,6 +194,10 @@ public class MovieDb implements Serializable {
     public String getStatus() {
         return status;
     }
+
+    public float getUserRating() {
+        return userRating;
+    }
     // </editor-fold>
 
     // <editor-fold defaultstate="collapsed" desc="Setter methods">
@@ -308,6 +293,9 @@ public class MovieDb implements Serializable {
         this.status = status;
     }
 
+    public void setUserRating(float userRating) {
+        this.userRating = userRating;
+    }
     // </editor-fold>
 
     //<editor-fold defaultstate="collapsed" desc="AppendToResponse Getters">
@@ -354,7 +342,7 @@ public class MovieDb implements Serializable {
     public List<Reviews> getReviews() {
         return reviews.getReviews();
     }
-    //</editor-fold>
+    // </editor-fold>
 
     //<editor-fold defaultstate="collapsed" desc="AppendToResponse Setters">
     public void setAlternativeTitles(WrapperAlternativeTitles alternativeTitles) {
@@ -396,22 +384,7 @@ public class MovieDb implements Serializable {
     public void setReviews(WrapperReviews reviews) {
         this.reviews = reviews;
     }
-
-    //</editor-fold>
-
-    /**
-     * 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>
 
     //<editor-fold defaultstate="collapsed" desc="Equals and HashCode">
     @Override
@@ -443,10 +416,5 @@ public class MovieDb implements Serializable {
         hash = 89 * hash + this.runtime;
         return hash;
     }
-    //</editor-fold>
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
+    // </editor-fold>
 }

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

@@ -1,158 +1,144 @@
-/*
- *      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.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 {
-    /*
-     * Logger
-     */
-
-    private static final Logger LOG = LoggerFactory.getLogger(MovieDbList.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("id")
-    private String id;
-    @JsonProperty("created_by")
-    private String createdBy;
-    @JsonProperty("description")
-    private String description;
-    @JsonProperty("favorite_count")
-    private int favoriteCount;
-    @JsonProperty("items")
-    private List<MovieDb> items = Collections.EMPTY_LIST;
-    @JsonProperty("item_count")
-    private int itemCount;
-    @JsonProperty("iso_639_1")
-    private String language;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("poster_path")
-    private String posterPath;
-
-    //<editor-fold defaultstate="collapsed" desc="Getter Methods">
-    public String getId() {
-        return id;
-    }
-
-    public String getCreatedBy() {
-        return createdBy;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public int getFavoriteCount() {
-        return favoriteCount;
-    }
-
-    public List<MovieDb> getItems() {
-        return items;
-    }
-
-    public int getItemCount() {
-        return itemCount;
-    }
-
-    public String getLanguage() {
-        return language;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getPosterPath() {
-        return posterPath;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter Methods">
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public void setCreatedBy(String createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public void setFavoriteCount(int favoriteCount) {
-        this.favoriteCount = favoriteCount;
-    }
-
-    public void setItems(List<MovieDb> items) {
-        this.items = items;
-    }
-
-    public void setItemCount(int itemCount) {
-        this.itemCount = itemCount;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    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);
-    }
-}
+/*
+ *      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;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Wrapper for the MovieDbList function
+ *
+ * @author stuart.boston
+ */
+public class MovieDbList extends AbstractJsonMapping {
+
+    @JsonProperty("id")
+    private String id;
+    @JsonProperty("created_by")
+    private String createdBy;
+    @JsonProperty("description")
+    private String description;
+    @JsonProperty("favorite_count")
+    private int favoriteCount;
+    @JsonProperty("items")
+    private List<MovieDb> items = Collections.EMPTY_LIST;
+    @JsonProperty("item_count")
+    private int itemCount;
+    @JsonProperty("iso_639_1")
+    private String language;
+    @JsonProperty("name")
+    private String name;
+    @JsonProperty("poster_path")
+    private String posterPath;
+    @JsonProperty("status_code")
+    private String statusCode;
+    @JsonProperty("status_message")
+    private String statusMessage;
+
+    public String getId() {
+        return id;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public int getFavoriteCount() {
+        return favoriteCount;
+    }
+
+    public List<MovieDb> getItems() {
+        return items;
+    }
+
+    public int getItemCount() {
+        return itemCount;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getPosterPath() {
+        return posterPath;
+    }
+
+    public String getStatusCode() {
+        return statusCode;
+    }
+
+    public String getStatusMessage() {
+        return statusMessage;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public void setFavoriteCount(int favoriteCount) {
+        this.favoriteCount = favoriteCount;
+    }
+
+    public void setItems(List<MovieDb> items) {
+        this.items = items;
+    }
+
+    public void setItemCount(int itemCount) {
+        this.itemCount = itemCount;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setPosterPath(String posterPath) {
+        this.posterPath = posterPath;
+    }
+
+    public void setStatusCode(String statusCode) {
+        this.statusCode = statusCode;
+    }
+
+    public void setStatusMessage(String statusMessage) {
+        this.statusMessage = statusMessage;
+    }
+}

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

@@ -1,148 +1,111 @@
-/*
- *      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.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 {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(MovieList.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("description")
-    private String description;
-    @JsonProperty("favorite_count")
-    private int favoriteCount;
-    @JsonProperty("id")
-    private String id;
-    @JsonProperty("item_count")
-    private int itemCount;
-    @JsonProperty("iso_639_1")
-    private String language;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("poster_path")
-    private String posterPath;
-    @JsonProperty("list_type")
-    private String listType;
-
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
-    public String getDescription() {
-        return description;
-    }
-
-    public int getFavoriteCount() {
-        return favoriteCount;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public int getItemCount() {
-        return itemCount;
-    }
-
-    public String getLanguage() {
-        return language;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getPosterPath() {
-        return posterPath;
-    }
-
-    public String getListType() {
-        return listType;
-    }
-    // </editor-fold>
-
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public void setFavoriteCount(int favoriteCount) {
-        this.favoriteCount = favoriteCount;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public void setItemCount(int itemCount) {
-        this.itemCount = itemCount;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setPosterPath(String posterPath) {
-        this.posterPath = posterPath;
-    }
-
-    public void setListType(String listType) {
-        this.listType = listType;
-    }
-    // </editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        LOG.trace(sb.toString());
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
-}
+/*
+ *      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 Stuart
+ */
+public class MovieList extends AbstractJsonMapping {
+
+    private static final long serialVersionUID = 1L;
+
+    @JsonProperty("description")
+    private String description;
+    @JsonProperty("favorite_count")
+    private int favoriteCount;
+    @JsonProperty("id")
+    private String id;
+    @JsonProperty("item_count")
+    private int itemCount;
+    @JsonProperty("iso_639_1")
+    private String language;
+    @JsonProperty("name")
+    private String name;
+    @JsonProperty("poster_path")
+    private String posterPath;
+    @JsonProperty("list_type")
+    private String listType;
+
+    public String getDescription() {
+        return description;
+    }
+
+    public int getFavoriteCount() {
+        return favoriteCount;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public int getItemCount() {
+        return itemCount;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getPosterPath() {
+        return posterPath;
+    }
+
+    public String getListType() {
+        return listType;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public void setFavoriteCount(int favoriteCount) {
+        this.favoriteCount = favoriteCount;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public void setItemCount(int itemCount) {
+        this.itemCount = itemCount;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setPosterPath(String posterPath) {
+        this.posterPath = posterPath;
+    }
+
+    public void setListType(String listType) {
+        this.listType = listType;
+    }
+}

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

@@ -1,328 +1,300 @@
-/*
- *      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.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.boston
- */
-public class Person implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(Person.class);
-
-    /*
-     * Static fields for default cast information
-     */
-    private static final String CAST_DEPARTMENT = "acting";
-    private static final String CAST_JOB = "actor";
-    private static final String DEFAULT_STRING = "";
-    /*
-     * Properties
-     */
-    @JsonProperty("id")
-    private int id = -1;
-    @JsonProperty("name")
-    private String name = "";
-    @JsonProperty("profile_path")
-    private String profilePath = DEFAULT_STRING;
-    private PersonType personType = PersonType.PERSON;
-    private String department = DEFAULT_STRING;  // Crew
-    private String job = DEFAULT_STRING;         // Crew
-    private String character = DEFAULT_STRING;   // Cast
-    private int order = -1;                      // Cast
-    @JsonProperty("adult")
-    private boolean adult = false;  // Person info
-    @JsonProperty("also_known_as")
-    private List<String> aka = new ArrayList<String>();
-    @JsonProperty("biography")
-    private String biography = DEFAULT_STRING;
-    @JsonProperty("birthday")
-    private String birthday = DEFAULT_STRING;
-    @JsonProperty("deathday")
-    private String deathday = DEFAULT_STRING;
-    @JsonProperty("homepage")
-    private String homepage = DEFAULT_STRING;
-    @JsonProperty("place_of_birth")
-    private String birthplace = DEFAULT_STRING;
-    @JsonProperty("imdb_id")
-    private String imdbId = DEFAULT_STRING;
-    @JsonProperty("popularity")
-    private float popularity = 0.0f;
-
-    /**
-     * Add a crew member
-     *
-     * @param id
-     * @param name
-     * @param profilePath
-     * @param department
-     * @param job
-     */
-    public void addCrew(int id, String name, String profilePath, String department, String job) {
-        this.personType = PersonType.CREW;
-        this.id = id;
-        this.name = name;
-        this.profilePath = profilePath;
-        this.department = department;
-        this.job = job;
-        this.character = "";
-        this.order = -1;
-    }
-
-    /**
-     * Add a cast member
-     *
-     * @param id
-     * @param name
-     * @param profilePath
-     * @param character
-     * @param order
-     */
-    public void addCast(int id, String name, String profilePath, String character, int order) {
-        this.personType = PersonType.CAST;
-        this.id = id;
-        this.name = name;
-        this.profilePath = profilePath;
-        this.character = character;
-        this.order = order;
-        this.department = CAST_DEPARTMENT;
-        this.job = CAST_JOB;
-    }
-
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
-    public String getCharacter() {
-        return character;
-    }
-
-    public String getDepartment() {
-        return department;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public String getJob() {
-        return job;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public int getOrder() {
-        return order;
-    }
-
-    public PersonType getPersonType() {
-        return personType;
-    }
-
-    public String getProfilePath() {
-        return profilePath;
-    }
-
-    public boolean isAdult() {
-        return adult;
-    }
-
-    public List<String> getAka() {
-        return aka;
-    }
-
-    public String getBiography() {
-        return biography;
-    }
-
-    public String getBirthday() {
-        return birthday;
-    }
-
-    public String getBirthplace() {
-        return birthplace;
-    }
-
-    public String getDeathday() {
-        return deathday;
-    }
-
-    public String getHomepage() {
-        return homepage;
-    }
-
-    public String getImdbId() {
-        return imdbId;
-    }
-
-    public float getPopularity() {
-        return popularity;
-    }
-    // </editor-fold>
-
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setCharacter(String character) {
-        this.character = character;
-    }
-
-    public void setDepartment(String department) {
-        this.department = department;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public void setJob(String job) {
-        this.job = job;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setOrder(int order) {
-        this.order = order;
-    }
-
-    public void setPersonType(PersonType personType) {
-        this.personType = personType;
-    }
-
-    public void setProfilePath(String profilePath) {
-        this.profilePath = profilePath;
-    }
-
-    public void setAdult(boolean adult) {
-        this.adult = adult;
-    }
-
-    public void setAka(List<String> aka) {
-        this.aka = aka;
-    }
-
-    public void setBiography(String biography) {
-        this.biography = biography;
-    }
-
-    public void setBirthday(String birthday) {
-        this.birthday = birthday;
-    }
-
-    public void setBirthplace(String birthplace) {
-        this.birthplace = birthplace;
-    }
-
-    public void setDeathday(String deathday) {
-        this.deathday = deathday;
-    }
-
-    public void setHomepage(String homepage) {
-        this.homepage = homepage;
-    }
-
-    public void setImdbId(String imdbId) {
-        this.imdbId = imdbId;
-    }
-
-    public void setPopularity(float popularity) {
-        this.popularity = popularity;
-    }
-    // </editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        LOG.trace(sb.toString());
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final Person other = (Person) obj;
-        if (this.id != other.id) {
-            return false;
-        }
-        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
-            return false;
-        }
-        if ((this.profilePath == null) ? (other.profilePath != null) : !this.profilePath.equals(other.profilePath)) {
-            return false;
-        }
-        if (this.personType != other.personType) {
-            return false;
-        }
-        if ((this.department == null) ? (other.department != null) : !this.department.equals(other.department)) {
-            return false;
-        }
-        if ((this.job == null) ? (other.job != null) : !this.job.equals(other.job)) {
-            return false;
-        }
-        if ((this.character == null) ? (other.character != null) : !this.character.equals(other.character)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 3;
-        hash = 37 * hash + this.id;
-        hash = 37 * hash + (this.name != null ? this.name.hashCode() : 0);
-        hash = 37 * hash + (this.profilePath != null ? this.profilePath.hashCode() : 0);
-        hash = 37 * hash + (this.personType != null ? this.personType.hashCode() : 0);
-        hash = 37 * hash + (this.department != null ? this.department.hashCode() : 0);
-        hash = 37 * hash + (this.job != null ? this.job.hashCode() : 0);
-        hash = 37 * hash + (this.character != null ? this.character.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
-}
+/*
+ *      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;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author stuart.boston
+ */
+public class Person extends AbstractJsonMapping {
+
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * Static fields for default cast information
+     */
+    private static final String CAST_DEPARTMENT = "acting";
+    private static final String CAST_JOB = "actor";
+    private static final String DEFAULT_STRING = "";
+    /*
+     * Properties
+     */
+    @JsonProperty("id")
+    private int id = -1;
+    @JsonProperty("name")
+    private String name = "";
+    @JsonProperty("profile_path")
+    private String profilePath = DEFAULT_STRING;
+    private PersonType personType = PersonType.PERSON;
+    // Crew
+    private String department = DEFAULT_STRING;
+    // Crew
+    private String job = DEFAULT_STRING;
+    // Cast
+    private String character = DEFAULT_STRING;
+    // Cast
+    private int order = -1;
+    @JsonProperty("adult")
+    // Person info
+    private boolean adult = false;
+    @JsonProperty("also_known_as")
+    private List<String> aka = new ArrayList<String>();
+    @JsonProperty("biography")
+    private String biography = DEFAULT_STRING;
+    @JsonProperty("birthday")
+    private String birthday = DEFAULT_STRING;
+    @JsonProperty("deathday")
+    private String deathday = DEFAULT_STRING;
+    @JsonProperty("homepage")
+    private String homepage = DEFAULT_STRING;
+    @JsonProperty("place_of_birth")
+    private String birthplace = DEFAULT_STRING;
+    @JsonProperty("imdb_id")
+    private String imdbId = DEFAULT_STRING;
+    @JsonProperty("popularity")
+    private float popularity = 0.0f;
+
+    /**
+     * Add a crew member
+     *
+     * @param id
+     * @param name
+     * @param profilePath
+     * @param department
+     * @param job
+     */
+    public void addCrew(int id, String name, String profilePath, String department, String job) {
+        setPersonType(PersonType.CREW);
+        setId(id);
+        setName(name);
+        setProfilePath(profilePath);
+        setDepartment(department);
+        setJob(job);
+        setCharacter("");
+        setOrder(-1);
+    }
+
+    /**
+     * Add a cast member
+     *
+     * @param id
+     * @param name
+     * @param profilePath
+     * @param character
+     * @param order
+     */
+    public void addCast(int id, String name, String profilePath, String character, int order) {
+        setPersonType(PersonType.CAST);
+        setId(id);
+        setName(name);
+        setProfilePath(profilePath);
+        setCharacter(character);
+        setOrder(order);
+        setDepartment(CAST_DEPARTMENT);
+        setJob(CAST_JOB);
+    }
+
+    public String getCharacter() {
+        return character;
+    }
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public String getJob() {
+        return job;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getOrder() {
+        return order;
+    }
+
+    public PersonType getPersonType() {
+        return personType;
+    }
+
+    public String getProfilePath() {
+        return profilePath;
+    }
+
+    public boolean isAdult() {
+        return adult;
+    }
+
+    public List<String> getAka() {
+        return aka;
+    }
+
+    public String getBiography() {
+        return biography;
+    }
+
+    public String getBirthday() {
+        return birthday;
+    }
+
+    public String getBirthplace() {
+        return birthplace;
+    }
+
+    public String getDeathday() {
+        return deathday;
+    }
+
+    public String getHomepage() {
+        return homepage;
+    }
+
+    public String getImdbId() {
+        return imdbId;
+    }
+
+    public float getPopularity() {
+        return popularity;
+    }
+
+    public void setCharacter(String character) {
+        this.character = character;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public void setJob(String job) {
+        this.job = StringUtils.trimToEmpty(job);
+    }
+
+    public void setName(String name) {
+        this.name = StringUtils.trimToEmpty(name);
+    }
+
+    public void setOrder(int order) {
+        this.order = order;
+    }
+
+    public void setPersonType(PersonType personType) {
+        this.personType = personType;
+    }
+
+    public void setProfilePath(String profilePath) {
+        this.profilePath = StringUtils.trimToEmpty(profilePath);
+    }
+
+    public void setAdult(boolean adult) {
+        this.adult = adult;
+    }
+
+    public void setAka(List<String> aka) {
+        this.aka = aka;
+    }
+
+    public void setBiography(String biography) {
+        this.biography = StringUtils.trimToEmpty(biography);
+    }
+
+    public void setBirthday(String birthday) {
+        this.birthday = StringUtils.trimToEmpty(birthday);
+    }
+
+    public void setBirthplace(String birthplace) {
+        this.birthplace = StringUtils.trimToEmpty(birthplace);
+    }
+
+    public void setDeathday(String deathday) {
+        this.deathday = StringUtils.trimToEmpty(deathday);
+    }
+
+    public void setHomepage(String homepage) {
+        this.homepage = StringUtils.trimToEmpty(homepage);
+    }
+
+    public void setImdbId(String imdbId) {
+        this.imdbId = StringUtils.trimToEmpty(imdbId);
+    }
+
+    public void setPopularity(float popularity) {
+        this.popularity = popularity;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final Person other = (Person) obj;
+        if (this.id != other.id) {
+            return false;
+        }
+        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
+            return false;
+        }
+        if ((this.profilePath == null) ? (other.profilePath != null) : !this.profilePath.equals(other.profilePath)) {
+            return false;
+        }
+        if (this.personType != other.personType) {
+            return false;
+        }
+        if ((this.department == null) ? (other.department != null) : !this.department.equals(other.department)) {
+            return false;
+        }
+        if ((this.job == null) ? (other.job != null) : !this.job.equals(other.job)) {
+            return false;
+        }
+        if ((this.character == null) ? (other.character != null) : !this.character.equals(other.character)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 3;
+        hash = 37 * hash + this.id;
+        hash = 37 * hash + (this.name != null ? this.name.hashCode() : 0);
+        hash = 37 * hash + (this.profilePath != null ? this.profilePath.hashCode() : 0);
+        hash = 37 * hash + (this.personType != null ? this.personType.hashCode() : 0);
+        hash = 37 * hash + (this.department != null ? this.department.hashCode() : 0);
+        hash = 37 * hash + (this.job != null ? this.job.hashCode() : 0);
+        hash = 37 * hash + (this.character != null ? this.character.hashCode() : 0);
+        return hash;
+    }
+}

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

@@ -1,168 +1,133 @@
-/*
- *      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.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 PersonCast implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(PersonCast.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("id")
-    private int id;
-    @JsonProperty("character")
-    private String character;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("order")
-    private int order;
-    @JsonProperty("profile_path")
-    private String profilePath;
-    @JsonProperty("cast_id")
-    private int castId;
-
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public String getCharacter() {
-        return character;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public int getOrder() {
-        return order;
-    }
-
-    public String getProfilePath() {
-        return profilePath;
-    }
-
-    public int getCastId() {
-        return castId;
-    }
-
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setCharacter(String character) {
-        this.character = character;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setOrder(int order) {
-        this.order = order;
-    }
-
-    public void setProfilePath(String profilePath) {
-        this.profilePath = 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) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final PersonCast other = (PersonCast) obj;
-        if (this.id != other.id) {
-            return false;
-        }
-        if ((this.character == null) ? (other.character != null) : !this.character.equals(other.character)) {
-            return false;
-        }
-        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
-            return false;
-        }
-        if (this.order != other.order) {
-            return false;
-        }
-        if ((this.profilePath == null) ? (other.profilePath != null) : !this.profilePath.equals(other.profilePath)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 7;
-        hash = 41 * hash + this.id;
-        hash = 41 * hash + (this.character != null ? this.character.hashCode() : 0);
-        hash = 41 * hash + (this.name != null ? this.name.hashCode() : 0);
-        hash = 41 * hash + this.order;
-        hash = 41 * hash + (this.profilePath != null ? this.profilePath.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
-}
+/*
+ *      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;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * @author Stuart
+ */
+public class PersonCast extends AbstractJsonMapping {
+
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * Properties
+     */
+    @JsonProperty("id")
+    private int id;
+    @JsonProperty("character")
+    private String character;
+    @JsonProperty("name")
+    private String name;
+    @JsonProperty("order")
+    private int order;
+    @JsonProperty("profile_path")
+    private String profilePath;
+    @JsonProperty("cast_id")
+    private int castId;
+
+    public String getCharacter() {
+        return character;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getOrder() {
+        return order;
+    }
+
+    public String getProfilePath() {
+        return profilePath;
+    }
+
+    public int getCastId() {
+        return castId;
+    }
+
+    public void setCharacter(String character) {
+        this.character = StringUtils.trimToEmpty(character);
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public void setName(String name) {
+        this.name = StringUtils.trimToEmpty(name);
+    }
+
+    public void setOrder(int order) {
+        this.order = order;
+    }
+
+    public void setProfilePath(String profilePath) {
+        this.profilePath = StringUtils.trimToEmpty(profilePath);
+    }
+
+    public void setCastId(int castId) {
+        this.castId = castId;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final PersonCast other = (PersonCast) obj;
+        if (this.id != other.id) {
+            return false;
+        }
+        if ((this.character == null) ? (other.character != null) : !this.character.equals(other.character)) {
+            return false;
+        }
+        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
+            return false;
+        }
+        if (this.order != other.order) {
+            return false;
+        }
+        if ((this.profilePath == null) ? (other.profilePath != null) : !this.profilePath.equals(other.profilePath)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 41 * hash + this.id;
+        hash = 41 * hash + (this.character != null ? this.character.hashCode() : 0);
+        hash = 41 * hash + (this.name != null ? this.name.hashCode() : 0);
+        hash = 41 * hash + this.order;
+        hash = 41 * hash + (this.profilePath != null ? this.profilePath.hashCode() : 0);
+        return hash;
+    }
+}

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

@@ -1,168 +1,134 @@
-/*
- *      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.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.boston
- */
-public class PersonCredit implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(PersonCredit.class);
-    private static final String DEFAULT_STRING = "";
-    /*
-     * Properties
-     */
-    @JsonProperty("id")
-    private int movieId = 0;
-    @JsonProperty("character")
-    private String character = DEFAULT_STRING;
-    @JsonProperty("original_title")
-    private String movieOriginalTitle = DEFAULT_STRING;
-    @JsonProperty("poster_path")
-    private String posterPath = DEFAULT_STRING;
-    @JsonProperty("release_date")
-    private String releaseDate = DEFAULT_STRING;
-    @JsonProperty("title")
-    private String movieTitle = DEFAULT_STRING;
-    @JsonProperty("department")
-    private String department = DEFAULT_STRING;
-    @JsonProperty("job")
-    private String job = DEFAULT_STRING;
-    @JsonProperty("adult")
-    private String adult = DEFAULT_STRING;
-    private PersonType personType = PersonType.PERSON;
-
-    //<editor-fold defaultstate="collapsed" desc="Getter Methods">
-    public String getCharacter() {
-        return character;
-    }
-
-    public String getDepartment() {
-        return department;
-    }
-
-    public String getJob() {
-        return job;
-    }
-
-    public int getMovieId() {
-        return movieId;
-    }
-
-    public String getMovieOriginalTitle() {
-        return movieOriginalTitle;
-    }
-
-    public String getMovieTitle() {
-        return movieTitle;
-    }
-
-    public PersonType getPersonType() {
-        return personType;
-    }
-
-    public String getPosterPath() {
-        return posterPath;
-    }
-
-    public String getReleaseDate() {
-        return releaseDate;
-    }
-
-    public String getAdult() {
-        return adult;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter Methods">
-    public void setCharacter(String character) {
-        this.character = character;
-    }
-
-    public void setDepartment(String department) {
-        this.department = department;
-    }
-
-    public void setJob(String job) {
-        this.job = job;
-    }
-
-    public void setMovieId(int movieId) {
-        this.movieId = movieId;
-    }
-
-    public void setMovieOriginalTitle(String movieOriginalTitle) {
-        this.movieOriginalTitle = movieOriginalTitle;
-    }
-
-    public void setMovieTitle(String movieTitle) {
-        this.movieTitle = movieTitle;
-    }
-
-    public void setPersonType(PersonType personType) {
-        this.personType = personType;
-    }
-
-    public void setPosterPath(String posterPath) {
-        this.posterPath = posterPath;
-    }
-
-    public void setReleaseDate(String releaseDate) {
-        this.releaseDate = releaseDate;
-    }
-
-    public void setAdult(String adult) {
-        this.adult = 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);
-    }
-}
+/*
+ *      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;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * @author stuart.boston
+ */
+public class PersonCredit extends AbstractJsonMapping {
+
+    private static final long serialVersionUID = 1L;
+    private static final String DEFAULT_STRING = "";
+    /*
+     * Properties
+     */
+    @JsonProperty("id")
+    private int movieId = 0;
+    @JsonProperty("character")
+    private String character = DEFAULT_STRING;
+    @JsonProperty("original_title")
+    private String movieOriginalTitle = DEFAULT_STRING;
+    @JsonProperty("poster_path")
+    private String posterPath = DEFAULT_STRING;
+    @JsonProperty("release_date")
+    private String releaseDate = DEFAULT_STRING;
+    @JsonProperty("title")
+    private String movieTitle = DEFAULT_STRING;
+    @JsonProperty("department")
+    private String department = DEFAULT_STRING;
+    @JsonProperty("job")
+    private String job = DEFAULT_STRING;
+    @JsonProperty("adult")
+    private String adult = DEFAULT_STRING;
+    private PersonType personType = PersonType.PERSON;
+
+    public String getCharacter() {
+        return character;
+    }
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public String getJob() {
+        return job;
+    }
+
+    public int getMovieId() {
+        return movieId;
+    }
+
+    public String getMovieOriginalTitle() {
+        return movieOriginalTitle;
+    }
+
+    public String getMovieTitle() {
+        return movieTitle;
+    }
+
+    public PersonType getPersonType() {
+        return personType;
+    }
+
+    public String getPosterPath() {
+        return posterPath;
+    }
+
+    public String getReleaseDate() {
+        return releaseDate;
+    }
+
+    public String getAdult() {
+        return adult;
+    }
+
+    public void setCharacter(String character) {
+        this.character = StringUtils.trimToEmpty(character);
+    }
+
+    public void setDepartment(String department) {
+        this.department = StringUtils.trimToEmpty(department);
+    }
+
+    public void setJob(String job) {
+        this.job = StringUtils.trimToEmpty(job);
+    }
+
+    public void setMovieId(int movieId) {
+        this.movieId = movieId;
+    }
+
+    public void setMovieOriginalTitle(String movieOriginalTitle) {
+        this.movieOriginalTitle = StringUtils.trimToEmpty(movieOriginalTitle);
+    }
+
+    public void setMovieTitle(String movieTitle) {
+        this.movieTitle = StringUtils.trimToEmpty(movieTitle);
+    }
+
+    public void setPersonType(PersonType personType) {
+        this.personType = personType;
+    }
+
+    public void setPosterPath(String posterPath) {
+        this.posterPath = StringUtils.trimToEmpty(posterPath);
+    }
+
+    public void setReleaseDate(String releaseDate) {
+        this.releaseDate = StringUtils.trimToEmpty(releaseDate);
+    }
+
+    public void setAdult(String adult) {
+        this.adult = StringUtils.trimToEmpty(adult);
+    }
+}

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

@@ -1,153 +1,120 @@
-/*
- *      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.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 PersonCrew implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(PersonCrew.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("id")
-    private int id;
-    @JsonProperty("department")
-    private String department;
-    @JsonProperty("job")
-    private String job;
-    @JsonProperty("name")
-    private String name;
-    @JsonProperty("profile_path")
-    private String profilePath;
-
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public String getDepartment() {
-        return department;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public String getJob() {
-        return job;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getProfilePath() {
-        return profilePath;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setDepartment(String department) {
-        this.department = department;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public void setJob(String job) {
-        this.job = job;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setProfilePath(String profilePath) {
-        this.profilePath = 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
-    public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final PersonCrew other = (PersonCrew) obj;
-        if (this.id != other.id) {
-            return false;
-        }
-        if ((this.department == null) ? (other.department != null) : !this.department.equals(other.department)) {
-            return false;
-        }
-        if ((this.job == null) ? (other.job != null) : !this.job.equals(other.job)) {
-            return false;
-        }
-        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 7;
-        hash = 59 * hash + this.id;
-        hash = 59 * hash + (this.department != null ? this.department.hashCode() : 0);
-        hash = 59 * hash + (this.job != null ? this.job.hashCode() : 0);
-        hash = 59 * hash + (this.name != null ? this.name.hashCode() : 0);
-        hash = 59 * hash + (this.profilePath != null ? this.profilePath.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
-}
+/*
+ *      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;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * @author Stuart
+ */
+public class PersonCrew extends AbstractJsonMapping {
+
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * Properties
+     */
+    @JsonProperty("id")
+    private int id;
+    @JsonProperty("department")
+    private String department;
+    @JsonProperty("job")
+    private String job;
+    @JsonProperty("name")
+    private String name;
+    @JsonProperty("profile_path")
+    private String profilePath;
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public String getJob() {
+        return job;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getProfilePath() {
+        return profilePath;
+    }
+
+    public void setDepartment(String department) {
+        this.department = StringUtils.trimToEmpty(department);
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public void setJob(String job) {
+        this.job = StringUtils.trimToEmpty(job);
+    }
+
+    public void setName(String name) {
+        this.name = StringUtils.trimToEmpty(name);
+    }
+
+    public void setProfilePath(String profilePath) {
+        this.profilePath = StringUtils.trimToEmpty(profilePath);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final PersonCrew other = (PersonCrew) obj;
+        if (this.id != other.id) {
+            return false;
+        }
+        if ((this.department == null) ? (other.department != null) : !this.department.equals(other.department)) {
+            return false;
+        }
+        if ((this.job == null) ? (other.job != null) : !this.job.equals(other.job)) {
+            return false;
+        }
+        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 59 * hash + this.id;
+        hash = 59 * hash + (this.department != null ? this.department.hashCode() : 0);
+        hash = 59 * hash + (this.job != null ? this.job.hashCode() : 0);
+        hash = 59 * hash + (this.name != null ? this.name.hashCode() : 0);
+        hash = 59 * hash + (this.profilePath != null ? this.profilePath.hashCode() : 0);
+        return hash;
+    }
+}

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

@@ -1,31 +1,33 @@
-/*
- *      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;
-
-/**
- *
- * @author stuart.boston
- */
-public enum PersonType {
-
-    CAST,   // A member of the cast
-    CREW,   // A member of the crew
-    PERSON  // No specific type
-}
+/*
+ *      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;
+
+/**
+ * @author stuart.boston
+ */
+public enum PersonType {
+
+    // A member of the cast
+    CAST,
+    // A member of the crew
+    CREW,
+    // No specific type
+    PERSON
+}

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

@@ -1,116 +1,82 @@
-/*
- *      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.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 {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(ProductionCompany.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("id")
-    private int id;
-    @JsonProperty("name")
-    private String name;
-
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public int getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    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) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final ProductionCompany other = (ProductionCompany) obj;
-        if (this.id != other.id) {
-            return false;
-        }
-        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 5;
-        hash = 37 * hash + this.id;
-        hash = 37 * hash + (this.name != null ? this.name.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
-}
+/*
+ *      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;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+/**
+ * @author stuart.boston
+ */
+@JsonRootName("production_company")
+public class ProductionCompany extends AbstractJsonMapping {
+
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * Properties
+     */
+    @JsonProperty("id")
+    private int id;
+    @JsonProperty("name")
+    private String name;
+
+    public int getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final ProductionCompany other = (ProductionCompany) obj;
+        if (this.id != other.id) {
+            return false;
+        }
+        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 5;
+        hash = 37 * hash + this.id;
+        hash = 37 * hash + (this.name != null ? this.name.hashCode() : 0);
+        return hash;
+    }
+}

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

@@ -1,116 +1,82 @@
-/*
- *      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.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 {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(ProductionCountry.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("iso_3166_1")
-    private String isoCode;
-    @JsonProperty("name")
-    private String name;
-
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public String getIsoCode() {
-        return isoCode;
-    }
-
-    public String getName() {
-        return name;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setIsoCode(String isoCode) {
-        this.isoCode = isoCode;
-    }
-
-    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) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final ProductionCountry other = (ProductionCountry) obj;
-        if ((this.isoCode == null) ? (other.isoCode != null) : !this.isoCode.equals(other.isoCode)) {
-            return false;
-        }
-        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 7;
-        hash = 47 * hash + (this.isoCode != null ? this.isoCode.hashCode() : 0);
-        hash = 47 * hash + (this.name != null ? this.name.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
-}
+/*
+ *      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;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+/**
+ * @author stuart.boston
+ */
+@JsonRootName("production_country")
+public class ProductionCountry extends AbstractJsonMapping {
+
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * Properties
+     */
+    @JsonProperty("iso_3166_1")
+    private String isoCode;
+    @JsonProperty("name")
+    private String name;
+
+    public String getIsoCode() {
+        return isoCode;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setIsoCode(String isoCode) {
+        this.isoCode = isoCode;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final ProductionCountry other = (ProductionCountry) obj;
+        if ((this.isoCode == null) ? (other.isoCode != null) : !this.isoCode.equals(other.isoCode)) {
+            return false;
+        }
+        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 47 * hash + (this.isoCode != null ? this.isoCode.hashCode() : 0);
+        hash = 47 * hash + (this.name != null ? this.name.hashCode() : 0);
+        return hash;
+    }
+}

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

@@ -1,128 +1,94 @@
-/*
- *      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.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 {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(ReleaseInfo.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("iso_3166_1")
-    private String country;
-    @JsonProperty("certification")
-    private String certification;
-    @JsonProperty("release_date")
-    private String releaseDate;
-
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public String getCertification() {
-        return certification;
-    }
-
-    public String getCountry() {
-        return country;
-    }
-
-    public String getReleaseDate() {
-        return releaseDate;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setCertification(String certification) {
-        this.certification = certification;
-    }
-
-    public void setCountry(String country) {
-        this.country = country;
-    }
-
-    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) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final ReleaseInfo other = (ReleaseInfo) obj;
-        if ((this.country == null) ? (other.country != null) : !this.country.equals(other.country)) {
-            return false;
-        }
-        if ((this.certification == null) ? (other.certification != null) : !this.certification.equals(other.certification)) {
-            return false;
-        }
-        if ((this.releaseDate == null) ? (other.releaseDate != null) : !this.releaseDate.equals(other.releaseDate)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 3;
-        hash = 89 * hash + (this.country != null ? this.country.hashCode() : 0);
-        hash = 89 * hash + (this.certification != null ? this.certification.hashCode() : 0);
-        hash = 89 * hash + (this.releaseDate != null ? this.releaseDate.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
-}
+/*
+ *      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 Stuart
+ */
+public class ReleaseInfo extends AbstractJsonMapping {
+
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * Properties
+     */
+    @JsonProperty("iso_3166_1")
+    private String country;
+    @JsonProperty("certification")
+    private String certification;
+    @JsonProperty("release_date")
+    private String releaseDate;
+
+    public String getCertification() {
+        return certification;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public String getReleaseDate() {
+        return releaseDate;
+    }
+
+    public void setCertification(String certification) {
+        this.certification = certification;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public void setReleaseDate(String releaseDate) {
+        this.releaseDate = releaseDate;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final ReleaseInfo other = (ReleaseInfo) obj;
+        if ((this.country == null) ? (other.country != null) : !this.country.equals(other.country)) {
+            return false;
+        }
+        if ((this.certification == null) ? (other.certification != null) : !this.certification.equals(other.certification)) {
+            return false;
+        }
+        if ((this.releaseDate == null) ? (other.releaseDate != null) : !this.releaseDate.equals(other.releaseDate)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 3;
+        hash = 89 * hash + (this.country != null ? this.country.hashCode() : 0);
+        hash = 89 * hash + (this.certification != null ? this.certification.hashCode() : 0);
+        hash = 89 * hash + (this.releaseDate != null ? this.releaseDate.hashCode() : 0);
+        return hash;
+    }
+}

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

@@ -19,26 +19,15 @@
  */
 package com.omertron.themoviedbapi.model;
 
-import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import java.io.Serializable;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
- *
  * @author Stuart
  */
-public class Reviews implements Serializable {
+public class Reviews extends AbstractJsonMapping {
 
     private static final long serialVersionUID = 1L;
 
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(Reviews.class);
     /*
      * Properties
      */
@@ -51,7 +40,6 @@ public class Reviews implements Serializable {
     @JsonProperty("url")
     private String url;
 
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
     public String getId() {
         return id;
     }
@@ -67,9 +55,7 @@ public class Reviews implements Serializable {
     public String getUrl() {
         return url;
     }
-    // </editor-fold>
 
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
     public void setId(String id) {
         this.id = id;
     }
@@ -85,24 +71,4 @@ public class Reviews implements Serializable {
     public void setUrl(String url) {
         this.url = url;
     }
-    // </editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        LOG.trace(sb.toString());
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
 }

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

@@ -1,88 +1,54 @@
-/*
- *      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.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 {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(StatusCode.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("status_code")
-    private int statusCode;
-    @JsonProperty("status_message")
-    private String statusMessage;
-
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public int getStatusCode() {
-        return statusCode;
-    }
-
-    public void setStatusCode(int statusCode) {
-        this.statusCode = statusCode;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
-    public String getStatusMessage() {
-        return statusMessage;
-    }
-
-    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);
-    }
-}
+/*
+ *      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 Stuart
+ */
+public class StatusCode extends AbstractJsonMapping {
+
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * Properties
+     */
+    @JsonProperty("status_code")
+    private int statusCode;
+    @JsonProperty("status_message")
+    private String statusMessage;
+
+    public int getStatusCode() {
+        return statusCode;
+    }
+
+    public void setStatusCode(int statusCode) {
+        this.statusCode = statusCode;
+    }
+
+    public String getStatusMessage() {
+        return statusMessage;
+    }
+
+    public void setStatusMessage(String statusMessage) {
+        this.statusMessage = statusMessage;
+    }
+}

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

@@ -1,202 +1,174 @@
-/*
- *      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.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 org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- *
- * @author stuart.boston
- */
-public class TmdbConfiguration implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(TmdbConfiguration.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("base_url")
-    private String baseUrl;
-    @JsonProperty("secure_base_url")
-    private String secureBaseUrl;
-    @JsonProperty("poster_sizes")
-    private List<String> posterSizes;
-    @JsonProperty("backdrop_sizes")
-    private List<String> backdropSizes;
-    @JsonProperty("profile_sizes")
-    private List<String> profileSizes;
-    @JsonProperty("logo_sizes")
-    private List<String> logoSizes;
-
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">//GEN-BEGIN:getterMethods
-    public List<String> getBackdropSizes() {
-        return backdropSizes;
-    }
-
-    public String getBaseUrl() {
-        return baseUrl;
-    }
-
-    public List<String> getPosterSizes() {
-        return posterSizes;
-    }
-
-    public List<String> getProfileSizes() {
-        return profileSizes;
-    }
-
-    public List<String> getLogoSizes() {
-        return logoSizes;
-    }
-
-    public String getSecureBaseUrl() {
-        return secureBaseUrl;
-    }
-
-    // </editor-fold>
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">//GEN-BEGIN:setterMethods
-    public void setBackdropSizes(List<String> backdropSizes) {
-        this.backdropSizes = backdropSizes;
-    }
-
-    public void setBaseUrl(String baseUrl) {
-        this.baseUrl = baseUrl;
-    }
-
-    public void setPosterSizes(List<String> posterSizes) {
-        this.posterSizes = posterSizes;
-    }
-
-    public void setProfileSizes(List<String> profileSizes) {
-        this.profileSizes = profileSizes;
-    }
-
-    public void setLogoSizes(List<String> logoSizes) {
-        this.logoSizes = logoSizes;
-    }
-
-    public void setSecureBaseUrl(String secureBaseUrl) {
-        this.secureBaseUrl = secureBaseUrl;
-    }
-    // </editor-fold>
-
-    /**
-     * Copy the data from the passed object to this one
-     *
-     * @param config
-     */
-    public void clone(TmdbConfiguration config) {
-        backdropSizes = config.getBackdropSizes();
-        baseUrl = config.getBaseUrl();
-        posterSizes = config.getPosterSizes();
-        profileSizes = config.getProfileSizes();
-        logoSizes = config.getLogoSizes();
-    }
-
-    /**
-     * Check that the poster size is valid
-     *
-     * @param posterSize
-     */
-    public boolean isValidPosterSize(String posterSize) {
-        if (StringUtils.isBlank(posterSize) || posterSizes.isEmpty()) {
-            return false;
-        }
-        return posterSizes.contains(posterSize);
-    }
-
-    /**
-     * Check that the backdrop size is valid
-     *
-     * @param backdropSize
-     */
-    public boolean isValidBackdropSize(String backdropSize) {
-        if (StringUtils.isBlank(backdropSize) || backdropSizes.isEmpty()) {
-            return false;
-        }
-        return backdropSizes.contains(backdropSize);
-    }
-
-    /**
-     * Check that the profile size is valid
-     *
-     * @param profileSize
-     */
-    public boolean isValidProfileSize(String profileSize) {
-        if (StringUtils.isBlank(profileSize) || profileSizes.isEmpty()) {
-            return false;
-        }
-        return profileSizes.contains(profileSize);
-    }
-
-    /**
-     * Check that the logo size is valid
-     *
-     * @param logoSize
-     */
-    public boolean isValidLogoSize(String logoSize) {
-        if (StringUtils.isBlank(logoSize) || logoSizes.isEmpty()) {
-            return false;
-        }
-        return logoSizes.contains(logoSize);
-    }
-
-    /**
-     * Check to see if the size is valid for any of the images types
-     *
-     * @param sizeToCheck
-     */
-    public boolean isValidSize(String sizeToCheck) {
-        return (isValidPosterSize(sizeToCheck)
-                || isValidBackdropSize(sizeToCheck)
-                || 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);
-    }
-}
+/*
+ *      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;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.List;
+
+/**
+ * @author stuart.boston
+ */
+public class TmdbConfiguration extends AbstractJsonMapping {
+
+    private static final long serialVersionUID = 1L;
+    /*
+     * Properties
+     */
+    @JsonProperty("base_url")
+    private String baseUrl;
+    @JsonProperty("secure_base_url")
+    private String secureBaseUrl;
+    @JsonProperty("poster_sizes")
+    private List<String> posterSizes;
+    @JsonProperty("backdrop_sizes")
+    private List<String> backdropSizes;
+    @JsonProperty("profile_sizes")
+    private List<String> profileSizes;
+    @JsonProperty("logo_sizes")
+    private List<String> logoSizes;
+
+    public List<String> getBackdropSizes() {
+        return backdropSizes;
+    }
+
+    public String getBaseUrl() {
+        return baseUrl;
+    }
+
+    public List<String> getPosterSizes() {
+        return posterSizes;
+    }
+
+    public List<String> getProfileSizes() {
+        return profileSizes;
+    }
+
+    public List<String> getLogoSizes() {
+        return logoSizes;
+    }
+
+    public String getSecureBaseUrl() {
+        return secureBaseUrl;
+    }
+
+    public void setBackdropSizes(List<String> backdropSizes) {
+        this.backdropSizes = backdropSizes;
+    }
+
+    public void setBaseUrl(String baseUrl) {
+        this.baseUrl = baseUrl;
+    }
+
+    public void setPosterSizes(List<String> posterSizes) {
+        this.posterSizes = posterSizes;
+    }
+
+    public void setProfileSizes(List<String> profileSizes) {
+        this.profileSizes = profileSizes;
+    }
+
+    public void setLogoSizes(List<String> logoSizes) {
+        this.logoSizes = logoSizes;
+    }
+
+    public void setSecureBaseUrl(String secureBaseUrl) {
+        this.secureBaseUrl = secureBaseUrl;
+    }
+
+    /**
+     * Copy the data from the passed object to this one
+     *
+     * @param config
+     */
+    public void clone(TmdbConfiguration config) {
+        backdropSizes = config.getBackdropSizes();
+        baseUrl = config.getBaseUrl();
+        posterSizes = config.getPosterSizes();
+        profileSizes = config.getProfileSizes();
+        logoSizes = config.getLogoSizes();
+    }
+
+    /**
+     * Check that the poster size is valid
+     *
+     * @param posterSize
+     * @return
+     */
+    public boolean isValidPosterSize(String posterSize) {
+        if (StringUtils.isBlank(posterSize) || posterSizes.isEmpty()) {
+            return false;
+        }
+        return posterSizes.contains(posterSize);
+    }
+
+    /**
+     * Check that the backdrop size is valid
+     *
+     * @param backdropSize
+     * @return
+     */
+    public boolean isValidBackdropSize(String backdropSize) {
+        if (StringUtils.isBlank(backdropSize) || backdropSizes.isEmpty()) {
+            return false;
+        }
+        return backdropSizes.contains(backdropSize);
+    }
+
+    /**
+     * Check that the profile size is valid
+     *
+     * @param profileSize
+     * @return
+     */
+    public boolean isValidProfileSize(String profileSize) {
+        if (StringUtils.isBlank(profileSize) || profileSizes.isEmpty()) {
+            return false;
+        }
+        return profileSizes.contains(profileSize);
+    }
+
+    /**
+     * Check that the logo size is valid
+     *
+     * @param logoSize
+     * @return
+     */
+    public boolean isValidLogoSize(String logoSize) {
+        if (StringUtils.isBlank(logoSize) || logoSizes.isEmpty()) {
+            return false;
+        }
+        return logoSizes.contains(logoSize);
+    }
+
+    /**
+     * Check to see if the size is valid for any of the images types
+     *
+     * @param sizeToCheck
+     * @return
+     */
+    public boolean isValidSize(String sizeToCheck) {
+        return (isValidPosterSize(sizeToCheck)
+                || isValidBackdropSize(sizeToCheck)
+                || isValidProfileSize(sizeToCheck)
+                || isValidLogoSize(sizeToCheck));
+    }
+}

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

@@ -1,91 +1,59 @@
-/*
- *      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.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
-     */
-    @JsonProperty("expires_at")
-    private String expires;
-    @JsonProperty("request_token")
-    private String requestToken;
-    @JsonProperty("success")
-    private Boolean success;
-
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
-    public String getExpires() {
-        return expires;
-    }
-
-    public String getRequestToken() {
-        return requestToken;
-    }
-
-    public Boolean getSuccess() {
-        return success;
-    }
-    // </editor-fold>
-
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setExpires(String expires) {
-        this.expires = expires;
-    }
-
-    public void setRequestToken(String requestToken) {
-        this.requestToken = requestToken;
-    }
-
-    public void setSuccess(Boolean success) {
-        this.success = success;
-    }
-    // </editor-fold>
-
-    /**
-     * Handle unknown properties and print a message
-     *
-     * @param key
-     * @param value
-     */
-    @JsonAnySetter
-    public void handleUnknown(String key, Object value) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Unknown property: '").append(key);
-        sb.append("' value: '").append(value).append("'");
-        LOG.trace(sb.toString());
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
-
-}
+/*
+ *      Copyright (c) 2004-2013 Stuart Boston
+ *
+ *      This file is part of TheMovieDB API.
+ *
+ *      TheMovieDB API is free software: you can redistribute it and/or modify
+ *      it under the terms of the GNU General Public License as published by
+ *      the Free Software Foundation, either version 3 of the License, or
+ *      any later version.
+ *
+ *      TheMovieDB API is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      GNU General Public License for more details.
+ *
+ *      You should have received a copy of the GNU General Public License
+ *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.omertron.themoviedbapi.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class TokenAuthorisation extends AbstractJsonMapping {
+
+    /*
+     * Properties
+     */
+    @JsonProperty("expires_at")
+    private String expires;
+    @JsonProperty("request_token")
+    private String requestToken;
+    @JsonProperty("success")
+    private Boolean success;
+
+    public String getExpires() {
+        return expires;
+    }
+
+    public String getRequestToken() {
+        return requestToken;
+    }
+
+    public Boolean getSuccess() {
+        return success;
+    }
+
+    public void setExpires(String expires) {
+        this.expires = expires;
+    }
+
+    public void setRequestToken(String requestToken) {
+        this.requestToken = requestToken;
+    }
+
+    public void setSuccess(Boolean success) {
+        this.success = success;
+    }
+}

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

@@ -1,122 +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.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
-     */
-    @JsonProperty("session_id")
-    private String sessionId;
-    @JsonProperty("success")
-    private Boolean success;
-    @JsonProperty("status_code")
-    private String statusCode;
-    @JsonProperty("status_message")
-    private String statusMessage;
-    @JsonProperty("guest_session_id")
-    private String guestSessionId;
-    @JsonProperty("expires_at")
-    private String expiresAt;
-
-    // <editor-fold defaultstate="collapsed" desc="Getter methods">
-    public String getSessionId() {
-        return sessionId;
-    }
-
-    public Boolean getSuccess() {
-        return success;
-    }
-
-    public String getStatusCode() {
-        return statusCode;
-    }
-
-    public String getStatusMessage() {
-        return statusMessage;
-    }
-
-    public String getGuestSessionId() {
-        return guestSessionId;
-    }
-
-    public String getExpiresAt() {
-        return expiresAt;
-    }
-    // </editor-fold>
-
-    // <editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setSessionId(String sessionId) {
-        this.sessionId = sessionId;
-    }
-
-    public void setSuccess(Boolean success) {
-        this.success = success;
-    }
-
-    public void setStatusCode(String statusCode) {
-        this.statusCode = statusCode;
-    }
-
-    public void setStatusMessage(String statusMessage) {
-        this.statusMessage = statusMessage;
-    }
-
-    public void setGuestSessionId(String guestSessionId) {
-        this.guestSessionId = guestSessionId;
-    }
-
-    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);
-    }
-}
+/*
+ *      Copyright (c) 2004-2013 Stuart Boston
+ *
+ *      This file is part of TheMovieDB API.
+ *
+ *      TheMovieDB API is free software: you can redistribute it and/or modify
+ *      it under the terms of the GNU General Public License as published by
+ *      the Free Software Foundation, either version 3 of the License, or
+ *      any later version.
+ *
+ *      TheMovieDB API is distributed in the hope that it will be useful,
+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *      GNU General Public License for more details.
+ *
+ *      You should have received a copy of the GNU General Public License
+ *      along with TheMovieDB API.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.omertron.themoviedbapi.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class TokenSession extends AbstractJsonMapping {
+
+    /*
+     * Properties
+     */
+    @JsonProperty("session_id")
+    private String sessionId;
+    @JsonProperty("success")
+    private Boolean success;
+    @JsonProperty("status_code")
+    private String statusCode;
+    @JsonProperty("status_message")
+    private String statusMessage;
+    @JsonProperty("guest_session_id")
+    private String guestSessionId;
+    @JsonProperty("expires_at")
+    private String expiresAt;
+
+    public String getSessionId() {
+        return sessionId;
+    }
+
+    public Boolean getSuccess() {
+        return success;
+    }
+
+    public String getStatusCode() {
+        return statusCode;
+    }
+
+    public String getStatusMessage() {
+        return statusMessage;
+    }
+
+    public String getGuestSessionId() {
+        return guestSessionId;
+    }
+
+    public String getExpiresAt() {
+        return expiresAt;
+    }
+
+    public void setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+    }
+
+    public void setSuccess(Boolean success) {
+        this.success = success;
+    }
+
+    public void setStatusCode(String statusCode) {
+        this.statusCode = statusCode;
+    }
+
+    public void setStatusMessage(String statusMessage) {
+        this.statusMessage = statusMessage;
+    }
+
+    public void setGuestSessionId(String guestSessionId) {
+        this.guestSessionId = guestSessionId;
+    }
+
+    public void setExpiresAt(String expiresAt) {
+        this.expiresAt = expiresAt;
+    }
+}

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

@@ -1,139 +1,114 @@
-/*
- *      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.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 {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(Trailer.class);
-    /*
-     * Website sources
-     */
-    public static final String WEBSITE_YOUTUBE = "youtube";
-    public static final String WEBSITE_QUICKTIME = "quicktime";
-    /*
-     * Properties
-     */
-    private String name;
-    private String size;
-    private String source;
-    private String website;    // The website of the trailer
-
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public String getName() {
-        return name;
-    }
-
-    public String getSize() {
-        return size;
-    }
-
-    public String getSource() {
-        return source;
-    }
-
-    public String getWebsite() {
-        return website;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setSize(String size) {
-        this.size = size;
-    }
-
-    public void setSource(String source) {
-        this.source = source;
-    }
-
-    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) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final Trailer other = (Trailer) obj;
-        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
-            return false;
-        }
-        if ((this.size == null) ? (other.size != null) : !this.size.equals(other.size)) {
-            return false;
-        }
-        if ((this.source == null) ? (other.source != null) : !this.source.equals(other.source)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 7;
-        hash = 61 * hash + (this.name != null ? this.name.hashCode() : 0);
-        hash = 61 * hash + (this.size != null ? this.size.hashCode() : 0);
-        hash = 61 * hash + (this.source != null ? this.source.hashCode() : 0);
-        hash = 61 * hash + (this.website != null ? this.website.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-    }
-}
+/*
+ *      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;
+
+/**
+ * @author Stuart
+ */
+public class Trailer extends AbstractJsonMapping {
+
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * Website sources
+     */
+    public static final String WEBSITE_YOUTUBE = "youtube";
+    public static final String WEBSITE_QUICKTIME = "quicktime";
+    /*
+     * Properties
+     */
+    private String name;
+    private String size;
+    private String source;
+    // The website of the trailer
+    private String website;
+    private String type;
+
+    public String getName() {
+        return name;
+    }
+
+    public String getSize() {
+        return size;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getWebsite() {
+        return website;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setSize(String size) {
+        this.size = size;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public void setWebsite(String website) {
+        this.website = website;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final Trailer other = (Trailer) obj;
+        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
+            return false;
+        }
+        if ((this.size == null) ? (other.size != null) : !this.size.equals(other.size)) {
+            return false;
+        }
+        if ((this.source == null) ? (other.source != null) : !this.source.equals(other.source)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 61 * hash + (this.name != null ? this.name.hashCode() : 0);
+        hash = 61 * hash + (this.size != null ? this.size.hashCode() : 0);
+        hash = 61 * hash + (this.source != null ? this.source.hashCode() : 0);
+        hash = 61 * hash + (this.website != null ? this.website.hashCode() : 0);
+        return hash;
+    }
+}

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

@@ -1,128 +1,101 @@
-/*
- *      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.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 {
-
-    private static final long serialVersionUID = 1L;
-
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(Translation.class);
-    /*
-     * Properties
-     */
-    @JsonProperty("english_name")
-    private String englishName;
-    @JsonProperty("iso_639_1")
-    private String isoCode;
-    @JsonProperty("name")
-    private String name;
-
-    //<editor-fold defaultstate="collapsed" desc="Getter methods">
-    public String getEnglishName() {
-        return englishName;
-    }
-
-    public String getIsoCode() {
-        return isoCode;
-    }
-
-    public String getName() {
-        return name;
-    }
-    //</editor-fold>
-
-    //<editor-fold defaultstate="collapsed" desc="Setter methods">
-    public void setEnglishName(String englishName) {
-        this.englishName = englishName;
-    }
-
-    public void setIsoCode(String isoCode) {
-        this.isoCode = isoCode;
-    }
-
-    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) {
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final Translation other = (Translation) obj;
-        if ((this.englishName == null) ? (other.englishName != null) : !this.englishName.equals(other.englishName)) {
-            return false;
-        }
-        if ((this.isoCode == null) ? (other.isoCode != null) : !this.isoCode.equals(other.isoCode)) {
-            return false;
-        }
-        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 3;
-        hash = 29 * hash + (this.englishName != null ? this.englishName.hashCode() : 0);
-        hash = 29 * hash + (this.isoCode != null ? this.isoCode.hashCode() : 0);
-        hash = 29 * hash + (this.name != null ? this.name.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this, ToStringStyle.DEFAULT_STYLE);
-     }
-}
+/*
+ *      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;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * @author Stuart
+ */
+public class Translation extends AbstractJsonMapping {
+
+    private static final long serialVersionUID = 1L;
+
+    /*
+     * Properties
+     */
+    @JsonProperty("english_name")
+    private String englishName;
+    @JsonProperty("iso_639_1")
+    private String isoCode;
+    @JsonProperty("name")
+    private String name;
+
+    public String getEnglishName() {
+        return englishName;
+    }
+
+    public String getIsoCode() {
+        return isoCode;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setEnglishName(String englishName) {
+        this.englishName = englishName;
+    }
+
+    public void setIsoCode(String isoCode) {
+        this.isoCode = isoCode;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final Translation other = (Translation) obj;
+        if ((this.englishName == null) ? (other.englishName != null) : !this.englishName.equals(other.englishName)) {
+            return false;
+        }
+        if ((this.isoCode == null) ? (other.isoCode != null) : !this.isoCode.equals(other.isoCode)) {
+            return false;
+        }
+        if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 3;
+        hash = 29 * hash + (this.englishName != null ? this.englishName.hashCode() : 0);
+        hash = 29 * hash + (this.isoCode != null ? this.isoCode.hashCode() : 0);
+        hash = 29 * hash + (this.name != null ? this.name.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this, ToStringStyle.SIMPLE_STYLE);
+    }
+}

src/main/java/com/omertron/themoviedbapi/model/comparator/PersonCreditDateComparator.java

@@ -0,0 +1,98 @@
+/*
+ *      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.comparator;
+
+import com.omertron.themoviedbapi.model.PersonCredit;
+import java.io.Serializable;
+import java.util.Comparator;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Compare two PersonCredits by date
+ *
+ * @author stuart.boston
+ */
+public class PersonCreditDateComparator implements Comparator<PersonCredit>, Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private static final Pattern YEAR_PATTERN = Pattern.compile("(?:.*?)(\\d{4})(?:.*?)");
+    private final boolean ascending;
+
+    public PersonCreditDateComparator() {
+        this.ascending = Boolean.FALSE;
+    }
+
+    public PersonCreditDateComparator(boolean ascending) {
+        this.ascending = ascending;
+    }
+
+    @Override
+    public int compare(PersonCredit pc1, PersonCredit pc2) {
+        return compare(pc1, pc2, ascending);
+    }
+
+    /**
+     * Compare two PersonCredits based on the respective years
+     *
+     * @param pc1
+     * @param pc2
+     * @param ascending
+     * @return
+     */
+    public int compare(PersonCredit pc1, PersonCredit pc2, boolean ascending) {
+        boolean valid1 = StringUtils.isNotBlank(pc1.getReleaseDate());
+        boolean valid2 = StringUtils.isNotBlank(pc2.getReleaseDate());
+
+        if (!valid1 && !valid2) {
+            return 0;
+        }
+
+        if (!valid1) {
+            return ascending ? -1 : 1;
+        }
+
+        if (!valid2) {
+            return ascending ? 1 : -1;
+        }
+
+        int year1 = extractYear(pc1.getReleaseDate());
+        int year2 = extractYear(pc2.getReleaseDate());
+        return ascending ? (year1 - year2) : (year2 - year1);
+    }
+
+    /**
+     * locate a 4 digit year in a date string
+     *
+     * @param date
+     * @return
+     */
+    private static int extractYear(String date) {
+        int year = 0;
+        Matcher m = YEAR_PATTERN.matcher(date);
+        if (m.find()) {
+            year = Integer.valueOf(m.group(1)).intValue();
+        }
+
+        // Give up and return 0
+        return year;
+    }
+}

src/main/java/com/omertron/themoviedbapi/results/AbstractResults.java

@@ -30,7 +30,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  *
  * @author Stuart
  */
-public abstract class TmdbResults {
+public abstract class AbstractResults {
 
     private int id = 0;
     private int page = 0;
@@ -100,6 +100,6 @@ public abstract class TmdbResults {
 
     @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/results/TmdbResultsList.java

@@ -1,50 +1,59 @@
-/*
- *      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.results;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * List of the results from TheMovieDb
- *
- * @author Stuart
- * @param <T>
- */
-public final class TmdbResultsList<T> extends TmdbResults {
-
-    private List<T> results;
-
-    public TmdbResultsList(List<T> resultList) {
-        if (resultList != null) {
-            results = new ArrayList<T>(resultList);
-        } else {
-            results = new ArrayList<T>(0);
-        }
-    }
-
-    public List<T> getResults() {
-        return results;
-    }
-
-    public void setResults(List<T> results) {
-        this.results = results;
-    }
-}
+/*
+ *      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.results;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * List of the results from TheMovieDb
+ *
+ * @author Stuart
+ * @param <T>
+ */
+public final class TmdbResultsList<T> extends AbstractResults {
+
+    private List<T> results;
+
+    public TmdbResultsList(List<T> resultList) {
+        if (resultList != null) {
+            results = new ArrayList<T>(resultList);
+        } else {
+            results = new ArrayList<T>(0);
+        }
+    }
+
+    public List<T> getResults() {
+        return results;
+    }
+
+    public void setResults(List<T> results) {
+        this.results = results;
+    }
+
+    @Override
+    public int getTotalResults() {
+        if (super.getTotalResults() == 0) {
+            return results.size();
+        } else {
+            return super.getTotalResults();
+        }
+    }
+}

src/main/java/com/omertron/themoviedbapi/results/TmdbResultsMap.java

@@ -29,7 +29,7 @@ import java.util.Map;
  * @param <K>
  * @param <V>
  */
-public final class TmdbResultsMap<K, V> extends TmdbResults {
+public final class TmdbResultsMap<K, V> extends AbstractResults {
 
     private Map<K, V> results;
 
@@ -44,4 +44,13 @@ public final class TmdbResultsMap<K, V> extends TmdbResults {
     public void setResults(Map<K, V> results) {
         this.results = results;
     }
+
+    @Override
+    public int getTotalResults() {
+        if (super.getTotalResults() == 0) {
+            return results.size();
+        } else {
+            return super.getTotalResults();
+        }
+    }
 }

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

@@ -1,253 +1,257 @@
-/*
- *      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.tools;
-
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * The API URL that is used to construct the API call
- *
- * @author Stuart
- */
-public class ApiUrl {
-
-    /*
-     * Logger
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(ApiUrl.class);
-    /*
-     * TheMovieDbApi API Base URL
-     */
-    private static final String TMDB_API_BASE = "http://api.themoviedb.org/3/";
-    /*
-     * Parameter configuration
-     */
-    private static final String DELIMITER_FIRST = "?";
-    private static final String DELIMITER_SUBSEQUENT = "&";
-    private static final String DEFAULT_STRING = "";
-    /*
-     * Properties
-     */
-    private String apiKey;
-    private String method;
-    private String submethod;
-    private Map<String, String> arguments = new HashMap<String, String>();
-    /*
-     * API Parameters
-     */
-    public static final String PARAM_ADULT = "include_adult=";
-    public static final String PARAM_API_KEY = "api_key=";
-    public static final String PARAM_COUNTRY = "country=";
-    public static final String PARAM_FAVORITE = "favorite=";
-    public static final String PARAM_ID = "id=";
-    public static final String PARAM_LANGUAGE = "language=";
-    public static final String PARAM_INCLUDE_ALL_MOVIES = "include_all_movies=";
-    public static final String PARAM_MOVIE_WATCHLIST = "movie_watchlist=";
-    public static final String PARAM_PAGE = "page=";
-    public static final String PARAM_QUERY = "query=";
-    public static final String PARAM_SESSION = "session_id=";
-    public static final String PARAM_TOKEN = "request_token=";
-    public static final String PARAM_VALUE = "value=";
-    public static final String PARAM_YEAR = "year=";
-    public static final String PARAM_START_DATE="start_date=";
-    public static final String PARAM_END_DATE="end_date=";
-    private static final String APPEND_TO_RESPONSE = "append_to_response=";
-
-    //<editor-fold defaultstate="collapsed" desc="Constructor Methods">
-    /**
-     * Constructor for the simple API URL method without a sub-method
-     *
-     * @param method
-     */
-    public ApiUrl(String apiKey, String method) {
-        this.apiKey = apiKey;
-        this.method = method;
-        this.submethod = DEFAULT_STRING;
-    }
-
-    /**
-     * Constructor for the API URL with a sub-method
-     *
-     * @param method
-     * @param submethod
-     */
-    public ApiUrl(String apiKey, String method, String submethod) {
-        this.apiKey = apiKey;
-        this.method = method;
-        this.submethod = submethod;
-    }
-    //</editor-fold>
-
-    /**
-     * Build the URL from the pre-created arguments.
-     */
-    public URL buildUrl() {
-        StringBuilder urlString = new StringBuilder(TMDB_API_BASE);
-
-        // Get the start of the URL
-        urlString.append(method);
-
-        // We have either a queury, or a direct request
-        if (arguments.containsKey(PARAM_QUERY)) {
-            // Append the suffix of the API URL
-            if(StringUtils.endsWith(urlString, "/") && submethod.startsWith("/")) {
-                urlString.deleteCharAt(urlString.length()-1);
-            }
-            urlString.append(submethod);
-
-            // Append the key information
-            urlString.append(DELIMITER_FIRST).append(PARAM_API_KEY);
-            urlString.append(apiKey);
-
-            // Append the search term
-            urlString.append(DELIMITER_SUBSEQUENT);
-            urlString.append(PARAM_QUERY);
-
-            String query = arguments.get(PARAM_QUERY);
-
-            try {
-                urlString.append(URLEncoder.encode(query, "UTF-8"));
-            } catch (UnsupportedEncodingException ex) {
-                LOG.trace("Unable to encode query: '{}' trying raw.", query);
-                // If we can't encode it, try it raw
-                urlString.append(query);
-            }
-
-            // Remove the query from the arguments so it is not added later
-            arguments.remove(PARAM_QUERY);
-        } else {
-            // Append the ID if provided
-            if (arguments.containsKey(PARAM_ID)) {
-                urlString.append(arguments.get(PARAM_ID));
-                arguments.remove(PARAM_ID);
-            }
-
-            // Append the suffix of the API URL
-            if(StringUtils.endsWith(urlString, "/") && submethod.startsWith("/")) {
-                urlString.deleteCharAt(urlString.length()-1);
-            }
-            urlString.append(submethod);
-
-            // Append the key information
-            urlString.append(DELIMITER_FIRST).append(PARAM_API_KEY);
-            urlString.append(apiKey);
-        }
-
-        for (Map.Entry<String, String> argEntry : arguments.entrySet()) {
-            urlString.append(DELIMITER_SUBSEQUENT).append(argEntry.getKey());
-            urlString.append(argEntry.getValue());
-        }
-
-        try {
-            LOG.trace("URL: {}", urlString.toString());
-            return new URL(urlString.toString());
-        } catch (MalformedURLException ex) {
-            LOG.warn("Failed to create URL {} - {}", urlString.toString(), ex.toString());
-            return null;
-        } finally {
-            arguments.clear();
-        }
-    }
-
-    /**
-     * Add arguments individually
-     *
-     * @param key
-     * @param value
-     */
-    public void addArgument(String key, String value) {
-        arguments.put(key, value);
-    }
-
-    /**
-     * Add arguments individually
-     *
-     * @param key
-     * @param value
-     */
-    public void addArgument(String key, int value) {
-        arguments.put(key, Integer.toString(value));
-    }
-
-    /**
-     * Add arguments individually
-     *
-     * @param key
-     * @param value
-     */
-    public void addArgument(String key, boolean value) {
-        arguments.put(key, Boolean.toString(value));
-    }
-
-    /**
-     * Add arguments individually
-     *
-     * @param key
-     * @param value
-     */
-    public void addArgument(String key, float value) {
-        arguments.put(key, Float.toString(value));
-    }
-
-    /**
-     * Clear the arguments
-     */
-    public void clearArguments() {
-        arguments.clear();
-    }
-
-    /**
-     * Set the arguments directly
-     *
-     * @param args
-     */
-    public void setArguments(Map<String, String> args) {
-        arguments.putAll(args);
-    }
-
-    /**
-     * Append any optional parameters to the URL
-     *
-     * @param appendToResponse
-     */
-    public void appendToResponse(String[] appendToResponse) {
-        if (appendToResponse.length > 0) {
-            StringBuilder sb = new StringBuilder();
-            boolean first = Boolean.TRUE;
-            for (String append : appendToResponse) {
-                if (first) {
-                    first = Boolean.FALSE;
-                } else {
-                    sb.append(",");
-                }
-                sb.append(append);
-            }
-            addArgument(APPEND_TO_RESPONSE, sb.toString());
-        }
-    }
-}
+/*
+ *      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.tools;
+
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * The API URL that is used to construct the API call
+ *
+ * @author Stuart
+ */
+public class ApiUrl {
+
+    /*
+     * Logger
+     */
+    private static final Logger LOG = LoggerFactory.getLogger(ApiUrl.class);
+    /*
+     * TheMovieDbApi API Base URL
+     */
+    private static final String TMDB_API_BASE = "http://api.themoviedb.org/3/";
+    /*
+     * Parameter configuration
+     */
+    private static final String DELIMITER_FIRST = "?";
+    private static final String DELIMITER_SUBSEQUENT = "&";
+    private static final String DEFAULT_STRING = "";
+    /*
+     * Properties
+     */
+    private final String apiKey;
+    private final String method;
+    private final String submethod;
+    private final Map<String, String> arguments = new HashMap<String, String>();
+    /*
+     * API Parameters
+     */
+    public static final String PARAM_ADULT = "include_adult=";
+    public static final String PARAM_API_KEY = "api_key=";
+    public static final String PARAM_COUNTRY = "country=";
+    public static final String PARAM_FAVORITE = "favorite=";
+    public static final String PARAM_ID = "id=";
+    public static final String PARAM_LANGUAGE = "language=";
+    public static final String PARAM_INCLUDE_ALL_MOVIES = "include_all_movies=";
+    public static final String PARAM_MOVIE_WATCHLIST = "movie_watchlist=";
+    public static final String PARAM_PAGE = "page=";
+    public static final String PARAM_QUERY = "query=";
+    public static final String PARAM_SESSION = "session_id=";
+    public static final String PARAM_TOKEN = "request_token=";
+    public static final String PARAM_VALUE = "value=";
+    public static final String PARAM_YEAR = "year=";
+    public static final String PARAM_START_DATE = "start_date=";
+    public static final String PARAM_END_DATE = "end_date=";
+    private static final String APPEND_TO_RESPONSE = "append_to_response=";
+
+    //<editor-fold defaultstate="collapsed" desc="Constructor Methods">
+    /**
+     * Constructor for the simple API URL method without a sub-method
+     *
+     * @param apiKey
+     * @param method
+     */
+    public ApiUrl(String apiKey, String method) {
+        this.apiKey = apiKey;
+        this.method = method;
+        this.submethod = DEFAULT_STRING;
+    }
+
+    /**
+     * Constructor for the API URL with a sub-method
+     *
+     * @param apiKey
+     * @param method
+     * @param submethod
+     */
+    public ApiUrl(String apiKey, String method, String submethod) {
+        this.apiKey = apiKey;
+        this.method = method;
+        this.submethod = submethod;
+    }
+    //</editor-fold>
+
+    /**
+     * Build the URL from the pre-created arguments.
+     *
+     * @return
+     */
+    public URL buildUrl() {
+        StringBuilder urlString = new StringBuilder(TMDB_API_BASE);
+
+        // Get the start of the URL
+        urlString.append(method);
+
+        // We have either a queury, or a direct request
+        if (arguments.containsKey(PARAM_QUERY)) {
+            // Append the suffix of the API URL
+            if (StringUtils.endsWith(urlString, "/") && submethod.startsWith("/")) {
+                urlString.deleteCharAt(urlString.length() - 1);
+            }
+            urlString.append(submethod);
+
+            // Append the key information
+            urlString.append(DELIMITER_FIRST).append(PARAM_API_KEY);
+            urlString.append(apiKey);
+
+            // Append the search term
+            urlString.append(DELIMITER_SUBSEQUENT);
+            urlString.append(PARAM_QUERY);
+
+            String query = arguments.get(PARAM_QUERY);
+
+            try {
+                urlString.append(URLEncoder.encode(query, "UTF-8"));
+            } catch (UnsupportedEncodingException ex) {
+                LOG.trace("Unable to encode query: '{}' trying raw.", query);
+                // If we can't encode it, try it raw
+                urlString.append(query);
+            }
+
+            // Remove the query from the arguments so it is not added later
+            arguments.remove(PARAM_QUERY);
+        } else {
+            // Append the ID if provided
+            if (arguments.containsKey(PARAM_ID)) {
+                urlString.append(arguments.get(PARAM_ID));
+                arguments.remove(PARAM_ID);
+            }
+
+            // Append the suffix of the API URL
+            if (StringUtils.endsWith(urlString, "/") && submethod.startsWith("/")) {
+                urlString.deleteCharAt(urlString.length() - 1);
+            }
+            urlString.append(submethod);
+
+            // Append the key information
+            urlString.append(DELIMITER_FIRST).append(PARAM_API_KEY);
+            urlString.append(apiKey);
+        }
+
+        for (Map.Entry<String, String> argEntry : arguments.entrySet()) {
+            urlString.append(DELIMITER_SUBSEQUENT).append(argEntry.getKey());
+            urlString.append(argEntry.getValue());
+        }
+
+        try {
+            LOG.trace("URL: {}", urlString.toString());
+            return new URL(urlString.toString());
+        } catch (MalformedURLException ex) {
+            LOG.warn("Failed to create URL {} - {}", urlString.toString(), ex.toString());
+            return null;
+        } finally {
+            arguments.clear();
+        }
+    }
+
+    /**
+     * Add arguments individually
+     *
+     * @param key
+     * @param value
+     */
+    public void addArgument(String key, String value) {
+        arguments.put(key, value);
+    }
+
+    /**
+     * Add arguments individually
+     *
+     * @param key
+     * @param value
+     */
+    public void addArgument(String key, int value) {
+        arguments.put(key, Integer.toString(value));
+    }
+
+    /**
+     * Add arguments individually
+     *
+     * @param key
+     * @param value
+     */
+    public void addArgument(String key, boolean value) {
+        arguments.put(key, Boolean.toString(value));
+    }
+
+    /**
+     * Add arguments individually
+     *
+     * @param key
+     * @param value
+     */
+    public void addArgument(String key, float value) {
+        arguments.put(key, Float.toString(value));
+    }
+
+    /**
+     * Clear the arguments
+     */
+    public void clearArguments() {
+        arguments.clear();
+    }
+
+    /**
+     * Set the arguments directly
+     *
+     * @param args
+     */
+    public void setArguments(Map<String, String> args) {
+        arguments.putAll(args);
+    }
+
+    /**
+     * Append any optional parameters to the URL
+     *
+     * @param appendToResponse
+     */
+    public void appendToResponse(String[] appendToResponse) {
+        if (appendToResponse.length > 0) {
+            StringBuilder sb = new StringBuilder();
+            boolean first = Boolean.TRUE;
+            for (String append : appendToResponse) {
+                if (first) {
+                    first = Boolean.FALSE;
+                } else {
+                    sb.append(",");
+                }
+                sb.append(append);
+            }
+            addArgument(APPEND_TO_RESPONSE, sb.toString());
+        }
+    }
+}

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

@@ -1,289 +1,325 @@
-/*
- *      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.tools;
-
-import com.omertron.themoviedbapi.MovieDbException;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.charset.Charset;
-import java.nio.charset.UnsupportedCharsetException;
-import java.util.HashMap;
-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
- */
-public final class WebBrowser {
-
-    private static final Logger LOG = LoggerFactory.getLogger(WebBrowser.class);
-    private static Map<String, String> browserProperties = new HashMap<String, String>();
-    private static Map<String, Map<String, String>> cookies = new HashMap<String, Map<String, String>>();
-    private static String proxyHost = null;
-    private static String proxyPort = null;
-    private static String proxyUsername = null;
-    private static String proxyPassword = null;
-    private static String proxyEncodedPassword = null;
-    private static int webTimeoutConnect = 25000;   // 25 second timeout
-    private static int webTimeoutRead = 90000;      // 90 second timeout
-
-    // Hide the constructor
-    protected WebBrowser() {
-        // prevents calls from subclass
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Populate the browser properties
-     */
-    private static void populateBrowserProperties() {
-        if (browserProperties.isEmpty()) {
-            browserProperties.put("User-Agent", "Mozilla/5.25 Netscape/5.0 (Windows; I; Win95)");
-            browserProperties.put("Accept", "application/json");
-        }
-    }
-
-    public static String request(String url) throws MovieDbException {
-        try {
-            return request(new URL(url));
-        } catch (MalformedURLException ex) {
-            throw new MovieDbException(MovieDbException.MovieDbExceptionType.INVALID_URL, null, ex);
-        }
-    }
-
-    public static URLConnection openProxiedConnection(URL url) throws MovieDbException {
-        try {
-            if (proxyHost != null) {
-                System.getProperties().put("proxySet", "true");
-                System.getProperties().put("proxyHost", proxyHost);
-                System.getProperties().put("proxyPort", proxyPort);
-            }
-
-            URLConnection cnx = url.openConnection();
-
-            if (proxyUsername != null) {
-                cnx.setRequestProperty("Proxy-Authorization", proxyEncodedPassword);
-            }
-
-            return cnx;
-        } catch (IOException ex) {
-            throw new MovieDbException(MovieDbException.MovieDbExceptionType.INVALID_URL, null, ex);
-        }
-    }
-
-    public static String request(URL url) throws MovieDbException {
-        StringWriter content = null;
-
-        try {
-            content = new StringWriter();
-
-            BufferedReader in = null;
-            URLConnection cnx = null;
-            try {
-                cnx = openProxiedConnection(url);
-
-                sendHeader(cnx);
-                readHeader(cnx);
-
-                in = new BufferedReader(new InputStreamReader(cnx.getInputStream(), getCharset(cnx)));
-                String line;
-                while ((line = in.readLine()) != null) {
-                    content.write(line);
-                }
-            } finally {
-                if (in != null) {
-                    in.close();
-                }
-
-                if (cnx instanceof HttpURLConnection) {
-                    ((HttpURLConnection) cnx).disconnect();
-                }
-            }
-            return content.toString();
-        } catch (IOException ex) {
-            throw new MovieDbException(MovieDbException.MovieDbExceptionType.CONNECTION_ERROR, null, ex);
-        } finally {
-            if (content != null) {
-                try {
-                    content.close();
-                } catch (IOException ex) {
-                    LOG.debug("Failed to close connection: " + ex.getMessage());
-                }
-            }
-        }
-    }
-
-    private static void sendHeader(URLConnection cnx) {
-        populateBrowserProperties();
-
-        // send browser properties
-        for (Map.Entry<String, String> browserProperty : browserProperties.entrySet()) {
-            cnx.setRequestProperty(browserProperty.getKey(), browserProperty.getValue());
-        }
-        // send cookies
-        String cookieHeader = createCookieHeader(cnx);
-        if (!cookieHeader.isEmpty()) {
-            cnx.setRequestProperty("Cookie", cookieHeader);
-        }
-    }
-
-    private static String createCookieHeader(URLConnection cnx) {
-        String host = cnx.getURL().getHost();
-        StringBuilder cookiesHeader = new StringBuilder();
-        for (Map.Entry<String, Map<String, String>> domainCookies : cookies.entrySet()) {
-            if (host.endsWith(domainCookies.getKey())) {
-                for (Map.Entry<String, String> cookie : domainCookies.getValue().entrySet()) {
-                    cookiesHeader.append(cookie.getKey());
-                    cookiesHeader.append("=");
-                    cookiesHeader.append(cookie.getValue());
-                    cookiesHeader.append(";");
-                }
-            }
-        }
-        if (cookiesHeader.length() > 0) {
-            // remove last ; char
-            cookiesHeader.deleteCharAt(cookiesHeader.length() - 1);
-        }
-        return cookiesHeader.toString();
-    }
-
-    private static void readHeader(URLConnection cnx) {
-        // read new cookies and update our cookies
-        for (Map.Entry<String, List<String>> header : cnx.getHeaderFields().entrySet()) {
-            if ("Set-Cookie".equals(header.getKey())) {
-                for (String cookieHeader : header.getValue()) {
-                    String[] cookieElements = cookieHeader.split(" *; *");
-                    if (cookieElements.length >= 1) {
-                        String[] firstElem = cookieElements[0].split(" *= *");
-                        String cookieName = firstElem[0];
-                        String cookieValue = firstElem.length > 1 ? firstElem[1] : null;
-                        String cookieDomain = null;
-                        // find cookie domain
-                        for (int i = 1; i < cookieElements.length; i++) {
-                            String[] cookieElement = cookieElements[i].split(" *= *");
-                            if ("domain".equals(cookieElement[0])) {
-                                cookieDomain = cookieElement.length > 1 ? cookieElement[1] : null;
-                                break;
-                            }
-                        }
-                        if (cookieDomain == null) {
-                            // if domain isn't set take current host
-                            cookieDomain = cnx.getURL().getHost();
-                        }
-                        Map<String, String> domainCookies = cookies.get(cookieDomain);
-                        if (domainCookies == null) {
-                            domainCookies = new HashMap<String, String>();
-                            cookies.put(cookieDomain, domainCookies);
-                        }
-                        // add or replace cookie
-                        domainCookies.put(cookieName, cookieValue);
-                    }
-                }
-            }
-        }
-    }
-
-    private static Charset getCharset(URLConnection cnx) {
-        Charset charset = null;
-        // content type will be string like "text/html; charset=UTF-8" or "text/html"
-        String contentType = cnx.getContentType();
-        if (contentType != null) {
-            // changed 'charset' to 'harset' in regexp because some sites send 'Charset'
-            Matcher m = Pattern.compile("harset *=[ '\"]*([^ ;'\"]+)[ ;'\"]*").matcher(contentType);
-            if (m.find()) {
-                String encoding = m.group(1);
-                try {
-                    charset = Charset.forName(encoding);
-                } catch (UnsupportedCharsetException e) {
-                    // there will be used default charset
-                }
-            }
-        }
-        if (charset == null) {
-            charset = Charset.defaultCharset();
-        }
-
-        return charset;
-    }
-
-    public static String getProxyHost() {
-        return proxyHost;
-    }
-
-    public static void setProxyHost(String myProxyHost) {
-        WebBrowser.proxyHost = myProxyHost;
-    }
-
-    public static String getProxyPort() {
-        return proxyPort;
-    }
-
-    public static void setProxyPort(String myProxyPort) {
-        WebBrowser.proxyPort = myProxyPort;
-    }
-
-    public static String getProxyUsername() {
-        return proxyUsername;
-    }
-
-    public static void setProxyUsername(String myProxyUsername) {
-        WebBrowser.proxyUsername = myProxyUsername;
-    }
-
-    public static String getProxyPassword() {
-        return proxyPassword;
-    }
-
-    public static void setProxyPassword(String myProxyPassword) {
-        WebBrowser.proxyPassword = myProxyPassword;
-
-        if (proxyUsername != null) {
-            proxyEncodedPassword = proxyUsername + ":" + proxyPassword;
-            proxyEncodedPassword = "Basic " + new String(Base64.encodeBase64((proxyUsername + ":" + proxyPassword).getBytes()));
-        }
-    }
-
-    public static int getWebTimeoutConnect() {
-        return webTimeoutConnect;
-    }
-
-    public static int getWebTimeoutRead() {
-        return webTimeoutRead;
-    }
-
-    public static void setWebTimeoutConnect(int webTimeoutConnect) {
-        WebBrowser.webTimeoutConnect = webTimeoutConnect;
-    }
-
-    public static void setWebTimeoutRead(int webTimeoutRead) {
-        WebBrowser.webTimeoutRead = webTimeoutRead;
-    }
-}
+/*
+ *      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.tools;
+
+import com.omertron.themoviedbapi.MovieDbException;
+import org.apache.commons.codec.binary.Base64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.charset.Charset;
+import java.nio.charset.UnsupportedCharsetException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Web browser with simple cookies support
+ */
+public final class WebBrowser {
+
+    private static final Logger LOG = LoggerFactory.getLogger(WebBrowser.class);
+    private static final Map<String, String> BROWSER_PROPERTIES = new HashMap<String, String>();
+    private static final Map<String, Map<String, String>> COOKIES = new HashMap<String, Map<String, String>>();
+    private static String proxyHost = null;
+    private static int proxyPort = 0;
+    private static String proxyUsername = null;
+    private static String proxyPassword = null;
+    private static String proxyEncodedPassword = null;
+    // 25 second timeout
+    private static int webTimeoutConnect = 25000;
+    // 90 second timeout
+    private static int webTimeoutRead = 90000;
+
+    // Hide the constructor
+    protected WebBrowser() {
+        // prevents calls from subclass
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Populate the browser properties
+     */
+    private static void populateBrowserProperties() {
+        if (BROWSER_PROPERTIES.isEmpty()) {
+            BROWSER_PROPERTIES.put("User-Agent", "Mozilla/5.25 Netscape/5.0 (Windows; I; Win95)");
+            BROWSER_PROPERTIES.put("Accept", "application/json");
+            BROWSER_PROPERTIES.put("Content-type", "application/json");
+        }
+    }
+
+    public static String request(String url) throws MovieDbException {
+        try {
+            return request(new URL(url));
+        } catch (MalformedURLException ex) {
+            throw new MovieDbException(MovieDbException.MovieDbExceptionType.INVALID_URL, null, ex);
+        }
+    }
+
+    public static URLConnection openProxiedConnection(URL url) throws MovieDbException {
+        try {
+            if (proxyHost != null) {
+                System.getProperties().put("proxySet", "true");
+                System.getProperties().put("proxyHost", proxyHost);
+                System.getProperties().put("proxyPort", proxyPort);
+            }
+
+            URLConnection cnx = url.openConnection();
+
+            if (proxyUsername != null) {
+                cnx.setRequestProperty("Proxy-Authorization", proxyEncodedPassword);
+            }
+
+            return cnx;
+        } catch (IOException ex) {
+            throw new MovieDbException(MovieDbException.MovieDbExceptionType.INVALID_URL, null, ex);
+        }
+    }
+
+    public static String request(URL url) throws MovieDbException {
+        return request(url, null, Boolean.FALSE);
+    }
+
+    public static String request(URL url, String jsonBody) throws MovieDbException {
+        return request(url, jsonBody, Boolean.FALSE);
+    }
+
+    public static String request(URL url, String jsonBody, boolean isDeleteRequest) throws MovieDbException {
+
+        StringWriter content = null;
+
+        try {
+            content = new StringWriter();
+
+            BufferedReader in = null;
+            HttpURLConnection cnx = null;
+            OutputStreamWriter wr = null;
+            try {
+                cnx = (HttpURLConnection) openProxiedConnection(url);
+
+                if (isDeleteRequest) {
+                    cnx.setDoOutput(true);
+                    cnx.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+                    cnx.setRequestMethod("DELETE");
+                }
+
+                sendHeader(cnx);
+
+                if (StringUtils.isNotBlank(jsonBody)) {
+                    cnx.setDoOutput(true);
+                    wr = new OutputStreamWriter(cnx.getOutputStream());
+                    wr.write(jsonBody);
+                }
+
+                readHeader(cnx);
+
+                // 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();
+                }
+
+                if (cnx instanceof HttpURLConnection) {
+                    ((HttpURLConnection) cnx).disconnect();
+                }
+            }
+            return content.toString();
+        } catch (IOException ex) {
+            throw new MovieDbException(MovieDbException.MovieDbExceptionType.CONNECTION_ERROR, null, ex);
+        } finally {
+            if (content != null) {
+                try {
+                    content.close();
+                } catch (IOException ex) {
+                    LOG.debug("Failed to close connection: " + ex.getMessage());
+                }
+            }
+        }
+    }
+
+    private static void sendHeader(URLConnection cnx) {
+        populateBrowserProperties();
+
+        // send browser properties
+        for (Map.Entry<String, String> browserProperty : BROWSER_PROPERTIES.entrySet()) {
+            cnx.setRequestProperty(browserProperty.getKey(), browserProperty.getValue());
+        }
+        // send cookies
+        String cookieHeader = createCookieHeader(cnx);
+        if (!cookieHeader.isEmpty()) {
+            cnx.setRequestProperty("Cookie", cookieHeader);
+        }
+    }
+
+    private static String createCookieHeader(URLConnection cnx) {
+        String host = cnx.getURL().getHost();
+        StringBuilder cookiesHeader = new StringBuilder();
+        for (Map.Entry<String, Map<String, String>> domainCookies : COOKIES.entrySet()) {
+            if (host.endsWith(domainCookies.getKey())) {
+                for (Map.Entry<String, String> cookie : domainCookies.getValue().entrySet()) {
+                    cookiesHeader.append(cookie.getKey());
+                    cookiesHeader.append("=");
+                    cookiesHeader.append(cookie.getValue());
+                    cookiesHeader.append(";");
+                }
+            }
+        }
+        if (cookiesHeader.length() > 0) {
+            // remove last ; char
+            cookiesHeader.deleteCharAt(cookiesHeader.length() - 1);
+        }
+        return cookiesHeader.toString();
+    }
+
+    private static void readHeader(URLConnection cnx) {
+        // read new cookies and update our cookies
+        for (Map.Entry<String, List<String>> header : cnx.getHeaderFields().entrySet()) {
+            if ("Set-Cookie".equals(header.getKey())) {
+                for (String cookieHeader : header.getValue()) {
+                    String[] cookieElements = cookieHeader.split(" *; *");
+                    if (cookieElements.length >= 1) {
+                        String[] firstElem = cookieElements[0].split(" *= *");
+                        String cookieName = firstElem[0];
+                        String cookieValue = firstElem.length > 1 ? firstElem[1] : null;
+                        String cookieDomain = null;
+                        // find cookie domain
+                        for (int i = 1; i < cookieElements.length; i++) {
+                            String[] cookieElement = cookieElements[i].split(" *= *");
+                            if ("domain".equals(cookieElement[0])) {
+                                cookieDomain = cookieElement.length > 1 ? cookieElement[1] : null;
+                                break;
+                            }
+                        }
+                        if (cookieDomain == null) {
+                            // if domain isn't set take current host
+                            cookieDomain = cnx.getURL().getHost();
+                        }
+                        Map<String, String> domainCookies = COOKIES.get(cookieDomain);
+                        if (domainCookies == null) {
+                            domainCookies = new HashMap<String, String>();
+                            COOKIES.put(cookieDomain, domainCookies);
+                        }
+                        // add or replace cookie
+                        domainCookies.put(cookieName, cookieValue);
+                    }
+                }
+            }
+        }
+    }
+
+    private static Charset getCharset(URLConnection cnx) {
+        Charset charset = null;
+        // content type will be string like "text/html; charset=UTF-8" or "text/html"
+        String contentType = cnx.getContentType();
+        if (contentType != null) {
+            // changed 'charset' to 'harset' in regexp because some sites send 'Charset'
+            Matcher m = Pattern.compile("harset *=[ '\"]*([^ ;'\"]+)[ ;'\"]*").matcher(contentType);
+            if (m.find()) {
+                String encoding = m.group(1);
+                try {
+                    charset = Charset.forName(encoding);
+                } catch (UnsupportedCharsetException e) {
+                    // there will be used default charset
+                }
+            }
+        }
+        if (charset == null) {
+            charset = Charset.defaultCharset();
+        }
+
+        return charset;
+    }
+
+    public static String getProxyHost() {
+        return proxyHost;
+    }
+
+    public static void setProxyHost(String myProxyHost) {
+        WebBrowser.proxyHost = myProxyHost;
+    }
+
+    public static int getProxyPort() {
+        return proxyPort;
+    }
+
+    public static void setProxyPort(int myProxyPort) {
+        WebBrowser.proxyPort = myProxyPort;
+    }
+
+    public static String getProxyUsername() {
+        return proxyUsername;
+    }
+
+    public static void setProxyUsername(String myProxyUsername) {
+        WebBrowser.proxyUsername = myProxyUsername;
+    }
+
+    public static String getProxyPassword() {
+        return proxyPassword;
+    }
+
+    public static void setProxyPassword(String myProxyPassword) {
+        WebBrowser.proxyPassword = myProxyPassword;
+
+        if (proxyUsername != null) {
+            proxyEncodedPassword = proxyUsername + ":" + proxyPassword;
+            proxyEncodedPassword = "Basic " + new String(Base64.encodeBase64((proxyUsername + ":" + proxyPassword).getBytes()));
+        }
+    }
+
+    public static int getWebTimeoutConnect() {
+        return webTimeoutConnect;
+    }
+
+    public static int getWebTimeoutRead() {
+        return webTimeoutRead;
+    }
+
+    public static void setWebTimeoutConnect(int webTimeoutConnect) {
+        WebBrowser.webTimeoutConnect = webTimeoutConnect;
+    }
+
+    public static void setWebTimeoutRead(int webTimeoutRead) {
+        WebBrowser.webTimeoutRead = webTimeoutRead;
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,72 +1,72 @@
-/*
- *      Copyright (c) 2004-2013 Stuart Boston
- *
- *      This file is part of the FanartTV API.
- *
- *      The FanartTV 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.
- *
- *      The FanartTV 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 the FanartTV API.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.omertron.themoviedbapi;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.logging.LogManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TestLogger {
-
-    private static final Logger LOG = LoggerFactory.getLogger(TestLogger.class);
-    private static final String CRLF = "\n";
-
-    private TestLogger() {
-        throw new UnsupportedOperationException("Class can not be instantiated");
-    }
-
-    /**
-     * Configure the logger with a simple in-memory file for the required log level
-     *
-     * @param level The logging level required
-     * @return True if successful
-     */
-    public static boolean Configure(String level) {
-        StringBuilder config = new StringBuilder("handlers = java.util.logging.ConsoleHandler\n");
-        config.append(".level = ").append(level).append(CRLF);
-        config.append("java.util.logging.ConsoleHandler.level = ").append(level).append(CRLF);
-        // Only works with Java 7 or later
-        config.append("java.util.logging.SimpleFormatter.format = [%1$tc %4$s] %2$s - %5$s %6$s%n").append(CRLF);
-        // Exclude http logging
-        config.append("sun.net.www.protocol.http.HttpURLConnection.level = OFF").append(CRLF);
-
-        InputStream ins = new ByteArrayInputStream(config.toString().getBytes());
-        try {
-            LogManager.getLogManager().readConfiguration(ins);
-        } catch (IOException e) {
-            LOG.warn("Failed to configure log manager due to an IO problem", e);
-            return Boolean.FALSE;
-        }
-        LOG.debug("Logger initialized to '{}' level", level);
-        return Boolean.TRUE;
-    }
-
-    /**
-     * Set the logging level to "ALL"
-     *
-     * @return True if successful
-     */
-    public static boolean Configure() {
-        return Configure("ALL");
-    }
-}
+/*
+ *      Copyright (c) 2004-2013 Stuart Boston
+ *
+ *      This file is part of the FanartTV API.
+ *
+ *      The FanartTV 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.
+ *
+ *      The FanartTV 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 the FanartTV API.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.omertron.themoviedbapi;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.logging.LogManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestLogger {
+
+    private static final Logger LOG = LoggerFactory.getLogger(TestLogger.class);
+    private static final String CRLF = "\n";
+
+    private TestLogger() {
+        throw new UnsupportedOperationException("Class can not be instantiated");
+    }
+
+    /**
+     * Configure the logger with a simple in-memory file for the required log level
+     *
+     * @param level The logging level required
+     * @return True if successful
+     */
+    public static boolean Configure(String level) {
+        StringBuilder config = new StringBuilder("handlers = java.util.logging.ConsoleHandler\n");
+        config.append(".level = ").append(level).append(CRLF);
+        config.append("java.util.logging.ConsoleHandler.level = ").append(level).append(CRLF);
+        // Only works with Java 7 or later
+        config.append("java.util.logging.SimpleFormatter.format = [%1$tH:%1$tM:%1$tS %4$6s] %2$s - %5$s %6$s%n").append(CRLF);
+        // Exclude http logging
+        config.append("sun.net.www.protocol.http.HttpURLConnection.level = OFF").append(CRLF);
+
+        InputStream ins = new ByteArrayInputStream(config.toString().getBytes());
+        try {
+            LogManager.getLogManager().readConfiguration(ins);
+        } catch (IOException e) {
+            LOG.warn("Failed to configure log manager due to an IO problem", e);
+            return Boolean.FALSE;
+        }
+        LOG.debug("Logger initialized to '{}' level", level);
+        return Boolean.TRUE;
+    }
+
+    /**
+     * Set the logging level to "ALL"
+     *
+     * @return True if successful
+     */
+    public static boolean Configure() {
+        return Configure("ALL");
+    }
+}

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

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